update for beta release
authorGwanglim Lee <gl77.lee@samsung.com>
Fri, 17 Feb 2012 05:56:08 +0000 (14:56 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Fri, 17 Feb 2012 05:56:08 +0000 (14:56 +0900)
591 files changed:
AUTHORS
COPYING
autogen.sh
config/.cvsignore [deleted file]
config/default/.cvsignore [deleted file]
config/default/e.src [changed mode: 0755->0644]
config/default/profile.desktop [changed mode: 0755->0644]
config/illume/e.src [changed mode: 0755->0644]
config/illume/icon.png
config/illume/module.illume-home.src [new file with mode: 0644]
config/illume/module.illume-indicator.src [new file with mode: 0644]
config/illume/module.illume-keyboard.src [new file with mode: 0644]
config/illume/module.illume-softkey.src [new file with mode: 0644]
config/illume/module.illume2.src [new file with mode: 0644]
config/illume/profile.desktop [changed mode: 0755->0644]
config/standard/.cvsignore [deleted file]
config/standard/e.src [changed mode: 0755->0644]
config/standard/icon.png
config/standard/profile.desktop [changed mode: 0755->0644]
configure.ac
data/.cvsignore [deleted file]
data/Makefile.am
data/etc/.cvsignore [deleted file]
data/etc/sysactions.conf.in [changed mode: 0755->0644]
data/icons/.cvsignore [deleted file]
data/images/.cvsignore [deleted file]
data/images/Makefile.am [changed mode: 0755->0644]
data/images/lang-system.png [new file with mode: 0644]
data/images/lang-zh_HK.png [new file with mode: 0644]
data/images/lang-zh_TW.png
data/input_methods/.cvsignore [deleted file]
data/input_methods/Makefile.am
data/input_methods/ibus.imc [new file with mode: 0644]
data/input_methods/iiimf.imc
data/input_methods/scim.imc
data/input_methods/uim.imc
data/other/.cvsignore [deleted file]
data/other/Makefile.am [deleted file]
data/other/_enlightenment_remote [deleted file]
data/other/desktop_files.tar.gz [deleted file]
data/other/desktop_order.tar.gz [deleted file]
data/other/efm_favorites.tar.gz [deleted file]
data/other/enlightenment_remote [deleted file]
data/other/icon_example.tar.gz [deleted file]
data/other/parse_todo.pl [deleted file]
data/themes/.cvsignore [deleted file]
data/themes/default.edc [changed mode: 0755->0644]
data/themes/images/.cvsignore [deleted file]
data/themes/images/Makefile.am [changed mode: 0755->0644]
data/themes/images/ball.png [deleted file]
data/themes/images/bat_content1.png [deleted file]
data/themes/images/bat_content1b.png [deleted file]
data/themes/images/bat_content2.png [deleted file]
data/themes/images/bat_content2b.png [deleted file]
data/themes/images/bat_content3.png [deleted file]
data/themes/images/bat_content3b.png [deleted file]
data/themes/images/bat_over.png [deleted file]
data/themes/images/bat_shadow.png [deleted file]
data/themes/images/batt_base.png [new file with mode: 0644]
data/themes/images/batt_level.png [new file with mode: 0644]
data/themes/images/batt_over.png [new file with mode: 0644]
data/themes/images/batt_power.png [new file with mode: 0644]
data/themes/images/bg_base.png [new file with mode: 0644]
data/themes/images/bg_over.png [new file with mode: 0644]
data/themes/images/bg_shadow.png [new file with mode: 0644]
data/themes/images/bluetooth.png [deleted file]
data/themes/images/bulb-0.png [new file with mode: 0644]
data/themes/images/bulb-1.png [new file with mode: 0644]
data/themes/images/bulb-2.png [new file with mode: 0644]
data/themes/images/cfg.png [deleted file]
data/themes/images/exq-bglight.png
data/themes/images/exq-vgrad.png [new file with mode: 0644]
data/themes/images/favorites.png [new file with mode: 0644]
data/themes/images/init_check1.png [deleted file]
data/themes/images/init_check2.png [deleted file]
data/themes/images/power.png [deleted file]
data/themes/images/power_glow.png [deleted file]
data/themes/images/refresh.png [new file with mode: 0644]
data/themes/images/wifi_0.png [deleted file]
data/themes/images/wifi_1.png [deleted file]
data/themes/images/wifi_2.png [deleted file]
data/themes/images/wifi_3.png [deleted file]
data/themes/images/wifi_4.png [deleted file]
data/tools/enlightenment_remote
data/xsession/.cvsignore [deleted file]
data/xsession/enlightenment.desktop.in [changed mode: 0755->0644]
debian/changelog
debian/rules
doc/.cvsignore [deleted file]
doc/Doxyfile.in [moved from doc/Doxyfile with 94% similarity]
doc/Makefile.am
enlightenment.spec.in
intl/.cvsignore [deleted file]
lib/.cvsignore [deleted file]
m4/.cvsignore [deleted file]
po/.cvsignore [deleted file]
po/ar.po
po/bg.po
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/eo.po
po/es.po
po/et.po
po/fi.po
po/fo.po
po/fr.po
po/fr_CH.po
po/he.po
po/hr.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/ms.po
po/nb.po
po/nl.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/zh_CN.po
po/zh_TW.po
src/.cvsignore [deleted file]
src/bin/.cvsignore [deleted file]
src/bin/Makefile.am
src/bin/e.h
src/bin/e_about.c
src/bin/e_actions.c
src/bin/e_alert.c
src/bin/e_alert.h
src/bin/e_alert_main.c [new file with mode: 0644]
src/bin/e_backlight.c [new file with mode: 0644]
src/bin/e_backlight.h [new file with mode: 0644]
src/bin/e_backlight_main.c [new file with mode: 0644]
src/bin/e_bg.c
src/bin/e_bg.h
src/bin/e_bindings.c
src/bin/e_bindings.h
src/bin/e_border.c
src/bin/e_border.h
src/bin/e_config.c
src/bin/e_config.h
src/bin/e_configure.c
src/bin/e_container.c
src/bin/e_desk.c
src/bin/e_deskenv.c [new file with mode: 0644]
src/bin/e_deskenv.h [new file with mode: 0644]
src/bin/e_desklock.c
src/bin/e_dialog.c
src/bin/e_eap_editor.c
src/bin/e_editable.c
src/bin/e_editable.h
src/bin/e_entry.c
src/bin/e_error.c
src/bin/e_error.h
src/bin/e_exec.c
src/bin/e_fm.c
src/bin/e_fm/Makefile.am [changed mode: 0755->0644]
src/bin/e_fm/e_fm_ipc.c [changed mode: 0755->0644]
src/bin/e_fm/e_fm_main.c [changed mode: 0755->0644]
src/bin/e_fm/e_fm_main.h [changed mode: 0755->0644]
src/bin/e_fm/e_fm_main_eeze.c [new file with mode: 0644]
src/bin/e_fm/e_fm_main_eeze.h [new file with mode: 0644]
src/bin/e_fm/e_fm_main_hal.c [changed mode: 0755->0644]
src/bin/e_fm/e_fm_main_udisks.c [changed mode: 0755->0644]
src/bin/e_fm_device.c
src/bin/e_fm_device.h
src/bin/e_fm_op.c
src/bin/e_fm_op_registry.c
src/bin/e_fm_shared_device.c
src/bin/e_fm_shared_types.h.in
src/bin/e_gadcon.c
src/bin/e_gadcon.h
src/bin/e_hints.c
src/bin/e_icon.c
src/bin/e_icon.h
src/bin/e_imc_main.c
src/bin/e_includes.h
src/bin/e_int_border_menu.c
src/bin/e_int_menus.c
src/bin/e_int_shelf_config.c
src/bin/e_intl.c
src/bin/e_intl_data.c
src/bin/e_intl_data.h
src/bin/e_ipc.c
src/bin/e_ipc.h
src/bin/e_livethumb.c
src/bin/e_main.c
src/bin/e_manager.c
src/bin/e_manager.h
src/bin/e_menu.c
src/bin/e_menu.h
src/bin/e_module.c
src/bin/e_msg.c
src/bin/e_msgbus.c
src/bin/e_pointer.c
src/bin/e_randr.c
src/bin/e_randr.h
src/bin/e_screensaver.c
src/bin/e_shelf.c
src/bin/e_signals.c
src/bin/e_start_main.c
src/bin/e_sys.c
src/bin/e_sys_main.c
src/bin/e_table.c
src/bin/e_theme.c
src/bin/e_thumb.c
src/bin/e_toolbar.c
src/bin/e_utils.c
src/bin/e_utils.h
src/bin/e_widget.c
src/bin/e_widget_color_well.c
src/bin/e_widget_fsel.c
src/bin/e_widget_ilist.c
src/bin/e_widget_preview.c
src/bin/e_widget_preview.h
src/bin/e_widget_slider.c
src/bin/e_win.c
src/bin/e_xsettings.c [new file with mode: 0644]
src/bin/e_xsettings.h [new file with mode: 0644]
src/bin/e_zone.c
src/bin/e_zone.h
src/modules/.cvsignore [deleted file]
src/modules/Makefile.am
src/modules/backlight/Makefile.am [new file with mode: 0644]
src/modules/backlight/e-module-backlight.edj [new file with mode: 0644]
src/modules/backlight/e_mod_main.c [new file with mode: 0644]
src/modules/backlight/e_mod_main.h [new file with mode: 0644]
src/modules/backlight/module.desktop.in [new file with mode: 0644]
src/modules/battery/.cvsignore [deleted file]
src/modules/battery/Makefile.am
src/modules/battery/batget.c
src/modules/battery/e-module-battery.edj
src/modules/battery/e_mod_config.c
src/modules/battery/e_mod_dbus.c
src/modules/battery/e_mod_main.c
src/modules/battery/e_mod_main.h
src/modules/battery/e_mod_openbsd.c [new file with mode: 0644]
src/modules/battery/e_mod_udev.c
src/modules/battery/module.desktop.in [changed mode: 0755->0644]
src/modules/bluez/e_mod_main.c
src/modules/clock/.cvsignore [deleted file]
src/modules/clock/e_mod_config.c
src/modules/clock/e_mod_main.c
src/modules/clock/e_mod_main.h
src/modules/comp/.cvsignore [deleted file]
src/modules/comp/Makefile.am
src/modules/comp/e_mod_comp.c
src/modules/comp/e_mod_comp_cfdata.c [new file with mode: 0644]
src/modules/comp/e_mod_comp_cfdata.h [new file with mode: 0644]
src/modules/comp/e_mod_config.c
src/modules/comp/e_mod_main.c
src/modules/comp/e_mod_main.h
src/modules/comp/shadow.edj
src/modules/conf/.cvsignore [deleted file]
src/modules/conf/e_conf.c
src/modules/conf/e_mod_main.c
src/modules/conf_applications/.cvsignore [deleted file]
src/modules/conf_applications/Makefile.am
src/modules/conf_applications/e_int_config_apps.c
src/modules/conf_applications/e_int_config_defapps.c [new file with mode: 0644]
src/modules/conf_applications/e_int_config_defapps.h [new file with mode: 0644]
src/modules/conf_applications/e_int_config_delapps.c [new file with mode: 0644]
src/modules/conf_applications/e_int_config_delapps.h [new file with mode: 0644]
src/modules/conf_applications/e_int_config_deskenv.c [new file with mode: 0644]
src/modules/conf_applications/e_int_config_deskenv.h [new file with mode: 0644]
src/modules/conf_applications/e_mod_main.c
src/modules/conf_applications/e_mod_main.h
src/modules/conf_dialogs/.cvsignore [deleted file]
src/modules/conf_display/.cvsignore [deleted file]
src/modules/conf_display/e_int_config_desklock.c
src/modules/conf_display/e_int_config_desks.c
src/modules/conf_display/e_int_config_display.c
src/modules/conf_display/e_int_config_dpms.c
src/modules/conf_display/e_int_config_screensaver.c
src/modules/conf_display/e_mod_main.c
src/modules/conf_display/module.desktop.in [changed mode: 0755->0644]
src/modules/conf_edgebindings/.cvsignore [deleted file]
src/modules/conf_edgebindings/e_int_config_edgebindings.c
src/modules/conf_interaction/.cvsignore [deleted file]
src/modules/conf_intl/.cvsignore [deleted file]
src/modules/conf_intl/e_int_config_intl.c
src/modules/conf_keybindings/.cvsignore [deleted file]
src/modules/conf_keybindings/e_int_config_acpibindings.c
src/modules/conf_keybindings/e_int_config_keybindings.c
src/modules/conf_keybindings/e_int_config_mousebindings.c
src/modules/conf_menus/.cvsignore [deleted file]
src/modules/conf_paths/.cvsignore [deleted file]
src/modules/conf_paths/e_int_config_env.c
src/modules/conf_performance/.cvsignore [deleted file]
src/modules/conf_randr/Makefile.am [new file with mode: 0644]
src/modules/conf_randr/e-module-conf_randr.edc [new file with mode: 0755]
src/modules/conf_randr/e_int_config_randr.c [new file with mode: 0644]
src/modules/conf_randr/e_int_config_randr.h [new file with mode: 0644]
src/modules/conf_randr/e_int_config_randr_arrangement.c [new file with mode: 0644]
src/modules/conf_randr/e_int_config_randr_orientation.c [new file with mode: 0644]
src/modules/conf_randr/e_int_config_randr_policies.c [new file with mode: 0644]
src/modules/conf_randr/e_int_config_randr_resolutions.c [new file with mode: 0644]
src/modules/conf_randr/e_mod_main.c [new file with mode: 0644]
src/modules/conf_randr/e_mod_main.h [new file with mode: 0644]
src/modules/conf_randr/images/display-glass-shine.png [new file with mode: 0644]
src/modules/conf_randr/images/display.png [new file with mode: 0644]
src/modules/conf_randr/images/icon.png [new file with mode: 0644]
src/modules/conf_randr/images/video-display.png [new file with mode: 0644]
src/modules/conf_randr/module.desktop.in [new file with mode: 0644]
src/modules/conf_shelves/.cvsignore [deleted file]
src/modules/conf_theme/.cvsignore [deleted file]
src/modules/conf_theme/Makefile.am
src/modules/conf_theme/e_int_config_borders.c
src/modules/conf_theme/e_int_config_color_classes.c
src/modules/conf_theme/e_int_config_fonts.c
src/modules/conf_theme/e_int_config_icon_themes.c
src/modules/conf_theme/e_int_config_scale.c
src/modules/conf_theme/e_int_config_theme.c
src/modules/conf_theme/e_int_config_transitions.c
src/modules/conf_theme/e_int_config_wallpaper.c
src/modules/conf_theme/e_int_config_wallpaper_import.c
src/modules/conf_theme/e_int_config_xsettings.c [new file with mode: 0644]
src/modules/conf_theme/e_mod_main.c
src/modules/conf_theme/e_mod_main.h
src/modules/conf_theme/module.desktop.in [changed mode: 0755->0644]
src/modules/conf_wallpaper2/e_int_config_wallpaper.c
src/modules/conf_window_manipulation/.cvsignore [deleted file]
src/modules/conf_window_manipulation/e_int_config_window_display.c
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
src/modules/conf_window_remembers/.cvsignore [deleted file]
src/modules/connman/.cvsignore [deleted file]
src/modules/connman/e_mod_main.c
src/modules/connman/e_mod_main.h
src/modules/cpufreq/.cvsignore [deleted file]
src/modules/cpufreq/e_mod_main.c
src/modules/dropshadow/.cvsignore [deleted file]
src/modules/everything/Makefile.am
src/modules/everything/e-module-everything-start.edj [new file with mode: 0644]
src/modules/everything/e_mod_main.c
src/modules/everything/e_mod_main.h
src/modules/everything/evry.c
src/modules/everything/evry_api.h
src/modules/everything/evry_config.c
src/modules/everything/evry_gadget.c
src/modules/everything/evry_history.c
src/modules/everything/evry_plug_actions.c
src/modules/everything/evry_plug_aggregator.c
src/modules/everything/evry_plug_apps.c
src/modules/everything/evry_plug_calc.c
src/modules/everything/evry_plug_clipboard.c
src/modules/everything/evry_plug_collection.c
src/modules/everything/evry_plug_files.c
src/modules/everything/evry_plug_settings.c
src/modules/everything/evry_plug_text.c
src/modules/everything/evry_plug_windows.c
src/modules/everything/evry_plugin.c
src/modules/everything/evry_types.h
src/modules/everything/evry_util.c
src/modules/everything/evry_view.c
src/modules/everything/evry_view_help.c
src/modules/everything/evry_view_tabs.c
src/modules/everything/md5.c
src/modules/fileman/.cvsignore [deleted file]
src/modules/fileman/Makefile.am
src/modules/fileman/e_fwin.c
src/modules/fileman/e_fwin.h
src/modules/fileman/e_fwin_nav.c [new file with mode: 0644]
src/modules/fileman/e_int_config_mime.c
src/modules/fileman/e_mod_dbus.c
src/modules/fileman/e_mod_main.c
src/modules/fileman_opinfo/e_mod_main.c
src/modules/gadman/.cvsignore [deleted file]
src/modules/gadman/e_mod_config.c
src/modules/gadman/module.desktop.in [changed mode: 0755->0644]
src/modules/ibar/.cvsignore [deleted file]
src/modules/ibar/e_mod_main.c
src/modules/ibar/module.desktop.in [changed mode: 0755->0644]
src/modules/ibox/.cvsignore [deleted file]
src/modules/ibox/e_mod_main.c
src/modules/ibox/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-bluetooth/e_mod_main.c
src/modules/illume-bluetooth/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-home-toggle/e_mod_main.c
src/modules/illume-home-toggle/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-home/e_mod_main.c
src/modules/illume-home/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-indicator/e_mod_ind_win.c
src/modules/illume-indicator/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-kbd-toggle/e_mod_main.c
src/modules/illume-kbd-toggle/module.desktop.in [changed mode: 0755->0644]
src/modules/illume-keyboard/Makefile.am
src/modules/illume-keyboard/e-module-illume-keyboard.edc [new file with mode: 0755]
src/modules/illume-keyboard/e-module-illume-keyboard.edj [deleted file]
src/modules/illume-keyboard/e_kbd_buf.c
src/modules/illume-keyboard/e_kbd_dict.c
src/modules/illume-keyboard/e_kbd_int.c
src/modules/illume-keyboard/e_kbd_int.h
src/modules/illume-keyboard/e_mod_config.c
src/modules/illume-keyboard/e_mod_config.h
src/modules/illume-keyboard/e_mod_main.c
src/modules/illume-keyboard/images/Makefile.am [new file with mode: 0644]
src/modules/illume-keyboard/images/base_bg.png [new file with mode: 0644]
src/modules/illume-keyboard/images/big_arrow_up.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_base2.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_basew.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_dis_hilight.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_glow.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_hilight.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_hilightw.png [new file with mode: 0644]
src/modules/illume-keyboard/images/bt_shine.png [new file with mode: 0644]
src/modules/illume-keyboard/images/inset_sunk.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_grad.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tabhl.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tabhm.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tabhr.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tabl.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tabr.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_tpsh.png [new file with mode: 0644]
src/modules/illume-keyboard/images/k_wtgr.png [new file with mode: 0644]
src/modules/illume-keyboard/images/module_icon.png [new file with mode: 0644]
src/modules/illume-mode-toggle/e_mod_main.c
src/modules/illume-softkey/e-module-illume-softkey.edc [changed mode: 0644->0755]
src/modules/illume-softkey/e_mod_sft_win.c
src/modules/illume2/e_illume.c
src/modules/illume2/e_illume.h
src/modules/illume2/e_mod_config.c
src/modules/illume2/e_mod_config_animation.c
src/modules/illume2/e_mod_config_policy.c
src/modules/illume2/e_mod_config_windows.c
src/modules/illume2/e_mod_kbd.c
src/modules/illume2/e_mod_kbd_device.c
src/modules/illume2/e_mod_policy.c
src/modules/illume2/e_mod_quickpanel.c
src/modules/illume2/e_mod_select_window.c
src/modules/illume2/policies/Makefile.am
src/modules/illume2/policies/illume/policy.c
src/modules/illume2/policies/tablet/Makefile.am [new file with mode: 0644]
src/modules/illume2/policies/tablet/policy.c [new file with mode: 0644]
src/modules/illume2/policies/tablet/policy.h [new file with mode: 0644]
src/modules/illume2/policies/tablet/tablet.c [new file with mode: 0644]
src/modules/illume2/policies/tablet/tablet.h [new file with mode: 0644]
src/modules/layout/.cvsignore [deleted file]
src/modules/mixer/.cvsignore [deleted file]
src/modules/mixer/Makefile.am
src/modules/mixer/Pulse.h [new file with mode: 0644]
src/modules/mixer/app_mixer.c
src/modules/mixer/conf_gadget.c
src/modules/mixer/conf_module.c
src/modules/mixer/e_mod_main.c
src/modules/mixer/e_mod_main.h
src/modules/mixer/e_mod_system.h
src/modules/mixer/module.desktop.in [changed mode: 0755->0644]
src/modules/mixer/msg.c [new file with mode: 0644]
src/modules/mixer/pa.c [new file with mode: 0644]
src/modules/mixer/pa.h [new file with mode: 0644]
src/modules/mixer/serial.c [new file with mode: 0644]
src/modules/mixer/sink.c [new file with mode: 0644]
src/modules/mixer/sys_alsa.c
src/modules/mixer/sys_pulse.c [new file with mode: 0644]
src/modules/mixer/tag.c [new file with mode: 0644]
src/modules/msgbus/msgbus_desktop.c
src/modules/notification/AUTHORS [new file with mode: 0755]
src/modules/notification/COPYING [new file with mode: 0755]
src/modules/notification/COPYING-PLAIN [new file with mode: 0755]
src/modules/notification/Makefile.am [new file with mode: 0644]
src/modules/notification/README [new file with mode: 0755]
src/modules/notification/e-module-notification.edj [new file with mode: 0644]
src/modules/notification/e_mod_box.c [new file with mode: 0644]
src/modules/notification/e_mod_config.c [new file with mode: 0644]
src/modules/notification/e_mod_config_item.c [new file with mode: 0644]
src/modules/notification/e_mod_main.c [new file with mode: 0644]
src/modules/notification/e_mod_main.h [new file with mode: 0644]
src/modules/notification/e_mod_popup.c [new file with mode: 0644]
src/modules/notification/e_modules-notification.spec.in [new file with mode: 0755]
src/modules/notification/images/base_bg.png [new file with mode: 0644]
src/modules/notification/images/base_bg_alpha.png [new file with mode: 0644]
src/modules/notification/images/bd_button_close_focused.png [new file with mode: 0644]
src/modules/notification/images/bd_button_close_shadow.png [new file with mode: 0644]
src/modules/notification/images/bd_title_bg.png [new file with mode: 0644]
src/modules/notification/images/bd_title_over.png [new file with mode: 0644]
src/modules/notification/images/bd_top_hilight.png [new file with mode: 0644]
src/modules/notification/images/close_btn.png [new file with mode: 0644]
src/modules/notification/images/e17_dialog_watermark.png [new file with mode: 0644]
src/modules/notification/images/e17_menu_bg_border.png [new file with mode: 0644]
src/modules/notification/images/module_icon.png [new file with mode: 0644]
src/modules/notification/module.desktop.in [new file with mode: 0644]
src/modules/notification/po/LINGUAS [new file with mode: 0755]
src/modules/notification/po/Makevars [new file with mode: 0755]
src/modules/notification/po/POTFILES.in [new file with mode: 0755]
src/modules/notification/po/ar.po [new file with mode: 0755]
src/modules/notification/po/bg.po [new file with mode: 0755]
src/modules/notification/po/cs.po [new file with mode: 0755]
src/modules/notification/po/de.po [new file with mode: 0755]
src/modules/notification/po/el.po [new file with mode: 0755]
src/modules/notification/po/en_GB.po [new file with mode: 0755]
src/modules/notification/po/eo.po [new file with mode: 0755]
src/modules/notification/po/es.po [new file with mode: 0755]
src/modules/notification/po/fi.po [new file with mode: 0755]
src/modules/notification/po/fo.po [new file with mode: 0755]
src/modules/notification/po/fr.po [new file with mode: 0755]
src/modules/notification/po/he.po [new file with mode: 0755]
src/modules/notification/po/hr.po [new file with mode: 0755]
src/modules/notification/po/hu.po [new file with mode: 0755]
src/modules/notification/po/it.po [new file with mode: 0755]
src/modules/notification/po/ja.po [new file with mode: 0755]
src/modules/notification/po/lt.po [new file with mode: 0755]
src/modules/notification/po/nl.po [new file with mode: 0755]
src/modules/notification/po/pl.po [new file with mode: 0755]
src/modules/notification/po/pt.po [new file with mode: 0755]
src/modules/notification/po/pt_BR.po [new file with mode: 0755]
src/modules/notification/po/ru.po [new file with mode: 0755]
src/modules/notification/po/sk.po [new file with mode: 0755]
src/modules/notification/po/sl.po [new file with mode: 0755]
src/modules/notification/po/sv.po [new file with mode: 0755]
src/modules/notification/po/tr.po [new file with mode: 0755]
src/modules/notification/po/uk.po [new file with mode: 0755]
src/modules/notification/po/zh_CN.po [new file with mode: 0755]
src/modules/ofono/e_mod_main.c
src/modules/pager/.cvsignore [deleted file]
src/modules/pager/e_mod_main.c
src/modules/shot/.cvsignore [deleted file]
src/modules/shot/e_mod_main.c
src/modules/shot/module.desktop.in [changed mode: 0755->0644]
src/modules/start/.cvsignore [deleted file]
src/modules/start/e_mod_main.c
src/modules/syscon/.cvsignore [deleted file]
src/modules/syscon/e_mod_main.c
src/modules/syscon/e_syscon.c
src/modules/systray/e_mod_main.c
src/modules/tasks/Makefile.am [new file with mode: 0644]
src/modules/tasks/e-module-tasks.edj [new file with mode: 0644]
src/modules/tasks/e_mod_config.c [new file with mode: 0644]
src/modules/tasks/e_mod_main.c [new file with mode: 0644]
src/modules/tasks/e_mod_main.h [new file with mode: 0644]
src/modules/tasks/module.desktop.in [new file with mode: 0644]
src/modules/temperature/.cvsignore [deleted file]
src/modules/temperature/e_mod_config.c
src/modules/temperature/e_mod_main.c
src/modules/temperature/e_mod_main.h
src/modules/temperature/e_mod_main_private.h
src/modules/temperature/module.desktop.in [changed mode: 0755->0644]
src/modules/temperature/tempget.c
src/modules/winlist/.cvsignore [deleted file]
src/modules/winlist/e_winlist.c
src/modules/wizard/.cvsignore [deleted file]
src/modules/wizard/Makefile.am
src/modules/wizard/data/def-ibar.txt [new file with mode: 0755]
src/modules/wizard/data/desktop/home.desktop [new file with mode: 0755]
src/modules/wizard/data/desktop/root.desktop [new file with mode: 0755]
src/modules/wizard/data/desktop/tmp.desktop [new file with mode: 0755]
src/modules/wizard/data/extra_desktops/mplayer.desktop [new file with mode: 0755]
src/modules/wizard/data/extra_desktops/xterm.desktop [new file with mode: 0755]
src/modules/wizard/data/favorites/.order [new file with mode: 0755]
src/modules/wizard/data/favorites/desktop.desktop [new file with mode: 0755]
src/modules/wizard/data/favorites/home.desktop [new file with mode: 0755]
src/modules/wizard/data/favorites/root.desktop [new file with mode: 0755]
src/modules/wizard/data/favorites/tmp.desktop [new file with mode: 0755]
src/modules/wizard/e_mod_main.c
src/modules/wizard/e_mod_main.h
src/modules/wizard/e_wizard.c
src/modules/wizard/e_wizard.h
src/modules/wizard/module.desktop.in [changed mode: 0755->0644]
src/modules/wizard/page_010.c
src/modules/wizard/page_020.c
src/modules/wizard/page_030.c
src/modules/wizard/page_040.c
src/modules/wizard/page_050.c
src/modules/wizard/page_060.c
src/modules/wizard/page_070.c
src/modules/wizard/page_080.c
src/modules/wizard/page_090.c [new file with mode: 0644]
src/modules/wizard/page_100.c [new file with mode: 0644]
src/modules/wizard/page_110.c [new file with mode: 0644]
src/modules/wizard/page_120.c [new file with mode: 0644]
src/modules/wizard/page_130.c [new file with mode: 0644]
src/modules/wizard/page_140.c [new file with mode: 0644]
src/modules/wizard/page_150.c [new file with mode: 0644]
src/modules/wizard/page_160.c [new file with mode: 0644]
src/modules/wizard/page_200.c
src/preload/.cvsignore [deleted file]
src/preload/Makefile.am
src/preload/e_precache.c
x-ui.sh

diff --git a/AUTHORS b/AUTHORS
index 0920049..11d58ec 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,10 @@ k-s (Gustavo Sverzut Barbieri) <barbieri@profusion.mobi>
 Peter van de Werken <pwerken-e@a-eskwadraat.nl>
 Florian Hackenberger <florian@hackenberger.at>
 Hannes Janetzek <hannes.janetzek@gmail.com>
-Mike Blumenkrantz (discomfitor/zmike) <mike@zentific.com>
+Mike Blumenkrantz (discomfitor/zmike) <michael.blumenkrantz@gmail.com>
 Leif Middelschulte <leif.middelschulte@gmail.com>
 yoz (Michael Bouchaud) <michael.bouchaud@gmail.com>
+billiob (Boris Faure) <billiob@gmail.com>
+Jihoon Kim <jihoon48.kim@samsung.com>
+Sthitha <iamsthitha@gmail>
+Doyoun Kang <doyoun.kang@samsung.com>
diff --git a/COPYING b/COPYING
index 61bb2f6..7625f00 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Copyright notice for Enlightenment:
 
-Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+Copyright (C) 2000-2011 Carsten Haitzler and various contributors (see AUTHORS)
 
 All rights reserved.
 
index 60fd3f0..b814903 100755 (executable)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+rm -rf autom4te.cache
+rm -f aclocal.m4 ltmain.sh
+
 touch README
 touch ABOUT-NLS
 
diff --git a/config/.cvsignore b/config/.cvsignore
deleted file mode 100644 (file)
index cd2c9ce..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.cfg
diff --git a/config/default/.cvsignore b/config/default/.cvsignore
deleted file mode 100644 (file)
index cd2c9ce..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.cfg
old mode 100755 (executable)
new mode 100644 (file)
index b6c122a..7bc4736
@@ -10,7 +10,7 @@ group "E_Config" struct {
   value "border_shade_transition" int: 3;
   value "border_shade_speed" double: 3000.0000000000000000000000000;
   value "framerate" double: 60.0000000000000000000000000;
-  value "priority" int: 1;
+  value "priority" int: 3;
   value "image_cache" int: 4096;
   value "font_cache" int: 512;
   value "edje_cache" int: 10;
@@ -511,7 +511,7 @@ group "E_Config" struct {
   value "scale.min" double: 1.0000000000000000000000000;
   value "scale.max" double: 3.0000000000000000000000000;
   value "scale.factor" double: 1.0000000000000000000000000;
-  value "scale.base_dpi" int: 142;
+  value "scale.base_dpi" int: 90;
   value "scale.use_dpi" uchar: 1;
   value "scale.use_custom" uchar: 0;
   value "show_cursor" uchar: 1;
@@ -528,4 +528,12 @@ group "E_Config" struct {
   value "exec.expire_timeout" double: 30.0;
   value "exec.show_run_dialog" uchar: 1;
   value "exec.show_exit_dialog" uchar: 1;
+  value "backlight.normal" double: 1.0;
+  value "backlight.dim" double: 0.3;
+  value "backlight.transition" double: 0.5;
+  value "device_desktop" int: 0;
+  value "device_auto_mount" int: 0;
+  value "device_auto_open" int: 0;
+  value "xsettings.match_e17_theme" uchar: 1;
+  value "xsettings.match_e17_icon_theme" uchar: 1;
 }
old mode 100755 (executable)
new mode 100644 (file)
index 72804aa..21d50b7
@@ -11,8 +11,9 @@ Name[eo]=Pravaloroj
 Name[zh_CN]=默认
 Name[pt]=Omissões
 Name[tr]=Öntanımlı
+Name[ko]=기본
 Icon=icon.png
-Comment=Select this to begin<br>the initial setup again.
+Comment=Select this to begin the initial setup again.
 Comment[ru]=Выберите это для<br>запуска инициализации настроек (сброс).
 Comment[cs]=Vyberte pro znovuspuštění<br>tohoto průvodce.
 Comment[it]=Selezionare questo per<br>riprendere la<br>configurazione iniziale.
@@ -23,3 +24,4 @@ Comment[eo]=Elektu tion por restartigi<br>la pravalorizan agordon.
 Comment[zh_CN]=点击这里重新进行初始化设置主题。
 Comment[pt]=Selecione isto para executar novamente a configuração inicial
 Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin.
+Comment[ko]=초기 설정을 다시 하려면 이 부분을 선택하세요.
old mode 100755 (executable)
new mode 100644 (file)
index 7292cae..b205cf4
 group "E_Config" struct {
-    group "syscon.actions" list {
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "halt";
-            value "params" string: "now";
-            value "button" string: "button";
-            value "icon" string: "system-shutdown";
-            value "is_main" int: 1;
+    group "modules" list {
+        group "E_Config_Module" struct {
+            value "name" string: "comp";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: -1000;
         }
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "suspend";
-            value "params" string: "now";
-            value "button" string: "button";
-            value "icon" string: "system-suspend";
-            value "is_main" int: 1;
+        group "E_Config_Module" struct {
+            value "name" string: "illume2";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 100;
         }
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "desk_lock";
-            value "button" string: "button";
-            value "icon" string: "system-lock-screen";
-            value "is_main" int: 1;
+        group "E_Config_Module" struct {
+            value "name" string: "illume-indicator";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 90;
         }
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "reboot";
-            value "params" string: "now";
-            value "button" string: "button";
-            value "icon" string: "system-restart";
-            value "is_main" int: 0;
+        group "E_Config_Module" struct {
+            value "name" string: "illume-softkey";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 85;
         }
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "hibernate";
-            value "params" string: "now";
-            value "button" string: "button";
-            value "icon" string: "system-suspend-hibernate";
-            value "is_main" int: 0;
+        group "E_Config_Module" struct {
+            value "name" string: "fileman";
+            value "enabled" uchar: 0;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Syscon_Action" struct {
-            value "action" string: "logout";
-            value "params" string: "now";
-            value "button" string: "button";
-            value "icon" string: "system-log-out";
-            value "is_main" int: 0;
+        group "E_Config_Module" struct {
+            value "name" string: "battery";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-    }
-    group "mime_icons" list {
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/jpeg";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "connman";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/png";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "illume-keyboard";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/x-pixmap";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "illume-home";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/x-xpixmap";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "illume-home-toggle";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/svg+xml";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "illume-kbd-toggle";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/gif";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "illume-mode-toggle";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "image/tiff";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "syscon";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "application/x-edje";
-            value "icon" string: "THUMB";
+        group "E_Config_Module" struct {
+            value "name" string: "conf";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Mime_Icon" struct {
-            value "mime" string: "application/x-desktop";
-            value "icon" string: "DESKTOP";
+        group "E_Config_Module" struct {
+            value "name" string: "conf_interaction";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-    }
-    group "gadcons" list {
-        group "E_Config_Gadcon" struct {
-            group "clients" list {
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-home-toggle";
-                    value "id" string: "illume-home-toggle.0";
-                    value "geom.pos" int: 41;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 2;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-mode-toggle";
-                    value "id" string: "illume-mode-toggle.0";
-                    value "geom.pos" int: 82;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 3;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-kbd-toggle";
-                    value "id" string: "illume-kbd-toggle.0";
-                    value "geom.pos" int: 123;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 4;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "battery";
-                    value "id" string: "battery";
-                    value "geom.pos" int: 433;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 6;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "configuration";
-                    value "id" string: "configuration";
-                    value "geom.pos" int: 410;
-                    value "geom.size" int: 64;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 5;
-                    value "state_info.flags" int: 1;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "start";
-                    value "id" string: "start";
-                    value "geom.pos" int: 0;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 1;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-            }
-            value "name" string: "illume-indicator";
-            value "id" int: 0;
-            value "zone" int: 0;
+        group "E_Config_Module" struct {
+            value "name" string: "conf_performance";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Gadcon" struct {
-            group "clients" list {
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-home-toggle";
-                    value "id" string: "illume-home-toggle.1";
-                    value "geom.pos" int: 41;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 2;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-mode-toggle";
-                    value "id" string: "illume-mode-toggle.1";
-                    value "geom.pos" int: 82;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 3;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "illume-kbd-toggle";
-                    value "id" string: "illume-kbd-toggle.1";
-                    value "geom.pos" int: 123;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 4;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "battery";
-                    value "id" string: "battery";
-                    value "geom.pos" int: 433;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 6;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "configuration";
-                    value "id" string: "configuration";
-                    value "geom.pos" int: 720;
-                    value "geom.size" int: 80;
-                    value "geom.res" int: 800;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 5;
-                    value "state_info.flags" int: 0;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-                group "E_Config_Gadcon_Client" struct {
-                    value "name" string: "start";
-                    value "id" string: "start";
-                    value "geom.pos" int: 0;
-                    value "geom.size" int: 41;
-                    value "geom.res" int: 474;
-                    value "geom.pos_x" double: 0.0000000000000000000000000;
-                    value "geom.pos_y" double: 0.0000000000000000000000000;
-                    value "geom.size_w" double: 0.0000000000000000000000000;
-                    value "geom.size_h" double: 0.0000000000000000000000000;
-                    value "state_info.seq" int: 1;
-                    value "state_info.flags" int: 3;
-                    value "style" string: "plain";
-                    value "orient" int: 0;
-                    value "autoscroll" uchar: 0;
-                    value "resizable" uchar: 0;
-                }
-            }
-            value "name" string: "illume-indicator";
-            value "id" int: 1;
-            value "zone" int: 1;
+        group "E_Config_Module" struct {
+            value "name" string: "conf_display";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-    }
-    group "wheel_bindings" list {
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 4;
-            value "direction" int: 0;
-            value "z" int: -1;
-            value "modifiers" int: 4;
-            value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
+        group "E_Config_Module" struct {
+            value "name" string: "start";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 4;
-            value "direction" int: 1;
-            value "z" int: -1;
-            value "modifiers" int: 4;
-            value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
+        group "E_Config_Module" struct {
+            value "name" string: "clock";
+            value "enabled" uchar: 0;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 4;
-            value "direction" int: 0;
-            value "z" int: 1;
-            value "modifiers" int: 4;
-            value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
+        group "E_Config_Module" struct {
+            value "name" string: "shot";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 4;
-            value "direction" int: 1;
-            value "z" int: 1;
-            value "modifiers" int: 4;
-            value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
+        group "E_Config_Module" struct {
+            value "name" string: "backlight";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
         }
-        group "E_Config_Binding_Wheel" struct {
+    }
+    group "themes" list {
+        group "E_Config_Theme" struct {
+            value "category" string: "theme";
+            value "file" string: "default.edj";
+        }
+    }
+    group "mouse_bindings" list {
+        group "E_Config_Binding_Mouse" struct {
             value "context" int: 2;
-            value "direction" int: 0;
-            value "z" int: -1;
             value "modifiers" int: 4;
+            value "action" string: "window_move";
+            value "button" uchar: 1;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
         }
-        group "E_Config_Binding_Wheel" struct {
+        group "E_Config_Binding_Mouse" struct {
             value "context" int: 2;
-            value "direction" int: 1;
-            value "z" int: -1;
             value "modifiers" int: 4;
+            value "action" string: "window_resize";
+            value "button" uchar: 2;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
         }
-        group "E_Config_Binding_Wheel" struct {
+        group "E_Config_Binding_Mouse" struct {
             value "context" int: 2;
-            value "direction" int: 0;
-            value "z" int: 1;
             value "modifiers" int: 4;
+            value "action" string: "window_menu";
+            value "button" uchar: 3;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 2;
-            value "direction" int: 1;
-            value "z" int: 1;
-            value "modifiers" int: 4;
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "main";
+            value "button" uchar: 1;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 8;
-            value "direction" int: 0;
-            value "z" int: -1;
-            value "modifiers" int: 4;
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "clients";
+            value "button" uchar: 2;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 8;
-            value "direction" int: 1;
-            value "z" int: -1;
-            value "modifiers" int: 4;
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
+            value "button" uchar: 3;
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 8;
-            value "direction" int: 0;
-            value "z" int: 1;
-            value "modifiers" int: 4;
+    }
+    group "key_bindings" list {
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Left";
+            value "action" string: "desk_flip_by";
+            value "params" string: "-1 0";
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
         }
-        group "E_Config_Binding_Wheel" struct {
-            value "context" int: 8;
-            value "direction" int: 1;
-            value "z" int: 1;
-            value "modifiers" int: 4;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Right";
+            value "action" string: "desk_flip_by";
+            value "params" string: "1 0";
             value "any_mod" uchar: 0;
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
         }
-    }
-    group "signal_bindings" list {
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1,double";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_shaded_toggle";
-            value "params" string: "up";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Up";
+            value "action" string: "desk_flip_by";
+            value "params" string: "0 -1";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,2";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_shaded_toggle";
-            value "params" string: "up";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Down";
+            value "action" string: "desk_flip_by";
+            value "params" string: "0 1";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,wheel,?,1";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_shaded";
-            value "params" string: "0 up";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Up";
+            value "action" string: "window_raise";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,wheel,?,-1";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_shaded";
-            value "params" string: "1 up";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Down";
+            value "action" string: "window_lower";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,3";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_menu";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "x";
+            value "action" string: "window_close";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,?";
-            value "source" string: "e.event.icon";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "k";
+            value "action" string: "window_kill";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "w";
             value "action" string: "window_menu";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,[12]";
-            value "source" string: "e.event.close";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_close";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "s";
+            value "action" string: "window_sticky_toggle";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,3";
-            value "source" string: "e.event.close";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_kill";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "i";
+            value "action" string: "window_iconic_toggle";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,1";
-            value "source" string: "e.event.maximize";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "f";
             value "action" string: "window_maximized_toggle";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,2";
-            value "source" string: "e.event.maximize";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 1;
+            value "key" string: "F10";
             value "action" string: "window_maximized_toggle";
-            value "params" string: "smart";
+            value "params" string: "default vertical";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,3";
-            value "source" string: "e.event.maximize";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "F10";
             value "action" string: "window_maximized_toggle";
-            value "params" string: "expand";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,?";
-            value "source" string: "e.event.minimize";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_iconic_toggle";
+            value "params" string: "default horizontal";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,?";
-            value "source" string: "e.event.shade";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "r";
             value "action" string: "window_shaded_toggle";
-            value "params" string: "up";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,clicked,?";
-            value "source" string: "e.event.lower";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_lower";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.icon";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_drag_icon";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Left";
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_move";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Right";
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,up,1";
-            value "source" string: "e.event.titlebar";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_move";
-            value "params" string: "end";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F1";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "0";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.tl";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "tl";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F2";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.t";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "t";
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F3";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "2";
+            value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.tr";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "tr";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.r";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "r";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.br";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "br";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.b";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "b";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.bl";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "bl";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,1";
-            value "source" string: "e.event.resize.l";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "l";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,up,1";
-            value "source" string: "e.event.resize.*";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_resize";
-            value "params" string: "end";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,down,3";
-            value "source" string: "e.event.resize.*";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_move";
-        }
-        group "E_Config_Binding_Signal" struct {
-            value "context" int: 2;
-            value "signal" string: "mouse,up,3";
-            value "source" string: "e.event.resize.*";
-            value "modifiers" int: 0;
-            value "any_mod" uchar: 1;
-            value "action" string: "window_move";
-            value "params" string: "end";
-        }
-    }
-    group "edge_bindings" list {
-        group "E_Config_Binding_Edge" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "desk_flip_in_direction";
-            value "edge" uchar: 1;
-            value "any_mod" uchar: 0;
-            value "delay" float: 0.3000000119209289550781250;
-        }
-        group "E_Config_Binding_Edge" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "desk_flip_in_direction";
-            value "edge" uchar: 2;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F4";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "3";
             value "any_mod" uchar: 0;
-            value "delay" float: 0.3000000119209289550781250;
         }
-        group "E_Config_Binding_Edge" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "desk_flip_in_direction";
-            value "edge" uchar: 3;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F5";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "4";
             value "any_mod" uchar: 0;
-            value "delay" float: 0.3000000119209289550781250;
         }
-        group "E_Config_Binding_Edge" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "desk_flip_in_direction";
-            value "edge" uchar: 4;
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F6";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "5";
             value "any_mod" uchar: 0;
-            value "delay" float: 0.3000000119209289550781250;
         }
-    }
-    group "key_bindings" list {
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 5;
-            value "key" string: "Left";
-            value "action" string: "desk_flip_by";
-            value "params" string: "-1 0";
+            value "modifiers" int: 4;
+            value "key" string: "F7";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "6";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 5;
-            value "key" string: "Right";
-            value "action" string: "desk_flip_by";
-            value "params" string: "1 0";
+            value "modifiers" int: 4;
+            value "key" string: "F8";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "7";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 5;
-            value "key" string: "Up";
-            value "action" string: "desk_flip_by";
-            value "params" string: "0 -1";
+            value "modifiers" int: 4;
+            value "key" string: "F9";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "8";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 5;
-            value "key" string: "Down";
-            value "action" string: "desk_flip_by";
-            value "params" string: "0 1";
+            value "modifiers" int: 4;
+            value "key" string: "F10";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "9";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "Up";
-            value "action" string: "window_raise";
+            value "modifiers" int: 4;
+            value "key" string: "F11";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "10";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "Down";
-            value "action" string: "window_lower";
+            value "modifiers" int: 4;
+            value "key" string: "F12";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "11";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 6;
-            value "key" string: "x";
-            value "action" string: "window_close";
+            value "key" string: "m";
+            value "action" string: "menu_show";
+            value "params" string: "main";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 6;
-            value "key" string: "k";
-            value "action" string: "window_kill";
+            value "key" string: "a";
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "w";
-            value "action" string: "window_menu";
+            value "modifiers" int: 0;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "main";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "s";
-            value "action" string: "window_sticky_toggle";
+            value "modifiers" int: 2;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "clients";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "i";
-            value "action" string: "window_iconic_toggle";
+            value "modifiers" int: 4;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 6;
-            value "key" string: "f";
-            value "action" string: "window_maximized_toggle";
+            value "key" string: "Insert";
+            value "action" string: "exec";
+            value "params" string: "Eterm";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 1;
-            value "key" string: "F10";
-            value "action" string: "window_maximized_toggle";
-            value "params" string: "default vertical";
+            value "modifiers" int: 4;
+            value "key" string: "Tab";
+            value "action" string: "winlist";
+            value "params" string: "next";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 5;
-            value "key" string: "F10";
-            value "action" string: "window_maximized_toggle";
-            value "params" string: "default horizontal";
+            value "key" string: "Tab";
+            value "action" string: "winlist";
+            value "params" string: "prev";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 6;
-            value "key" string: "r";
-            value "action" string: "window_shaded_toggle";
+            value "key" string: "End";
+            value "action" string: "restart";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 6;
-            value "key" string: "Left";
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "-1";
+            value "key" string: "Delete";
+            value "action" string: "syscon";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "Right";
-            value "action" string: "desk_linear_flip_by";
-            value "params" string: "1";
+            value "modifiers" int: 4;
+            value "key" string: "Escape";
+            value "action" string: "exebuf";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F1";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "0";
+            value "modifiers" int: 6;
+            value "key" string: "l";
+            value "action" string: "desk_lock";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F2";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "1";
+            value "modifiers" int: 6;
+            value "key" string: "d";
+            value "action" string: "desk_deskshow_toggle";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F3";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "2";
+            value "modifiers" int: 3;
+            value "key" string: "Left";
+            value "action" string: "screen_send_by";
+            value "params" string: "-1";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F4";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "3";
+            value "modifiers" int: 3;
+            value "key" string: "Right";
+            value "action" string: "screen_send_by";
+            value "params" string: "1";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F5";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "4";
+            value "modifiers" int: 3;
+            value "key" string: "F1";
+            value "action" string: "screen_send_to";
+            value "params" string: "0";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F6";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "5";
+            value "modifiers" int: 3;
+            value "key" string: "F2";
+            value "action" string: "screen_send_to";
+            value "params" string: "1";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F7";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "6";
+            value "modifiers" int: 3;
+            value "key" string: "F3";
+            value "action" string: "screen_send_to";
+            value "params" string: "2";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F8";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "7";
+            value "modifiers" int: 3;
+            value "key" string: "F4";
+            value "action" string: "screen_send_to";
+            value "params" string: "3";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F9";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "8";
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioLowerVolume";
+            value "action" string: "volume_decrease";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F10";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "9";
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioRaiseVolume";
+            value "action" string: "volume_increase";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F11";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "10";
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioMute";
+            value "action" string: "volume_mute";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "F12";
-            value "action" string: "desk_linear_flip_to";
-            value "params" string: "11";
+            value "modifiers" int: 0;
+            value "key" string: "Print";
+            value "action" string: "shot";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "m";
-            value "action" string: "menu_show";
-            value "params" string: "main";
+            value "modifiers" int: 0;
+            value "key" string: "XF86Standby";
+            value "action" string: "suspend";
+            value "params" string: "now";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "a";
+            value "modifiers" int: 0;
+            value "key" string: "XF86Start";
             value "action" string: "menu_show";
-            value "params" string: "favorites";
+            value "params" string: "all";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
             value "modifiers" int: 0;
-            value "key" string: "Menu";
-            value "action" string: "menu_show";
-            value "params" string: "main";
+            value "key" string: "XF86PowerDown";
+            value "action" string: "hibernate";
+            value "params" string: "now";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 2;
-            value "key" string: "Menu";
-            value "action" string: "menu_show";
-            value "params" string: "clients";
+            value "modifiers" int: 0;
+            value "key" string: "XF86PowerOff";
+            value "action" string: "halt";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "Menu";
-            value "action" string: "menu_show";
-            value "params" string: "favorites";
+            value "modifiers" int: 0;
+            value "key" string: "XF86Sleep";
+            value "action" string: "suspend";
+            value "params" string: "now";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "Insert";
-            value "action" string: "exec";
-            value "params" string: "Eterm";
+            value "modifiers" int: 0;
+            value "key" string: "XF86Suspend";
+            value "action" string: "suspend";
+            value "params" string: "now";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "Tab";
-            value "action" string: "winlist";
-            value "params" string: "next";
+            value "modifiers" int: 0;
+            value "key" string: "XF86Hibernate";
+            value "action" string: "hibernate";
+            value "params" string: "now";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 5;
-            value "key" string: "Tab";
-            value "action" string: "winlist";
-            value "params" string: "prev";
+            value "modifiers" int: 0;
+            value "key" string: "Execute";
+            value "action" string: "everything";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "End";
-            value "action" string: "restart";
+            value "modifiers" int: 0;
+            value "key" string: "XF86MonBrightnessUp";
+            value "action" string: "backlight_adjust";
+            value "params" string: "0.1";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "Delete";
-            value "action" string: "syscon";
+            value "modifiers" int: 0;
+            value "key" string: "XF86MonBrightnessDown";
+            value "action" string: "backlight_adjust";
+            value "params" string: "-0.1";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 4;
-            value "key" string: "Escape";
-            value "action" string: "exebuf";
+            value "modifiers" int: 0;
+            value "key" string: "XF86LightBulb";
+            value "action" string: "backlight";
             value "any_mod" uchar: 0;
         }
         group "E_Config_Binding_Key" struct {
             value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "l";
-            value "action" string: "desk_lock";
+            value "modifiers" int: 0;
+            value "key" string: "XF86BrightnessAdjust";
+            value "action" string: "backlight";
             value "any_mod" uchar: 0;
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 6;
-            value "key" string: "d";
-            value "action" string: "desk_deskshow_toggle";
+    }
+    group "edge_bindings" list {
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 1;
             value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "Left";
-            value "action" string: "screen_send_by";
-            value "params" string: "-1";
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 2;
             value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "Right";
-            value "action" string: "screen_send_by";
-            value "params" string: "1";
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 3;
             value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "F1";
-            value "action" string: "screen_send_to";
-            value "params" string: "0";
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 4;
             value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
+        }
+    }
+    group "signal_bindings" list {
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1,double";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,2";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,wheel,?,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded";
+            value "params" string: "0 up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,wheel,?,-1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded";
+            value "params" string: "1 up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_menu";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.icon";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_menu";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,[12]";
+            value "source" string: "e.event.close";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_close";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.close";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_kill";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,1";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,2";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "smart";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "expand";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.minimize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_iconic_toggle";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.shade";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.lower";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_lower";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.icon";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_drag_icon";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+            value "params" string: "end";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.tl";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "tl";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.t";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "t";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.tr";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "tr";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.r";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "r";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.br";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "br";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.b";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "b";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.bl";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "bl";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.l";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "l";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,1";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "end";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,3";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,3";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+            value "params" string: "end";
+        }
+    }
+    group "acpi_bindings" list {
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 15;
+            value "status" int: -1;
+            value "action" string: "dim_screen";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 16;
+            value "status" int: -1;
+            value "action" string: "undim_screen";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 22;
+            value "status" int: 0;
+            value "action" string: "dim_screen";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 22;
+            value "status" int: 1;
+            value "action" string: "undim_screen";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 3;
+            value "status" int: -1;
+            value "action" string: "syscon";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 6;
+            value "status" int: -1;
+            value "action" string: "halt";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 8;
+            value "status" int: -1;
+            value "action" string: "suspend";
+            value "params" string: "now";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 12;
+            value "status" int: -1;
+            value "action" string: "hiberate";
+            value "params" string: "now";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 5;
+            value "status" int: 1;
+            value "action" string: "suspend";
+            value "params" string: "now";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 20;
+            value "status" int: -1;
+            value "action" string: "volume_mute";
+        }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 22;
+            value "status" int: -1;
+            value "action" string: "backlight";
+        }
+    }
+    group "wheel_bindings" list {
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+    }
+    group "gadcons" list {
+        group "E_Config_Gadcon" struct {
+            group "clients" list {
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "start";
+                    value "id" string: "start";
+                    value "geom.pos" int: 0;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 1;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "backlight";
+                    value "id" string: "backlight";
+                    value "geom.pos" int: 41;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 2;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "illume-home-toggle";
+                    value "id" string: "illume-home-toggle.0";
+                    value "geom.pos" int: 82;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 3;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "illume-mode-toggle";
+                    value "id" string: "illume-mode-toggle.0";
+                    value "geom.pos" int: 123;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 4;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "illume-kbd-toggle";
+                    value "id" string: "illume-kbd-toggle.0";
+                    value "geom.pos" int: 164;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 5;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "configuration";
+                    value "id" string: "configuration";
+                    value "geom.pos" int: 410;
+                    value "geom.size" int: 64;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 6;
+                    value "state_info.flags" int: 1;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "battery";
+                    value "id" string: "battery";
+                    value "geom.pos" int: 433;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 7;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "connman";
+                    value "id" string: "connman";
+                    value "geom.pos" int: 433;
+                    value "geom.size" int: 41;
+                    value "geom.res" int: 474;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 8;
+                    value "state_info.flags" int: 3;
+                    value "style" string: "plain";
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+            }
+            value "name" string: "illume-indicator";
+            value "id" int: 0;
+            value "zone" int: 0;
+        }
+    }
+    group "mime_icons" list {
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/jpeg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/png";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-pixmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-xpixmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/svg+xml";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/gif";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/tiff";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-edje";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/pdf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/postscript";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-photoshop";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-anymap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-bitmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-graymap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-pixmap";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "F2";
-            value "action" string: "screen_send_to";
-            value "params" string: "1";
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/vnd.wap.wbmp";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "F3";
-            value "action" string: "screen_send_to";
-            value "params" string: "2";
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-ms-bmp";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 3;
-            value "key" string: "F4";
-            value "action" string: "screen_send_to";
-            value "params" string: "3";
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-icon";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Key" struct {
-            value "context" int: 9;
-            value "modifiers" int: 0;
-            value "key" string: "Print";
-            value "action" string: "shot";
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-tga";
+            value "icon" string: "THUMB";
         }
-    }
-    group "mouse_bindings" list {
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 2;
-            value "modifiers" int: 4;
-            value "action" string: "window_move";
-            value "button" uchar: 1;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/svg+xml-compressed";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 2;
-            value "modifiers" int: 4;
-            value "action" string: "window_resize";
-            value "button" uchar: 2;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-xcf";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 2;
-            value "modifiers" int: 4;
-            value "action" string: "window_menu";
-            value "button" uchar: 3;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-compressed-xcf";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "menu_show";
-            value "params" string: "main";
-            value "button" uchar: 1;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/3gpp";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "menu_show";
-            value "params" string: "clients";
-            value "button" uchar: 2;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ms-asf";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Binding_Mouse" struct {
-            value "context" int: 3;
-            value "modifiers" int: 0;
-            value "action" string: "menu_show";
-            value "params" string: "favorites";
-            value "button" uchar: 3;
-            value "any_mod" uchar: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-msvideo";
+            value "icon" string: "THUMB";
         }
-    }
-    group "themes" list {
-        group "E_Config_Theme" struct {
-            value "category" string: "theme";
-            value "file" string: "default.edj";
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-flv";
+            value "icon" string: "THUMB";
         }
-    }
-    group "modules" list {
-        group "E_Config_Module" struct {
-            value "name" string: "illume2";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 100;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-matroska";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-indicator";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 90;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/quicktime";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-softkey";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 85;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mp4";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "fileman";
-            value "enabled" uchar: 0;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mpeg";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "battery";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mp2t";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-keyboard";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/mxf";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-home";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ogm+ogg";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-home-toggle";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/ogg";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-kbd-toggle";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-theora+ogg";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "illume-mode-toggle";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/vnd.rn-realmedia";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "syscon";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-shockwave-flash";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ms-wmv";
+            value "icon" string: "THUMB";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_interaction";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-desktop";
+            value "icon" string: "DESKTOP";
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_performance";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+    }
+    group "syscon.actions" list {
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "halt";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-shutdown";
+            value "is_main" int: 1;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_display";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "suspend";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-suspend";
+            value "is_main" int: 1;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "start";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "desk_lock";
+            value "button" string: "button";
+            value "icon" string: "system-lock-screen";
+            value "is_main" int: 1;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "clock";
-            value "enabled" uchar: 0;
-            value "delayed" uchar: 0;
-            value "priority" int: 0;
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "reboot";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-restart";
+            value "is_main" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "comp";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 0;
-            value "priority" int: -1000;
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "hibernate";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-suspend-hibernate";
+            value "is_main" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "shot";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "logout";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-log-out";
+            value "is_main" int: 0;
         }
     }
     value "config_version" int: 65847;
@@ -1247,7 +1488,7 @@ group "E_Config" struct {
     value "border_shade_transition" int: 1;
     value "border_shade_speed" double: 1800.0000000000000000000000000;
     value "framerate" double: 60.0000000000000000000000000;
-    value "priority" int: 1;
+    value "priority" int: 3;
     value "image_cache" int: 4096;
     value "font_cache" int: 512;
     value "edje_cache" int: 32;
@@ -1322,7 +1563,7 @@ group "E_Config" struct {
     value "move_info_visible" int: 0;
     value "resize_info_visible" int: 0;
     value "focus_last_focused_per_desktop" int: 1;
-    value "focus_revert_on_hide_or_close" int: 1;
+    value "focus_revert_on_hide_or_close" int: 0;
     value "pointer_slide" int: 0;
     value "use_e_cursor" int: 1;
     value "cursor_size" int: 32;
@@ -1356,27 +1597,30 @@ group "E_Config" struct {
     value "desklock_autolock_idle" int: 0;
     value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
     value "desklock_use_custom_desklock" int: 0;
-    value "desklock_ask_presentation" uchar: 1;
+    value "desklock_ask_presentation" uchar: 0;
     value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000;
     value "display_res_restore" int: 0;
     value "display_res_width" int: 1;
     value "display_res_height" int: 1;
     value "display_res_hz" int: 0;
     value "display_res_rotation" int: 0;
-    value "screensaver_enable" int: 0;
-    value "screensaver_timeout" int: 0;
+    value "screensaver_enable" int: 1;
+    value "screensaver_timeout" int: 60;
     value "screensaver_interval" int: 5;
     value "screensaver_blanking" int: 2;
     value "screensaver_expose" int: 2;
     value "screensaver_ask_presentation" uchar: 1;
     value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000;
-    value "dpms_enable" int: 0;
-    value "dpms_standby_enable" int: 0;
-    value "dpms_suspend_enable" int: 0;
-    value "dpms_off_enable" int: 0;
-    value "dpms_standby_timeout" int: 1;
-    value "dpms_suspend_timeout" int: 1;
-    value "dpms_off_timeout" int: 1;
+    value "screensaver_suspend" uchar: 1;
+    value "screensaver_suspend_on_ac" uchar: 0;
+    value "screensaver_suspend_delay" double: 5.0000000000000000000000000;
+    value "dpms_enable" int: 1;
+    value "dpms_standby_enable" int: 1;
+    value "dpms_suspend_enable" int: 1;
+    value "dpms_off_enable" int: 1;
+    value "dpms_standby_timeout" int: 60;
+    value "dpms_suspend_timeout" int: 60;
+    value "dpms_off_timeout" int: 60;
     value "clientlist_group_by" int: 0;
     value "clientlist_include_all_zones" int: 0;
     value "clientlist_separate_with" int: 0;
@@ -1431,12 +1675,12 @@ group "E_Config" struct {
     value "scale.min" double: 1.0000000000000000000000000;
     value "scale.max" double: 3.0000000000000000000000000;
     value "scale.factor" double: 1.0000000000000000000000000;
-    value "scale.base_dpi" int: 142;
+    value "scale.base_dpi" int: 90;
     value "scale.use_dpi" uchar: 1;
     value "scale.use_custom" uchar: 0;
     value "show_cursor" uchar: 1;
     value "idle_cursor" uchar: 0;
-    value "default_system_menu" string: "/etc/xdg/menus/gnome-applications.menu";
+    value "default_system_menu" string: "";
     value "cfgdlg_normal_wins" uchar: 1;
     value "syscon.main.icon_size" int: 64;
     value "syscon.secondary.icon_size" int: 48;
@@ -1448,4 +1692,10 @@ group "E_Config" struct {
     value "exec.expire_timeout" double: 60.0000000000000000000000000;
     value "exec.show_run_dialog" uchar: 0;
     value "exec.show_exit_dialog" uchar: 0;
+    value "backlight.normal" double: 1.0000000000000000000000000;
+    value "backlight.dim" double: 0.2999999999999999888977698;
+    value "backlight.transition" double: 0.5000000000000000000000000;
+    value "device_desktop" int: 0;
+    value "device_auto_mount" int: 0;
+    value "device_auto_open" int: 0;
 }
index 78101de..698e2bc 100644 (file)
Binary files a/config/illume/icon.png and b/config/illume/icon.png differ
diff --git a/config/illume/module.illume-home.src b/config/illume/module.illume-home.src
new file mode 100644 (file)
index 0000000..4c8f1a3
--- /dev/null
@@ -0,0 +1,6 @@
+group "Illume-Home_Cfg" struct {
+    value "version" int: 0;
+    value "icon_size" int: 120;
+    value "single_click" int: 1;
+    value "single_click_delay" int: 250;
+}
diff --git a/config/illume/module.illume-indicator.src b/config/illume/module.illume-indicator.src
new file mode 100644 (file)
index 0000000..ec31283
--- /dev/null
@@ -0,0 +1,4 @@
+group "Illume-Indicator_Cfg" struct {
+    value "version" int: 0;
+    value "height" int: 32;
+}
diff --git a/config/illume/module.illume-keyboard.src b/config/illume/module.illume-keyboard.src
new file mode 100644 (file)
index 0000000..60c10dd
--- /dev/null
@@ -0,0 +1,5 @@
+group "Illume_Kbd_Cfg" struct {
+    value "version" int: 0;
+    value "use_internal" int: 1;
+    value "dict" string: "English_(US).dic";
+}
diff --git a/config/illume/module.illume-softkey.src b/config/illume/module.illume-softkey.src
new file mode 100644 (file)
index 0000000..afca4e8
--- /dev/null
@@ -0,0 +1,4 @@
+group "Illume-Softkey_Cfg" struct {
+    value "version" int: 0;
+    value "height" int: 32;
+}
diff --git a/config/illume/module.illume2.src b/config/illume/module.illume2.src
new file mode 100644 (file)
index 0000000..f371169
--- /dev/null
@@ -0,0 +1,50 @@
+group "Illume_Config" struct {
+    group "policy.zones" list {
+        group "Illume_Config_Zone" struct {
+            value "id" int: 0;
+            value "mode.dual" int: 0;
+            value "mode.side" int: 1;
+        }
+        group "Illume_Config_Zone" struct {
+            value "id" int: 1;
+            value "mode.dual" int: 0;
+            value "mode.side" int: 1;
+        }
+    }
+    value "version" int: 1;
+    value "animation.vkbd.duration" int: 1000;
+    value "animation.quickpanel.duration" int: 1000;
+    value "policy.name" string: "illume";
+    value "policy.vkbd.class" string: "Virtual-Keyboard";
+    value "policy.vkbd.name" string: "Virtual-Keyboard";
+    value "policy.vkbd.title" string: "Virtual Keyboard";
+    value "policy.vkbd.type" int: 7;
+    value "policy.vkbd.match.class" int: 0;
+    value "policy.vkbd.match.name" int: 1;
+    value "policy.vkbd.match.title" int: 1;
+    value "policy.vkbd.match.type" int: 0;
+    value "policy.indicator.class" string: "Illume-Indicator";
+    value "policy.indicator.name" string: "Illume-Indicator";
+    value "policy.indicator.title" string: "Illume Indicator";
+    value "policy.indicator.type" int: 1;
+    value "policy.indicator.match.class" int: 0;
+    value "policy.indicator.match.name" int: 1;
+    value "policy.indicator.match.title" int: 1;
+    value "policy.indicator.match.type" int: 0;
+    value "policy.softkey.class" string: "Illume-Softkey";
+    value "policy.softkey.name" string: "Illume-Softkey";
+    value "policy.softkey.title" string: "Illume Softkey";
+    value "policy.softkey.type" int: 1;
+    value "policy.softkey.match.class" int: 0;
+    value "policy.softkey.match.name" int: 1;
+    value "policy.softkey.match.title" int: 1;
+    value "policy.softkey.match.type" int: 0;
+    value "policy.home.class" string: "Illume-Home";
+    value "policy.home.name" string: "Illume-Home";
+    value "policy.home.title" string: "Illume Home";
+    value "policy.home.type" int: 7;
+    value "policy.home.match.class" int: 0;
+    value "policy.home.match.name" int: 1;
+    value "policy.home.match.title" int: 1;
+    value "policy.home.match.type" int: 0;
+}
old mode 100755 (executable)
new mode 100644 (file)
index 97a4456..841fba7
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Link
-Name=Illume
-Name[ru]=Illume
-Name[zh_CN]=Illume
+Name=Touchscreen
+Name[fr]=Écran tactile
+Name[pt]=Ecrã táctil
+Name[ko]=터치스크린
 Icon=icon.png
-Comment=Illume profile for embedded systems like phones and web tablets with tiny<br>touchscreen displays.Only use this if you really have such a device.
-Comment[ru]=Профиль Illume для встроенных систем типа телефон или планшет, с маленькими<br>сенсорными экранами. Используйте его только если вы действительно имеете такое устройство.
-Comment[fr]=Illume pour les systèmes embarqués<br>comme les téléphones et les tablettes<br>Internet pourvus d'un petit écran<br>tactile. À n'utiliser que si vous<br>disposez d'un tel matériel.
-Comment[it]=Profilo Illume per sistemi embedded come cellulari e webpad con piccoli display<br>touchscreen. Usatelo solo se avete realmente un dispositivo simile.
-Comment[zh_CN]=为带有小型触屏的嵌入式系统如手机和上网本设计的 Illume 设置主题。
-Comment[pt]=Perfil para telemóveis e tablets com pequenos ecrãs tácteis.<br>Só deve ser utilizado se possuir dispositivos deste tipo
+Comment=EXPERIMENTAL!<br>Configuration set up to work best with touchscreen<br>phones, tablets and similar devices.
+Comment[fr]=EXPÉRIMENTAL !<br>Configuration adaptée aux écrans tactiles<br>des téléphones, tablettes et apparentés.
+Comment[it]=SPERIMENTALE!<br>Configurazione adatta per l'uso in smartphone<br>con interfaccia tattile, tablets e similari.
+Comment[pt]=EXPERIMENTAL!<br>Configuração para ecrãs de toque de<br>telefones, tablets e similares.
+Comment[ko]=실험 단계중!<br>터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
diff --git a/config/standard/.cvsignore b/config/standard/.cvsignore
deleted file mode 100644 (file)
index cd2c9ce..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.cfg
old mode 100755 (executable)
new mode 100644 (file)
index 6c4b3e0..a3941ec
 group "E_Config" struct {
-  value "config_version" int: 65847;
-  value "show_splash" int: 1;
-  value "init_default_theme" string: "default.edj";
-  value "desktop_default_name" string: "Desktop %i, %i";
-  value "menus_scroll_speed" double: 1000.0000000000000000000000000;
-  value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
-  value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
-  value "border_shade_animate" int: 1;
-  value "border_shade_transition" int: 3;
-  value "border_shade_speed" double: 3000.0000000000000000000000000;
-  value "framerate" double: 60.0000000000000000000000000;
-  value "priority" int: 1;
-  value "image_cache" int: 4096;
-  value "font_cache" int: 512;
-  value "edje_cache" int: 32;
-  value "edje_collection_cache" int: 64;
-  value "zone_desks_x_count" int: 4;
-  value "zone_desks_y_count" int: 1;
-  value "use_virtual_roots" int: 0;
-  value "show_desktop_icons" int: 1;
-  value "edge_flip_dragging" int: 1;
-  value "evas_engine_default" int: 1;
-  value "evas_engine_container" int: 0;
-  value "evas_engine_init" int: 0;
-  value "evas_engine_menus" int: 0;
-  value "evas_engine_borders" int: 0;
-  value "evas_engine_errors" int: 0;
-  value "evas_engine_popups" int: 0;
-  value "evas_engine_drag" int: 0;
-  value "evas_engine_win" int: 0;
-  value "evas_engine_zone" int: 0;
-  value "use_composite" int: 0;
-  value "language" string: "en_US.UTF-8";
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "mixer";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_remembers";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_interaction";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "fileman";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_manipulation";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_shelves";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_performance";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_edgebindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_paths";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_menus";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_keybindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_intl";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dialogs";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_applications";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "winlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "pager";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "temperature";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "cpufreq";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "battery";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "clock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "dropshadow";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "ibox";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "ibar";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "start";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "gadman";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: -100;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "syscon";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "everything";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: -1000;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "shot";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "themes" list {
-    group "E_Config_Theme" struct {
-      value "category" string: "theme";
-      value "file" string: "default.edj";
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 2;
-      value "modifiers" int: 4;
-      value "action" string: "window_move";
-      value "button" uchar: 1;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 2;
-      value "modifiers" int: 4;
-      value "action" string: "window_resize";
-      value "button" uchar: 2;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 2;
-      value "modifiers" int: 4;
-      value "action" string: "window_menu";
-      value "button" uchar: 3;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "menu_show";
-      value "params" string: "main";
-      value "button" uchar: 1;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "menu_show";
-      value "params" string: "clients";
-      value "button" uchar: 2;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "mouse_bindings" list {
-    group "E_Config_Binding_Mouse" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "menu_show";
-      value "params" string: "favorites";
-      value "button" uchar: 3;
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "Left";
-      value "action" string: "desk_flip_by";
-      value "params" string: "-1 0";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "Right";
-      value "action" string: "desk_flip_by";
-      value "params" string: "1 0";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "Up";
-      value "action" string: "desk_flip_by";
-      value "params" string: "0 -1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "Down";
-      value "action" string: "desk_flip_by";
-      value "params" string: "0 1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Up";
-      value "action" string: "window_raise";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Down";
-      value "action" string: "window_lower";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "x";
-      value "action" string: "window_close";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "k";
-      value "action" string: "window_kill";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "w";
-      value "action" string: "window_menu";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "s";
-      value "action" string: "window_sticky_toggle";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "i";
-      value "action" string: "window_iconic_toggle";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "f";
-      value "action" string: "window_maximized_toggle";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 1;
-      value "key" string: "F10";
-      value "action" string: "window_maximized_toggle";
-      value "params" string: "default vertical";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "F10";
-      value "action" string: "window_maximized_toggle";
-      value "params" string: "default horizontal";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "r";
-      value "action" string: "window_shaded_toggle";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Left";
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Right";
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F1";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "0";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F2";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F3";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "2";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F4";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "3";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F5";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "4";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F6";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "5";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F7";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "6";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F8";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "7";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F9";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "8";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F10";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "9";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F11";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "10";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "F12";
-      value "action" string: "desk_linear_flip_to";
-      value "params" string: "11";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "m";
-      value "action" string: "menu_show";
-      value "params" string: "main";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "a";
-      value "action" string: "menu_show";
-      value "params" string: "favorites";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "Menu";
-      value "action" string: "menu_show";
-      value "params" string: "main";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 2;
-      value "key" string: "Menu";
-      value "action" string: "menu_show";
-      value "params" string: "clients";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "Menu";
-      value "action" string: "menu_show";
-      value "params" string: "favorites";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Insert";
-      value "action" string: "exec";
-      value "params" string: "Eterm";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "Tab";
-      value "action" string: "winlist";
-      value "params" string: "next";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 5;
-      value "key" string: "Tab";
-      value "action" string: "winlist";
-      value "params" string: "prev";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "End";
-      value "action" string: "restart";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "Delete";
-      value "action" string: "syscon";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "Escape";
-      value "action" string: "everything";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "l";
-      value "action" string: "desk_lock";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 6;
-      value "key" string: "d";
-      value "action" string: "desk_deskshow_toggle";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "Left";
-      value "action" string: "screen_send_by";
-      value "params" string: "-1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "Right";
-      value "action" string: "screen_send_by";
-      value "params" string: "1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "F1";
-      value "action" string: "screen_send_to";
-      value "params" string: "0";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "F2";
-      value "action" string: "screen_send_to";
-      value "params" string: "1";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "F3";
-      value "action" string: "screen_send_to";
-      value "params" string: "2";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 3;
-      value "key" string: "F4";
-      value "action" string: "screen_send_to";
-      value "params" string: "3";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86AudioLowerVolume";
-      value "action" string: "volume_decrease";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86AudioRaiseVolume";
-      value "action" string: "volume_increase";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86AudioMute";
-      value "action" string: "volume_mute";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "Print";
-      value "action" string: "shot";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86Standby";
-      value "action" string: "suspend";
-      value "params" string: "now";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86Start";
-      value "action" string: "menu_show";
-      value "params" string: "all";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86PowerDown";
-      value "action" string: "hibernate";
-      value "params" string: "now";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86PowerOff";
-      value "action" string: "halt";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86Sleep";
-      value "action" string: "suspend";
-      value "params" string: "now";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86Suspend";
-      value "action" string: "suspend";
-      value "params" string: "now";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "XF86Hibernate";
-      value "action" string: "hibernate";
-      value "params" string: "now";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "Execute";
-      value "action" string: "everything";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "Execute";
-      value "action" string: "everything";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "edge_bindings" list {
-    group "E_Config_Binding_Edge" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "desk_flip_in_direction";
-      value "edge" uchar: 1;
-      value "any_mod" uchar: 0;
-      value "delay" float: 0.3000000000000000000000000;
-    }
-  }
-  group "edge_bindings" list {
-    group "E_Config_Binding_Edge" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "desk_flip_in_direction";
-      value "edge" uchar: 2;
-      value "any_mod" uchar: 0;
-      value "delay" float: 0.3000000000000000000000000;
-    }
-  }
-  group "edge_bindings" list {
-    group "E_Config_Binding_Edge" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "desk_flip_in_direction";
-      value "edge" uchar: 3;
-      value "any_mod" uchar: 0;
-      value "delay" float: 0.3000000000000000000000000;
-    }
-  }
-  group "edge_bindings" list {
-    group "E_Config_Binding_Edge" struct {
-      value "context" int: 3;
-      value "modifiers" int: 0;
-      value "action" string: "desk_flip_in_direction";
-      value "edge" uchar: 4;
-      value "any_mod" uchar: 0;
-      value "delay" float: 0.3000000000000000000000000;
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1,double";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_shaded_toggle";
-      value "params" string: "up";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,2";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_shaded_toggle";
-      value "params" string: "up";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,wheel,?,1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_shaded";
-      value "params" string: "0 up";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,wheel,?,-1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_shaded";
-      value "params" string: "1 up";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,3";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_menu";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,?";
-      value "source" string: "e.event.icon";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_menu";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,[12]";
-      value "source" string: "e.event.close";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_close";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,3";
-      value "source" string: "e.event.close";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_kill";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,1";
-      value "source" string: "e.event.maximize";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_maximized_toggle";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,2";
-      value "source" string: "e.event.maximize";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_maximized_toggle";
-      value "params" string: "smart";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,3";
-      value "source" string: "e.event.maximize";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_maximized_toggle";
-      value "params" string: "expand";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,?";
-      value "source" string: "e.event.minimize";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_iconic_toggle";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,?";
-      value "source" string: "e.event.shade";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_shaded_toggle";
-      value "params" string: "up";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,?";
-      value "source" string: "e.event.lower";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_lower";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.icon";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_drag_icon";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-      value "params" string: "end";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.tl";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "tl";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.t";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "t";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.tr";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "tr";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.r";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "r";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.br";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "br";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.b";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "b";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.bl";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "bl";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.l";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "l";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,1";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "end";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,3";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,3";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-      value "params" string: "end";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 4;
-      value "direction" int: 0;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 4;
-      value "direction" int: 1;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 4;
-      value "direction" int: 0;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 4;
-      value "direction" int: 1;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 2;
-      value "direction" int: 0;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 2;
-      value "direction" int: 1;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 2;
-      value "direction" int: 0;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 2;
-      value "direction" int: 1;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
-    }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 8;
-      value "direction" int: 0;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
+    group "syscon.actions" list {
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "halt";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-shutdown";
+            value "is_main" int: 2;
+        }
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "suspend";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-suspend";
+            value "is_main" int: 1;
+        }
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "desk_lock";
+            value "button" string: "button";
+            value "icon" string: "system-lock-screen";
+            value "is_main" int: 1;
+        }
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "reboot";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-restart";
+            value "is_main" int: 0;
+        }
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "hibernate";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-suspend-hibernate";
+            value "is_main" int: 0;
+        }
+        group "E_Config_Syscon_Action" struct {
+            value "action" string: "logout";
+            value "params" string: "now";
+            value "button" string: "button";
+            value "icon" string: "system-log-out";
+            value "is_main" int: 0;
+        }
     }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 8;
-      value "direction" int: 1;
-      value "z" int: -1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "-1";
+    group "mime_icons" list {
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/jpeg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/png";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-pixmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-xpixmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/svg+xml";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/gif";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/tiff";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-edje";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/pdf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/postscript";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-photoshop";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-anymap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-bitmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-graymap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-portable-pixmap";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/vnd.wap.wbmp";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-ms-bmp";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-icon";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-tga";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/svg+xml-compressed";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-xcf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "image/x-compressed-xcf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/3gpp";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ms-asf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-msvideo";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-flv";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-matroska";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/quicktime";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mp4";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mpeg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/mp2t";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/mxf";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ogm+ogg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/ogg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-theora+ogg";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/vnd.rn-realmedia";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-shockwave-flash";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "video/x-ms-wmv";
+            value "icon" string: "THUMB";
+        }
+        group "E_Config_Mime_Icon" struct {
+            value "mime" string: "application/x-desktop";
+            value "icon" string: "DESKTOP";
+        }
     }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 8;
-      value "direction" int: 0;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
+    group "shelves" list {
+        group "E_Config_Shelf" struct {
+            group "desk_list" list {
+                group "E_Config_Shelf_Desk" struct {
+                    value "x" int: 135642264;
+                    value "y" int: 1;
+                }
+            }
+            value "name" string: "shelf";
+            value "id" int: 1;
+            value "container" int: 0;
+            value "zone" int: 0;
+            value "layer" int: 200;
+            value "popup" uchar: 1;
+            value "orient" int: 6;
+            value "fit_along" uchar: 1;
+            value "fit_size" uchar: 0;
+            value "style" string: "default";
+            value "size" int: 40;
+            value "overlap" int: 0;
+            value "autohide" int: 0;
+            value "autohide_show_action" int: 0;
+            value "hide_timeout" float: 1.0000000000000000000000000;
+            value "hide_duration" float: 1.0000000000000000000000000;
+            value "desk_show_mode" int: 0;
+        }
     }
-  }
-  group "wheel_bindings" list {
-    group "E_Config_Binding_Wheel" struct {
-      value "context" int: 8;
-      value "direction" int: 1;
-      value "z" int: 1;
-      value "modifiers" int: 4;
-      value "any_mod" uchar: 0;
-      value "action" string: "desk_linear_flip_by";
-      value "params" string: "1";
+    group "gadcons" list {
+        group "E_Config_Gadcon" struct {
+            group "clients" list {
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "start";
+                    value "id" string: "start";
+                    value "geom.pos" int: 0;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 2;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "pager";
+                    value "id" string: "pager";
+                    value "geom.pos" int: 32;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 3;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "inset";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "ibox";
+                    value "id" string: "ibox.1";
+                    value "geom.pos" int: 64;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 4;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "inset";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "ibar";
+                    value "id" string: "ibar.1";
+                    value "geom.pos" int: 96;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 5;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "inset";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "backlight";
+                    value "id" string: "backlight";
+                    value "geom.pos" int: 128;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 6;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "temperature";
+                    value "id" string: "temperature.1";
+                    value "geom.pos" int: 160;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 7;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "cpufreq";
+                    value "id" string: "cpufreq";
+                    value "geom.pos" int: 192;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 8;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "battery";
+                    value "id" string: "battery";
+                    value "geom.pos" int: 224;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 9;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "clock";
+                    value "id" string: "clock";
+                    value "geom.pos" int: 256;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 10;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "connman";
+                    value "id" string: "connman";
+                    value "geom.pos" int: 288;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 11;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "plain";
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "tasks";
+                    value "id" string: "tasks.0";
+                    value "geom.pos" int: 320;
+                    value "geom.size" int: 32;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 12;
+                    value "state_info.flags" int: 0;
+                    value "style" string: "inset";
+                    value "autoscroll" uchar: 1;
+                    value "resizable" uchar: 0;
+                }
+            }
+            value "name" string: "shelf";
+            value "id" int: 1;
+        }
+        group "E_Config_Gadcon" struct {
+            group "clients" list {
+                group "E_Config_Gadcon_Client" struct {
+                    value "name" string: "efm_navigation";
+                    value "id" string: "efm_navigation.1";
+                    value "geom.pos" int: 720;
+                    value "geom.size" int: 80;
+                    value "geom.res" int: 800;
+                    value "geom.pos_x" double: 0.0000000000000000000000000;
+                    value "geom.pos_y" double: 0.0000000000000000000000000;
+                    value "geom.size_w" double: 0.0000000000000000000000000;
+                    value "geom.size_h" double: 0.0000000000000000000000000;
+                    value "state_info.seq" int: 2;
+                    value "state_info.flags" int: 0;
+                    value "orient" int: 0;
+                    value "autoscroll" uchar: 0;
+                    value "resizable" uchar: 0;
+                }
+            }
+            value "name" string: "toolbar";
+            value "id" int: 1;
+            value "zone" int: 0;
+        }
+        group "E_Config_Gadcon" struct {
+            value "name" string: "gadman";
+            value "id" int: 114;
+        }
+        group "E_Config_Gadcon" struct {
+            value "name" string: "gadman_top";
+            value "id" int: 115;
+        }
     }
-  }
     group "acpi_bindings" list {
         group "E_Config_Binding_Acpi" struct {
             value "context" int: 0;
             value "type" int: 15;
             value "status" int: -1;
-            value "action" string: "dim_screen";
+            value "action" string: "backlight_adjust";
+            value "params" string: "-0.1";
         }
         group "E_Config_Binding_Acpi" struct {
             value "context" int: 0;
             value "type" int: 16;
             value "status" int: -1;
-            value "action" string: "undim_screen";
+            value "action" string: "backlight_adjust";
+            value "params" string: "0.1";
         }
         group "E_Config_Binding_Acpi" struct {
             value "context" int: 0;
@@ -1438,7 +480,6 @@ group "E_Config" struct {
             value "type" int: 6;
             value "status" int: -1;
             value "action" string: "halt";
-            value "params" string: "now";
         }
         group "E_Config_Binding_Acpi" struct {
             value "context" int: 0;
@@ -1457,7 +498,7 @@ group "E_Config" struct {
         group "E_Config_Binding_Acpi" struct {
             value "context" int: 0;
             value "type" int: 5;
-            value "status" int: 1;
+            value "status" int: -1;
             value "action" string: "suspend";
             value "params" string: "now";
         }
@@ -1467,662 +508,1364 @@ group "E_Config" struct {
             value "status" int: -1;
             value "action" string: "volume_mute";
         }
+        group "E_Config_Binding_Acpi" struct {
+            value "context" int: 0;
+            value "type" int: 22;
+            value "status" int: -1;
+            value "action" string: "backlight";
+        }
     }
-  value "window_placement_policy" int: 0;
-  value "focus_policy" int: 2;
-  value "focus_setting" int: 3;
-  value "pass_click_on" int: 1;
-  value "always_click_to_raise" int: 0;
-  value "always_click_to_focus" int: 0;
-  value "use_auto_raise" int: 0;
-  value "auto_raise_delay" double: 0.5000000000000000000000000;
-  value "use_resist" int: 1;
-  value "drag_resist" int: 16;
-  value "desk_resist" int: 32;
-  value "window_resist" int: 12;
-  value "gadget_resist" int: 32;
-  value "geometry_auto_resize_limit" int: 1;
-  value "geometry_auto_move" int: 1;
-  value "winlist_warp_while_selecting" int: 1;
-  value "winlist_warp_at_end" int: 1;
-  value "winlist_warp_speed" double: 0.1000000000000000055511151;
-  value "winlist_scroll_animate" int: 1;
-  value "winlist_scroll_speed" double: 0.1000000000000000055511151;
-  value "winlist_list_show_iconified" int: 1;
-  value "winlist_list_show_other_desk_iconified" int: 1;
-  value "winlist_list_show_other_screen_iconified" int: 0;
-  value "winlist_list_show_other_desk_windows" int: 0;
-  value "winlist_list_show_other_screen_windows" int: 0;
-  value "winlist_list_uncover_while_selecting" int: 0;
-  value "winlist_list_jump_desk_while_selecting" int: 0;
-  value "winlist_list_focus_while_selecting" int: 1;
-  value "winlist_list_raise_while_selecting" int: 1;
-  value "winlist_pos_align_x" double: 0.5000000000000000000000000;
-  value "winlist_pos_align_y" double: 0.5000000000000000000000000;
-  value "winlist_pos_size_w" double: 0.5000000000000000000000000;
-  value "winlist_pos_size_h" double: 0.5000000000000000000000000;
-  value "winlist_pos_min_w" int: 0;
-  value "winlist_pos_min_h" int: 0;
-  value "winlist_pos_max_w" int: 320;
-  value "winlist_pos_max_h" int: 320;
-  value "maximize_policy" int: 50;
-  value "allow_manip" int: 0;
-  value "border_fix_on_shelf_toggle" int: 0;
-  value "allow_above_fullscreen" int: 0;
-  value "kill_if_close_not_possible" int: 1;
-  value "kill_process" int: 1;
-  value "kill_timer_wait" double: 10.0000000000000000000000000;
-  value "ping_clients" int: 1;
-  value "transition_desk" string: "vswipe";
-  value "transition_change" string: "crossfade";
-  value "remember_internal_windows" int: 0;
-  value "move_info_follows" int: 1;
-  value "resize_info_follows" int: 1;
-  value "move_info_visible" int: 1;
-  value "resize_info_visible" int: 1;
-  value "focus_last_focused_per_desktop" int: 1;
-  value "focus_revert_on_hide_or_close" int: 1;
-  value "pointer_slide" int: 1;
-  value "use_e_cursor" int: 1;
-  value "cursor_size" int: 32;
-  value "menu_autoscroll_margin" int: 0;
-  value "menu_autoscroll_cursor_margin" int: 1;
-  value "transient.move" int: 1;
-  value "transient.resize" int: 0;
-  value "transient.raise" int: 1;
-  value "transient.lower" int: 1;
-  value "transient.layer" int: 1;
-  value "transient.desktop" int: 1;
-  value "transient.iconify" int: 1;
-  value "modal_windows" int: 1;
-  value "menu_eap_name_show" int: 1;
-  value "menu_eap_generic_show" int: 1;
-  value "menu_eap_comment_show" int: 0;
-  value "menu_gadcon_client_toplevel" int: 0;
-  value "fullscreen_policy" int: 0;
-  value "exebuf_term_cmd" string: "xterm -hold -e";
-  value "use_app_icon" int: 0;
-  value "cnfmdlg_disabled" int: 0;
-  value "cfgdlg_auto_apply" int: 0;
-  value "cfgdlg_default_mode" int: 0;
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "shelf";
-      value "id" int: 1;
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "start";
-          value "id" string: "start";
-          value "geom.pos" int: 0;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 2;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "pager";
-          value "id" string: "pager";
-          value "geom.pos" int: 32;
-          value "geom.size" int: 120;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 3;
-          value "state_info.flags" int: 0;
-          value "style" string: "inset";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "ibox";
-          value "id" string: "ibox.1";
-          value "geom.pos" int: 152;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 4;
-          value "state_info.flags" int: 0;
-          value "style" string: "inset";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "ibar";
-          value "id" string: "ibar.1";
-          value "geom.pos" int: 350;
-          value "geom.size" int: 200;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 5;
-          value "state_info.flags" int: 0;
-          value "style" string: "inset";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "temperature";
-          value "id" string: "temperature.1";
-          value "geom.pos" int: 672;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 6;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "cpufreq";
-          value "id" string: "cpufreq";
-          value "geom.pos" int: 704;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 7;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "battery";
-          value "id" string: "battery";
-          value "geom.pos" int: 736;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 8;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "clock";
-          value "id" string: "clock";
-          value "geom.pos" int: 768;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 9;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "gadman";
-      value "id" int: 114;
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "gadman_top";
-      value "id" int: 115;
-    }
-  }
-  group "shelves" list {
-    group "E_Config_Shelf" struct {
-      value "name" string: "shelf";
-      value "id" int: 1;
-      value "container" int: 0;
-      value "zone" int: 0;
-      value "layer" int: 200;
-      value "popup" uchar: 1;
-      value "orient" int: 6;
-      value "fit_along" uchar: 1;
-      value "fit_size" uchar: 0;
-      value "style" string: "default";
-      value "size" int: 40;
-      value "overlap" int: 0;
-      value "autohide" int: 0;
-      value "autohide_show_action" int: 0;
-      value "hide_timeout" float: 1.0000000000000000000000000;
-      value "hide_duration" float: 1.0000000000000000000000000;
-      value "desk_show_mode" int: 0;
-      group "desk_list" list {
-        group "E_Config_Shelf_Desk" struct {
-          value "x" int: 135642264;
-          value "y" int: 1;
-        }
-      }
-    }
-  }
-  value "font_hinting" int: 0;
-  value "desklock_auth_method" int: 0;
-  value "desklock_login_box_zone" int: -1;
-  value "desklock_start_locked" int: 0;
-  value "desklock_on_suspend" int: 0;
-  value "desklock_autolock_screensaver" int: 0;
-  value "desklock_post_screensaver_time" double: 0.0;
-  value "desklock_autolock_idle" int: 0;
-  value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
-  value "desklock_use_custom_desklock" int: 0;
-  value "desklock_ask_presentation" uchar: 1;
-  value "desklock_ask_presentation_timeout" double: 30;
-  value "display_res_restore" int: 0;
-  value "display_res_width" int: 1;
-  value "display_res_height" int: 1;
-  value "display_res_hz" int: 0;
-  value "display_res_rotation" int: 0;
-  value "screensaver_enable" int: 0;
-  value "screensaver_timeout" int: 0;
-  value "screensaver_interval" int: 5;
-  value "screensaver_blanking" int: 2;
-  value "screensaver_expose" int: 2;
-  value "screensaver_ask_presentation" uchar: 1;
-  value "screensaver_ask_presentation_timeout" double: 30;
-  value "dpms_enable" int: 0;
-  value "dpms_standby_enable" int: 0;
-  value "dpms_suspend_enable" int: 0;
-  value "dpms_off_enable" int: 0;
-  value "dpms_standby_timeout" int: 1;
-  value "dpms_suspend_timeout" int: 1;
-  value "dpms_off_timeout" int: 1;
-  value "clientlist_group_by" int: 0;
-  value "clientlist_include_all_zones" int: 0;
-  value "clientlist_separate_with" int: 0;
-  value "clientlist_sort_by" int: 0;
-  value "clientlist_separate_iconified_apps" int: 0;
-  value "clientlist_warp_to_iconified_desktop" int: 0;
-  value "clientlist_limit_caption_len" int: 0;
-  value "clientlist_max_caption_len" int: 2;
-  value "mouse_hand" int: 1;
-  value "mouse_accel_numerator" int: 2;
-  value "mouse_accel_denominator" int: 1;
-  value "mouse_accel_threshold" int: 4;
-  value "border_raise_on_mouse_action" int: 1;
-  value "border_raise_on_focus" int: 1;
-  value "desk_flip_wrap" int: 0;
-  value "fullscreen_flip" int: 1;
-  value "icon_theme" string: "Tango";
-  value "icon_theme_overrides" uchar: 0;
-  value "desk_flip_animate_mode" int: 1;
-  value "desk_flip_animate_interpolation" int: 0;
-  value "desk_flip_animate_time" double: 0.2000000000000000111022302;
-  value "wallpaper_import_last_dev" string: "~/";
-  value "wallpaper_import_last_path" string: "/";
-  value "wallpaper_grad_c1_r" int: 0;
-  value "wallpaper_grad_c1_g" int: 0;
-  value "wallpaper_grad_c1_b" int: 0;
-  value "wallpaper_grad_c2_r" int: 255;
-  value "wallpaper_grad_c2_g" int: 255;
-  value "wallpaper_grad_c2_b" int: 255;
-  value "theme_default_border_style" string: "default";
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/jpeg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/png";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-pixmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-xpixmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/svg+xml";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/gif";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/tiff";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-edje";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/pdf";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/postscript";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-photoshop";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-portable-anymap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-portable-bitmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-portable-graymap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-portable-pixmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/vnd.wap.wbmp";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-ms-bmp";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-icon";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-tga";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/svg+xml";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/svg+xml-compressed";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-xcf";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-compressed-xcf";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/3gpp";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-ms-asf";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-msvideo";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-flv";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-matroska";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/quicktime";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/mp4";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/mpeg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/mp2t";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/mxf";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-ogm+ogg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/ogg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-theora+ogg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/vnd.rn-realmedia";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-shockwave-flash";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "video/x-ms-wmv";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-desktop";
-      value "icon" string: "DESKTOP";
+    group "wheel_bindings" list {
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 4;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 2;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 0;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 1;
+            value "z" int: -1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 0;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
+        group "E_Config_Binding_Wheel" struct {
+            value "context" int: 8;
+            value "direction" int: 1;
+            value "z" int: 1;
+            value "modifiers" int: 4;
+            value "any_mod" uchar: 0;
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+        }
     }
-  }
-  value "desk_auto_switch" int: 0;
-  value "thumb_nice" int: 0;
-  value "menu_favorites_show" int: 1;
-  value "menu_apps_show" int: 1;
-  value "ping_clients_interval" int: 128;
-  value "cache_flush_poll_interval" int: 512;
-  value "thumbscroll_enable" int: 0;
-  value "thumbscroll_threshhold" int: 8;
-  value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
-  value "thumbscroll_friction" double: 1.0000000000000000000000000;
-  value "dbus_desktop" int: 1;
-  value "border_keyboard.timeout" double: 5.0000000000000000000000000;
-  value "border_keyboard.move.dx" uchar: 5;
-  value "border_keyboard.move.dy" uchar: 5;
-  value "border_keyboard.resize.dx" uchar: 5;
-  value "border_keyboard.resize.dy" uchar: 5;
-  value "dbus_desktop" int: 1;
-  value "scale.min" double: 1.0000000000000000000000000;
-  value "scale.max" double: 3.0000000000000000000000000;
-  value "scale.factor" double: 1.0000000000000000000000000;
-  value "scale.base_dpi" int: 142;
-  value "scale.use_dpi" uchar: 0;
-  value "scale.use_custom" uchar: 0;
-  value "show_cursor" uchar: 1;
-  value "idle_cursor" uchar: 1;
-  value "default_system_menu" string: "";
-  value "cfgdlg_normal_wins" uchar: 0;
-  value "syscon.main.icon_size" int: 64;
-  value "syscon.secondary.icon_size" int: 48;
-  value "syscon.extra.icon_size" int: 48;
-  value "syscon.timeout" double: 5.0;
-  value "syscon.do_input" uchar: 1;
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "halt";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-shutdown";
-      value "is_main" int: 1;
+    group "signal_bindings" list {
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1,double";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,2";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,wheel,?,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded";
+            value "params" string: "0 up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,wheel,?,-1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded";
+            value "params" string: "1 up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_menu";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.icon";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_menu";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,[12]";
+            value "source" string: "e.event.close";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_close";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.close";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_kill";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,1";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,2";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "smart";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,3";
+            value "source" string: "e.event.maximize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "expand";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.minimize";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_iconic_toggle";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.shade";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_shaded_toggle";
+            value "params" string: "up";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,clicked,?";
+            value "source" string: "e.event.lower";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_lower";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.icon";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_drag_icon";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,1";
+            value "source" string: "e.event.titlebar";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+            value "params" string: "end";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.tl";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "tl";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.t";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "t";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.tr";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "tr";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.r";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "r";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.br";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "br";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.b";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "b";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.bl";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "bl";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,1";
+            value "source" string: "e.event.resize.l";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "l";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,1";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_resize";
+            value "params" string: "end";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,down,3";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+        }
+        group "E_Config_Binding_Signal" struct {
+            value "context" int: 2;
+            value "signal" string: "mouse,up,3";
+            value "source" string: "e.event.resize.*";
+            value "modifiers" int: 0;
+            value "any_mod" uchar: 1;
+            value "action" string: "window_move";
+            value "params" string: "end";
+        }
     }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "suspend";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-suspend";
-      value "is_main" int: 1;
+    group "edge_bindings" list {
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 1;
+            value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
+        }
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 2;
+            value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
+        }
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 3;
+            value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
+        }
+        group "E_Config_Binding_Edge" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "desk_flip_in_direction";
+            value "edge" uchar: 4;
+            value "any_mod" uchar: 0;
+            value "delay" float: 0.3000000119209289550781250;
+        }
     }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "desk_lock";
-      value "button" string: "button";
-      value "icon" string: "system-lock-screen";
-      value "is_main" int: 1;
+    group "key_bindings" list {
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Left";
+            value "action" string: "desk_flip_by";
+            value "params" string: "-1 0";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Right";
+            value "action" string: "desk_flip_by";
+            value "params" string: "1 0";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Up";
+            value "action" string: "desk_flip_by";
+            value "params" string: "0 -1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Down";
+            value "action" string: "desk_flip_by";
+            value "params" string: "0 1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Up";
+            value "action" string: "window_raise";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Down";
+            value "action" string: "window_lower";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "x";
+            value "action" string: "window_close";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "k";
+            value "action" string: "window_kill";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "w";
+            value "action" string: "window_menu";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "s";
+            value "action" string: "window_sticky_toggle";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "i";
+            value "action" string: "window_iconic_toggle";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "f";
+            value "action" string: "window_maximized_toggle";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 1;
+            value "key" string: "F10";
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "default vertical";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "F10";
+            value "action" string: "window_maximized_toggle";
+            value "params" string: "default horizontal";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "r";
+            value "action" string: "window_shaded_toggle";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Left";
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "-1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Right";
+            value "action" string: "desk_linear_flip_by";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F1";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "0";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F2";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F3";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "2";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F4";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "3";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F5";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "4";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F6";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "5";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F7";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "6";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F8";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "7";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F9";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "8";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F10";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "9";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F11";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "10";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "F12";
+            value "action" string: "desk_linear_flip_to";
+            value "params" string: "11";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "m";
+            value "action" string: "menu_show";
+            value "params" string: "main";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "a";
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "main";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 2;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "clients";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "Menu";
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Insert";
+            value "action" string: "exec";
+            value "params" string: "Eterm";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "Tab";
+            value "action" string: "winlist";
+            value "params" string: "next";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 5;
+            value "key" string: "Tab";
+            value "action" string: "winlist";
+            value "params" string: "prev";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "End";
+            value "action" string: "restart";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "Delete";
+            value "action" string: "syscon";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 4;
+            value "key" string: "Escape";
+            value "action" string: "everything";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "l";
+            value "action" string: "desk_lock";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 6;
+            value "key" string: "d";
+            value "action" string: "desk_deskshow_toggle";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "Left";
+            value "action" string: "screen_send_by";
+            value "params" string: "-1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "Right";
+            value "action" string: "screen_send_by";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "F1";
+            value "action" string: "screen_send_to";
+            value "params" string: "0";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "F2";
+            value "action" string: "screen_send_to";
+            value "params" string: "1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "F3";
+            value "action" string: "screen_send_to";
+            value "params" string: "2";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 3;
+            value "key" string: "F4";
+            value "action" string: "screen_send_to";
+            value "params" string: "3";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioLowerVolume";
+            value "action" string: "volume_decrease";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioRaiseVolume";
+            value "action" string: "volume_increase";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86AudioMute";
+            value "action" string: "volume_mute";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "Print";
+            value "action" string: "shot";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86Standby";
+            value "action" string: "suspend";
+            value "params" string: "now";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86Start";
+            value "action" string: "menu_show";
+            value "params" string: "all";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86PowerDown";
+            value "action" string: "hibernate";
+            value "params" string: "now";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86PowerOff";
+            value "action" string: "halt";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86Sleep";
+            value "action" string: "suspend";
+            value "params" string: "now";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86Suspend";
+            value "action" string: "suspend";
+            value "params" string: "now";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86Hibernate";
+            value "action" string: "hibernate";
+            value "params" string: "now";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "Execute";
+            value "action" string: "everything";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86MonBrightnessUp";
+            value "action" string: "backlight_adjust";
+            value "params" string: "0.1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86MonBrightnessDown";
+            value "action" string: "backlight_adjust";
+            value "params" string: "-0.1";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86LightBulb";
+            value "action" string: "backlight";
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Key" struct {
+            value "context" int: 9;
+            value "modifiers" int: 0;
+            value "key" string: "XF86BrightnessAdjust";
+            value "action" string: "backlight";
+            value "any_mod" uchar: 0;
+        }
     }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "reboot";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-restart";
-      value "is_main" int: 0;
+    group "mouse_bindings" list {
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 2;
+            value "modifiers" int: 4;
+            value "action" string: "window_move";
+            value "button" uchar: 1;
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 2;
+            value "modifiers" int: 4;
+            value "action" string: "window_resize";
+            value "button" uchar: 2;
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 2;
+            value "modifiers" int: 4;
+            value "action" string: "window_menu";
+            value "button" uchar: 3;
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "main";
+            value "button" uchar: 1;
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "clients";
+            value "button" uchar: 2;
+            value "any_mod" uchar: 0;
+        }
+        group "E_Config_Binding_Mouse" struct {
+            value "context" int: 3;
+            value "modifiers" int: 0;
+            value "action" string: "menu_show";
+            value "params" string: "favorites";
+            value "button" uchar: 3;
+            value "any_mod" uchar: 0;
+        }
     }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "hibernate";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-suspend-hibernate";
-      value "is_main" int: 0;
+    group "themes" list {
+        group "E_Config_Theme" struct {
+            value "category" string: "theme";
+            value "file" string: "default.edj";
+        }
     }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "logout";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-log-out";
-      value "is_main" int: 0;
+    group "modules" list {
+        group "E_Config_Module" struct {
+            value "name" string: "comp";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: -1000;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "mixer";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_window_remembers";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_interaction";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "fileman";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_window_manipulation";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_theme";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_shelves";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_performance";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_edgebindings";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_paths";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_menus";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_keybindings";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_intl";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_display";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_dialogs";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf_applications";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "conf";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "winlist";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "pager";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "temperature";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "cpufreq";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "battery";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "clock";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "dropshadow";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "ibox";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "ibar";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "start";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "gadman";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: -100;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "syscon";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "everything";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: -1000;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "shot";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "backlight";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 1;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
+            value "name" string: "connman";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
     }
-  }
-  value "mode.presentation" uchar: 0;
-  value "mode.offline" uchar: 0;
-  value "exec.expire_timeout" double: 30.0;
-  value "exec.show_run_dialog" uchar: 1;
-  value "exec.show_exit_dialog" uchar: 1;
+    value "config_version" int: 65847;
+    value "show_splash" int: 1;
+    value "init_default_theme" string: "default.edj";
+    value "desktop_default_name" string: "Desktop %i, %i";
+    value "menus_scroll_speed" double: 1000.0000000000000000000000000;
+    value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
+    value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
+    value "border_shade_animate" int: 1;
+    value "border_shade_transition" int: 3;
+    value "border_shade_speed" double: 3000.0000000000000000000000000;
+    value "framerate" double: 60.0000000000000000000000000;
+    value "priority" int: 3;
+    value "image_cache" int: 4096;
+    value "font_cache" int: 512;
+    value "edje_cache" int: 32;
+    value "edje_collection_cache" int: 64;
+    value "zone_desks_x_count" int: 4;
+    value "zone_desks_y_count" int: 1;
+    value "use_virtual_roots" int: 0;
+    value "show_desktop_icons" int: 1;
+    value "edge_flip_dragging" int: 1;
+    value "evas_engine_default" int: 1;
+    value "evas_engine_container" int: 0;
+    value "evas_engine_init" int: 0;
+    value "evas_engine_menus" int: 0;
+    value "evas_engine_borders" int: 0;
+    value "evas_engine_errors" int: 0;
+    value "evas_engine_popups" int: 0;
+    value "evas_engine_drag" int: 0;
+    value "evas_engine_win" int: 0;
+    value "evas_engine_zone" int: 0;
+    value "use_composite" int: 0;
+    value "language" string: "en_US.UTF-8";
+    value "window_placement_policy" int: 0;
+    value "focus_policy" int: 2;
+    value "focus_setting" int: 3;
+    value "pass_click_on" int: 1;
+    value "always_click_to_raise" int: 0;
+    value "always_click_to_focus" int: 0;
+    value "use_auto_raise" int: 0;
+    value "auto_raise_delay" double: 0.5000000000000000000000000;
+    value "use_resist" int: 1;
+    value "drag_resist" int: 16;
+    value "desk_resist" int: 32;
+    value "window_resist" int: 12;
+    value "gadget_resist" int: 32;
+    value "geometry_auto_resize_limit" int: 1;
+    value "geometry_auto_move" int: 1;
+    value "winlist_warp_while_selecting" int: 1;
+    value "winlist_warp_at_end" int: 1;
+    value "winlist_warp_speed" double: 0.1000000000000000055511151;
+    value "winlist_scroll_animate" int: 1;
+    value "winlist_scroll_speed" double: 0.1000000000000000055511151;
+    value "winlist_list_show_iconified" int: 1;
+    value "winlist_list_show_other_desk_iconified" int: 1;
+    value "winlist_list_show_other_screen_iconified" int: 0;
+    value "winlist_list_show_other_desk_windows" int: 0;
+    value "winlist_list_show_other_screen_windows" int: 0;
+    value "winlist_list_uncover_while_selecting" int: 0;
+    value "winlist_list_jump_desk_while_selecting" int: 0;
+    value "winlist_list_focus_while_selecting" int: 1;
+    value "winlist_list_raise_while_selecting" int: 1;
+    value "winlist_pos_align_x" double: 0.5000000000000000000000000;
+    value "winlist_pos_align_y" double: 0.5000000000000000000000000;
+    value "winlist_pos_size_w" double: 0.5000000000000000000000000;
+    value "winlist_pos_size_h" double: 0.5000000000000000000000000;
+    value "winlist_pos_min_w" int: 0;
+    value "winlist_pos_min_h" int: 0;
+    value "winlist_pos_max_w" int: 320;
+    value "winlist_pos_max_h" int: 320;
+    value "maximize_policy" int: 50;
+    value "allow_manip" int: 0;
+    value "border_fix_on_shelf_toggle" int: 0;
+    value "allow_above_fullscreen" int: 0;
+    value "kill_if_close_not_possible" int: 1;
+    value "kill_process" int: 1;
+    value "kill_timer_wait" double: 10.0000000000000000000000000;
+    value "ping_clients" int: 1;
+    value "transition_desk" string: "vswipe";
+    value "transition_change" string: "crossfade";
+    value "remember_internal_windows" int: 0;
+    value "move_info_follows" int: 1;
+    value "resize_info_follows" int: 1;
+    value "move_info_visible" int: 1;
+    value "resize_info_visible" int: 1;
+    value "focus_last_focused_per_desktop" int: 1;
+    value "focus_revert_on_hide_or_close" int: 1;
+    value "pointer_slide" int: 1;
+    value "use_e_cursor" int: 1;
+    value "cursor_size" int: 32;
+    value "menu_autoscroll_margin" int: 0;
+    value "menu_autoscroll_cursor_margin" int: 1;
+    value "transient.move" int: 1;
+    value "transient.resize" int: 0;
+    value "transient.raise" int: 1;
+    value "transient.lower" int: 1;
+    value "transient.layer" int: 1;
+    value "transient.desktop" int: 1;
+    value "transient.iconify" int: 1;
+    value "modal_windows" int: 1;
+    value "menu_eap_name_show" int: 1;
+    value "menu_eap_generic_show" int: 1;
+    value "menu_eap_comment_show" int: 0;
+    value "menu_gadcon_client_toplevel" int: 0;
+    value "fullscreen_policy" int: 0;
+    value "exebuf_term_cmd" string: "xterm -hold -e";
+    value "use_app_icon" int: 0;
+    value "cnfmdlg_disabled" int: 0;
+    value "cfgdlg_auto_apply" int: 0;
+    value "cfgdlg_default_mode" int: 0;
+    value "font_hinting" int: 0;
+    value "desklock_auth_method" int: 0;
+    value "desklock_login_box_zone" int: -1;
+    value "desklock_start_locked" int: 0;
+    value "desklock_on_suspend" int: 0;
+    value "desklock_autolock_screensaver" int: 0;
+    value "desklock_post_screensaver_time" double: 0.0000000000000000000000000;
+    value "desklock_autolock_idle" int: 0;
+    value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
+    value "desklock_use_custom_desklock" int: 0;
+    value "desklock_ask_presentation" uchar: 1;
+    value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000;
+    value "display_res_restore" int: 0;
+    value "display_res_width" int: 1;
+    value "display_res_height" int: 1;
+    value "display_res_hz" int: 0;
+    value "display_res_rotation" int: 0;
+    value "screensaver_enable" int: 1;
+    value "screensaver_timeout" int: 300;
+    value "screensaver_interval" int: 5;
+    value "screensaver_blanking" int: 2;
+    value "screensaver_expose" int: 2;
+    value "screensaver_ask_presentation" uchar: 1;
+    value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000;
+    value "screensaver_suspend" uchar: 0;
+    value "screensaver_suspend_on_ac" uchar: 0;
+    value "screensaver_suspend_delay" double: 15.0000000000000000000000000;
+    value "dpms_enable" int: 1;
+    value "dpms_standby_enable" int: 1;
+    value "dpms_suspend_enable" int: 1;
+    value "dpms_off_enable" int: 1;
+    value "dpms_standby_timeout" int: 300;
+    value "dpms_suspend_timeout" int: 300;
+    value "dpms_off_timeout" int: 300;
+    value "clientlist_group_by" int: 0;
+    value "clientlist_include_all_zones" int: 0;
+    value "clientlist_separate_with" int: 0;
+    value "clientlist_sort_by" int: 0;
+    value "clientlist_separate_iconified_apps" int: 0;
+    value "clientlist_warp_to_iconified_desktop" int: 0;
+    value "clientlist_limit_caption_len" int: 0;
+    value "clientlist_max_caption_len" int: 2;
+    value "mouse_hand" int: 1;
+    value "mouse_accel_numerator" int: 2;
+    value "mouse_accel_denominator" int: 1;
+    value "mouse_accel_threshold" int: 4;
+    value "border_raise_on_mouse_action" int: 1;
+    value "border_raise_on_focus" int: 1;
+    value "desk_flip_wrap" int: 0;
+    value "fullscreen_flip" int: 1;
+    value "icon_theme" string: "Tango";
+    value "icon_theme_overrides" uchar: 0;
+    value "desk_flip_animate_mode" int: 1;
+    value "desk_flip_animate_interpolation" int: 0;
+    value "desk_flip_animate_time" double: 0.2000000000000000111022302;
+    value "wallpaper_import_last_dev" string: "~/";
+    value "wallpaper_import_last_path" string: "/";
+    value "wallpaper_grad_c1_r" int: 0;
+    value "wallpaper_grad_c1_g" int: 0;
+    value "wallpaper_grad_c1_b" int: 0;
+    value "wallpaper_grad_c2_r" int: 255;
+    value "wallpaper_grad_c2_g" int: 255;
+    value "wallpaper_grad_c2_b" int: 255;
+    value "theme_default_border_style" string: "default";
+    value "desk_auto_switch" int: 0;
+    value "thumb_nice" int: 0;
+    value "menu_favorites_show" int: 1;
+    value "menu_apps_show" int: 1;
+    value "ping_clients_interval" int: 128;
+    value "cache_flush_poll_interval" int: 512;
+    value "thumbscroll_enable" int: 0;
+    value "thumbscroll_threshhold" int: 8;
+    value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
+    value "thumbscroll_friction" double: 1.0000000000000000000000000;
+    value "dbus_desktop" int: 1;
+    value "scale.min" double: 1.0000000000000000000000000;
+    value "scale.max" double: 3.0000000000000000000000000;
+    value "scale.factor" double: 1.0000000000000000000000000;
+    value "scale.base_dpi" int: 90;
+    value "scale.use_dpi" uchar: 0;
+    value "scale.use_custom" uchar: 0;
+    value "show_cursor" uchar: 1;
+    value "idle_cursor" uchar: 1;
+    value "default_system_menu" string: "";
+    value "cfgdlg_normal_wins" uchar: 0;
+    value "syscon.main.icon_size" int: 64;
+    value "syscon.secondary.icon_size" int: 48;
+    value "syscon.extra.icon_size" int: 48;
+    value "syscon.timeout" double: 5.0000000000000000000000000;
+    value "syscon.do_input" uchar: 1;
+    value "mode.presentation" uchar: 0;
+    value "mode.offline" uchar: 0;
+    value "exec.expire_timeout" double: 30.0000000000000000000000000;
+    value "exec.show_run_dialog" uchar: 1;
+    value "exec.show_exit_dialog" uchar: 1;
+    value "backlight.normal" double: 1.0000000000000000000000000;
+    value "backlight.dim" double: 0.2999999999999999888977698;
+    value "backlight.transition" double: 0.5000000000000000000000000;
+    value "device_desktop" int: 1;
+    value "device_auto_mount" int: 0;
+    value "device_auto_open" int: 0;
+    value "xsettings.enabled" uchar: 1;
+    value "xsettings.match_e17_theme" uchar: 1;
+    value "xsettings.match_e17_icon_theme" uchar: 1;
 }
index 0b79b69..eec2a1e 100644 (file)
Binary files a/config/standard/icon.png and b/config/standard/icon.png differ
old mode 100755 (executable)
new mode 100644 (file)
index c2e5b00..68d2c30
@@ -1,25 +1,13 @@
 [Desktop Entry]
 Type=Link
-Name=Standard
-Name[ru]=Стандартный
-Name[cs]=Standartní
-Name[hu]=Általános
-Name[el]=Κανονικό
-Name[eo]=Kutima
-Name[ja]=スタンダード
-Name[tr_TR]=Standart
-Name[zh_CN]=标准
-Name[pt]=Padrão
+Name=Computer (Standard Enlightenment)
+Name[fr]=Ordinateur (Enlightenment standard)
+Name[it]=Computer (Enlightenment standard)
+Name[pt]=Computador (Enlightenment padrão)
+Name[ko]=컴퓨터 (표준 Enlightenment)
 Icon=icon.png
-Comment=This is the standard<br>profile that is<br>universal for most<br>desktop and laptop<br>systems. Choose this<br>if you are not<br>sure what to choose.
-Comment[ru]=Этот стандартный профиль<br>универсален для большинства<br>стационарных и переносных<br>систем. Выберите его<br>если вы не знаете<br>что надо выбрать.
-Comment[cs]=Toto je standartní<br>univerzální<br>profil pro většinu<br>stolních a přenosných<br>počítačů. Vyberte pokud<br>si nejste jisti<br>co vybrat.
-Comment[it]=Questo è il profilo standard, universale<br>per la maggior parte dei sistemi<br>desktop e portatili. Scegliete questo se<br>non siete sicuri di cosa scegliere.
-Comment[hu]=Ez az általános,<br>alap beállítás,<br>amely megfelelő a<br>legtöbb laptop és<br>asztali gép számára.
-Comment[fr]=Le profil standard adapté à la quasi totalité des<br>systèmes de bureau et ordinateurs portables.<br>Choisissez ce profil si vous êtes indécis.
-Comment[el]=Αυτό είναι το κανονικό <br>προφίλ που είναι κοινό<br>για τα περισσότερα συστήματα. Επιλέξτε αυτό<br>αν δεν είστε σίγουροι για <br>την επιλογή σας.
-Comment[eo]=Tio estas la kutima profilo<br>taŭga por preskaŭ ĉiuj<br>oficejaj sistemoj kaj<br>porteblaj sistemoj.<br>Elektu ĝin se vi ne certas.
-Comment[ja]=これはスタンダードプロファイルです。<br>デスクトップシステムやラップトップシステムならほぼどれでも使えます。<br>どれを選べばいいかわからなければこれを選んでください。
-Comment[tr_TR]=Çoğu masaüstü ve dizüstü sistemler<br>için tasarlanmış standart kurulumdur.<br>Hangisini seçeceğinizden emin değilseniz bu seçeneği öneririz.
-Comment[zh_CN]=适用于大多数台式机和笔记本的设置主题,如果您不清楚如何选择则请使用这个。
-Comment[pt]= O perfil de configuração padrão utilizado para a maioria dos computadores e portáteis.<br>Escolha-o se não souber o que escolher
+Comment=Configuration for devices with keyboards and mice<br>like your average PC Desktop, Laptop or Netbook<br>with Enlightenment's traditional keyboard bindings<br>and mouse controls.
+Comment[fr]=Configuration pour les machines avec clavier et<br>souris comme les PC de bureau et les portables,<br>offrant raccourcis et contrôles traditionnels.
+Comment[it]=Configurazione per macchine con tastiera e mouse,<br>come i normali computer fissi e portatili,<br>con le tradizionali associazioni di tasti e controlli<br>del mouse.
+Comment[pt]=Configuração de dispositivos com teclados e ratos<br>como computadores de secretária ou portáteis<br>com as associações de teclado do Enlightenment<br>e os controlos do rato.
+Comment[ko]=일반적인 PC 데스크탑, 노트북, 넷북 환경과 같이 키보드와 마우스 기반 환경 설정. Enlightenment 의 전통적인 키보드 바인딩 및 마우스 동작 지원.
index 7472356..a45ffd6 100644 (file)
@@ -252,7 +252,7 @@ ALL_LINGUAS="bg ca cs da de el eo es fi fr fr_CH he hu it ja ko nb nl pl pt_BR r
 AC_SUBST(ALL_LINGUAS)
 
 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
-AM_GNU_GETTEXT_VERSION([0.12.1])
+AM_GNU_GETTEXT_VERSION([0.17])
 ])
 
 m4_ifdef([AM_GNU_GETTEXT], [
@@ -376,12 +376,12 @@ eeze_mount=
 EEZE_MOUNT_CONFIG=0
 if test "x$e_cv_want_mount_eeze" != "xno" ; then
       AC_CHECK_LIB([eeze], [eeze_disk_function],
-##        [
-##           eeze_mount="eeze >= 1.1.0"
-##           EEZE_MOUNT_CONFIG=1
-##           AC_DEFINE_UNQUOTED([HAVE_EEZE_MOUNT], [1], [enable eeze mounting])
-##           AC_MSG_NOTICE([eeze mounting enabled])
-##        ],
+        [
+           eeze_mount="eeze >= 1.0.0 ecore-con >= 1.0.0"
+           EEZE_MOUNT_CONFIG=1
+           AC_DEFINE_UNQUOTED([HAVE_EEZE_MOUNT], [1], [enable eeze mounting])
+           AC_MSG_NOTICE([eeze mounting enabled])
+        ],
         [
            AC_MSG_NOTICE([eeze mounting disabled])
            e_cv_want_mount_eeze=no
@@ -398,7 +398,7 @@ AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
 test -n "$hal_mount" && AC_DEFINE_UNQUOTED([HAVE_HAL_MOUNT], [1], [enable HAL mounting])
 test -n "$udisks_mount" && AC_DEFINE_UNQUOTED([HAVE_UDISKS_MOUNT], [1], [enable Udisks mounting])
 AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n "$udisks_mount"])
-##AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
+AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
 
 # doxygen program for documentation building
 
@@ -412,6 +412,10 @@ PKG_CHECK_MODULES(E_REMOTE, [
   eina >= 1.0.0
 ])
 
+PKG_CHECK_MODULES(E_START, [
+  eina >= 1.0.0
+])
+
 PKG_CHECK_MODULES(E_IMC, [
   ecore-file >= 1.0.0
   eet >= 1.4.0
@@ -430,7 +434,13 @@ PKG_CHECK_MODULES(E_THUMB, [
   efreet >= 1.0.0
 ])
 
-efm_requires="ecore >= 1.0.0 ecore-file >= 1.0.0 ecore-ipc >= 1.0.0 eet >= 1.4.0 efreet >= 1.0.0 eina >= 1.0.0 edbus >= 1.0.0"
+efm_requires="\
+ecore >= 1.0.0 \
+ecore-file >= 1.0.0 \
+ecore-ipc >= 1.0.0 \
+eet >= 1.4.0 \
+efreet >= 1.0.0 \
+eina >= 1.0.0"
 efm_requires+=" $eeze_mount $dbus_mount $hal_mount $udisks_mount"
 
 PKG_CHECK_MODULES(E_FM, [$efm_requires])
@@ -444,6 +454,7 @@ PKG_CHECK_MODULES(E_FM_OP, [
 PKG_CHECK_MODULES(E_FM_OPEN, [
   ecore >= 1.0.0
   ecore-ipc >= 1.0.0
+  ecore-con >= 1.0.0
   eet >= 1.4.0
   eina >= 1.0.0
 ])
@@ -485,9 +496,27 @@ PKG_CHECK_MODULES(E, [
   $udisks_mount
   $device_backend
 ])
-requirements_e="evas >= 1.0.0 ecore >= 1.0.0 ecore-x >= 1.0.0 ecore-evas >= 1.0.0 ecore-con >= 1.0.0 ecore-ipc >= 1.0.0 ecore-file >= 1.0.0 eet >= 1.4.0 edje >= 1.0.0 efreet >= 1.0.0 efreet-mime >= 1.0.0 eina >= 1.0.0 dbus-1 edbus >= 1.0.0 $hal_mount $udisks_mount $eeze_mount $device_backend"
-
-AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf >= 1.0.0 ecore-imf-evas >= 1.0.0], [], [:])
+requirements_e="\
+evas >= 1.0.0 \
+ecore >= 1.0.0 \
+ecore-x >= 1.0.0 \
+ecore-evas >= 1.0.0 \
+ecore-con >= 1.0.0 \
+ecore-ipc >= 1.0.0 \
+ecore-file >= 1.0.0 \
+eet >= 1.4.0 \
+edje >= 1.0.0 \
+efreet >= 1.0.0 \
+efreet-mime >= 1.0.0 \
+eina >= 1.0.0 \
+dbus-1 \
+edbus >= 1.0.0 \
+$hal_mount \
+$udisks_mount \
+$eeze_mount \
+$device_backend"
+
+AC_E_CHECK_PKG(ECORE_IMF, [ ecore-imf >= 1.0.0 ecore-imf-evas >= 1.0.0 ], [], [:])
 
 e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "$execinfo_libs
 e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS
@@ -505,6 +534,10 @@ e_extra_features+="-D_F_WINDOW_GROUP_RAISE_ "
 e_extra_features+="-D_F_NOTIFICATION_LAYER_POLICY_ "
 # enable screen lock / unlock
 e_extra_features+="-D_F_COMP_SCREEN_LOCK_ "
+# enable set compositor's input region
+e_extra_features+="-D_F_COMP_INPUT_REGION_SET_ "
+# enable window move lock / unlock
+e_extra_features+="-D_F_COMP_MOVE_LOCK_ "
 
 have_extra_features=no
 AC_ARG_ENABLE(extra_features,
@@ -562,22 +595,27 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c
 AM_CONDITIONAL(HAVE_BATTERY, false)
 define([CHECK_MODULE_BATTERY],
 [
-  AC_E_CHECK_PKG(BATTERY, [ecore >= 1.0.0 ecore-file >= 1.0.0 ecore-con >= 1.0.0 eina >= 1.0.0], [], [BATTERY=false])
+  AC_E_CHECK_PKG(BATTERY, [ ecore >= 1.0.0 ecore-file >= 1.0.0 ecore-con >= 1.0.0 eina >= 1.0.0 ], [], [BATTERY=false])
 ])
 
+have_openbsd="no"
 BATTERY_LDFLAGS=
 case "$host_os" in
   darwin*)
     BATTERY_LDFLAGS="-framework Foundation -framework IOKit"
   ;;
+  openbsd*)
+    have_openbsd="yes"
+  ;;
 esac
 
 AC_SUBST(BATTERY_LDFLAGS)
+AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"])
 
 AM_CONDITIONAL(HAVE_TEMPERATURE, false)
 define([CHECK_MODULE_TEMPERATURE],
 [
-  AC_E_CHECK_PKG(TEMPERATURE, [ecore >= 1.0.0 ecore-file >= 1.0.0 eina >= 1.0.0], [], [TEMPERATURE=false])
+  AC_E_CHECK_PKG(TEMPERATURE, [ ecore >= 1.0.0 ecore-file >= 1.0.0 eina >= 1.0.0 ], [], [TEMPERATURE=false])
 ])
 
 have_exchange=no
@@ -606,7 +644,7 @@ AC_ARG_ENABLE([enotify],
   AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
 )
 if test "x$e_cv_want_enotify" != "xno" ; then
-  AC_E_CHECK_PKG(ENOTIFY, [ edbus >= 1.0.999 enotify >= 1.0.999 ], 
+  AC_E_CHECK_PKG(ENOTIFY, [ edbus >= 1.0.0 enotify >= 1.0.0 ], 
   [
     AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
   ], 
@@ -653,7 +691,7 @@ AC_SUBST(SOUND_LIBS)
 AM_CONDITIONAL(HAVE_ECONNMAN, false)
 define([CHECK_MODULE_CONNMAN],
 [
-  AC_E_CHECK_PKG(ECONNMAN, [edbus >= 1.0.0 econnman >= 1.0.0], [], [CONNMAN=false])
+  AC_E_CHECK_PKG(ECONNMAN, [ edbus >= 1.0.0 econnman >= 1.0.0 ], [], [CONNMAN=false])
 ])
 AC_SUBST(ECONNMAN_CFLAGS)
 AC_SUBST(ECONNMAN_LIBS)
@@ -661,7 +699,7 @@ AC_SUBST(ECONNMAN_LIBS)
 AM_CONDITIONAL(HAVE_EBLUEZ, false)
 define([CHECK_MODULE_BLUEZ],
 [
-  AC_E_CHECK_PKG(EBLUEZ, [edbus >= 1.0.0 ebluez >= 1.0.0], [], [BLUEZ=false])
+  AC_E_CHECK_PKG(EBLUEZ, [ edbus >= 1.0.0 ebluez >= 1.0.0 ], [], [BLUEZ=false])
 ])
 AC_SUBST(EBLUEZ_CFLAGS)
 AC_SUBST(EBLUEZ_LIBS)
@@ -669,17 +707,19 @@ AC_SUBST(EBLUEZ_LIBS)
 AM_CONDITIONAL(HAVE_EOFONO, false)
 define([CHECK_MODULE_OFONO],
 [
-  AC_E_CHECK_PKG(EOFONO, [edbus >= 1.0.0 eofono >= 1.0.0], [], [OFONO=false])
+  AC_E_CHECK_PKG(EOFONO, [ edbus >= 1.0.0 eofono >= 1.0.0 ], [], [OFONO=false])
 ])
 AC_SUBST(EOFONO_CFLAGS)
 AC_SUBST(EOFONO_LIBS)
 
+
 AC_E_OPTIONAL_MODULE([ibar], true)
 AC_E_OPTIONAL_MODULE([dropshadow], true)
 AC_E_OPTIONAL_MODULE([clock], true)
 AC_E_OPTIONAL_MODULE([pager], true)
 AC_E_OPTIONAL_MODULE([battery], true, [CHECK_MODULE_BATTERY])
 AC_E_OPTIONAL_MODULE([temperature], true, [CHECK_MODULE_TEMPERATURE])
+AC_E_OPTIONAL_MODULE([notification], true, [CHECK_MODULE_NOTIFICATION])
 AC_E_OPTIONAL_MODULE([cpufreq], true)
 AC_E_OPTIONAL_MODULE([ibox], true)
 AC_E_OPTIONAL_MODULE([start], true)
@@ -715,6 +755,9 @@ AC_E_OPTIONAL_MODULE([everything], true)
 AC_E_OPTIONAL_MODULE([systray], true)
 AC_E_OPTIONAL_MODULE([comp], true)
 AC_E_OPTIONAL_MODULE([shot], true)
+AC_E_OPTIONAL_MODULE([backlight], true)
+AC_E_OPTIONAL_MODULE([tasks], true)
+AC_E_OPTIONAL_MODULE([conf_randr], true)
 
 SUSPEND=""
 HIBERNATE=""
@@ -742,7 +785,6 @@ case "$host_os" in
       ;;
 esac
 
-
 AC_OUTPUT([
 Makefile
 enlightenment.spec
@@ -764,6 +806,8 @@ src/modules/battery/Makefile
 src/modules/battery/module.desktop
 src/modules/temperature/Makefile
 src/modules/temperature/module.desktop
+src/modules/notification/Makefile
+src/modules/notification/module.desktop
 src/modules/cpufreq/Makefile
 src/modules/cpufreq/module.desktop
 src/modules/ibox/Makefile
@@ -811,6 +855,8 @@ src/modules/conf_interaction/Makefile
 src/modules/conf_interaction/module.desktop
 src/modules/msgbus/Makefile
 src/modules/msgbus/module.desktop
+src/modules/conf_randr/Makefile
+src/modules/conf_randr/module.desktop
 src/modules/gadman/Makefile
 src/modules/gadman/module.desktop
 src/modules/mixer/Makefile
@@ -829,6 +875,7 @@ src/modules/illume2/module.desktop
 src/modules/illume2/keyboards/Makefile
 src/modules/illume2/policies/Makefile
 src/modules/illume2/policies/illume/Makefile
+src/modules/illume2/policies/tablet/Makefile
 src/modules/illume-home/Makefile
 src/modules/illume-home/module.desktop
 src/modules/illume-home-toggle/Makefile
@@ -840,6 +887,7 @@ src/modules/illume-keyboard/Makefile
 src/modules/illume-keyboard/module.desktop
 src/modules/illume-keyboard/keyboards/Makefile
 src/modules/illume-keyboard/dicts/Makefile
+src/modules/illume-keyboard/images/Makefile
 src/modules/illume-indicator/Makefile
 src/modules/illume-indicator/module.desktop
 src/modules/illume-indicator/images/Makefile
@@ -860,13 +908,16 @@ src/modules/comp/Makefile
 src/modules/comp/module.desktop
 src/modules/shot/Makefile
 src/modules/shot/module.desktop
+src/modules/backlight/Makefile
+src/modules/backlight/module.desktop
+src/modules/tasks/Makefile
+src/modules/tasks/module.desktop
 src/preload/Makefile
 data/Makefile
 data/images/Makefile
 data/input_methods/Makefile
 data/themes/Makefile
 data/themes/images/Makefile
-data/other/Makefile
 data/xsession/Makefile
 data/xsession/enlightenment.desktop
 data/tools/Makefile
@@ -875,6 +926,7 @@ data/etc/sysactions.conf
 data/icons/Makefile
 data/backgrounds/Makefile
 doc/Makefile
+doc/Doxyfile
 doc/e.dox
 config/Makefile
 config/default/Makefile
diff --git a/data/.cvsignore b/data/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
index e1c8697..b7a5119 100644 (file)
@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = \
 images \
 themes \
-other \
 tools \
 xsession \
 input_methods \
diff --git a/data/etc/.cvsignore b/data/etc/.cvsignore
deleted file mode 100644 (file)
index 9a4d3f7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.tar.gz
old mode 100755 (executable)
new mode 100644 (file)
index 179a570..8c0ffa6
@@ -47,6 +47,9 @@ action:   halt      /sbin/shutdown -h now
 action:   reboot    /sbin/shutdown -r now
 action:   suspend   @SUSPEND@
 action:   hibernate @HIBERNATE@
+action:   /bin/mount /bin/mount
+action:   /bin/umount /bin/umount
+action:   /usr/bin/eject /usr/bin/eject
 
 # on FreeBSD use this instead of the above.
 #action suspend  /usr/sbin/zzz 
@@ -71,5 +74,11 @@ group:    plugdev   allow: *
 # e.g.
 # user:     myuser     allow:  *
 # user:     another    allow:  suspend hibernate
+#
+#
+# uncomment this line to enable eeze mounting for users
+# user:   someuser allow: /bin/mount /bin/umount /usr/bin/eject
+#
+#
 # deny everyone else by default
 user:     *         deny:  *
diff --git a/data/icons/.cvsignore b/data/icons/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/images/.cvsignore b/data/images/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
old mode 100755 (executable)
new mode 100644 (file)
index cbf4153..9be4c44
@@ -6,6 +6,7 @@ test.png \
 test.jpg \
 test.edj \
 test.svg \
+lang-system.png \
 lang-bg_BG.png \
 lang-ca_ES.png \
 lang-cs_CZ.png \
@@ -30,6 +31,7 @@ lang-sk_SK.png \
 lang-sl_SI.png \
 lang-sv_SE.png \
 lang-zh_CN.png \
+lang-zh_HK.png \
 lang-zh_TW.png
 
 EXTRA_DIST = $(files_DATA)
diff --git a/data/images/lang-system.png b/data/images/lang-system.png
new file mode 100644 (file)
index 0000000..b922f85
Binary files /dev/null and b/data/images/lang-system.png differ
diff --git a/data/images/lang-zh_HK.png b/data/images/lang-zh_HK.png
new file mode 100644 (file)
index 0000000..7249692
Binary files /dev/null and b/data/images/lang-zh_HK.png differ
index 7249692..f1fc2d5 100644 (file)
Binary files a/data/images/lang-zh_TW.png and b/data/images/lang-zh_TW.png differ
diff --git a/data/input_methods/.cvsignore b/data/input_methods/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
index d5a9c2b..b995c68 100644 (file)
@@ -3,6 +3,7 @@ filesdir = $(datadir)/enlightenment/data/input_methods
 files_DATA = \
 scim.imc \
 uim.imc \
-iiimf.imc
-          
+iiimf.imc \
+ibus.imc
+
 EXTRA_DIST = $(files_DATA)
diff --git a/data/input_methods/ibus.imc b/data/input_methods/ibus.imc
new file mode 100644 (file)
index 0000000..7bc105c
Binary files /dev/null and b/data/input_methods/ibus.imc differ
index f0c4e28..2e37f81 100644 (file)
Binary files a/data/input_methods/iiimf.imc and b/data/input_methods/iiimf.imc differ
index 6873e5a..d38eea2 100644 (file)
Binary files a/data/input_methods/scim.imc and b/data/input_methods/scim.imc differ
index 2913fb8..cd17cdb 100644 (file)
Binary files a/data/input_methods/uim.imc and b/data/input_methods/uim.imc differ
diff --git a/data/other/.cvsignore b/data/other/.cvsignore
deleted file mode 100644 (file)
index 9a4d3f7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.tar.gz
diff --git a/data/other/Makefile.am b/data/other/Makefile.am
deleted file mode 100644 (file)
index 33d2603..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-filesdir = $(datadir)/enlightenment/data/other
-files_DATA = \
-desktop_files.tar.gz \
-desktop_order.tar.gz \
-efm_favorites.tar.gz \
-icon_example.tar.gz
-
-EXTRA_DIST = $(files_DATA)
diff --git a/data/other/_enlightenment_remote b/data/other/_enlightenment_remote
deleted file mode 100644 (file)
index 28ce9fc..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-#compdef enlightenment_remote
-
-# zshcompsys function for enlightenment_remote
-# written by Oliver Burnett-Hall <olly@burnett-hall.co.uk>
-
-# TODO:
-#   .  -module-load produces completions for all available modules; it should
-#      just complete unloaded ones
-#   .  I'm not sure if completions for arguments to -lang-set are correct
-#   .  produces completions for keys argument to -binding-key-(add|del)
-#   .  produces completions for buttons argument to -binding-mouse-(add|del)
-#   .  produce completions for actions argument to -binding-*
-#   .  possibly produce completions for parameters argument to -binding-*
-#   .  completions for -binding-(key|mouse)-del should be based on existing
-#      bindings
-
-local allopts="-bg-dirs-list -default-bg-get -default-bg-set \
-            -binding-key-add -binding-key-del \
-            -binding-key-list -binding-mouse-add -binding-mouse-del \
-            -binding-mouse-list -font-apply -font-available-list \
-            -font-default-get -font-default-list -font-default-remove \
-            -font-default-set -font-fallback-append -font-fallback-clear \
-            -font-fallback-list -font-fallback-prepend -font-fallback-remove \
-            -lang-get -lang-list -lang-set -module-dirs-list -module-disable \
-            -module-enable -module-list -module-load -module-unload -restart \
-            -shutdown -help"
-
-local text_classes="default title_bar"
-local contexts="NONE UNKNOWN BORDER ZONE MANAGER ANY"
-local modifiers="SHIFT CTRL ALT WIN"
-
-local context line state
-typeset -A opt_args
-
-_arguments : \
-       "($allopts)-help[Show usage]" \
-       "($allopts)-module-load[Load module into memory]:module name:->unloaded-module" \
-       "($allopts)-module-unload[Unload (and disable) module]:module name:->loaded-module" \
-       "($allopts)-module-enable[Enable module if not enabled]:module name:->disabled-module" \
-       "($allopts)-module-disable[Disable module if not disabled]:module name:->enabled-module" \
-       "($allopts)-module-list[List all loaded modules and their states]" \
-       "($allopts)-module-dirs-list[List all modules directories]" \
-       "($allopts)-default-bg-set[Set the background edje file]:background edje:_files -g \*.edj" \
-       "($allopts)-default-bg-get[Get the background edje file]" \
-       "($allopts)-bg-dirs-list[Get the background directories]" \
-       "($allopts)-font-fallback-remove[Remove a font from the fontset]:font name:->fallback-font" \
-       "($allopts)-font-fallback-prepend[Prepend a font to the fontset]:font name:->available-font" \
-       "($allopts)-font-fallback-append[Append a font to the fontset]:font name:->available-font" \
-       "($allopts)-font-apply[Apply changes made to the font system]" \
-       "($allopts)-font-fallback-list[List the fallback fonts in order]" \
-       "($allopts)-font-available-list[List available fonts]" \
-       "($allopts)-font-fallback-clear[Clear font fallback list]" \
-       "($allopts)-font-default-get[List the default font associated with OPT1]:text class:($text_classes)" \
-       "($allopts)-font-default-remove[Remove the default text class OPT1]:text class:($text_classes)" \
-       "($allopts)-font-default-list[List all configured text classes]" \
-       "($allopts)-font-default-set[Set textclass, font, and size]:text class:($text_classes):font name:->available-font:font size:" \
-       "($allopts)-restart[Restart E17]" \
-       "($allopts)-shutdown[Shutdown E17]" \
-       "($allopts)-lang-get[Get the current language]" \
-       "($allopts)-lang-list[List all available languages]" \
-       "($allopts)-lang-set[Set the current language]:language:->language" \
-       "($allopts)-binding-mouse-list[List all mouse bindings]" \
-       "($allopts)-binding-mouse-add[Add or replace an existing mouse binding]:context:($contexts):button::modifiers:_values -s \| modifiers $modifiers:'any modifiers' flag:(0 1):action::action parameters:" \
-       "($allopts)-binding-mouse-del[Delete an existing mouse binding]:context:($contexts):button::modifiers:_values -s \| modifiers $modifiers:'any modifiers' flag:(0 1):action::action parameters:" \
-       "($allopts)-binding-key-list[List all key bindings]" \
-       "($allopts)-binding-key-add[Add or replace an existing key binding]:context:($contexts):key::modifiers:_values -s \| modifiers $modifiers:'any modifiers' flag:(0 1):action::action parameters:" \
-       "($allopts)-binding-key-del[Delete an existing key binding]:context:($contexts):key::modifiers:_values -s \| modifiers $modifiers:'any modifiers' flag:(0 1):action::action parameters:" \
-       "-display[Specify X display]:display::" \
-       && return 0
-
-local tag description cmd=enlightenment_remote
-local -a opts
-
-case $state in
-       available-font)
-               opts=($($cmd -font-available-list | sed 's/.*"\([^"]*\)"/\1/gp;d'))
-               description="font name"
-               tag=fonts
-               ;;
-       fallback-font)
-               opts=($($cmd -font-fallback-list | sed 's/.*"\([^"]*\)"/\1/gp;d'))
-               description="font name"
-               tag=fonts
-               ;;
-       language)
-               opts=($($cmd -lang-list | sed 's/.*"\([^"]*\)"/\1/gp;d'))
-               description="language"
-               tag=languages
-               ;;
-       enabled-module)
-               opts=($($cmd -module-list | sed 's/.*"\([^"]*\)" ENABLED 1.*/\1/gp;d'))
-               description="enabled module"
-               tag=modules
-               ;;
-       disabled-module)
-               opts=($($cmd -module-list | sed 's/.*"\([^"]*\)" ENABLED 0/\1/gp;d'))
-               description="disabled module"
-               tag=modules
-               ;;
-       unloaded-module)
-               # FIXME: matches all available modules, not just unloaded ones
-               opts=(${^$($cmd -dirs-list modules | sed 's/.*"\([^"]*\)"/\1/gp;d')}/*(N/:t))
-               description="module name"
-               tag=modules
-               ;;
-       loaded-module)
-               opts=($($cmd -module-list | sed 's/.*"\([^"]*\)" ENABLED ./\1/gp;d'))
-               description="loaded module"
-               tag=modules
-               ;;
-       *)
-               # we should never get here
-               return 1
-               ;;
-esac
-
-_wanted $tag expl $description compadd -a opts && return 0
-
diff --git a/data/other/desktop_files.tar.gz b/data/other/desktop_files.tar.gz
deleted file mode 100644 (file)
index fc657bb..0000000
Binary files a/data/other/desktop_files.tar.gz and /dev/null differ
diff --git a/data/other/desktop_order.tar.gz b/data/other/desktop_order.tar.gz
deleted file mode 100644 (file)
index 433f763..0000000
Binary files a/data/other/desktop_order.tar.gz and /dev/null differ
diff --git a/data/other/efm_favorites.tar.gz b/data/other/efm_favorites.tar.gz
deleted file mode 100755 (executable)
index 77ecfdc..0000000
Binary files a/data/other/efm_favorites.tar.gz and /dev/null differ
diff --git a/data/other/enlightenment_remote b/data/other/enlightenment_remote
deleted file mode 100755 (executable)
index 7bd26d9..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-# $Id: enlightenment_remote 53943 2010-10-28 00:34:03Z raster $
-# bash-completion script for enlightenment_remote
-# By Justin Rocha (Xenith)
-# Additions by Sebastian Dransfeld
-
-# TODO:
-# Add here:
-# -binding-mouse-add, -binding-mouse-del
-# -binding-signal-add, -binding-signal-del
-# -binding-wheel-add, -binding-wheel-del
-# -desktop-bg-add, -desktop-bg-del
-# -desktop-name-add, -desktop-name-del
-
-_enlightenment_remote() {
-       local cur prev opts
-       COMPREPLY=()
-       cur=${COMP_WORDS[COMP_CWORD]}
-       prev=${COMP_WORDS[COMP_CWORD-1]}
-       action=${COMP_WORDS[1]}
-       opts=`enlightenment_remote -h | awk '{print $1}' | grep -v "OPTIONS:" | xargs`
-       BINDING_CONTEXT="NONE BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY"
-       ENGINE_CONTEXT="INIT CONTAINER ZONE BORDER MENU ERROR WIN POPUP DRAG"
-       MODIFIERS="NONE SHIFT| SHIFT CONTROL| CONTROL ALT| ALT WIN| WIN"
-       DIRS="data images fonts themes init icons modules backgrounds"
-
-
-       case "${action}" in
-       -h|-help|--help)
-               COMPREPLY=($(compgen -W "${opts/-h -help --help}" -- "${cur}"))
-               return 0
-               ;;
-       -always-click-to-focus-set| \
-       -always-click-to-raise-set| \
-       -border-shade-animate-set| \
-       -edge-flip-set| \
-       -focus-last-focused-per-desktop-set| \
-       -focus-revert-on-hide-or-close-set| \
-       -kill-if-close-not-possible-set| \
-       -kill-process-set| \
-       -modal-windows-set| \
-       -move-info-follows-set| \
-       -pass-click-on-set| \
-       -ping-clients-set| \
-       -resize-info-follows-set| \
-       -transient-*-set| \
-       -use-*-set| \
-       -winlist-list-*-set| \
-       -winlist-scroll-animate-set| \
-       -winlist-warp-at-end-set| \
-       -winlist-warp-while-selecting-set)
-               COMPREPLY=($(compgen -W " 0 1" -- "${cur}"))
-               return 0
-               ;;
-       -binding-key-add)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       COMPREPLY=($(compgen -W "${BINDING_CONTEXT}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       COMPREPLY=()
-               elif [[ ${COMP_CWORD} -eq 4 ]]; then
-                       # Find the selected modifiers
-                       selected=${cur#\'}
-                       selected=$(echo $selected | sed -e 's/\(.*|\)\?.*/\1/')
-                       # create updated modifier list
-                       if [[ "${selected}" ]]; then
-                               for modifier in ${MODIFIERS}; do
-                                       if ! echo $selected | grep -q $modifier; then
-                                               curmod="${curmod} ${selected}${modifier}"
-                                       fi
-                               done
-                       else
-                               curmod=${MODIFIERS}
-                       fi
-                       
-                       COMPREPLY=($(compgen -P "'" -S "'" -W "${curmod}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 5 ]]; then
-                       COMPREPLY=($(compgen -W "0 1" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 6 ]]; then
-                       actions=$(enlightenment_remote -action-list|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "${actions}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 7 ]]; then
-                       COMPREPLY=()
-               fi
-               return 0
-               ;;
-       -binding-key-del)
-               context=${COMP_WORDS[2]}
-               key=${COMP_WORDS[3]}
-               modifiers=${COMP_WORDS[4]}
-               modifiers=${modifiers#\'}
-               modifiers=${modifiers%\'}
-               any_mod=${COMP_WORDS[5]}
-               action=${COMP_WORDS[6]}
-               params=${COMP_WORDS[7]}
-               SIFS=$IFS
-               IFS=$'\n'
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=\(\S\+\)\s\+KEY=\"\(\S\+\)\"\s\+MODIFIERS=\(\S\+\)\s\+ANY_MOD=\(\S\+\)\s\+ACTION=\"\(\S\+\)\"\s\+PARAMS=\"\(\S\+\)\".*/'\1 \2 \3 \4 \5 \6'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=${context}\s\+KEY=\"\(\S\+\)\"\s\+MODIFIERS=\(\S\+\)\s\+ANY_MOD=\(\S\+\)\s\+ACTION=\"\(\S\+\)\"\s\+PARAMS=\"\(\S\+\)\".*/'\1 \2 \3 \4 \5'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 4 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=${context}\s\+KEY=\"${key}\"\s\+MODIFIERS=\(\S\+\)\s\+ANY_MOD=\(\S\+\)\s\+ACTION=\"\(\S\+\)\"\s\+PARAMS=\"\(\S\+\)\".*/'\1 \2 \3 \4'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 5 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=${context}\s\+KEY=\"${key}\"\s\+MODIFIERS=${modifiers}\s\+ANY_MOD=\(\S\+\)\s\+ACTION=\"\(\S\+\)\"\s\+PARAMS=\"\(\S\+\)\".*/'\1 \2 \3'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 6 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=${context}\s\+KEY=\"${key}\"\s\+MODIFIERS=${modifiers}\s\+ANY_MOD=${any_mod}\s\+ACTION=\"\(\S\+\)\"\s\+PARAMS=\"\(\S\+\)\".*/'\1 \2'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 7 ]]; then
-                       binding=$(enlightenment_remote -binding-key-list|grep 'REPLY:'|sed -e "s/.*CONTEXT=${context}\s\+KEY=\"${key}\"\s\+MODIFIERS=${modifiers}\s\+ANY_MOD=${any_mod}\s\+ACTION=\"${action}\"\s\+PARAMS=\"\(\S\+\)\".*/'\1'/"|grep -v 'REPLY:')
-                       COMPREPLY=($(compgen -W "${binding}" -- "${cur}"))
-               fi
-               IFS=$SIFS
-               return 0
-               ;;
-       -border-shade-transition-set)
-               COMPREPLY=($(compgen -W " 0 1 2 3" -- "${cur}"))
-               return 0
-               ;;
-       -default-bg-set)
-               # TODO Add filename expansion, and only match dirs and .edj files
-               return 0
-               ;;
-       -default-engine-set)
-               engines=$(enlightenment_remote -engine-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${engines}" -- "${cur}"))
-               return 0
-               ;;
-       -default-profile-set)
-               profiles=$(enlightenment_remote -profile-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${profiles}" -- "${cur}"))
-               return 0
-               ;;
-       -dirs-list)
-               COMPREPLY=($(compgen -W "${DIRS}" -- "${cur}"))
-               return 0
-               ;;
-       -dirs-list-append|-dirs-list-prepend)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       COMPREPLY=($(compgen -W "${DIRS}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       # TODO Add filename expansion, and only match dirs
-                       COMPREPLY=()
-               fi
-               return 0
-               ;;
-       -dirs-list-remove)
-               dir=${COMP_WORDS[2]}
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       COMPREPLY=($(compgen -W "${DIRS}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       dirs=$(enlightenment_remote -dirs-list ${dir}|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "${dirs}" -- "${cur}"))
-               fi
-               return 0
-               ;;
-       -display)
-               displays=$(/bin/ls $HOME/.ecore/enlightenment-\(*\)/0|sed -e 's+.*enlightenment-(\(.*\))/.*+\1+')
-               COMPREPLY=($(compgen -W "${displays}" -- "${cur}"))
-               return 0
-               ;;
-       -engine-set)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       COMPREPLY=($(compgen -W "${ENGINE_CONTEXT}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       engines=$(enlightenment_remote -engine-list|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "DEFAULT ${engines}" -- "${cur}"))
-               fi
-               return 0
-               ;;
-       -exec-action)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       actions=$(enlightenment_remote -action-list|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "${actions}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       COMPREPLY=()
-               fi
-               return 0
-               ;;
-       -focus-policy-set)
-               COMPREPLY=($(compgen -W "CLICK MOUSE SLOPPY" -- "${cur}"))
-               return 0
-               ;;
-       -focus-setting-set)
-               COMPREPLY=($(compgen -W "NONE NEW_WINDOW NEW_DIALOG NEW_DIALOG_IF_OWNER_FOCUSED" -- "${cur}"))
-               return 0
-               ;;
-       -font-default-get|-font-default-remove)
-               classes=$(enlightenment_remote -font-default-list|grep REPLY:|sed -e 's/.*TEXT_CLASS=\"\(\S\+\)\".*/\1/')
-               COMPREPLY=($(compgen -W "${classes}" -- "${cur}"))
-               return 0
-               ;;
-       -font-default-set)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       classes=$(enlightenment_remote -font-default-list|grep REPLY:|sed -e 's/.*TEXT_CLASS=\"\(\S\+\)\".*/\1/')
-                       COMPREPLY=($(compgen -W "${classes}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       fonts=$(enlightenment_remote -font-available-list|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "${fonts}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 4 ]]; then
-                       COMPREPLY=()
-               fi
-               return 0
-               ;;
-       -font-fallback-remove)
-               fonts=$(enlightenment_remote -font-fallback-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${fonts}" -- "${cur}"))
-               return 0
-               ;;
-       -fullscreen-policy-set)
-               COMPREPLY=($(compgen -W "RESIZE ZOOM" -- "${cur}"))
-               return 0
-               ;;
-       -lang-set)
-               languages=$(enlightenment_remote -lang-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${languages}" -- "${cur}"))
-               return 0
-               ;;
-       -maximize-policy-set)
-               COMPREPLY=($(compgen -W "FULLSCREEN SMART EXPAND FILL" -- "${cur}"))
-               return 0
-               ;;
-       -module-enable)
-               modules=$(enlightenment_remote -module-list|grep REPLY:|grep 0$|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))
-               return 0
-               ;;
-       -module-disable)
-               modules=$(enlightenment_remote -module-list|grep REPLY:|grep 1$|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))
-               return 0
-               ;;
-       -module-load)
-               extra_dir=$(pkg-config --variable=modules enlightenment)
-               # This is a hack. pkg-config should return extra dir and standard dir
-               dir=${extra_dir%_extra}
-               modules=$(cd ${dir} && /bin/ls && cd ${extra_dir} && /bin/ls)
-               COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))
-               return 0
-               ;;
-       -module-unload)
-               modules=$(enlightenment_remote -module-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))
-               return 0
-               ;;
-       -profile-del)
-               profiles=$(enlightenment_remote -profile-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${profiles}" -- "${cur}"))
-               return 0
-               ;;
-       -theme-get|-theme-remove)
-               theme_categories=$(enlightenment_remote -theme-category-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${theme_categories}" -- "${cur}"))
-               return 0
-               ;;
-       -theme-set)
-               if [[ ${COMP_CWORD} -eq 2 ]]; then
-                       theme_categories=$(enlightenment_remote -theme-category-list|grep REPLY:|awk '{print $2}')
-                       COMPREPLY=($(compgen -W "${theme_categories}" -- "${cur}"))
-               elif [[ ${COMP_CWORD} -eq 3 ]]; then
-                       # TODO Add filename expansion, and only match dirs and .edj files
-                       COMPREPLY=()
-               fi
-               return 0
-               ;;
-       -transition-*-set)
-               transitions=$(enlightenment_remote -transition-list|grep REPLY:|awk '{print $2}')
-               COMPREPLY=($(compgen -W "${transitions}" -- "${cur}"))
-               return 0
-               ;;
-       -window-placement-policy-set)
-               COMPREPLY=($(compgen -W "SMART CURSOR MANUAL" -- "${cur}"))
-               return 0
-               ;;
-       esac
-
-       if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
-       COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
-       fi
-}
-complete -F _enlightenment_remote enlightenment_remote
-
diff --git a/data/other/icon_example.tar.gz b/data/other/icon_example.tar.gz
deleted file mode 100644 (file)
index 0b91e05..0000000
Binary files a/data/other/icon_example.tar.gz and /dev/null differ
diff --git a/data/other/parse_todo.pl b/data/other/parse_todo.pl
deleted file mode 100644 (file)
index e8b131c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-my $new_item = 0;
-my $in_body  = 0;
-my $is_title = 0;
-
-# this hash is like this
-#
-# hash<str, arr<hash<str,str>>>
-#
-# [title1] -> [ (item1, asignee1), (item2, asignee2) ]
-# [title2] -> [ (item1, asignee1) ]
-#
-my %todo_hash;
-my $title;
-my $item = {};
-
-# use globals
-sub push_item {
-       if ($item->{'task'}) {
-               my $task = $item->{'task'};
-               $task =~ s/^\* //;
-               if ($task =~ s/<(.*)>//) {
-                       $item->{'asignee_email'} = $1;
-                       $1 =~ /(.*) AT /;
-                       $item->{'asignee'} = $1;
-               } else {
-                       $item->{'asignee_email'} = 0;
-                       $item->{'asignee'} = 'None';
-               }
-               $item->{'task'} = $task;
-               push(@{$todo_hash{$title}}, $item);
-       }
-}
-
-while(<>) {
-       chomp;    
-
-       if(/\[\[\[/) {
-               $item->{'task'} = 0;
-               $in_body = 1;
-       } elsif (/\]\]\]/) {
-               if ($in_body) {
-                       push_item;
-                       $item = {};
-                       $in_body = 0;
-               }
-       } elsif (/^---.*---$/) {
-               if ($in_body) {
-                       if($is_title) {
-                               $is_title = 0;
-                       } else {
-                               $is_title = 1;
-                       }
-               }
-       } elsif (/^\* /) {
-               if ($in_body ) {
-                       push_item;
-                       $item = {};
-                       $item->{'task'} = $_ ;
-               }
-       } else {
-               if ($in_body) {
-                       if ($is_title) {
-                               $title = $_;
-                       } else {
-                               $item->{'task'} = $item->{'task'} . $_ ;
-                       }
-               }
-       }
-
-}
-
-for $title ( keys %todo_hash ) {
-       my $count = 1;
-       print "<h2>" . $title . "</h2>\n";
-
-       print "<table>\n";
-       print "    <tr><td>#</td><td>Asignee</td><td>Task</td></tr>\n";
-       for $item ( @{$todo_hash{$title}} ) {
-               my $asignee_email = $item->{'asignee_email'};
-               my $asignee = $item->{'asignee'};
-               my $task = $item->{'task'};
-
-               my $mailto;
-
-               if ($asignee_email) {
-                    $mailto = "<a href='mailto://$asignee_email'>$asignee</a>" 
-               } else {
-                    $mailto = $asignee;
-               }
-               print "    <tr><td>$count</td><td>$mailto</td><td>$task</td></tr>\n";
-               $count++;
-       }
-       print "</table>\n";
-}
diff --git a/data/themes/.cvsignore b/data/themes/.cvsignore
deleted file mode 100644 (file)
index d880450..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-default.edj
old mode 100755 (executable)
new mode 100644 (file)
index 0f0609e..6fec1d5
@@ -1,9 +1,9 @@
 // TODO:
 //   Formatting review.
 //   Formatting Process: 1. http://tools.arantius.com/tabifier in C mode
-//                         2. sed 's/\t/   /g' default.edc > formatted.edc
-//                         3. Fix up defines, script{}, comments and other nicknacks.
-//                                                                     4. Replace ":    " with ": " and "//      " with "// " and so on.
+//                       2. sed 's/\t/   /g' default.edc > formatted.edc
+//                       3. Fix up defines, script{}, comments and other nicknacks.
+//                       4. Replace ":    " with ": " and "//      " with "// " and so on.
 //
 //   Icons:
 //      EFM - All popup icons ... eg, paste copy delete properties
@@ -41,7 +41,7 @@
  * and make sure you have replaced/provided everything here.
  */
 
-/* Specturm used in all the gradient icons
+/* Spectrum used in all the gradient icons
  * This needs to be defined outside of the collections
  *
  * FIXME: this is bad. namespacing! FIXME!
@@ -63,7 +63,7 @@ spectra {
  *
  * color: Font color     (Defaults to black)
  * color2: Outline color  (Defaults to transparent)
- * color3: Shadow color   (defaults to transparent)
+ * color3: Shadow color   (Defaults to transparent)
  *
  */
 
@@ -127,7 +127,7 @@ color_classes {
       color: 255 255 255 255;
    }
    // this seems totaly bogus, should be per module or really used as
-   // an unique color for all modules!
+   // a unique color for all modules!
    //    color_class {
    //       name: "module_label";
    //       color: 0 0 0 0;
@@ -261,10 +261,20 @@ color_classes {
       name: "comp_focus-out_color";
       color: 255 255 255 220;
    }
+   color_class {
+      name: "tasks_text";
+      color: 0 0 0 255;
+      color3: 0 0 0 0;
+   }
+   color_class {
+      name: "tasks_text_focused";
+      color: 224 224 224 255;
+      color3: 0 0 0 64;
+   }
 }
 
 /*
- * this section defined all the theme elements (a collection of groupings of
+ * this section defines all the theme elements (a collection of groupings of
  * parts (images, text, rects etc.))
  */
 
@@ -279,11 +289,14 @@ collections {
       /* this section defines that images are to be included and how to
        * encode them */
       images {
-         image: "vgrad_dark.png" COMP;
+         image: "bg_shadow.png" COMP;
          /* the encoding method is "COMP". this
           * is lossless, but compressed */
-         image: "grill_dark_tiny_pattern.png" COMP;
-         //    image: "circle_shade.png" COMP;
+         image: "bg_over.png" LOSSY 80;
+         /* the encoding is "LOSSY". this loses quality (80% quality level)
+          * but uses less space in return. uses JPEG and can do alpha channels
+          * too */
+         image: "bg_base.png" COMP;
       }
       /* this section actually contains the list of parts from bottom to top
        * (defining the layering/stacking order) */
@@ -312,7 +325,7 @@ collections {
                 * parent.child: blah; in a key to avoid doing
                 * parent { child: blah; }
                 */
-               image.normal: "vgrad_dark.png";
+               image.normal: "bg_base.png";
                /* use the vgrad_dark.png im */
                fill {
                   /* now specify how the image is to fill the part */
@@ -323,7 +336,7 @@ collections {
                      /* X and Y point relative to the part
                       * as a whole for the size (dont scale
                       * in X but scale 100% in Y */
-                     offset: 36 0;
+                     offset: 761 0;
                      /* offsets from the relative scale point
                       * so here offset is 36 to the right in
                       * X and at the Y relative point. this
@@ -334,32 +347,23 @@ collections {
             }
          }
          part {
-            name: "grill";
-            /* this is the overlay to look like a grill */
+            name: "over";
             description {
                state: "default" 0.0;
-               image.normal: "grill_dark_tiny_pattern.png";
-               /* use the grill */
-               fill {
-                  /* set the fill to only tile - never scale at all */
-                  size {
-                     relative: 0 0;
-                     /* relative 0 0 so it never scales */
-                     offset: 144 144;
-                     /* we know the grill image is 144x144
-                      * so set the offset to this so it
-                      * tiles perfectly */
-                  }
-               }
+               image.normal: "bg_over.png";
+               /* tiled at 800x600 */
+               fill.size.relative: 0 0;
+               fill.size.offset: 800 600;
+               fill.smooth: 0;
             }
          }
-         /* part { name: "shade";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-               image.normal: "circle_shade.png";
+         /* a circular shadow on top */
+         part { name: "shadow";
+            description { state: "default" 0.0;
+               image.normal: "bg_shadow.png";
                fill.smooth: 0;
             }
-         } */
+         }
       }
    }
    group {
@@ -6893,7 +6897,7 @@ collections {
                }
                rel2 {
                   relative: 1.0 1.0;
-                  offset: 3 1;
+                  offset: -1 1;
                }
                color_class: "menu_item";
                text {
@@ -6973,7 +6977,7 @@ collections {
                max: 9 12;
                rel1 {
                   relative: 0.0 0.0;
-                  offset: 0 1;
+                  offset: 4 1;
                }
                rel2 {
                   relative: 1.0 1.0;
@@ -8172,6 +8176,15 @@ collections {
          }
          programs {
             program {
+               name: "e,changed,state,online";
+               signal: "e,changed,state,online";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
+            }
+            program {
                name: "e,changed,state,ready";
                signal: "e,changed,state,ready";
                source: "e";
@@ -8590,6 +8603,15 @@ collections {
          }
          programs {
             program {
+               name: "e,changed,state,online";
+               signal: "e,changed,state,online";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
+            }
+            program {
                name: "e,changed,state,ready";
                signal: "e,changed,state,ready";
                source: "e";
@@ -11141,16 +11163,10 @@ collections {
    group {
       name: "e/modules/battery/main";
       images {
-         image: "bat_content1.png" COMP;
-         image: "bat_content2.png" COMP;
-         image: "bat_content3.png" COMP;
-         image: "bat_content1b.png" COMP;
-         image: "bat_content2b.png" COMP;
-         image: "bat_content3b.png" COMP;
-         image: "bat_over.png" COMP;
-         image: "bat_shadow.png" COMP;
-         image: "power.png" COMP;
-         image: "power_glow.png" COMP;
+         image: "batt_base.png" COMP;
+         image: "batt_level.png" COMP;
+         image: "batt_over.png" COMP;
+         image: "batt_power.png" COMP;
       }
       min: 16 16;
       max: 128 128;
@@ -11183,388 +11199,191 @@ collections {
                   b = 0;
                }
                custom_state(PART:"fill", "default", 0.0);
-               set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
+               set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+               set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+               set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
                set_state(PART:"fill", "custom", 0.0);
-               custom_state(PART:"bfill1", "default", 0.0);
-               custom_state(PART:"bfill2", "default", 0.0);
-               custom_state(PART:"bfill3", "default", 0.0);
-               set_state_val(PART:"bfill1", STATE_COLOR, r, g, b, 255);
-               set_state_val(PART:"bfill2", STATE_COLOR, r, g, b, 255);
-               set_state_val(PART:"bfill3", STATE_COLOR, r, g, b, 255);
-               set_state(PART:"bfill1", "custom", 0.0);
-               set_state(PART:"bfill2", "custom", 0.0);
-               set_state(PART:"bfill3", "custom", 0.0);
+               
+               custom_state(PART:"fill_clip", "default", 0.0);
+               set_state_val(PART:"fill_clip", STATE_REL1, 0.0, 1.0 - val);
+               set_state(PART:"fill_clip", "custom", 0.0);
             }
          }
       }
       parts {
-         part {
-            name: "fill_zone";
+         part { name: "fade_clip";
             type: RECT;
-            description {
-               state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  to: "over";
-                  relative: 0.0 0.25;
-               }
-               rel2 {
-                  to: "over";
-                  relative: 1.0 0.84375;
-               }
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
             }
-         }
-         part {
-            name: "fill";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               visible: 0;
-               rel1.to: "fill_zone";
-               rel1.relative: 0.0 0.5;
-               rel2.to: "fill_zone";
+            description { state: "faded" 0.0;
+               color: 255 255 255 160;
             }
          }
-         part {
-            name: "fade_clip";
+         part { name: "info_clip";
             type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 255 255 255 255;
+            mouse_events: 0;
+            clip_to: "fade_clip";
+            description { state: "default" 0.0;
+               color: 255 255 255 0;
             }
-            description {
-               state: "faded" 0.0;
-               color: 255 255 255 160;
+            description { state: "visible" 0.0;
+               color: 255 255 255 255;
             }
          }
-         part {
-            name: "pulse_clip";
+         part { name: "pulse_clip";
             type: RECT;
+            mouse_events: 0;
             clip_to: "fade_clip";
-            description {
-               state: "default" 0.0;
+            description { state: "default" 0.0;
                color: 255 255 255 255;
             }
-            description {
-               state: "faded" 1.0;
+            description { state: "faded" 1.0;
                color: 255 255 255 255;
             }
-            description {
-               state: "faded" 0.0;
+            description { state: "faded" 0.0;
                color: 255 255 255 0;
             }
          }
-         part {
-            name: "shadow";
+         part { name: "fill_region";
             mouse_events: 0;
-            clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image.normal: "bat_shadow.png";
-            }
-         }
-         part {
-            name: "bfill1";
-            mouse_events: 0;
-            clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               aspect: 3.0 3.0;
-               aspect_preference: HORIZONTAL;
-               align: 0.5 1.0;
-               rel1 {
-                  to: "fill";
-                  relative: 0.125 0.0;
-                  offset: 0 -1;
-               }
-               rel2 {
-                  to: "fill";
-                  relative: 0.875 0.0;
-                  offset: -1 -1;
-               }
-               image.normal: "bat_content1.png";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.relative: 0.0 (26/128);
+               rel2.relative: 1.0 ((128-14)/128);
             }
          }
-         part {
-            name: "bfill2";
+         part { name: "fill_clip";
+            type: RECT;
             mouse_events: 0;
             clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "fill";
-                  relative: 0.125 0.0;
-               }
-               rel2 {
-                  to: "fill";
-                  relative: 0.875 1.0;
-               }
-               image.normal: "bat_content2.png";
+            description { state: "default" 0.0;
+               rel1.to: "fill_region";
+               rel1.relative: 0.0 0.5;
+               rel2.to: "fill_region";
+               color: 255 255 255 255;
             }
          }
-         part {
-            name: "bfill3";
-            mouse_events: 0;
+         part { name: "base";
             clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "fill";
-                  relative: 0.125 1.0;
-               }
-               rel2 {
-                  to: "over";
-                  relative: 0.875 0.96875;
-               }
-               image.normal: "bat_content3.png";
+            description { state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "batt_base.png";
             }
          }
-         part {
-            name: "bfill1b";
+         part { name: "fill";
             mouse_events: 0;
-            clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               rel1.to: "bfill1";
-               rel2.to: "bfill1";
-               image.normal: "bat_content1b.png";
+            clip_to: "fill_clip";
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image.normal: "batt_level.png";
             }
          }
-         part {
-            name: "bfill2b";
+         part { name: "over";
             mouse_events: 0;
             clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               rel1.to: "bfill2";
-               rel2.to: "bfill2";
-               image.normal: "bat_content2b.png";
-            }
-         }
-         part {
-            name: "bfill3b";
-            mouse_events: 0;
-            clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               rel1.to: "bfill3";
-               rel2.to: "bfill3";
-               image.normal: "bat_content3b.png";
-            }
-         }
-         part {
-            name: "over";
-            clip_to: "pulse_clip";
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image.normal: "bat_over.png";
-            }
-         }
-         part {
-            name: "power_glow";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1.to: "power";
-               rel2.to: "power";
-               image.normal: "power_glow.png";
-               visible: 0;
-            }
-            description {
-               state: "active" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-            description {
-               state: "active2" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image.normal: "batt_over.png";
             }
          }
-         part {
-            name: "power";
+         part { name: "power";
             mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               rel1 {
-                  to: "over";
-                  relative: 0.0 0.35;
-               }
-               rel2 {
-                  to: "over";
-                  relative: 1.0 0.86875;
-               }
-               image.normal: "power.png";
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image.normal: "batt_power.png";
                visible: 0;
             }
-            description {
-               state: "active" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
-         part {
-            name: "e.text.reading";
+         part { name: "e.text.reading";
             mouse_events: 0;
             type: TEXT;
             scale: 1;
+            clip_to: "info_clip";
             effect: OUTLINE;
-            clip_to: "fade_clip";
-            description {
-               state: "default" 0.0;
-               align: 0.5 0.0;
-               rel1 {
-                  relative: 0.5 0.0;
-               }
-               rel2 {
-                  relative: 0.5 0.0;
-               }
-               color: 255 255 255 0;
-               color2: 0 0 0 0;
-               color3: 0 0 0 0;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1.relative: 0.5 0.0;
+               rel2.relative: 1.0 0.3;
+               color: 0 0 0 255;
+               color2: 255 255 255 128;
                color_class: "module_label";
                text {
-                  font: "Sans:style=Bold";
+                  font: "Sans";
                   size: 8;
                   min: 1 1;
-                  align: 0.5 0.0;
+                  align: 1.0 0.5;
                   text_class: "module_small";
                }
             }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               color2: 0 0 0 128;
-               color3: 0 0 0 32;
-            }
          }
-         part {
-            name: "e.text.time";
+         part { name: "e.text.time";
             mouse_events: 0;
             type: TEXT;
             scale: 1;
+            clip_to: "info_clip";
             effect: OUTLINE;
-            clip_to: "fade_clip";
-            description {
-               state: "default" 0.0;
-               align: 0.5 1.0;
-               rel1 {
-                  relative: 0.5 1.0;
-               }
-               rel2 {
-                  relative: 0.5 1.0;
-               }
-               color: 255 255 255 0;
-               color2: 0 0 0 0;
-               color3: 0 0 0 0;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1.relative: 0.5 0.3;
+               rel2.relative: 1.0 0.6;
+               color: 0 0 0 255;
+               color2: 255 255 255 128;
                color_class: "module_label";
                text {
-                  font: "Sans:style=Bold";
+                  font: "Sans";
                   size: 8;
                   min: 1 1;
-                  align: 0.5 1.0;
+                  align: 1.0 0.5;
                   text_class: "module_small";
                }
             }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               color2: 0 0 0 128;
-               color3: 0 0 0 32;
-            }
          }
       }
       programs {
-         program {
-            name: "hover1";
+         program { name: "hover1";
             signal: "mouse,in";
-            source: "over";
+            source: "base";
             action: STATE_SET "visible" 0.0;
             transition: LINEAR 0.3;
-            target: "e.text.reading";
-            target: "e.text.time";
+            target: "info_clip";
          }
-         program {
-            name: "hover2";
+         program { name: "hover2";
             signal: "mouse,out";
-            source: "over";
+            source: "base";
             action: STATE_SET "default" 0.0;
-            transition: LINEAR 1.0;
-            target: "e.text.reading";
-            target: "e.text.time";
-         }
-         program {
-            name: "charge";
-            signal: "e,state,charging";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            target: "fade_clip";
+            transition: LINEAR 0.3;
+            target: "info_clip";
          }
-         program {
-            name: "charge2";
+         program { name: "charge";
             signal: "e,state,charging";
             source: "e";
-            action: STATE_SET "active" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "power";
-            target: "power_glow";
-            after: "charge3";
-         }
-         program {
-            name: "charge3";
-            action: STATE_SET "active2" 0.0;
-            in: 1.0 0.0;
-            target: "power_glow";
-            after: "charge4";
-         }
-         program {
-            name: "charge4";
-            action: STATE_SET "active" 0.0;
-            in: 1.0 0.0;
-            target: "power_glow";
-            after: "charge3";
          }
-         program {
-            name: "discharge";
-            signal: "e,state,discharging";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            target: "fade_clip";
-         }
-         program {
-            name: "discharge2";
+         program { name: "discharge";
             signal: "e,state,discharging";
             source: "e";
             action: STATE_SET "default" 0.0;
             target: "power";
-            target: "power_glow";
-         }
-         program {
-            name: "discharge3";
-            signal: "e,state,discharging";
-            source: "e";
-            action: ACTION_STOP;
-            target: "charge3";
-            target: "charge4";
          }
-         program {
-            name: "unknown";
+         program { name: "unknown";
             signal: "e,state,unknown";
             source: "e";
             action: STATE_SET "faded" 0.0;
             target: "fade_clip";
          }
-         program {
-            name: "pulse";
+         program { name: "pulse";
             signal: "e,action,pulse,start";
             source: "e";
             action: STATE_SET "faded" 0.0;
@@ -11572,16 +11391,12 @@ collections {
             after: "pulse2";
             target: "pulse_clip";
          }
-         program {
-            name: "pulse2";
-            signal: "pulse2";
-            source: "e";
+         program { name: "pulse2";
             action: STATE_SET "faded" 1.0;
             transition: ACCELERATE 0.1;
             target: "pulse_clip";
          }
-         program {
-            name: "pulsestop";
+         program { name: "pulsestop";
             signal: "e,action,pulse,stop";
             source: "e";
             action: STATE_SET "default" 0.0;
@@ -11883,9 +11698,66 @@ collections {
 
 
 /////////////////////////////////////////////////////////////////////////////
-#define CLOCK_SECONDS 1
-/*** MOD: CLOCK ***/
+/*** MOD: BACKLIGHT ***/
+   group { name: "e/modules/backlight/main";
+      images {
+         image: "bulb-0.png" COMP;
+         image: "bulb-1.png" COMP;
+         image: "bulb-2.png" COMP;
+      }
+      min: 16 16;
+      max: 128 128;
+      script {      
+       public message(Msg_Type:type, id, ...) {
+          if ((type == MSG_FLOAT) && (id == 0)) {
+             new Float:val;
+             val = getfarg(2);
+             set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0);
+             set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0);
+          }
+       }
+      }
+      parts {
+         part {
+            name: "glow";
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image.normal: "bulb-1.png";
+               color: 255 255 255 0;
+            }
+            description { state: "full" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "base";
+            description { state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "bulb-0.png";
+            }
+         }
+         part {
+            name: "glow2";
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image.normal: "bulb-2.png";
+               color: 255 255 255 0;
+            }
+            description { state: "full" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+      }
+   }
+
+/////////////////////////////////////////////////////////////////////////////
 
+/*** MOD: CLOCK ***/
    group { name: "e/modules/clock/digital";
       min: 56 16;
       max: 512 128;
@@ -11932,10 +11804,6 @@ collections {
             if (pos >= 1.0) { \
                set_state(PART:nom"sh", "default", 0.0); \
                set_int(ns ## v0_lock, 0); \
-               v = get_int(ns ## v0_next); \
-               if (v >= 0) { \
-                  set_int(ns ## v0_next, -1); \
-               } \
             } \
          } \
          public ns ## animator1(val, Float:pos) { \
@@ -11949,12 +11817,11 @@ collections {
          } \
          public ns ## valset(value) { \
             new v, buf[11]; \
-            if (get_int(ns ## v0_lock) == 1) { \
-               set_int(ns ## v0_next, value); \
-               return; \
-            } \
             v = get_int(ns ## v0_cur); \
             if (v == value) return; \
+            if (get_int(ns ## v0_lock) == 1) { \
+               set_state(PART:nom"sh", "default", 0.0); \
+            } \
             set_int(ns ## v0_pre, v); \
             set_int(ns ## v0_cur, value); \
             set_int(ns ## v0_lock, 1); \
@@ -12929,26 +12796,20 @@ collections {
          image: "ch-h2.png" COMP;
          image: "ch-m1.png" COMP;
          image: "ch-m2.png" COMP;
-#ifdef CLOCK_SECONDS
          image: "ch-s1.png" COMP;
          image: "ch-s2.png" COMP;
-#endif
          image: "ch-h1-2.png" COMP;
          image: "ch-h2-2.png" COMP;
          image: "ch-m1-2.png" COMP;
          image: "ch-m2-2.png" COMP;
-#ifdef CLOCK_SECONDS
          image: "ch-s1-2.png" COMP;
          image: "ch-s2-2.png" COMP;
-#endif
          image: "ch-h1-3.png" COMP;
          image: "ch-h2-3.png" COMP;
          image: "ch-m1-3.png" COMP;
          image: "ch-m2-3.png" COMP;
-#ifdef CLOCK_SECONDS
          image: "ch-s1-3.png" COMP;
          image: "ch-s2-3.png" COMP;
-#endif
       }
       min: 16 16;
       max: 128 128;
@@ -12964,7 +12825,6 @@ collections {
             date(year, month, day, yearday, weekday, hour, minute, second);
             get_geometry(PART:"hour", x, y, w, h);
             dosec = get_int(do_seconds);
-#ifdef CLOCK_SECONDS
             if (dosec) {
                v = round(second);
                tim = timer(1.0 - (second - v), "clock_cb", 1);
@@ -12989,12 +12849,9 @@ collections {
                   set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2.png");
                set_state(PART:"seconds-sh", "custom", 0.0);
             }
-            else
-#else
-              {
-                 tim = timer(60.0 - (second), "clock_cb", 1);
-              }
-#endif
+            else {
+               tim = timer(60.0 - (second), "clock_cb", 1);
+            }
             set_int(tick_timer, tim);
 
             custom_state(PART:"minutes", "default", 0.0);
@@ -13065,7 +12922,6 @@ collections {
                }
             }
          }
-#ifdef CLOCK_SECONDS
          part {
             name: "seconds-sh";
             mouse_events: 0;
@@ -13116,7 +12972,6 @@ collections {
                visible: 0;
             }
          }
-#endif
          part {
             name: "minutes-sh";
             mouse_events: 0;
@@ -13424,7 +13279,7 @@ collections {
          part { name: "e.text.month";
             type: TEXT;
             effect: SOFT_SHADOW;
-            mouse_events: 0;
+            mouse_events: 1;
             description { state: "default" 0.0;
                fixed: 0 1;
                align: 0.0 0.0;
@@ -13712,7 +13567,7 @@ collections {
             } }
          }
          part { name: "inset";
-            mouse_events: 0;
+            mouse_events: 1;
             description { state: "default" 0.0;
                image.normal: "inset_sunk.png";
                image.middle: 0;
@@ -13725,6 +13580,20 @@ collections {
             }
          }
       }
+      programs {
+         program {
+            name: "mw_next";
+            source: "*";
+            signal: "mouse,wheel,0,-1";
+            action: SIGNAL_EMIT "e,action,prev" "";
+         }
+         program {
+            name: "mw_right";
+            source: "*";
+            signal: "mouse,wheel,0,1";
+            action: SIGNAL_EMIT "e,action,next" "";
+         }
+      }
    }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -20079,18 +19948,18 @@ collections {
                fixed: 1 1;
                color: 0 0 0 255;
                rel1 {
-                  to: "icon0";
+                  to_y: "icon0";
                   relative: 0.0 1.0;
                   offset: 3 3;
                }
                rel2 {
-                  to: "icon0";
                   relative: 1.0 1.0;
-                  offset: -3 35;
+                  offset: -3 -1;
                }
                text {
                   text_source: "e.text.label";
                   style: "fileman_icon_name";
+                 align: 0.5 0.0;
                   min: 0 1;
                   text_class: "fileman_icon";
                }
@@ -20226,7 +20095,7 @@ collections {
                }
                rel2 {
                   relative: 1.0 1.0;
-                  offset: -6 -30;
+                  offset: -6 -40;
                }
             }
          }
@@ -20305,14 +20174,13 @@ collections {
                color3: 0 0 0 64;
                visible: 0;
                rel1 {
-                  to: "icon0";
+                  to_y: "icon0";
                   relative: 0.0 1.0;
-                  offset: 4 3;
+                  offset: 3 3;
                }
                rel2 {
-                  to: "icon0";
                   relative: 1.0 1.0;
-                  offset: -5 35;
+                  offset: -3 -1;
                }
 
                text {
@@ -21117,18 +20985,18 @@ collections {
               color: 224 224 224 255;
                color3: 0 0 0 64;
                rel1 {
-                  to: "icon0";
+                  to_y: "icon0";
                   relative: 0.0 1.0;
-                  offset: 4 3;
+                  offset: 3 3;
                }
                rel2 {
-                  to: "icon0";
                   relative: 1.0 1.0;
-                  offset: -5 50;
+                  offset: -3 -1;
                }
                text {
                   style: "fileman_desktop_icon_name";
                  text_source: "e.text.label";
+                 align: 0.5 0.0;
                   min: 0 1;
                }
             }
@@ -21263,7 +21131,7 @@ collections {
                }
                rel2 {
                   relative: 1.0 1.0;
-                  offset: -6 -30;
+                  offset: -6 -40;
                }
             }
          }
@@ -21342,14 +21210,13 @@ collections {
                color3: 0 0 0 64;
                visible: 0;
                rel1 {
-                  to: "icon0";
+                  to_y: "icon0";
                   relative: 0.0 1.0;
                   offset: 4 3;
                }
                rel2 {
-                  to: "icon0";
                   relative: 1.0 1.0;
-                  offset: -5 50;
+                  offset: -3 -1;
                }
                text {
                   style: "fileman_desktop_icon_name_full";
@@ -30286,143 +30153,111 @@ collections {
 
    group {
       name: "e/wizard/extra";
-      images {
-         image: "vgrad_dark.png" COMP;
-         image: "grill_dark_tiny_pattern.png" COMP;
-      }
       parts {
          part {
-            name: "background_image";
-            description {
-               state: "default" 0.0;
-               image.normal: "vgrad_dark.png";
-               fill {
-                  smooth: 0;
-                  size {
-                     relative: 0 1.0;
-                     offset: 36 0;
-                  }
-               }
-            }
-         }
-         part {
-            name: "grill";
+            name: "base";
+            type: RECT;
             description {
                state: "default" 0.0;
-               image.normal: "grill_dark_tiny_pattern.png";
-               fill {
-                  size {
-                     relative: 0 0;
-                     offset: 144 144;
-                  }
-               }
+               color: 0 0 0 255;
             }
          }
       }
    }
    group {
       name: "e/wizard/main";
+      /* images used */
       images {
-         image: "vgrad_dark.png" COMP;
-         image: "grill_dark_tiny_pattern.png" COMP;
-         image: "bt_base1.png" COMP;
-         image: "bt_base2.png" COMP;
-         image: "bt_hilight.png" COMP;
-         image: "bt_shine.png" COMP;
-         image: "bt_glow.png" COMP;
-         image: "bt_dis_base.png" COMP;
-         image: "bt_dis_hilight.png" COMP;
+         image: "exq-bglight.png" COMP;
+         image: "exq-logo.png" COMP;
+         image: "exq-dot.png" COMP;
+         image: "exq-dot-glow.png" COMP;
+         image: "exq-vgrad.png" COMP;
       }
       parts {
          part {
-            name: "background_image";
+            name: "base";
+            type: RECT;
             description {
                state: "default" 0.0;
-               image.normal: "vgrad_dark.png";
-               fill {
-                  smooth: 0;
-                  size {
-                     relative: 0 1.0;
-                     offset: 36 0;
-                  }
-               }
+               color: 0 0 0 255;
             }
          }
          part {
-            name: "grill";
+            name: "content";
+            type: RECT;
             description {
                state: "default" 0.0;
-               image.normal: "grill_dark_tiny_pattern.png";
-               fill {
-                  size {
-                     relative: 0 0;
-                     offset: 144 144;
-                  }
+               visible: 0;
+               rel1 {
+                  to_y: "e.text.title";
+                  relative: 0.2 1.0;
+                  offset: 8 8;
+               }
+               rel2 {
+                  to_y: "logo";
+                  relative: 0.8 (143/217);
+                  offset: -9 -9;
                }
             }
          }
          part {
-            name: "e.text.title";
-            type: TEXT;
-            effect: SOFT_SHADOW;
-            mouse_events: 0;
-            scale: 1;
+            name: "swallow_center";
+            type: RECT;
             description {
                state: "default" 0.0;
-               align: 0.5 0.0;
+               visible: 0;
                rel1 {
-                  relative: 0.0 0.0;
-                  offset: 0 8;
+                  to: "content";
+                  relative: 0.5 1.0;
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  offset: -1  8;
-               }
-               color: 255 255 255 255;
-               color3: 0 0 0 32;
-               text {
-                  font: "Sans:style=Bold";
-                  size: 20;
-                  min: 1 1;
-                  align: 0.5 0.5;
+                  to: "content";
+                  relative: 0.5 1.0;
                }
             }
          }
          part {
-            name: "e.swallow.content";
-            type: SWALLOW;
+            name: "swallow_mirror";
+            type: PROXY;
+            mouse_events: 0;
             description {
                state: "default" 0.0;
+               source: "e.swallow.content";
                rel1 {
-                  to_y: "e.text.title";
-                  relative: 0.2 1.0;
-                  offset: 8 8;
+                  to: "content";
                }
                rel2 {
-                  to_y: "button_image";
-                  relative: 0.8 0.0;
-                  offset: -9 -9;
+                  to: "content";
+               }
+               perspective {
+                  zplane: 0;
+                  focal: 1000;
+               }
+               color: 255 255 255 64;
+               map {
+                  on: 1;
+                  smooth: 0;
+                  alpha: 1;
+                  rotation {
+                     center: "swallow_center";
+                     x: 180;
+                  }
                }
             }
          }
          part {
-            name: "button_image";
-            mouse_events: 1;
-            scale: 1;
+            name: "mirror_fade";
             description {
                state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.5 1.0;
-               rel1.relative: 0.5 1.0;
-               rel1.offset: 0 -9;
-               rel2.relative: 0.5 1.0;
-               rel2.offset: 0 -9;
-               min: 64 32;
-               max: 64 32;
+               rel1 {
+                  to_y: "content";
+                  relative: 0.0 1.0;
+               }
                image {
-                  normal: "bt_base2.png";
-                  border: 7 7 7 7;
+                  normal: "exq-vgrad.png";
                }
+               fill.smooth: 0;
             }
             description {
                state: "clicked" 0.0;
@@ -30439,261 +30274,1131 @@ collections {
             }
          }
          part {
-            name: "e.text.label";
-            type: TEXT;
-            effect: SOFT_SHADOW;
-            mouse_events: 0;
-            scale: 1;
+            name: "light";
             description {
                state: "default" 0.0;
-               rel1 {
-                  to: "button_image";
-                  relative: 0.0  0.0;
-                  offset: 3    3;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset: -4   -4;
-                  to: "button_image";
-               }
-               color_class: "button_text";
-               text {
-                  text: "Next";
-                  font: "Sans";
-                  size: 10;
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  text_class: "button";
-               }
+               align: 0.5 0.5;
+               rel1.relative: 0.1 0.8;
+               rel2.relative: 0.9 1.2;
+               aspect: (380/180) (380/180);
+               aspect_preference: HORIZONTAL;
+               max: 380 180;
+               image.normal: "exq-bglight.png";
+               color: 255 255 255 0;
             }
             description {
-               state: "disabled" 0.0;
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color_class: "button_text_disabled";
+               color: 255 255 255 255;
             }
          }
          part {
-            name: "over1";
-            mouse_events: 0;
+            name: "e.swallow.content";
+            type: SWALLOW;
             description {
                state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               rel2.relative: 1.0 0.5;
-               image {
-                  normal: "bt_hilight.png";
-                  border: 7 7 7 0;
+               rel1 {
+                  to: "content";
                }
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "bt_dis_hilight.png";
-                  border: 4 4 4 0;
+               rel2 {
+                  to: "content";
                }
             }
          }
          part {
-            name: "over2";
-            mouse_events: 0;
+            name: "logoclip";
+            type: RECT;
             description {
                state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               image {
-                  normal: "bt_shine.png";
-                  border: 7 7 7 7;
-               }
+               visible: 0;
+               color: 255 255 255 0;
             }
             description {
-               state: "disabled" 0.0;
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 0;
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
          part {
-            name: "over3";
+            name: "logo";
+            clip_to: "logoclip";
             mouse_events: 0;
             description {
                state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               visible: 0;
+               align: 0.5 1.0;
+               rel1.relative: 0.2 0.6;
+               rel2.relative: 0.8 1.0;
+               aspect: (121/217) (121/217);
+               aspect_preference: BOTH;
+               max: 121 217;
+               image.normal: "exq-logo.png";
+            }
+         }
+         part {
+            name: "e.text.title";
+            type: TEXT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  relative: 0.05 0.05;
+               }
+               rel2 {
+                  relative: 0.95 0.10;
+               }
                color: 255 255 255 0;
-               image {
-                  normal: "bt_glow.png";
-                  border: 12 12 12 12;
+               text {
+                  font: "Sans:style=Bold";
+                  size: 16;
+                  min: 0 1;
+                  text_class: "init_title";
                }
-               fill.smooth : 0;
             }
             description {
-               state: "clicked" 0.0;
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
                color: 255 255 255 255;
             }
          }
          part {
-            name: "block";
-            mouse_events: 1;
+            name: "p0-0";
             description {
                state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               visible: 0;
-               color: 0 0 0 0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to: "logo";
+                  relative: -0.5 0.7;
+               }
+               rel2 {
+                  to: "logo";
+                  relative: -0.5 0.7;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
             }
             description {
-               state: "disabled" 0.0;
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: -0.5 0.6;
+               rel2.relative: -0.5 0.6;
             }
          }
-      }
-      programs {
-         program {
-            name: "button_click";
-            signal: "mouse,down,1";
-            source: "button_image";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "over3";
-         }
-         program {
-            name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "button_image";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "over3";
-         }
-         program {
-            name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "button_image";
-            action: SIGNAL_EMIT "e,action,next" "";
-         }
-         program {
-            name: "button_enable";
-            signal: "e,state,next,enable";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "e.text.label";
-            target: "over1";
-            target: "over2";
-            target: "block";
-         }
-         program {
-            name: "button_disable";
-            signal: "e,state,next,disable";
-            source: "e";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "e.text.label";
-            target: "over1";
-            target: "over2";
-            target: "block";
-         }
-      }
-   }
-
-
-/////////////////////////////////////////////////////////////////////////////
-/*** ABOUT E ***/
-
-   group {
-      name: "e/widgets/about/main";
-      images {
-         image: "vgrad_dark.png" COMP;
-         image: "about_top.png" COMP;
-         image: "about_mid.png" COMP;
-         image: "about_bot.png" COMP;
-         image: "dia_botshad.png" COMP;
-         image: "topsh.png" COMP;
-         image: "logo_white_128.png" COMP;
-         image: "bt_base1.png" COMP;
-         image: "bt_base2.png" COMP;
-         image: "bt_hilight.png" COMP;
-         image: "bt_shine.png" COMP;
-         image: "bt_glow.png" COMP;
-      }
-      // data.item: "borderless" "1";
-      // data.item: "shaped" "1";
-      styles {
-         style {
-            name: "about_style";
-            base: "font=Sans:style=Bold font_size=10 align=center color=#e0e0e0ff style=soft_shadow shadow_color=#00000020 wrap=word";
-            tag: "hilight" "+ font=Sans:style=Bold text_class=tb_light color=#f00 style=soft_shadow";
-            tag: "title" "+ font_size=12 font=Sans:style=Bold text_class=tb_big style=soft_shadow color=#fff shadow_color=#00000020";
-            tag: "/title" "- \n \n";
-            tag: "br" "\n";
-         }
-      }
-      min: 300 240;
-      max: 640 640;
-      parts {
          part {
-            name: "sizer";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
+            name: "p0-1";
             description {
                state: "default" 0.0;
-               min: 300 240;
-               visible: 0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               rel1.to: "p0-0";
+               rel2.to: "p0-0";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
             }
          }
          part {
-            name: "about_clip";
-            type: RECT;
-            mouse_events: 0;
+            name: "p0-0.1";
             description {
                state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               min: 22 11;
+               max: 22 11;
                rel1 {
-                  to: "top";
-                  relative: 0.0 0.0;
-                  offset: 6 0;
+                  to_x: "p0-0";
+                  to_y: "logo";
+                  relative: 0.0 0.8;
                }
                rel2 {
-                  to: "top";
-                  relative: 1.0 1.0;
-                  offset: -7 -7;
+                  to_x: "p0-0";
+                  to_y: "logo";
+                  relative: 1.0 0.8;
                }
-               color: 255 255 255 255;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
             }
          }
          part {
-            name: "authors_clip";
-            type: RECT;
-            mouse_events: 0;
+            name: "p0-0.2";
             description {
                state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
                rel1 {
-                  to: "bot";
-                  relative: 0.0 0.0;
-                  offset: 6 6;
+                  to_x: "p0-0";
+                  to_y: "logo";
+                  relative: 0.0 0.9;
                }
                rel2 {
-                  to: "bot";
-                  relative: 1.0 1.0;
-                  offset: -7 -1;
+                  to_x: "p0-0";
+                  to_y: "logo";
+                  relative: 1.0 0.9;
                }
-               color: 255 255 255 255;
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
             }
          }
          part {
-            name: "background_image";
+            name: "p1-0";
             description {
                state: "default" 0.0;
-               image.normal: "vgrad_dark.png";
-               fill {
-                  smooth: 0;
-                  size {
-                     relative: 0 1.0;
-                     offset: 36 0;
-                  }
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to: "logo";
+                  relative: 0.0 0.7;
+               }
+               rel2 {
+                  to: "logo";
+                  relative: 0.0 0.7;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.0 0.6;
+               rel2.relative: 0.0 0.6;
+            }
+         }
+         part {
+            name: "p1-1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               rel1.to: "p1-0";
+               rel2.to: "p1-0";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "p1-0.1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               min: 22 11;
+               max: 22 11;
+               rel1 {
+                  to_x: "p1-0";
+                  to_y: "logo";
+                  relative: 0.0 0.8;
+               }
+               rel2 {
+                  to_x: "p1-0";
+                  to_y: "logo";
+                  relative: 1.0 0.8;
+               }
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+            }
+         }
+         part {
+            name: "p1-0.2";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to_x: "p1-0";
+                  to_y: "logo";
+                  relative: 0.0 0.9;
+               }
+               rel2 {
+                  to_x: "p1-0";
+                  to_y: "logo";
+                  relative: 1.0 0.9;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "p2-0";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to: "logo";
+                  relative: 0.5 0.7;
+               }
+               rel2 {
+                  to: "logo";
+                  relative: 0.5 0.7;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.5 0.6;
+               rel2.relative: 0.5 0.6;
+            }
+         }
+         part {
+            name: "p2-1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               rel1.to: "p2-0";
+               rel2.to: "p2-0";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "p2-0.1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               min: 22 11;
+               max: 22 11;
+               rel1 {
+                  to_x: "p2-0";
+                  to_y: "logo";
+                  relative: 0.0 0.8;
+               }
+               rel2 {
+                  to_x: "p2-0";
+                  to_y: "logo";
+                  relative: 1.0 0.8;
+               }
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+            }
+         }
+         part {
+            name: "p2-0.2";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to_x: "p2-0";
+                  to_y: "logo";
+                  relative: 0.0 0.9;
+               }
+               rel2 {
+                  to_x: "p2-0";
+                  to_y: "logo";
+                  relative: 1.0 0.9;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "p3-0";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to: "logo";
+                  relative: 1.0 0.7;
+               }
+               rel2 {
+                  to: "logo";
+                  relative: 1.0 0.7;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 1.0 0.6;
+               rel2.relative: 1.0 0.6;
+            }
+         }
+         part {
+            name: "p3-1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               rel1.to: "p3-0";
+               rel2.to: "p3-0";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "p3-0.1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               min: 22 11;
+               max: 22 11;
+               rel1 {
+                  to_x: "p3-0";
+                  to_y: "logo";
+                  relative: 0.0 0.8;
+               }
+               rel2 {
+                  to_x: "p3-0";
+                  to_y: "logo";
+                  relative: 1.0 0.8;
+               }
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+            }
+         }
+         part {
+            name: "p3-0.2";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to_x: "p3-0";
+                  to_y: "logo";
+                  relative: 0.0 0.9;
+               }
+               rel2 {
+                  to_x: "p3-0";
+                  to_y: "logo";
+                  relative: 1.0 0.9;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "p4-0";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to: "logo";
+                  relative: 1.5 0.7;
+               }
+               rel2 {
+                  to: "logo";
+                  relative: 1.5 0.7;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 1.5 0.6;
+               rel2.relative: 1.5 0.6;
+            }
+         }
+         part {
+            name: "p4-1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               rel1.to: "p4-0";
+               rel2.to: "p4-0";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "p4-0.1";
+            description {
+               state: "default" 0.0;
+               image.normal: "exq-dot-glow.png";
+               color: 255 255 255 0;
+               min: 22 11;
+               max: 22 11;
+               rel1 {
+                  to_x: "p4-0";
+                  to_y: "logo";
+                  relative: 0.0 0.8;
+               }
+               rel2 {
+                  to_x: "p4-0";
+                  to_y: "logo";
+                  relative: 1.0 0.8;
+               }
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+            }
+         }
+         part {
+            name: "p4-0.2";
+            description {
+               state: "default" 0.0;
+               min: 22 22;
+               max: 22 22;
+               rel1 {
+                  to_x: "p4-0";
+                  to_y: "logo";
+                  relative: 0.0 0.9;
+               }
+               rel2 {
+                  to_x: "p4-0";
+                  to_y: "logo";
+                  relative: 1.0 0.9;
+               }
+               image.normal: "exq-dot.png";
+               color: 255 255 255 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 16;
+            }
+            description {
+               state: "visible2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 4;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "e.text.label";
+            type: TEXT;
+            effect: GLOW;
+            mouse_events: 1;
+            scale: 1;
+            clip_to: "bdis";
+            description {
+               state: "default" 0.0;
+               min: 64 32;
+               align: 0.5 1.0;
+               rel1 {
+                  relative: 0.5  0.95;
+               }
+               rel2 {
+                  relative: 0.5  0.95;
+               }
+               color: 180 180 180 255;
+               color2: 255 255 255 24;
+               color3: 255 255 255 6;
+               text {
+                  text: "Next";
+                  font: "Sans:style=Bold";
+                  size: 16;
+                  min: 1 1;
+               }
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               color2: 255 255 255 40;
+               color3: 255 255 255 10;
+            }
+         }
+         part {
+            name: "arrow";
+            type: TEXT;
+            effect: GLOW;
+            scale: 1;
+            clip_to: "bdis";
+            description {
+               state: "default" 0.0;
+               min: 32 32;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "e.text.label";
+                  relative: 1.0  0.0;
+               }
+               rel2 {
+                  to: "e.text.label";
+                  relative: 1.0  1.0;
+               }
+               color: 255 255 255 255;
+               color2: 255 255 255 40;
+               color3: 255 255 255 10;
+               text {
+                  text: ">";
+                  font: "Sans:style=Bold";
+                  size: 16;
+                  min: 1 1;
+               }
+            }
+            description {
+               state: "go" 0.0;
+               inherit: "default" 0.0;
+               color: 180 180 180 0;
+               color2: 255 255 255 0;
+               color3: 255 255 255 0;
+               rel1.relative: 2.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+         }
+         part {
+            name: "block";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "e.text.label";
+               rel2.to: "e.text.label";
+               visible: 0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 0 0 255 128;
+            }
+         }
+         part {
+            name: "bdis";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "button_click";
+            signal: "mouse,down,1";
+            source: "e.text.label";
+            action: STATE_SET "clicked" 0.0;
+            target: "e.text.label";
+         }
+         program {
+            name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "e.text.label";
+            action: STATE_SET "default" 0.0;
+            target: "e.text.label";
+         }
+         program {
+            name: "button_unclick2";
+            signal: "mouse,clicked,1";
+            source: "e.text.label";
+            action: SIGNAL_EMIT "e,action,next" "";
+            after: "button_go";
+         }
+         program {
+            name: "button_go";
+            action: STATE_SET "go" 0.0;
+            transition: ACCELERATE 0.5;
+            target: "arrow";
+            after: "button_go2";
+         }
+         program {
+            name: "button_go2";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "button_enable";
+            signal: "e,state,next,enable";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "block";
+            target: "bdis";
+         }
+         program {
+            name: "button_disable";
+            signal: "e,state,next,disable";
+            source: "e";
+            action: STATE_SET "disabled" 0.0;
+            target: "block";
+            target: "bdis";
+         }
+         program {
+            name: "show1";
+            signal: "show";
+            source: "";
+            action: STATE_SET "visible" 0.0;
+            transition: LINEAR 0.3;
+            target: "light";
+         }
+         program {
+            name: "show2";
+            signal: "show";
+            source: "";
+            in: 0.1 0.0;
+            action: STATE_SET "visible" 0.0;
+            transition: LINEAR 0.4;
+            target: "logoclip";
+            target: "e.text.title";
+         }
+         program {
+            name: "show3";
+            signal: "show";
+            source: "";
+            action: STATE_SET "visible" 0.0;
+            transition: LINEAR 0.2;
+            target: "p0-0";
+            target: "p0-0.1";
+            target: "p0-0.2";
+            target: "p1-0";
+            target: "p1-0.1";
+            target: "p1-0.2";
+            target: "p2-0";
+            target: "p2-0.1";
+            target: "p2-0.2";
+            target: "p3-0";
+            target: "p3-0.1";
+            target: "p3-0.2";
+            target: "p4-0";
+            target: "p4-0.1";
+            target: "p4-0.2";
+            after: "pulsate1";
+            after: "pulsate1.2";
+            after: "pulsate2";
+            after: "pulsate2.2";
+            after: "pulsate3";
+            after: "pulsate3.2";
+            after: "pulsate4";
+            after: "pulsate4.2";
+            after: "pulsate5";
+            after: "pulsate5.2";
+            after: "ready";
+         }
+         program {
+            name: "ready";
+            action: STATE_SET "default" 0.0;
+            transition: ACCELERATE 2.0;
+            target: "logoclip";
+         }
+         program {
+            name: "pulsate1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.5;
+            in: 0.2 0.2;
+            after: "pulsate1.1";
+            target: "p0-1";
+         }
+         program {
+            name: "pulsate1.1";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            after: "pulsate1";
+            target: "p0-1";
+         }
+         program {
+            name: "pulsate1.2";
+            action: STATE_SET "visible2" 0.0;
+            transition: SINUSOIDAL 0.6;
+            in: 0.2 0.2;
+            after: "pulsate1.2.1";
+            target: "p0-0";
+            target: "p0-0.1";
+            target: "p0-0.2";
+         }
+         program {
+            name: "pulsate1.2.1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.7;
+            after: "pulsate1.2";
+            target: "p0-0";
+            target: "p0-0.1";
+            target: "p0-0.2";
+         }
+         program {
+            name: "pulsate2";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.5;
+            in: 0.2 0.2;
+            after: "pulsate2.1";
+            target: "p1-1";
+         }
+         program {
+            name: "pulsate2.1";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            after: "pulsate2";
+            target: "p1-1";
+         }
+         program {
+            name: "pulsate2.2";
+            action: STATE_SET "visible2" 0.0;
+            transition: SINUSOIDAL 0.6;
+            in: 0.2 0.2;
+            after: "pulsate2.2.1";
+            target: "p1-0";
+            target: "p1-0.1";
+            target: "p1-0.2";
+         }
+         program {
+            name: "pulsate2.2.1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.7;
+            after: "pulsate2.2";
+            target: "p1-0";
+            target: "p1-0.1";
+            target: "p1-0.2";
+         }
+         program {
+            name: "pulsate3";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.5;
+            in: 0.2 0.2;
+            after: "pulsate3.1";
+            target: "p2-1";
+         }
+         program {
+            name: "pulsate3.1";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            after: "pulsate3";
+            target: "p2-1";
+         }
+         program {
+            name: "pulsate3.2";
+            action: STATE_SET "visible2" 0.0;
+            transition: SINUSOIDAL 0.6;
+            in: 0.2 0.2;
+            after: "pulsate3.2.1";
+            target: "p2-0";
+            target: "p2-0.1";
+            target: "p2-0.2";
+         }
+         program {
+            name: "pulsate3.2.1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.7;
+            after: "pulsate3.2";
+            target: "p2-0";
+            target: "p2-0.1";
+            target: "p2-0.2";
+         }
+         program {
+            name: "pulsate4";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.5;
+            in: 0.2 0.2;
+            after: "pulsate4.1";
+            target: "p3-1";
+         }
+         program {
+            name: "pulsate4.1";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            after: "pulsate4";
+            target: "p3-1";
+         }
+         program {
+            name: "pulsate4.2";
+            action: STATE_SET "visible2" 0.0;
+            transition: SINUSOIDAL 0.6;
+            in: 0.2 0.2;
+            after: "pulsate4.2.1";
+            target: "p3-0";
+            target: "p3-0.1";
+            target: "p3-0.2";
+         }
+         program {
+            name: "pulsate4.2.1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.7;
+            after: "pulsate4.2";
+            target: "p3-0";
+            target: "p3-0.1";
+            target: "p3-0.2";
+         }
+         program {
+            name: "pulsate5";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.5;
+            in: 0.2 0.2;
+            after: "pulsate5.1";
+            target: "p4-1";
+         }
+         program {
+            name: "pulsate5.1";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            after: "pulsate5";
+            target: "p4-1";
+         }
+         program {
+            name: "pulsate5.2";
+            action: STATE_SET "visible2" 0.0;
+            transition: SINUSOIDAL 0.6;
+            in: 0.2 0.2;
+            after: "pulsate5.2.1";
+            target: "p4-0";
+            target: "p4-0.1";
+            target: "p4-0.2";
+         }
+         program {
+            name: "pulsate5.2.1";
+            action: STATE_SET "visible" 0.0;
+            transition: SINUSOIDAL 0.7;
+            after: "pulsate5.2";
+            target: "p4-0";
+            target: "p4-0.1";
+            target: "p4-0.2";
+         }
+      }
+   }
+
+/////////////////////////////////////////////////////////////////////////////
+/*** ABOUT E ***/
+
+   group {
+      name: "e/widgets/about/main";
+      images {
+         image: "vgrad_dark.png" COMP;
+         image: "about_top.png" COMP;
+         image: "about_mid.png" COMP;
+         image: "about_bot.png" COMP;
+         image: "dia_botshad.png" COMP;
+         image: "topsh.png" COMP;
+         image: "logo_white_128.png" COMP;
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+      }
+      // data.item: "borderless" "1";
+      // data.item: "shaped" "1";
+      styles {
+         style {
+            name: "about_style";
+            base: "font=Sans:style=Bold font_size=10 align=center text_class=tb_plain color=#e0e0e0ff style=soft_shadow shadow_color=#00000020 wrap=word";
+            tag: "hilight" "+ font=Sans:style=Bold text_class=tb_light color=#f00 style=soft_shadow";
+            tag: "title" "+ font_size=12 font=Sans:style=Bold text_class=tb_big style=soft_shadow color=#fff shadow_color=#00000020";
+            tag: "/title" "- \n \n";
+            tag: "br" "\n";
+         }
+      }
+      min: 300 240;
+      max: 640 640;
+      parts {
+         part {
+            name: "sizer";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min: 300 240;
+               visible: 0;
+            }
+         }
+         part {
+            name: "about_clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "top";
+                  relative: 0.0 0.0;
+                  offset: 6 0;
+               }
+               rel2 {
+                  to: "top";
+                  relative: 1.0 1.0;
+                  offset: -7 -7;
+               }
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "authors_clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "bot";
+                  relative: 0.0 0.0;
+                  offset: 6 6;
+               }
+               rel2 {
+                  to: "bot";
+                  relative: 1.0 1.0;
+                  offset: -7 -1;
+               }
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "background_image";
+            description {
+               state: "default" 0.0;
+               image.normal: "vgrad_dark.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0 1.0;
+                     offset: 36 0;
+                  }
                }
             }
          }
@@ -31434,7 +32139,7 @@ collections {
    ICON("preferences-dialogs","icon_dummy.png",64)               // *** // "enlightenment/dialogs"
    ICON("preferences-interaction","icon_interaction.png",64)     // *** // "enlightenment/interaction"
    ICON("preferences-imc","icon_imc.png",64)                     // *** // "enlightenment/imc"
-   ICON("preferences-desklock","icon_desklock.png",64)           // *** // "enlightenment/desklock"
+   ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // "enlightenment/desklock"
    ICON("preferences-icon-theme","icon_icon_theme.png",64)       // *** // "enlightenment/icon_theme"
    ICON("preferences-transitions","icon_transitions.png",64)     // *** // "enlightenment/transitions"
    ICON("preferences-toolbar","icon_toolbar.png",64)             // *** // "enlightenment/toolbar"
@@ -31463,6 +32168,8 @@ collections {
    ICON("preferences-applications-ibar","icon_applications_ibar.png",64)       // *** // "enlightenment/ibar_applications"
    ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
    ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
+   ICON("preferences-desktop-default-applications","icon_advanced.png",64)
+   ICON("preferences-preferences","icon_config.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
    ICON("preferences-plugin","icon_modules.png",64)                                   // "enlightenment/modules"
    ICON("preferences-system","icon_configuration.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
    ICON("preferences-system-windows","icon_windows.png",64)                           // "enlightenment/windows" "enlightenment/showhide"
@@ -31485,6 +32192,7 @@ collections {
    //Standard Emblem Icons
    ICON("emblem-symbolic-link","icon_dummy.png",64)                // EFMBUTTON("symlink")
    //Standard Place Icons
+   ICON("start-here","logo_white_128.png",128)                     // "enlightenment/e"
    ICON("folder","icon_efm_folder.png",64)                         // "fileman/folder"
    ICON("user-home","icon_efm_home.png",64)                        // "fileman/home"
    ICON("user-temp","icon_efm_tmp.png",64)                  // *** // "fileman/tmp"
@@ -32122,7 +32830,7 @@ collections {
                aspect_preference: HORIZONTAL;
                max: 380 180;
                image.normal: "exq-bglight.png";
-               color: 0 0 0 255;
+               color: 255 255 255 0;
             }
             description {
                state: "visible" 0.0;
@@ -35707,11 +36415,11 @@ collections {
                state: "default" 0.0;
                align: 0.0 1.0;
                fixed: 0 1;
-               rel1.to:   "e.swallow.icons";
-               rel1.relative:  1.0 0.0;
-               rel2.to:   "clip";
-               rel1.offset:   2 3;
-               rel2.offset:   -6 -7;
+               rel1.to: "e.swallow.icons";
+               rel1.relative: 1.0 0.0;
+               rel2.to: "clip";
+               rel1.offset: 2 3;
+               rel2.offset: -6 -7;
                /* visible: 0; */
                color: 24 24 24 255;
                text {
@@ -35834,6 +36542,7 @@ collections {
       parts {
          part {
             name: "clip";
+           type: RECT;
             mouse_events: 0;
             description {
                state: "default" 0.0;
@@ -35899,10 +36608,10 @@ collections {
                state: "default" 0.0;
                align: 0.5 0.5;
                fixed: 0 1;
-               rel1.to:   "clip";
-               rel2.to:   "clip";
-               rel1.offset:   5 3;
-               rel2.offset:   -6 -1;
+               rel1.to: "clip";
+               rel2.to: "clip";
+               rel1.offset: 5 3;
+               rel2.offset: -6 -1;
                visible: 0;
                color: 245 245 245 255;
                text {
@@ -35957,7 +36666,8 @@ collections {
       parts {
          part {
             name: "clip";
-            mouse_events: 0;
+           type: RECT;
+           mouse_events: 0;
             description {
                state: "default" 0.0;
             rel1.relative: 0.05 0.0;
@@ -36022,10 +36732,10 @@ collections {
                state: "default" 0.0;
                align: 0.5 0.5;
                fixed: 0 1;
-               rel1.to:   "clip";
-               rel2.to:   "clip";
-               rel1.offset:   5 3;
-               rel2.offset:   -6 -1;
+               rel1.to: "clip";
+               rel2.to: "clip";
+               rel1.offset: 5 3;
+               rel2.offset: -6 -1;
                visible: 0;
                color: 245 245 245 255;
                text {
@@ -36154,7 +36864,6 @@ collections {
             type: RECT;
             description {
                state: "default" 0.0;
-               /* visible: 0; */
                rel1 {
                   relative: 0.0 0.0;
                   offset: 0   4;
@@ -36163,12 +36872,6 @@ collections {
                   relative: 1.0 1.0;
                   offset: -5  -5;
                }
-               color: 255 255 255 128;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
                color: 255 255 255 255;
             }
          }
@@ -36176,12 +36879,17 @@ collections {
             name: "clip";
             mouse_events: 0;
             type: RECT;
-            clip_to: "base";
+            /* clip_to: "base"; */
             description {
                state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
-               color: 225 225 225 255;
+               color: 225 225 225 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
             }
          }
          part {
@@ -36288,6 +36996,85 @@ collections {
                color3: 20 20 20 40;
             }
          }
+         
+         part {
+            name: "over_clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
+               visible: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               visible: 1;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -0.5  -0.5;
+               rel2.relative: 1.5  1.5;
+               color: 255 255 255 0;
+               visible: 1;
+            }
+            description {
+               state: "huge" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.relative: -1.5 -1.5;
+               rel2.relative: 2.5  2.5;
+               visible: 1;
+            }
+         }
+
+         part {
+            name: "over";
+            type: PROXY;
+            mouse_events: 0;
+            clip_to: "over_clip";
+            description {
+               state: "default" 0.0;
+               source: "e.swallow.icon";
+               rel1.to: "over_clip";
+               rel2.to: "over_clip";
+               visible: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "over2";
+            type: PROXY;
+            mouse_events: 0;
+            clip_to: "over_clip";
+            description {
+               state: "default" 0.0;
+               source: "e.swallow.thumb";
+               rel1.to: "over_clip";
+               rel2.to: "over_clip";
+               visible: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         
          part {
             name: "event";
             type: RECT;
@@ -36345,25 +37132,57 @@ collections {
             signal: "e,action,thumb,show_delayed";
             source: "e";
             action: STATE_SET "default" 0.0;
-            target: "base";
-            transition: DECELERATE 0.1;
+            target: "clip";
             after: "thumb_show2";
          }
          program {
             name: "thumb_show";
             signal: "e,action,thumb,show";
             source: "e";
-            action: STATE_SET "default" 0.0;
-            /* transition: DECELERATE 0.02; */
-            target: "base";
-            after: "thumb_show2";
+            action: STATE_SET "visible" 0.0;
+            target: "clip";
          }
          program {
             name: "thumb_show2";
             action: STATE_SET "visible" 0.0;
-            /* transition: ACCELERATE 0.05; */
-            target: "base";
+           transition: DECELERATE 0.1;
+            target: "clip";
          }
+        program {
+            name: "go_big";
+            action: STATE_SET "visible" 0.0;
+            target: "over_clip";
+            target: "over";
+            target: "over2";
+            after: "go_big2";
+        }
+
+        program {
+            name: "go_big2";
+            action: STATE_SET "huge" 0.0;
+            transition: DECELERATE 0.4;
+            target: "over_clip";
+            after: "go_big3";
+        }
+
+        program {
+            name: "go_big3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.2;
+            target: "over_clip";
+            target: "over";
+            target: "over2";
+        }
+        program {
+            name: "action_go";
+            signal: "e,action,go";
+            source: "e";
+            action: ACTION_STOP;
+            target: "go_big";
+            target: "go_big2";
+            target: "go_big3";
+            after: "go_big";
+        }
       }
    }
    group {
@@ -36442,7 +37261,7 @@ collections {
             type: RECT;
             description {
                state: "default" 0.0;
-               color: 255 255 255 0;
+               color: 255 255 255 255;
                rel1 {
                   relative: 0.0 0.0;
                   offset: 0   3;
@@ -36452,12 +37271,6 @@ collections {
                   offset: -5  -4;
                }
             }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
          }
          part {
             name: "clip";
@@ -36466,7 +37279,7 @@ collections {
             clip_to: "base";
             description {
                state: "default" 0.0;
-               color: 225 225 225 255;
+               color: 225 225 225 0;
                rel1 {
                   to: "base";
                   relative: 0.0 0.0;
@@ -36478,6 +37291,11 @@ collections {
                   offset: 40   -1;
                }
             }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
          }
          part {
             name: "e.swallow.icon";
@@ -36689,16 +37507,15 @@ collections {
             signal: "e,action,thumb,show_delayed";
             source: "e";
             action: STATE_SET "visible" 0.0;
-            target: "base";
-            transition: ACCELERATE 0.02;
+            target: "clip";
+            transition: DECELERATE 0.1;
          }
          program {
             name: "thumb_show";
             signal: "e,action,thumb,show";
             source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.0;
-            target: "base";
+            target: "clip";
          }
          program {
             name: "detail_show";
@@ -37163,10 +37980,10 @@ collections {
          style {
             name: "everything_textblock_style";
             base: "font=Sans font_size=10 align=left color=#000";
-            tag:  "hilight" "+ font=Sans:style=Bold color=#0c0c0c";
-            tag:  "b" "+ font=Sans:style=Bold font_size=9";
-            tag:  "br" "\n";
-            tag:  "/title" "- \n \n";
+            tag: "hilight" "+ font=Sans:style=Bold color=#0c0c0c";
+            tag: "b" "+ font=Sans:style=Bold font_size=9";
+            tag: "br" "\n";
+            tag: "/title" "- \n \n";
          }
       }
       parts {
@@ -37177,15 +37994,93 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-               rel1.offset: 4 4;
-               rel2.offset: -5 -5;
-               text {
-                  style: "everything_textblock_style";
-                  min: 1 1;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               text {
+                  style: "everything_textblock_style";
+                  min: 1 1;
+               }
+            }
+         }
+      }
+   }
+
+   group {
+      name: "e/modules/everything/gadget";
+      max: 128 128;
+      parts {
+   
+         part {
+            name: "icon";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "logo_white_128.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+
+         part {
+            name: "e.swallow.icon";
+            type: SWALLOW;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               visible: 0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 0;
+            }
+         }
+
+         part {
+            name: "event";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
                }
             }
          }
       }
+      programs {
+         program {
+            name: "on";
+            signal: "e,state,icon,plugin";
+            source: "e";
+            action: STATE_SET "active" 0.0;
+            target: "e.swallow.icon";
+            target: "icon";
+         }
+         program {
+            name: "off";
+            signal: "e,state,icon,default";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "e.swallow.icon";
+            target: "icon";
+         }
+      }
    }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -37955,57 +38850,553 @@ collections {
             mouse_events: 0;
             description { state: "default" 0.0; }
          }
-         part { name: "e.text.label";
-            type: TEXT;
-            effect: SOFT_SHADOW;
+         part { name: "e.text.label";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 0 1;
+               color: 224 224 224 255;
+               color3: 0 0 0 32;
+               text {
+                  font: "Sans:style=Bold";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
+                  text_class: "fileman_icon";
+               }
+            }
+         }
+      }
+   }
+
+   group { name: "e/comp/default";
+      images {
+         image: "comp-sh1.png" COMP;
+         image: "bt_glow.png" COMP;
+      }
+      parts {
+         part { name: "focus-clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color_class: "comp_focus-out_color";
+               rel1 {
+                  relative: -1.0  -1.0;
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  relative: 2.0   2.0;
+                  offset: 9999  9999;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               color_class: "";
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            clip_to: "focus-clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: -1.0  -1.0;
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  relative: 2.0   2.0;
+                  offset: 9999  9999;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "shadow";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               image {
+                  normal: "comp-sh1.png";
+                  border: 18 18 18 18;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+               rel1 {
+                  to: "e.swallow.content";
+                  relative: 0.0  0.0;
+                  offset: -16  -14;
+               }
+               rel2 {
+                  to: "e.swallow.content";
+                  relative: 1.0  1.0;
+                  offset: 15   17;
+               }
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "shower";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 0.05  0.05;
+                  offset: 0    0;
+               }
+               rel2 {
+                  relative: 0.95  0.95;
+                  offset: -1   -1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  relative: 0.0  0.0;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+               }
+            }
+         }
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "shower";
+               }
+               rel2 {
+                  to: "shower";
+               }
+            }
+            description { state: "focus1" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -10 -10;
+               rel2.offset: 9   9;
+            }
+            description { state: "focus2" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 4   4;
+               rel2.offset: -5  -5;
+            }
+            description { state: "focus3" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -3  -3;
+               rel2.offset: 2   2;
+            }
+            description { state: "focus4" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 1   1;
+               rel2.offset: -2  -2;
+            }
+         }
+         part { name: "glow";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to: "e.swallow.content";
+               rel1.offset: -3 -3;
+               rel2.to: "e.swallow.content";
+               rel2.offset: 2  2;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 8 8 8 8;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description { state: "faded" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 0;
+               rel1.offset: -23 -22;
+               rel2.offset: 22  22;
+            }
+         }
+      }
+      programs {
+         program { name: "shadow-on";
+            signal: "e,state,shadow,on";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "shadow";
+         }
+         program { name: "shadow-off";
+            signal: "e,state,shadow,off";
+            source: "e";
+            action: STATE_SET "hidden" 0.0;
+            target: "shadow";
+         }
+         program { name: "show1";
+            signal: "e,state,visible,on";
+            source: "e";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.15;
+            target: "clipper";
+            target: "shower";
+            after: "show2";
+         }
+         program { name: "show2";
+            action: SIGNAL_EMIT "e,action,show,done" "e";
+         }
+         program { name: "hide1";
+            signal: "e,state,visible,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.30;
+            target: "clipper";
+            target: "shower";
+            after: "hide2";
+         }
+         program { name: "hide2";
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         }
+         program { name: "focus";
+            signal: "e,state,focus,on";
+            source: "e";
+            action: STATE_SET "focused" 0.0;
+            transition: SINUSOIDAL 0.2;
+            target: "focus-clipper";
+         }
+         program { name: "unfocus";
+            signal: "e,state,focus,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            target: "focus-clipper";
+         }
+         program { name: "focus1";
+            signal: "e,state,focus,on";
+            source: "e";
+            action: STATE_SET "focus1" 0.0;
+            transition: SINUSOIDAL 0.1;
+            target: "e.swallow.content";
+            after: "focus2";
+         }
+         program { name: "focus2";
+            action: STATE_SET "focus2" 0.0;
+            transition: SINUSOIDAL 0.1;
+            target: "e.swallow.content";
+            after: "focus3";
+         }
+         program { name: "focus3";
+            action: STATE_SET "focus3" 0.0;
+            transition: SINUSOIDAL 0.1;
+            target: "e.swallow.content";
+            after: "focus4";
+         }
+         program { name: "focus4";
+            action: STATE_SET "focus4" 0.0;
+            transition: SINUSOIDAL 0.1;
+            target: "e.swallow.content";
+            after: "focus5";
+         }
+         program { name: "focus5";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.1;
+            target: "e.swallow.content";
+         }
+         program { name: "urgent-on";
+            signal: "e,state,urgent,on";
+            source: "e";
+            action: STATE_SET "active" 0.0;
+            target: "glow";
+            after: "urgent2";
+         }
+         program { name: "urgent2";
+            action: STATE_SET "faded" 0.0;
+            transition: DECELERATE 0.5;
+            target: "glow";
+            after: "urgent-on";
+         }
+         program { name: "urgent-off";
+            signal: "e,state,urgent,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "glow";
+         }
+      }
+   }
+//----
+   group { name: "e/comp/none";
+      parts {
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+            }
+         }
+      }
+      programs {
+         program { name: "show1";
+            signal: "e,state,visible,on";
+            source: "e";
+            action: SIGNAL_EMIT "e,action,show,done" "e";
+         }
+         program { name: "hide1";
+            signal: "e,state,visible,off";
+            source: "e";
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         }
+      }
+   }
+//----
+   group { name: "e/comp/still";
+      images {
+         image: "comp-sh1.png" COMP;
+      }
+      parts {
+         part { name: "shadow";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               image {
+                  normal: "comp-sh1.png";
+                  border: 18 18 18 18;
+                  middle: 0;
+               }
+               fill {
+                  smooth: 0;
+               }
+               rel1 {
+                  to: "e.swallow.content";
+                  relative: 0.0  0.0;
+                  offset: -16  -14;
+               }
+               rel2 {
+                  to: "e.swallow.content";
+                  relative: 1.0  1.0;
+                  offset: 15   17;
+               }
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "focus-clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color_class: "comp_focus-out_color";
+               rel1 {
+                  relative: -1.0  -1.0;
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  relative: 2.0   2.0;
+                  offset: 9999  9999;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               color_class: "";
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            mouse_events: 0;
+            clip_to: "focus-clipper";
+            description { state: "default" 0.0;
+            }
+         }
+      }
+      programs {
+         program { name: "shadow-on";
+            signal: "e,state,shadow,on";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "shadow";
+         }
+         program { name: "shadow-off";
+            signal: "e,state,shadow,off";
+            source: "e";
+            action: STATE_SET "hidden" 0.0;
+            target: "shadow";
+         }
+         program { name: "show1";
+            signal: "e,state,visible,on";
+            source: "e";
+            action: SIGNAL_EMIT "e,action,show,done" "e";
+         }
+         program { name: "hide1";
+            signal: "e,state,visible,off";
+            source: "e";
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         }
+         program { name: "focus";
+            signal: "e,state,focus,on";
+            source: "e";
+            action: STATE_SET "focused" 0.0;
+            transition: SINUSOIDAL 0.2;
+            target: "focus-clipper";
+         }
+         program { name: "unfocus";
+            signal: "e,state,focus,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 0.5;
+            target: "focus-clipper";
+         }
+      }
+   }
+//----
+   group { name: "e/comp/popup";
+      images {
+         image: "comp-sh1.png" COMP;
+      }
+      parts {
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: -1.0  -1.0;
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  relative: 2.0   2.0;
+                  offset: 9999  9999;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "shadow";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               image {
+                  normal: "comp-sh1.png";
+                  border: 18 18 18 18;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+               rel1 {
+                  to: "e.swallow.content";
+                  relative: 0.0  0.0;
+                  offset: -16  -14;
+               }
+               rel2 {
+                  to: "e.swallow.content";
+                  relative: 1.0  1.0;
+                  offset: 15   17;
+               }
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "shower";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 0.05  0.05;
+                  offset: 0    0;
+               }
+               rel2 {
+                  relative: 0.95  0.95;
+                  offset: -1   -1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  relative: 0.0  0.0;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+               }
+            }
+         }
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
             mouse_events: 0;
-            scale: 1;
             description { state: "default" 0.0;
-               fixed: 0 1;
-               color: 224 224 224 255;
-               color3: 0 0 0 32;
-               text {
-                  font: "Sans:style=Bold";
-                  size: 10;
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  text_class: "fileman_icon";
+               rel1 {
+                  to: "shower";
+               }
+               rel2 {
+                  to: "shower";
                }
             }
          }
       }
+      programs {
+         program { name: "shadow-on";
+            signal: "e,state,shadow,on";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "shadow";
+         }
+         program { name: "shadow-off";
+            signal: "e,state,shadow,off";
+            source: "e";
+            action: STATE_SET "hidden" 0.0;
+            target: "shadow";
+         }
+         program { name: "show1";
+            signal: "e,state,visible,on";
+            source: "e";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.15;
+            target: "clipper";
+            target: "shower";
+            after: "show2";
+         }
+         program { name: "show2";
+            action: SIGNAL_EMIT "e,action,show,done" "e";
+         }
+         program { name: "hide1";
+            signal: "e,state,visible,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.30;
+            target: "clipper";
+            target: "shower";
+            after: "hide2";
+         }
+         program { name: "hide2";
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         }
+      }
    }
-
-   group { name: "e/comp/default";
+//----
+   group { name: "e/comp/menu";
       images {
          image: "comp-sh1.png" COMP;
-         image: "bt_glow.png" COMP;
       }
       parts {
-         part { name: "focus-clipper";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               color_class: "comp_focus-out_color";
-               rel1 {
-                  relative: -1.0  -1.0;
-                  offset: -9999 -9999;
-               }
-               rel2 {
-                  relative: 2.0   2.0;
-                  offset: 9999  9999;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               color_class: "";
-               color: 255 255 255 255;
-            }
-         }
          part { name: "clipper";
             type: RECT;
             mouse_events: 0;
-            clip_to: "focus-clipper";
             description { state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
@@ -38056,11 +39447,11 @@ collections {
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
-                  relative: 0.05  0.05;
+                  relative: 0.1  0.0;
                   offset: 0    0;
                }
                rel2 {
-                  relative: 0.95  0.95;
+                  relative: 0.9  0.8;
                   offset: -1   -1;
                }
             }
@@ -38086,55 +39477,6 @@ collections {
                   to: "shower";
                }
             }
-            description { state: "focus1" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: -10 -10;
-               rel2.offset: 9   9;
-            }
-            description { state: "focus2" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: 4   4;
-               rel2.offset: -5  -5;
-            }
-            description { state: "focus3" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: -3  -3;
-               rel2.offset: 2   2;
-            }
-            description { state: "focus4" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: 1   1;
-               rel2.offset: -2  -2;
-            }
-         }
-         part { name: "glow";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "e.swallow.content";
-               rel1.offset: -3 -3;
-               rel2.to: "e.swallow.content";
-               rel2.offset: 2  2;
-               color: 255 255 255 0;
-               image {
-                  normal: "bt_glow.png";
-                  border: 8 8 8 8;
-                  middle: 0;
-               }
-               fill.smooth: 0;
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-            description { state: "faded" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-               rel1.offset: -23 -22;
-               rel2.offset: 22  22;
-            }
          }
       }
       programs {
@@ -38174,103 +39516,208 @@ collections {
          program { name: "hide2";
             action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
-         program { name: "focus";
-            signal: "e,state,focus,on";
-            source: "e";
-            action: STATE_SET "focused" 0.0;
-            transition: SINUSOIDAL 0.2;
-            target: "focus-clipper";
-         }
-         program { name: "unfocus";
-            signal: "e,state,focus,off";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            target: "focus-clipper";
-         }
-         program { name: "focus1";
-            signal: "e,state,focus,on";
-            source: "e";
-            action: STATE_SET "focus1" 0.0;
-            transition: SINUSOIDAL 0.1;
-            target: "e.swallow.content";
-            after: "focus2";
-         }
-         program { name: "focus2";
-            action: STATE_SET "focus2" 0.0;
-            transition: SINUSOIDAL 0.1;
-            target: "e.swallow.content";
-            after: "focus3";
-         }
-         program { name: "focus3";
-            action: STATE_SET "focus3" 0.0;
-            transition: SINUSOIDAL 0.1;
-            target: "e.swallow.content";
-            after: "focus4";
-         }
-         program { name: "focus4";
-            action: STATE_SET "focus4" 0.0;
-            transition: SINUSOIDAL 0.1;
-            target: "e.swallow.content";
-            after: "focus5";
-         }
-         program { name: "focus5";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.1;
-            target: "e.swallow.content";
-         }
-         program { name: "urgent-on";
-            signal: "e,state,urgent,on";
-            source: "e";
-            action: STATE_SET "active" 0.0;
-            target: "glow";
-            after: "urgent2";
-         }
-         program { name: "urgent2";
-            action: STATE_SET "faded" 0.0;
-            transition: DECELERATE 0.5;
-            target: "glow";
-            after: "urgent-on";
-         }
-         program { name: "urgent-off";
-            signal: "e,state,urgent,off";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            target: "glow";
-         }
       }
    }
-//----
-   group { name: "e/comp/none";
-      parts {
-         part { name: "e.swallow.content";
-            type: SWALLOW;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-            }
-         }
+   group { name: "e/comp/everything";
+      images {
+         image: "comp-sh1.png" COMP;
       }
-      programs {
-         program { name: "show1";
-            signal: "e,state,visible,on";
-            source: "e";
-            action: SIGNAL_EMIT "e,action,show,done" "e";
-         }
-         program { name: "hide1";
-            signal: "e,state,visible,off";
-            source: "e";
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
-         }
+      parts {
+       part { name: "clipper";
+       type: RECT;
+       mouse_events: 0;
+       clip_to: "clipper2";
+         description { state: "default" 0.0;
+         visible: 0;
+         color: 255 255 255 0;
+           rel1 {
+           relative: -1.0  -1.0;
+           offset: -9999 -9999;
+           }
+           rel2 {
+           relative: 2.0   2.0;
+           offset: 9999  9999;
+           }
+         }
+         description { state: "visible" 0.0;
+         inherit: "default" 0.0;
+         visible: 1;
+         color: 255 255 255 255;
+         }
+         description { state: "big" 0.0;
+         inherit: "default" 0.0;
+         color: 255 255 255 0;
+         }
+       }
+       part { name: "clipper2";
+       type: RECT;
+       mouse_events: 0;
+         description { state: "default" 0.0;
+         color: 255 255 255 255;
+         rel1.to: "clipper";
+         rel2.to: "clipper";
+         }
+         description { state: "visible" 0.0;
+         inherit: "default" 0.0;
+         }
+         description { state: "big" 0.0;
+         inherit: "default" 0.0;
+         color: 255 255 255 0;
+         }
+       }
+       part { name: "shadow";
+       mouse_events: 0;
+       clip_to: "clipper";
+         description { state: "default" 0.0;
+           image {
+           normal: "comp-sh1.png";
+           border: 18 18 18 18;
+           middle: 0;
+           }
+         fill.smooth: 0;
+           rel1 {
+           to: "e.swallow.content";
+           relative: 0.0  0.0;
+           offset: -16  -14;
+           }
+           rel2 {
+           to: "e.swallow.content";
+           relative: 1.0  1.0;
+           offset: 15   17;
+           }
+         }
+         description { state: "hidden" 0.0;
+         inherit: "default" 0.0;
+         visible: 0;
+         }
+       }
+       part { name: "shower";
+       type: RECT;
+       mouse_events: 0;
+         description { state: "default" 0.0;
+         visible: 0;
+           rel1 {
+           relative: 0.05  0.05;
+           offset: 0    0;
+           }
+           rel2 {
+           relative: 0.95  0.95;
+           offset: -1   -1;
+           }
+         }
+         description { state: "visible" 0.0;
+         inherit: "default" 0.0;
+           rel1 {
+           relative: 0.0  0.0;
+           }
+           rel2 {
+           relative: 1.0  1.0;
+           }
+         }
+         description { state: "big" 0.0;
+         inherit: "default" 0.0;
+           rel1 {
+           relative: -0.3  -0.3;
+           }
+           rel2 {
+           relative: 1.3  1.3;
+           }
+         }
+       }
+       part { name: "e.swallow.content";
+       type: SWALLOW;
+       clip_to: "clipper";
+       mouse_events: 0;
+         description { state: "default" 0.0;
+           rel1 {
+           to: "shower";
+           }
+           rel2 {
+           to: "shower";
+           }
+         }
+       }
       }
+     programs {
+       program { name: "shadow-on";
+       signal: "e,state,shadow,on";
+       source: "e";
+       action: STATE_SET "default" 0.0;
+       target: "shadow";
+       }
+       program { name: "shadow-off";
+       signal: "e,state,shadow,off";
+       source: "e";
+       action: STATE_SET "hidden" 0.0;
+       target: "shadow";
+       }
+       program { name: "show1";
+       signal: "e,state,visible,on";
+       source: "e";
+       action: STATE_SET "visible" 0.0;
+       transition: DECELERATE 0.05;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "show2";
+       }
+       program { name: "show2";
+       action: SIGNAL_EMIT "e,action,show,done" "e";
+       }
+       program { name: "hide1";
+       signal: "e,state,visible,off";
+       source: "e";
+       action: STATE_SET "big" 0.0;
+       transition: ACCELERATE 0.25;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "hide2";
+       }
+       program { name: "hide2";
+       action: STATE_SET "default" 0.0;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "hide3";         
+       }
+       program { name: "hide3";
+       action: SIGNAL_EMIT "e,action,hide,done" "e";
+       }
+     }
    }
-//----
-   group { name: "e/comp/still";
+
+   //----
+/*
+   group { name: "e/comp/slow";
       images {
          image: "comp-sh1.png" COMP;
       }
       parts {
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: -1.0  -1.0;
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  relative: 2.0   2.0;
+                  offset: 9999  9999;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "shadow";
             mouse_events: 0;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                image {
                   normal: "comp-sh1.png";
@@ -38296,31 +39743,28 @@ collections {
                visible: 0;
             }
          }
-         part { name: "focus-clipper";
-            type: RECT;
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
             mouse_events: 0;
             description { state: "default" 0.0;
-               color_class: "comp_focus-out_color";
                rel1 {
-                  relative: -1.0  -1.0;
-                  offset: -9999 -9999;
+                  relative: 0.05  0.05;
+                  offset: 0    0;
                }
                rel2 {
-                  relative: 2.0   2.0;
-                  offset: 9999  9999;
+                  relative: 0.95  0.95;
+                  offset: -1   -1;
                }
             }
-            description { state: "focused" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               color_class: "";
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "e.swallow.content";
-            type: SWALLOW;
-            mouse_events: 0;
-            clip_to: "focus-clipper";
-            description { state: "default" 0.0;
+               rel1 {
+                  relative: 0.0  0.0;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+               }
             }
          }
       }
@@ -38340,31 +39784,31 @@ collections {
          program { name: "show1";
             signal: "e,state,visible,on";
             source: "e";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.4;
+            target: "clipper";
+            target: "e.swallow.content";
+            after: "show2";
+         }
+         program { name: "show2";
             action: SIGNAL_EMIT "e,action,show,done" "e";
          }
          program { name: "hide1";
             signal: "e,state,visible,off";
             source: "e";
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
-         }
-         program { name: "focus";
-            signal: "e,state,focus,on";
-            source: "e";
-            action: STATE_SET "focused" 0.0;
-            transition: SINUSOIDAL 0.2;
-            target: "focus-clipper";
-         }
-         program { name: "unfocus";
-            signal: "e,state,focus,off";
-            source: "e";
             action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            target: "focus-clipper";
+            transition: DECELERATE 0.8;
+            target: "clipper";
+            target: "e.swallow.content";
+            after: "hide2";
+         }
+         program { name: "hide2";
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
    }
 //----
-   group { name: "e/comp/popup";
+   group { name: "e/comp/fast";
       images {
          image: "comp-sh1.png" COMP;
       }
@@ -38399,7 +39843,9 @@ collections {
                   border: 18 18 18 18;
                   middle: 0;
                }
-               fill.smooth: 0;
+               fill {
+                  smooth: 0;
+               }
                rel1 {
                   to: "e.swallow.content";
                   relative: 0.0  0.0;
@@ -38416,11 +39862,11 @@ collections {
                visible: 0;
             }
          }
-         part { name: "shower";
-            type: RECT;
+         part { name: "e.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
                   relative: 0.05  0.05;
                   offset: 0    0;
@@ -38440,19 +39886,6 @@ collections {
                }
             }
          }
-         part { name: "e.swallow.content";
-            type: SWALLOW;
-            clip_to: "clipper";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "shower";
-               }
-               rel2 {
-                  to: "shower";
-               }
-            }
-         }
       }
       programs {
          program { name: "shadow-on";
@@ -38471,9 +39904,9 @@ collections {
             signal: "e,state,visible,on";
             source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.15;
+            transition: DECELERATE 0.1;
             target: "clipper";
-            target: "shower";
+            target: "e.swallow.content";
             after: "show2";
          }
          program { name: "show2";
@@ -38483,9 +39916,9 @@ collections {
             signal: "e,state,visible,off";
             source: "e";
             action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.30;
+            transition: DECELERATE 0.1;
             target: "clipper";
-            target: "shower";
+            target: "e.swallow.content";
             after: "hide2";
          }
          program { name: "hide2";
@@ -38494,9 +39927,10 @@ collections {
       }
    }
 //----
-   group { name: "e/comp/menu";
+   group { name: "e/comp/focus-out-colored";
       images {
          image: "comp-sh1.png" COMP;
+         image: "bt_glow.png" COMP;
       }
       parts {
          part { name: "clipper";
@@ -38552,11 +39986,11 @@ collections {
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
-                  relative: 0.1  0.0;
+                  relative: 0.05  0.05;
                   offset: 0    0;
                }
                rel2 {
-                  relative: 0.9  0.8;
+                  relative: 0.95  0.95;
                   offset: -1   -1;
                }
             }
@@ -38570,9 +40004,22 @@ collections {
                }
             }
          }
+         part { name: "clipper-content";
+            type: RECT;
+            clip_to: "clipper";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description { state: "unfocus" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 200;
+//               color_class: "comp_focus-out_color";
+            }
+         }
          part { name: "e.swallow.content";
             type: SWALLOW;
-            clip_to: "clipper";
+            clip_to: "clipper-content";
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1 {
@@ -38583,6 +40030,35 @@ collections {
                }
             }
          }
+         part { name: "glow";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to: "e.swallow.content";
+               rel1.offset: -3 -3;
+               rel2.to: "e.swallow.content";
+               rel2.offset: 2  2;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 8 8 8 8;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description { state: "faded" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 0;
+               rel1.offset: -23 -22;
+               rel2.offset: 22  22;
+            }
+         }
       }
       programs {
          program { name: "shadow-on";
@@ -38621,621 +40097,1221 @@ collections {
          program { name: "hide2";
             action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
+         program { name: "unfocus";
+            signal: "e,state,focus,off";
+            source: "e";
+            action: STATE_SET "unfocus" 0.0;
+            transition: ACCELERATE 0.2;
+            target: "clipper-content";
+         }
+         program { name: "focus";
+            signal: "e,state,focus,on";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: ACCELERATE 0.2;
+            target: "clipper-content";
+         }
+         program { name: "urgent-on";
+            signal: "e,state,urgent,on";
+            source: "e";
+            action: STATE_SET "active" 0.0;
+            target: "glow";
+            after: "urgent2";
+         }
+         program { name: "urgent2";
+            action: STATE_SET "faded" 0.0;
+            transition: DECELERATE 0.5;
+            target: "glow";
+            after: "urgent-on";
+         }
+         program { name: "urgent-off";
+            signal: "e,state,urgent,off";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "glow";
+         }
       }
    }
-   group { name: "e/comp/everything";
+ */
+
+
+   group {
+   name: "modules/efm_navigation/main";
+      
       images {
-         image: "comp-sh1.png" COMP;
+      image: "bt_base1.png" COMP;
+      image: "bt_base2.png" COMP;
+      image: "bt_dis_base.png" COMP;
+      image: "bt_hilight.png" COMP;
+      image: "bt_shine.png" COMP;
+      image: "bt_dis_hilight.png" COMP;
+      image: "bt_dis_shine.png" COMP;
+      image: "icon_left_arrow.png" COMP;
+      image: "icon_right_arrow.png" COMP;
+      image: "icon_up_arrow.png" COMP;
+      image: "refresh.png" COMP;
+      image: "favorites.png" COMP;
       }
+
       parts {
-       part { name: "clipper";
-       type: RECT;
-       mouse_events: 0;
-       clip_to: "clipper2";
-         description { state: "default" 0.0;
-         visible: 0;
-         color: 255 255 255 0;
-           rel1 {
-           relative: -1.0  -1.0;
-           offset: -9999 -9999;
+        part {
+        name: "base";
+        type: RECT;
+        mouse_events: 1;
+
+           description {
+           state: "default" 0.0;
+           color: 0 0 0 0;
            }
-           rel2 {
-           relative: 2.0   2.0;
-           offset: 9999  9999;
+        }
+        part {
+        name: "begin";
+        type: RECT;
+        mouse_events: 0;
+           description {
+           state: "default" 0.0;
+           max: 1 1;
+           align: 0.0 0.0;
+           color: 0 0 0 0;
            }
-         }
-         description { state: "visible" 0.0;
-         inherit: "default" 0.0;
-         visible: 1;
-         color: 255 255 255 255;
-         }
-         description { state: "big" 0.0;
-         inherit: "default" 0.0;
-         color: 255 255 255 0;
-         }
-       }
-       part { name: "clipper2";
-       type: RECT;
-       mouse_events: 0;
-         description { state: "default" 0.0;
-         color: 255 255 255 255;
-         rel1.to: "clipper";
-         rel2.to: "clipper";
-         }
-         description { state: "visible" 0.0;
-         inherit: "default" 0.0;
-         }
-         description { state: "big" 0.0;
-         inherit: "default" 0.0;
-         color: 255 255 255 0;
-         }
-       }
-       part { name: "shadow";
-       mouse_events: 0;
-       clip_to: "clipper";
-         description { state: "default" 0.0;
-           image {
-           normal: "comp-sh1.png";
-           border: 18 18 18 18;
-           middle: 0;
+        }
+
+#define NAV_BUTTON(NAME, ICON, REL_TO, OFF_X)  \
+        part {                                 \
+        name: NAME"_bg";                       \
+        mouse_events: 1;                       \
+        repeat_events: 1;                      \
+        type: IMAGE;                           \
+           description {                       \
+           state: "default" 0.0;               \
+           min: 28 28;                         \
+           max: 28 28;                         \
+           aspect: 1.0 1.0;                    \
+           aspect_preference: VERTICAL;        \
+           align: 0.0 0.5;                     \
+              rel1 {                           \
+              to_x: REL_TO;                    \
+              relative: 1.0 0.0;               \
+              offset: OFF_X 0;                 \
+              }                                \
+              image {                          \
+              normal: "bt_base2.png";          \
+              border: 7 7 7 7;                 \
+              }                                \
+           }                                   \
+           description {                       \
+           state: "down" 0.0;                  \
+           inherit: "default" 0.0;             \
+           image.normal: "bt_base1.png";       \
+           }                                   \
+           description {                       \
+           state: "disabled" 0.0;              \
+           inherit: "default" 0.0;             \
+           image.normal: "bt_dis_base.png";    \
+           image.border: 4 4 4 4;              \
+           }                                   \
+        }                                      \
+        part {                                 \
+        name: NAME"_img";                      \
+        mouse_events: 0;                       \
+        type: IMAGE;                           \
+           description {                       \
+           state: "default" 0.0;               \
+           min: 16 16;                         \
+           max: 16 16;                         \
+              rel1 {                           \
+              offset: 7 7;                     \
+              to: NAME"_bg";                   \
+              }                                \
+              rel2 {                           \
+              offset: -8 -8;                   \
+              to: NAME"_bg";                   \
+              }                                \
+           image.normal: ICON".png";           \
+           }                                   \
+        }                                      \
+        part {                                 \
+        name: NAME"_fg1";                      \
+        type: IMAGE;                           \
+        mouse_events: 1;                       \
+        repeat_events: 1;                      \
+           description {                       \
+           state: "default" 0.0;               \
+           rel1.to: NAME"_bg";                 \
+           rel2.to: NAME"_bg";                 \
+           rel2.relative: 1.0 0.5;             \
+              image {                          \
+              normal: "bt_hilight.png";        \
+              border: 7 7 7 0;                 \
+              }                                \
+           }                                   \
+           description {                       \
+           state: "disabled" 0.0;              \
+           inherit: "default" 0.0;             \
+           image.normal: "bt_dis_hilight.png"; \
+           image.border: 4 4 4 0;              \
+           }                                   \
+        }                                      \
+        part {                                 \
+        name: NAME"_fg2";                      \
+        type: IMAGE;                           \
+        mouse_events: 1;                       \
+        repeat_events: 1;                      \
+           description {                       \
+           state: "default" 0.0;               \
+           rel1.to: NAME"_bg";                 \
+           rel2.to: NAME"_bg";                 \
+              image {                          \
+              normal: "bt_shine.png";          \
+              border: 7 7 7 7;                 \
+              }                                \
+           }                                   \
+           description {                       \
+           state: "disabled" 0.0;              \
+           inherit: "default" 0.0;             \
+           image.normal: "bt_dis_shine.png";   \
+           }                                   \
+        }                                      \
+        part {                                 \
+        name: NAME"_event_eater";              \
+        type: RECT;                            \
+        mouse_events: 1;                       \
+        repeat_events: 0;                      \
+           description {                       \
+           state: "default" 0.0;               \
+           visible: 0;                         \
+           color: 255 255 255 0;               \
+           rel1.to: NAME"_bg";                 \
+           rel2.to: NAME"_bg";                 \
+           }                                   \
+           description {                       \
+           state: "disabled" 0.0;              \
+           inherit: "default" 0.0;             \
+           visible: 1;                         \
+           }                                   \
+        }                                      \
+
+        
+        NAV_BUTTON("back",       "icon_left_arrow",  "begin", 5);
+        NAV_BUTTON("forward",    "icon_right_arrow", "back_bg", 1);
+        NAV_BUTTON("up",         "icon_up_arrow",    "forward_bg", 10);
+        NAV_BUTTON("refresh",    "refresh",          "up_bg", 1);
+        NAV_BUTTON("favorites",  "favorites",        "refresh_bg", 1);
+
+        part {
+        name: "e.swallow.pathbar";
+        type: SWALLOW;
+           description {
+           state: "default" 0.0;
+           align: 0.0 0.5;
+
+              /* rel1.to_x: "favorites_base"; */
+           rel1.to_x: "favorites_bg";
+           rel1.relative: 1.0 0.0;
+           rel1.offset: 10 0;
+           rel2.offset: -40 -1;
+           color: 200 0 0 200;
            }
-         fill.smooth: 0;
-           rel1 {
-           to: "e.swallow.content";
-           relative: 0.0  0.0;
-           offset: -16  -14;
+        }
+                       
+      }
+
+      programs {
+#define NAV_BUTTON_PROG(NAME)                                  \
+        program {                                              \
+        name: NAME"_click";                                    \
+        signal: "mouse,down,1";                                \
+        source: "bg";                                          \
+        action: STATE_SET "down" 0.0;                          \
+        target: NAME"_bg";                                     \
+        }                                                      \
+        program {                                              \
+        name: NAME"_unclick";                                  \
+        signal: "mouse,up,1";                                  \
+        source: "bg";                                          \
+        action: STATE_SET "default" 0.0;                       \
+        target: NAME"_bg";                                     \
+        }                                                      \
+        program        {                                       \
+        name: NAME"_send";                                     \
+        signal: "mouse,clicked,1";                             \
+        source: NAME"_bg";                                     \
+        action: SIGNAL_EMIT "e,action,"NAME",click" "";        \
+        }                                                      \
+        program        {                                       \
+        name: NAME"_disable";                                  \
+        signal: "e,state,"NAME",disabled";                     \
+        source: "e";                                           \
+        action: STATE_SET "disabled" 0.0;                      \
+        target: NAME"_bg";                                     \
+        target: NAME"_fg1";                                    \
+        target: NAME"_fg2";                                    \
+        target: NAME"_event_eater";                            \
+        }                                                      \
+        program        {                                       \
+        name: NAME"_enable";                                   \
+        signal: "e,state,"NAME",enabled";                      \
+        source: "e";                                           \
+        action: STATE_SET "default" 0.0;                       \
+        target: NAME"_bg";                                     \
+        target: NAME"_fg1";                                    \
+        target: NAME"_fg2";                                    \
+        target: NAME"_event_eater";                            \
+        }                                                      \
+
+        NAV_BUTTON_PROG("back");
+        NAV_BUTTON_PROG("forward");
+        NAV_BUTTON_PROG("up");
+        NAV_BUTTON_PROG("refresh");
+        NAV_BUTTON_PROG("favorites");
+      }
+   }
+
+
+   group {
+   name: "modules/efm_navigation/pathbar_scrollframe";
+      images {
+      image: "icon_left_arrow.png" COMP;
+      image: "icon_right_arrow.png" COMP;
+      }
+
+      parts {
+        part {
+        name: "base";
+        type: RECT;
+        mouse_events: 1;
+           description {
+           state: "default" 0.0;
+              rel1 {
+              to_x: "left_arrow";
+              relative: 1.0 0.0;
+              }
+              rel2 {
+              to_x: "right_arrow";
+              relative: 0.0 1.0;
+              }
+           color: 0 0 0 0;
            }
-           rel2 {
-           to: "e.swallow.content";
-           relative: 1.0  1.0;
-           offset: 15   17;
+        }
+        part {
+        name: "clipper";
+        type: RECT;
+        mouse_events: 0;
+           description {
+           state: "default" 0.0;
+           rel1.to: "base";
+           rel2.to: "base";
            }
-         }
-         description { state: "hidden" 0.0;
-         inherit: "default" 0.0;
-         visible: 0;
-         }
-       }
-       part { name: "shower";
-       type: RECT;
-       mouse_events: 0;
-         description { state: "default" 0.0;
-         visible: 0;
-           rel1 {
-           relative: 0.05  0.05;
-           offset: 0    0;
+        }
+        part {
+        name: "e.swallow.content";
+        type: SWALLOW;
+        clip_to: "clipper";
+           description {
+           state: "default" 0.0;
+           rel1.to: "clipper";
+           rel2.to: "clipper";
            }
-           rel2 {
-           relative: 0.95  0.95;
-           offset: -1   -1;
+        }
+        part {
+        name: "left_arrow";
+        type: IMAGE;
+        mouse_events: 1;
+        scale: 1;
+           description {
+           state: "default" 0.0;
+              /* aspect: 1.0 1.0;
+               * aspect_preference: VERTICAL; */
+           align: 0.0 0.5;
+           min: 16 16;
+           max: 16 16;
+           image.normal: "icon_left_arrow.png";
            }
-         }
-         description { state: "visible" 0.0;
-         inherit: "default" 0.0;
-           rel1 {
-           relative: 0.0  0.0;
+        }
+        part {
+        name: "right_arrow";
+        type: IMAGE;
+        mouse_events: 1;
+        scale: 1;
+           description {
+           state: "default" 0.0;
+           align: 1.0 0.5;
+           min: 16 16;
+           max: 16 16;
+           image.normal: "icon_right_arrow.png";
            }
-           rel2 {
-           relative: 1.0  1.0;
+        }
+        part {
+        name: "e.dragable.hbar";
+        mouse_events: 0;
+           dragable {
+           x: 1 1 0;
+           y: 0 0 0;
+           confine: "base";
            }
-         }
-         description { state: "big" 0.0;
-         inherit: "default" 0.0;
-           rel1 {
-           relative: -0.3  -0.3;
+           description {
+           state: "default" 0.0;
+           visible: 0;
+           rel1.to: "base";
+           rel2.to: "base";
            }
-           rel2 {
-           relative: 1.3  1.3;
+        }
+        part {
+        name: "event";
+        mouse_events: 1;
+        repeat_events: 1;
+           description {
+           state: "default" 0.0;
+           color: 0 0 0 0;
            }
-         }
-       }
-       part { name: "e.swallow.content";
-       type: SWALLOW;
-       clip_to: "clipper";
-       mouse_events: 0;
-         description { state: "default" 0.0;
-           rel1 {
-           to: "shower";
+        }
+      }
+      program {
+      name: "sb_left";
+      signal: "mouse,down,1";
+      source: "left_arrow";
+      action: DRAG_VAL_STEP -5.0 0.0;
+      target: "e.dragable.hbar";
+      }
+      program {
+      name: "sb_right";
+      signal: "mouse,down,1";
+      source: "right_arrow";
+      action: DRAG_VAL_STEP 5.0 0.0;
+      target: "e.dragable.hbar";
+      }
+
+   }
+
+   group {
+   name: "modules/efm_navigation/pathbar_button";
+      images {
+      image: "bt_base1.png" COMP;
+      image: "bt_base2.png" COMP;
+      image: "bt_dis_base.png" COMP;
+      image: "bt_hilight.png" COMP;
+      image: "bt_shine.png" COMP;
+      image: "bt_dis_hilight.png" COMP;
+      image: "bt_dis_shine.png" COMP;
+      }
+
+      parts {
+        part {
+        name: "bg";
+        type: IMAGE;
+        mouse_events: 0;
+           description {
+           state: "default" 0.0;
+           min: 28 28;
+              image {
+              normal: "bt_base2.png";
+              border: 7 7 7 7;
+              }
            }
-           rel2 {
-           to: "shower";
+           description {
+           state: "down" 0.0;
+           inherit: "default" 0.0;
+           image.normal: "bt_base1.png";
            }
-         }
-       }
+        }
+        part {
+        name: "label2";
+        type: TEXT;
+        mouse_events: 0;
+        scale: 1;
+           description {
+           state: "default" 0.0;
+           max: 150 32;
+           rel1.to: "e.text.label";
+           rel2.to: "e.text.label";
+           color: 224 224 224 255;
+              text {
+              font: "Sans";
+              text_source: "e.text.label";
+              size: 10;
+              min: 1 1;
+              align: 0.5 0.5;
+              elipsis: 0.0;
+              }
+           }
+           description {
+           state: "selected" 0.0;
+           inherit: "default" 0.0;
+           visible: 0;
+           }
+        }
+        part {
+        name: "e.text.label";
+        type: TEXT;
+        mouse_events: 0;
+        scale: 1;
+           description {
+           state: "default" 0.0;
+           max: 150 32;
+           rel1.offset: 7 0;
+           rel2.offset: -8 -1;
+           visible: 0;
+           color: 255 255 255 255;
+              text {
+              font: "Sans:style=Bold";
+              size: 10;
+              min: 0 1;
+              max: 1 0;
+              align: 0.5 0.5;
+              elipsis: 0.0;
+              }
+           }
+           description {
+           state: "selected" 0.0;
+           inherit: "default" 0.0;
+           visible: 1;
+           }
+        }
+        part {
+        name: "fg1";
+        type: IMAGE;
+        mouse_events: 0;
+           description {
+           state: "default" 0.0;
+           rel1.to: "bg";
+              rel2 {
+              to: "bg";
+              relative: 1.0 0.5;
+              }
+              image {
+              normal: "bt_hilight.png";
+              border: 7 7 7 0;
+              }
+           }
+        }
+        part {
+        name: "fg2";
+        type: IMAGE;
+        mouse_events: 0;
+           description {
+           state: "default" 0.0;
+           rel1.to: "bg";
+           rel2.to: "bg";
+              image {
+              normal: "bt_shine.png";
+              border: 7 7 7 7;
+              }
+           }
+        }
+        part {
+        name: "event";
+        type: RECT;
+        mouse_events: 1;
+        ignore_flags: ON_HOLD;
+           description {
+           state: "default" 0.0;
+           color: 0 0 0 0;
+           }
+        }
+      }
+      programs {
+        program {
+        name: "click";
+        signal: "mouse,down,1";
+        source: "event";
+        action: STATE_SET "down" 0.0;
+        target: "bg";
+        }
+        program {
+        name: "unclick";
+        signal: "mouse,up,1";
+        source: "event";
+        action: STATE_SET "default" 0.0;
+        target: "bg";
+        }
+        program {
+        name: "send";
+        signal: "mouse,clicked,1";
+        source: "event";
+        action: SIGNAL_EMIT "e,action,click" "";
+        }
+        program {
+        name: "select";
+        signal: "e,state,selected";
+        source: "e";
+        action: STATE_SET "selected" 0.0;
+        target: "e.text.label";
+        target: "label2";
+        }
+        program {
+        name: "normal";
+        signal: "e,state,default";
+        source: "e";
+        action: STATE_SET "default" 0.0;
+        target: "e.text.label";
+        target: "label2";
+        }
       }
-     programs {
-       program { name: "shadow-on";
-       signal: "e,state,shadow,on";
-       source: "e";
-       action: STATE_SET "default" 0.0;
-       target: "shadow";
-       }
-       program { name: "shadow-off";
-       signal: "e,state,shadow,off";
-       source: "e";
-       action: STATE_SET "hidden" 0.0;
-       target: "shadow";
-       }
-       program { name: "show1";
-       signal: "e,state,visible,on";
-       source: "e";
-       action: STATE_SET "visible" 0.0;
-       transition: DECELERATE 0.05;
-       target: "clipper";
-       target: "clipper2";
-       target: "shower";
-       after: "show2";
-       }
-       program { name: "show2";
-       action: SIGNAL_EMIT "e,action,show,done" "e";
-       }
-       program { name: "hide1";
-       signal: "e,state,visible,off";
-       source: "e";
-       action: STATE_SET "big" 0.0;
-       transition: ACCELERATE 0.25;
-       target: "clipper";
-       target: "clipper2";
-       target: "shower";
-       after: "hide2";
-       }
-       program { name: "hide2";
-       action: STATE_SET "default" 0.0;
-       target: "clipper";
-       target: "clipper2";
-       target: "shower";
-       after: "hide3";         
-       }
-       program { name: "hide3";
-       action: SIGNAL_EMIT "e,action,hide,done" "e";
-       }
-     }
    }
 
-   //----
-/*
-   group { name: "e/comp/slow";
+/////////////////////////////////////////////////////////////////////////////
+/*** MOD: TASKS ***/
+
+   group { name:"modules/tasks/item";
       images {
-         image: "comp-sh1.png" COMP;
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "exclam.png" COMP;
       }
       parts {
-         part { name: "clipper";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "button_image";
+            mouse_events: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1 {
-                  relative: -1.0  -1.0;
-                  offset: -9999 -9999;
-               }
-               rel2 {
-                  relative: 2.0   2.0;
-                  offset: 9999  9999;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
             }
-            description { state: "visible" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               image.normal: "bt_base1.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
+               }
             }
          }
-         part { name: "shadow";
+         part { name: "icon_area"; type: RECT;
             mouse_events: 0;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               image {
-                  normal: "comp-sh1.png";
-                  border: 18 18 18 18;
-                  middle: 0;
-               }
-               fill {
-                  smooth: 0;
-               }
+               visible: 0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 0.0 0.5;
                rel1 {
-                  to: "e.swallow.content";
-                  relative: 0.0  0.0;
-                  offset: -16  -14;
+                  relative: 0.0 0.0;
+                  offset: 3  3;
+                  to: "button_image";
                }
                rel2 {
-                  to: "e.swallow.content";
-                  relative: 1.0  1.0;
-                  offset: 15   17;
+                  relative: 0.0 1.0;
+                  offset: 3   -4;
+                  to: "button_image";
                }
             }
-            description { state: "hidden" 0.0;
+            description { state: "iconified" 0.0;
                inherit: "default" 0.0;
+               rel1.relative: 0.0 0.25;
+               rel2.relative: 0.0 0.75;
+            }
+         }
+         part { name: "icon_area2"; type: RECT;
+            description { state: "default" 0.0;
                visible: 0;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+            }
+            description { state: "uw0" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -3 -2;
+               rel2.offset: -4 -3;
+            }
+            description { state: "uw1" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 5 -2;
+               rel2.offset: 4 -3;
+            }
+            description { state: "uw2" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -1 4;
+               rel2.offset: -2 3;
+            }
+            description { state: "uw3" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -2 -1;
+               rel2.offset: -3 -2;
+            }
+            description { state: "uw4" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -4 1;
+               rel2.offset: -5 0;
             }
          }
-         part { name: "e.swallow.content";
+         part { name: "e.swallow.icon";
             type: SWALLOW;
-            clip_to: "clipper";
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.05  0.05;
-                  offset: 0    0;
-               }
-               rel2 {
-                  relative: 0.95  0.95;
-                  offset: -1   -1;
-               }
+               aspect: 1.0 1.0;
+               rel1.to: "icon_area2";
+               rel2.to: "icon_area2";
+            }
+         }
+         part { name: "urgent";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+               image.normal: "exclam.png";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
-      }
-      programs {
-         program { name: "shadow-on";
-            signal: "e,state,shadow,on";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            target: "shadow";
-         }
-         program { name: "shadow-off";
-            signal: "e,state,shadow,off";
-            source: "e";
-            action: STATE_SET "hidden" 0.0;
-            target: "shadow";
-         }
-         program { name: "show1";
-            signal: "e,state,visible,on";
-            source: "e";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.4;
-            target: "clipper";
-            target: "e.swallow.content";
-            after: "show2";
-         }
-         program { name: "show2";
-            action: SIGNAL_EMIT "e,action,show,done" "e";
-         }
-         program { name: "hide1";
-            signal: "e,state,visible,off";
-            source: "e";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.8;
-            target: "clipper";
-            target: "e.swallow.content";
-            after: "hide2";
-         }
-         program { name: "hide2";
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
-         }
-      }
-   }
-//----
-   group { name: "e/comp/fast";
-      images {
-         image: "comp-sh1.png" COMP;
-      }
-      parts {
-         part { name: "clipper";
-            type: RECT;
+         part { name: "urgent2";
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+               image.normal: "exclam.png";
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description { state: "faded" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 -1.0;
+               rel2.relative: 2.0 2.0;
+               visible: 1;
+               color: 255 255 255 0;
+            }
+         }
+         part { name: "e.text.label"; type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
                rel1 {
-                  relative: -1.0  -1.0;
-                  offset: -9999 -9999;
+                  relative: 1.0  0.0;
+                  offset: 2    3;
+                  to_x: "icon_area";
+                  to_y: "button_image";
                }
                rel2 {
-                  relative: 2.0   2.0;
-                  offset: 9999  9999;
+                  relative: 1.0  1.0;
+                  offset: -4   -4;
+                  to: "button_image";
+               }
+               color_class: "tasks_text";
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "tasks_text";
                }
             }
-            description { state: "visible" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               color_class: "tasks_text_focused";
+               text.font: "Sans:style=Bold";
+               text.text_class: "tasks_text_focused";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               color_class: "tasks_text_focused";
+               text.font: "Sans:style=Bold";
+               text.text_class: "tasks_text_focused";
             }
          }
-         part { name: "shadow";
+         part { name: "over1";
             mouse_events: 0;
-            clip_to: "clipper";
             description { state: "default" 0.0;
+               rel2.relative: 1.0 0.5;
                image {
-                  normal: "comp-sh1.png";
-                  border: 18 18 18 18;
-                  middle: 0;
-               }
-               fill {
-                  smooth: 0;
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-               rel1 {
-                  to: "e.swallow.content";
-                  relative: 0.0  0.0;
-                  offset: -16  -14;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-               rel2 {
-                  to: "e.swallow.content";
-                  relative: 1.0  1.0;
-                  offset: 15   17;
+            }
+         }
+         part { name: "over2";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
             }
-            description { state: "hidden" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               visible: 0;
+               visible: 1;
             }
          }
-         part { name: "e.swallow.content";
-            type: SWALLOW;
-            clip_to: "clipper";
+         part { name: "over3";
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.05  0.05;
-                  offset: 0    0;
-               }
-               rel2 {
-                  relative: 0.95  0.95;
-                  offset: -1   -1;
+               visible: 0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 7 7 9 9;
                }
+               fill.smooth : 0;
             }
-            description { state: "visible" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
       }
       programs {
-         program { name: "shadow-on";
-            signal: "e,state,shadow,on";
-            source: "e";
+         program { name: "button_click";
+            signal: "mouse,down,1";
+            source: "button_image";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            target: "over3";
+            target: "e.text.label";
+         }
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "button_image";
             action: STATE_SET "default" 0.0;
-            target: "shadow";
+            target: "button_image";
+            target: "over3";
+            target: "e.text.label";
          }
-         program { name: "shadow-off";
-            signal: "e,state,shadow,off";
+         program { name: "button_unclick2";
+            signal: "mouse,clicked,1";
+            source: "button_image";
+            action: SIGNAL_EMIT "e,action,click" "";
+         }
+         program { name: "focused";
+            signal: "e,state,focused";
             source: "e";
-            action: STATE_SET "hidden" 0.0;
-            target: "shadow";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "e.text.label";
          }
-         program { name: "show1";
-            signal: "e,state,visible,on";
+         program { name: "unfocused";
+            signal: "e,state,unfocused";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "e.text.label";
+         }
+         program { name: "urgent";
+            signal: "e,state,urgent";
             source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.1;
-            target: "clipper";
-            target: "e.swallow.content";
-            after: "show2";
+            transition: DECELERATE 0.5;
+            target: "urgent";
+            target: "urgent2";
+            after: "urgent2";
          }
-         program { name: "show2";
-            action: SIGNAL_EMIT "e,action,show,done" "e";
+         program { name: "urgent2";
+            action: STATE_SET "faded" 0.0;
+            transition: LINEAR 0.5;
+            target: "urgent2";
+            after: "urgent3";
          }
-         program { name: "hide1";
-            signal: "e,state,visible,off";
+         program { name: "urgent3";
+            action: STATE_SET "visible" 0.0;
+            target: "urgent2";
+            after: "urgent2";
+         }
+         program { name: "urgentw0";
+            signal: "e,state,urgent";
             source: "e";
             action: STATE_SET "default" 0.0;
             transition: DECELERATE 0.1;
-            target: "clipper";
-            target: "e.swallow.content";
-            after: "hide2";
+            target: "icon_area2";
+            after: "urgentw1";
          }
-         program { name: "hide2";
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         program { name: "urgentw1";
+            action: STATE_SET "uw1" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw2";
+         }
+         program { name: "urgentw2";
+            action: STATE_SET "uw2" 0.0;
+            target: "icon_area2";
+            transition: DECELERATE 0.1;
+            after: "urgentw3";
+         }
+         program { name: "urgentw3";
+            action: STATE_SET "uw3" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw4";
+         }
+         program { name: "urgentw4";
+            action: STATE_SET "uw4" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw0";
+         }
+         program { name: "not_urgent";
+            signal: "e,state,not_urgent";
+            source: "e";
+            action: ACTION_STOP;
+            target: "urgentw0";
+            target: "urgentw1";
+            target: "urgentw2";
+            target: "urgentw3";
+            target: "urgentw4";
+            target: "urgent";
+            target: "urgent2";
+            target: "urgent3";
+            after: "not_urgent2";
+         }
+         program { name: "not_urgent2";
+            action: STATE_SET "default" 0.0;
+            target: "urgent";
+            target: "urgent2";
+            target: "icon_area2";
+         }
+         program { name: "iconified";
+            signal: "e,state,iconified";
+            source: "e";
+            action: STATE_SET "iconified" 0.0;
+            transition: DECELERATE 1.0;
+            target: "icon_area";
+         }
+         program { name: "uniconified";
+            signal: "e,state,uniconified";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 1.0;
+            target: "icon_area";
          }
       }
    }
-//----
-   group { name: "e/comp/focus-out-colored";
+   group { name:"modules/tasks/item_vert";
       images {
-         image: "comp-sh1.png" COMP;
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
          image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "exclam.png" COMP;
       }
       parts {
-         part { name: "clipper";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "button_image";
+            mouse_events: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1 {
-                  relative: -1.0  -1.0;
-                  offset: -9999 -9999;
-               }
-               rel2 {
-                  relative: 2.0   2.0;
-                  offset: 9999  9999;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
             }
-            description { state: "visible" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               image.normal: "bt_base1.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
+               }
             }
          }
-         part { name: "shadow";
+         part { name: "icon_area"; type: RECT;
             mouse_events: 0;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               image {
-                  normal: "comp-sh1.png";
-                  border: 18 18 18 18;
-                  middle: 0;
-               }
-               fill.smooth: 0;
+               visible: 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               align: 0.5 0.5;
                rel1 {
-                  to: "e.swallow.content";
-                  relative: 0.0  0.0;
-                  offset: -16  -14;
+                  offset: 3  3;
+                  to: "button_image";
                }
                rel2 {
-                  to: "e.swallow.content";
-                  relative: 1.0  1.0;
-                  offset: 15   17;
+                  offset: -4   -4;
+                  to: "button_image";
                }
             }
-            description { state: "hidden" 0.0;
+            description { state: "iconified" 0.0;
                inherit: "default" 0.0;
+               rel1.relative: 0.25 0.25;
+               rel2.relative: 0.75 0.75;
+            }
+         }
+         part { name: "icon_area2"; type: RECT;
+            description { state: "default" 0.0;
                visible: 0;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+            }
+            description { state: "uw0" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -3 -2;
+               rel2.offset: -4 -3;
+            }
+            description { state: "uw1" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 5 -2;
+               rel2.offset: 4 -3;
+            }
+            description { state: "uw2" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -1 4;
+               rel2.offset: -2 3;
+            }
+            description { state: "uw3" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -2 -1;
+               rel2.offset: -3 -2;
+            }
+            description { state: "uw4" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -4 1;
+               rel2.offset: -5 0;
             }
          }
-         part { name: "shower";
-            type: RECT;
+         part { name: "e.swallow.icon";
+            type: SWALLOW;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               aspect: 1.0 1.0;
+               rel1.to: "icon_area2";
+               rel2.to: "icon_area2";
+            }
+         }
+         part { name: "urgent";
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 0;
-               rel1 {
-                  relative: 0.05  0.05;
-                  offset: 0    0;
-               }
-               rel2 {
-                  relative: 0.95  0.95;
-                  offset: -1   -1;
-               }
+               color: 255 255 255 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+               image.normal: "exclam.png";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
-         part { name: "clipper-content";
-            type: RECT;
-            clip_to: "clipper";
+         part { name: "urgent2";
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1.to: "icon_area";
+               rel2.to: "icon_area";
+               image.normal: "exclam.png";
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
                color: 255 255 255 255;
             }
-            description { state: "unfocus" 0.0;
+            description { state: "faded" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 200;
-//               color_class: "comp_focus-out_color";
+               rel1.relative: -1.0 -1.0;
+               rel2.relative: 2.0 2.0;
+               visible: 1;
+               color: 255 255 255 0;
             }
          }
-         part { name: "e.swallow.content";
-            type: SWALLOW;
-            clip_to: "clipper-content";
+         part { name: "over1";
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 {
-                  to: "shower";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-               rel2 {
-                  to: "shower";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
             }
          }
-         part { name: "glow";
+         part { name: "over2";
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 0;
-               rel1.to: "e.swallow.content";
-               rel1.offset: -3 -3;
-               rel2.to: "e.swallow.content";
-               rel2.offset: 2  2;
-               color: 255 255 255 0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                image {
-                  normal: "bt_glow.png";
-                  border: 8 8 8 8;
-                  middle: 0;
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-               fill.smooth: 0;
             }
-            description { state: "active" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
-            description { state: "faded" 0.0;
+         }
+         part { name: "over3";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 7 7 9 9;
+               }
+               fill.smooth : 0;
+            }
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
-               rel1.offset: -23 -22;
-               rel2.offset: 22  22;
+               color: 255 255 255 255;
             }
          }
       }
       programs {
-         program { name: "shadow-on";
-            signal: "e,state,shadow,on";
-            source: "e";
+         program { name: "button_click";
+            signal: "mouse,down,1";
+            source: "button_image";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            target: "over3";
+         }
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "button_image";
             action: STATE_SET "default" 0.0;
-            target: "shadow";
+            target: "button_image";
+            target: "over3";
          }
-         program { name: "shadow-off";
-            signal: "e,state,shadow,off";
+         program { name: "button_unclick2";
+            signal: "mouse,clicked,1";
+            source: "button_image";
+            action: SIGNAL_EMIT "e,action,click" "";
+         }
+         program { name: "focused";
+            signal: "e,state,focused";
             source: "e";
-            action: STATE_SET "hidden" 0.0;
-            target: "shadow";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "over1";
          }
-         program { name: "show1";
-            signal: "e,state,visible,on";
+         program { name: "unfocused";
+            signal: "e,state,unfocused";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+         }
+         program { name: "urgent";
+            signal: "e,state,urgent";
             source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.15;
-            target: "clipper";
-            target: "shower";
-            after: "show2";
+            transition: DECELERATE 0.5;
+            target: "urgent";
+            target: "urgent2";
+            after: "urgent2";
          }
-         program { name: "show2";
-            action: SIGNAL_EMIT "e,action,show,done" "e";
+         program { name: "urgent2";
+            action: STATE_SET "faded" 0.0;
+            transition: LINEAR 0.5;
+            target: "urgent2";
+            after: "urgent3";
          }
-         program { name: "hide1";
-            signal: "e,state,visible,off";
+         program { name: "urgent3";
+            action: STATE_SET "visible" 0.0;
+            target: "urgent2";
+            after: "urgent2";
+         }
+         program { name: "urgentw0";
+            signal: "e,state,urgent";
             source: "e";
             action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.30;
-            target: "clipper";
-            target: "shower";
-            after: "hide2";
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw1";
          }
-         program { name: "hide2";
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
+         program { name: "urgentw1";
+            action: STATE_SET "uw1" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw2";
          }
-         program { name: "unfocus";
-            signal: "e,state,focus,off";
-            source: "e";
-            action: STATE_SET "unfocus" 0.0;
-            transition: ACCELERATE 0.2;
-            target: "clipper-content";
+         program { name: "urgentw2";
+            action: STATE_SET "uw2" 0.0;
+            target: "icon_area2";
+            transition: DECELERATE 0.1;
+            after: "urgentw3";
          }
-         program { name: "focus";
-            signal: "e,state,focus,on";
+         program { name: "urgentw3";
+            action: STATE_SET "uw3" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw4";
+         }
+         program { name: "urgentw4";
+            action: STATE_SET "uw4" 0.0;
+            transition: DECELERATE 0.1;
+            target: "icon_area2";
+            after: "urgentw0";
+         }
+         program { name: "not_urgent";
+            signal: "e,state,not_urgent";
             source: "e";
+            action: ACTION_STOP;
+            target: "urgentw0";
+            target: "urgentw1";
+            target: "urgentw2";
+            target: "urgentw3";
+            target: "urgentw4";
+            target: "urgent";
+            target: "urgent2";
+            target: "urgent3";
+            after: "not_urgent2";
+         }
+         program { name: "not_urgent2";
             action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.2;
-            target: "clipper-content";
+            target: "urgent";
+            target: "urgent2";
+            target: "icon_area2";
          }
-         program { name: "urgent-on";
-            signal: "e,state,urgent,on";
+         program { name: "iconified";
+            signal: "e,state,iconified";
             source: "e";
-            action: STATE_SET "active" 0.0;
-            target: "glow";
-            after: "urgent2";
-         }
-         program { name: "urgent2";
-            action: STATE_SET "faded" 0.0;
-            transition: DECELERATE 0.5;
-            target: "glow";
-            after: "urgent-on";
+            action: STATE_SET "iconified" 0.0;
+            transition: DECELERATE 1.0;
+            target: "icon_area";
          }
-         program { name: "urgent-off";
-            signal: "e,state,urgent,off";
+         program { name: "uniconified";
+            signal: "e,state,uniconified";
             source: "e";
             action: STATE_SET "default" 0.0;
-            target: "glow";
+            transition: DECELERATE 1.0;
+            target: "icon_area";
          }
       }
    }
- */
 }
diff --git a/data/themes/images/.cvsignore b/data/themes/images/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
old mode 100755 (executable)
new mode 100644 (file)
index 2e55c21..473f71a
@@ -7,16 +7,7 @@ arrow_down.png \
 arrow_left.png \
 arrow_right.png \
 arrow_up.png \
-ball.png \
 base_bg.png \
-bat_content1b.png \
-bat_content1.png \
-bat_content2b.png \
-bat_content2.png \
-bat_content3b.png \
-bat_content3.png \
-bat_over.png \
-bat_shadow.png \
 bd_bottom.png \
 bd_button_close_focused.png \
 bd_button_close_shadow.png \
@@ -34,7 +25,6 @@ bd_top_hilight.png \
 bd_top.png \
 big_arrow_down.png \
 big_arrow_up.png \
-bluetooth.png \
 bluetooth-powered.png \
 bluetooth-inactive.png \
 bluetooth-hidden.png \
@@ -62,7 +52,6 @@ busy-6.png \
 busy-7.png \
 busy-8.png \
 busy-9.png \
-cfg.png \
 check_base.png \
 check_on.png \
 check_sel.png \
@@ -96,6 +85,7 @@ everything_box.png \
 outline.png \
 everything_item_bg.png \
 exclam.png \
+favorites.png \
 frame_1.png \
 frame_2.png \
 gadman_border.png \
@@ -312,8 +302,6 @@ illume-kbd-on.png \
 illume-mode-dual-left.png \
 illume-mode-dual-top.png \
 illume-mode-single.png \
-init_check1.png \
-init_check2.png \
 inset_raised.png \
 inset_sunk_dark.png \
 inset_sunk.png \
@@ -362,11 +350,10 @@ pointer_glint_12.png \
 pointer_glow.png \
 pointer_mono.png \
 pointer.png \
-power_glow.png \
-power.png \
 radio_base.png \
 radio_on.png \
 radio_sel.png \
+refresh.png \
 sb_runnerh.png \
 sb_runnerv.png \
 shelf_alt_bg.png \
@@ -390,11 +377,6 @@ topsh.png \
 transition_vswipe.png \
 vgrad_dark.png \
 vgrad_light.png \
-wifi_0.png \
-wifi_1.png \
-wifi_2.png \
-wifi_3.png \
-wifi_4.png \
 wp-tb1.png \
 wp-bot1.png \
 wp-tb2.png \
@@ -409,6 +391,7 @@ exq-bglight.png \
 exq-logo.png \
 exq-dot.png \
 exq-dot-glow.png \
+exq-vgrad.png \
 connman-disconnect.png \
 connman-disconnect-offline.png \
 connman-ethernet.png \
@@ -453,4 +436,14 @@ flip_pmb.png \
 flip_pmt.png \
 flip_shad.png \
 flip_t.png \
-flip_colon.png
+flip_colon.png \
+bulb-0.png \
+bulb-1.png \
+bulb-2.png \
+batt_base.png \
+batt_level.png \
+batt_over.png \
+batt_power.png \
+bg_shadow.png \
+bg_over.png \
+bg_base.png
diff --git a/data/themes/images/ball.png b/data/themes/images/ball.png
deleted file mode 100644 (file)
index 2cc30ac..0000000
Binary files a/data/themes/images/ball.png and /dev/null differ
diff --git a/data/themes/images/bat_content1.png b/data/themes/images/bat_content1.png
deleted file mode 100644 (file)
index 27ad97b..0000000
Binary files a/data/themes/images/bat_content1.png and /dev/null differ
diff --git a/data/themes/images/bat_content1b.png b/data/themes/images/bat_content1b.png
deleted file mode 100644 (file)
index c840d42..0000000
Binary files a/data/themes/images/bat_content1b.png and /dev/null differ
diff --git a/data/themes/images/bat_content2.png b/data/themes/images/bat_content2.png
deleted file mode 100644 (file)
index 67f8eba..0000000
Binary files a/data/themes/images/bat_content2.png and /dev/null differ
diff --git a/data/themes/images/bat_content2b.png b/data/themes/images/bat_content2b.png
deleted file mode 100644 (file)
index 1b6288a..0000000
Binary files a/data/themes/images/bat_content2b.png and /dev/null differ
diff --git a/data/themes/images/bat_content3.png b/data/themes/images/bat_content3.png
deleted file mode 100644 (file)
index 175d004..0000000
Binary files a/data/themes/images/bat_content3.png and /dev/null differ
diff --git a/data/themes/images/bat_content3b.png b/data/themes/images/bat_content3b.png
deleted file mode 100644 (file)
index fc20911..0000000
Binary files a/data/themes/images/bat_content3b.png and /dev/null differ
diff --git a/data/themes/images/bat_over.png b/data/themes/images/bat_over.png
deleted file mode 100644 (file)
index 0fb2b99..0000000
Binary files a/data/themes/images/bat_over.png and /dev/null differ
diff --git a/data/themes/images/bat_shadow.png b/data/themes/images/bat_shadow.png
deleted file mode 100644 (file)
index 597dbbd..0000000
Binary files a/data/themes/images/bat_shadow.png and /dev/null differ
diff --git a/data/themes/images/batt_base.png b/data/themes/images/batt_base.png
new file mode 100644 (file)
index 0000000..610db36
Binary files /dev/null and b/data/themes/images/batt_base.png differ
diff --git a/data/themes/images/batt_level.png b/data/themes/images/batt_level.png
new file mode 100644 (file)
index 0000000..2604026
Binary files /dev/null and b/data/themes/images/batt_level.png differ
diff --git a/data/themes/images/batt_over.png b/data/themes/images/batt_over.png
new file mode 100644 (file)
index 0000000..c79adb5
Binary files /dev/null and b/data/themes/images/batt_over.png differ
diff --git a/data/themes/images/batt_power.png b/data/themes/images/batt_power.png
new file mode 100644 (file)
index 0000000..f64625e
Binary files /dev/null and b/data/themes/images/batt_power.png differ
diff --git a/data/themes/images/bg_base.png b/data/themes/images/bg_base.png
new file mode 100644 (file)
index 0000000..309ca66
Binary files /dev/null and b/data/themes/images/bg_base.png differ
diff --git a/data/themes/images/bg_over.png b/data/themes/images/bg_over.png
new file mode 100644 (file)
index 0000000..f0607ae
Binary files /dev/null and b/data/themes/images/bg_over.png differ
diff --git a/data/themes/images/bg_shadow.png b/data/themes/images/bg_shadow.png
new file mode 100644 (file)
index 0000000..ae502f8
Binary files /dev/null and b/data/themes/images/bg_shadow.png differ
diff --git a/data/themes/images/bluetooth.png b/data/themes/images/bluetooth.png
deleted file mode 100644 (file)
index 4286e35..0000000
Binary files a/data/themes/images/bluetooth.png and /dev/null differ
diff --git a/data/themes/images/bulb-0.png b/data/themes/images/bulb-0.png
new file mode 100644 (file)
index 0000000..6b54be1
Binary files /dev/null and b/data/themes/images/bulb-0.png differ
diff --git a/data/themes/images/bulb-1.png b/data/themes/images/bulb-1.png
new file mode 100644 (file)
index 0000000..ca46a4f
Binary files /dev/null and b/data/themes/images/bulb-1.png differ
diff --git a/data/themes/images/bulb-2.png b/data/themes/images/bulb-2.png
new file mode 100644 (file)
index 0000000..bacc911
Binary files /dev/null and b/data/themes/images/bulb-2.png differ
diff --git a/data/themes/images/cfg.png b/data/themes/images/cfg.png
deleted file mode 100644 (file)
index 554b580..0000000
Binary files a/data/themes/images/cfg.png and /dev/null differ
index 1a5a7c1..5eeeca2 100644 (file)
Binary files a/data/themes/images/exq-bglight.png and b/data/themes/images/exq-bglight.png differ
diff --git a/data/themes/images/exq-vgrad.png b/data/themes/images/exq-vgrad.png
new file mode 100644 (file)
index 0000000..708fe70
Binary files /dev/null and b/data/themes/images/exq-vgrad.png differ
diff --git a/data/themes/images/favorites.png b/data/themes/images/favorites.png
new file mode 100644 (file)
index 0000000..8f376d1
Binary files /dev/null and b/data/themes/images/favorites.png differ
diff --git a/data/themes/images/init_check1.png b/data/themes/images/init_check1.png
deleted file mode 100644 (file)
index f115ccd..0000000
Binary files a/data/themes/images/init_check1.png and /dev/null differ
diff --git a/data/themes/images/init_check2.png b/data/themes/images/init_check2.png
deleted file mode 100644 (file)
index 3de38f1..0000000
Binary files a/data/themes/images/init_check2.png and /dev/null differ
diff --git a/data/themes/images/power.png b/data/themes/images/power.png
deleted file mode 100644 (file)
index 2371422..0000000
Binary files a/data/themes/images/power.png and /dev/null differ
diff --git a/data/themes/images/power_glow.png b/data/themes/images/power_glow.png
deleted file mode 100644 (file)
index 5d42bf0..0000000
Binary files a/data/themes/images/power_glow.png and /dev/null differ
diff --git a/data/themes/images/refresh.png b/data/themes/images/refresh.png
new file mode 100644 (file)
index 0000000..cae286a
Binary files /dev/null and b/data/themes/images/refresh.png differ
diff --git a/data/themes/images/wifi_0.png b/data/themes/images/wifi_0.png
deleted file mode 100644 (file)
index e032dcb..0000000
Binary files a/data/themes/images/wifi_0.png and /dev/null differ
diff --git a/data/themes/images/wifi_1.png b/data/themes/images/wifi_1.png
deleted file mode 100644 (file)
index a3db891..0000000
Binary files a/data/themes/images/wifi_1.png and /dev/null differ
diff --git a/data/themes/images/wifi_2.png b/data/themes/images/wifi_2.png
deleted file mode 100644 (file)
index d45dfd3..0000000
Binary files a/data/themes/images/wifi_2.png and /dev/null differ
diff --git a/data/themes/images/wifi_3.png b/data/themes/images/wifi_3.png
deleted file mode 100644 (file)
index f9a84c6..0000000
Binary files a/data/themes/images/wifi_3.png and /dev/null differ
diff --git a/data/themes/images/wifi_4.png b/data/themes/images/wifi_4.png
deleted file mode 100644 (file)
index 00889ff..0000000
Binary files a/data/themes/images/wifi_4.png and /dev/null differ
index 7ca60db..a8c96a3 100755 (executable)
@@ -19,6 +19,7 @@ OPTIONS:
   -restart Restart Enlightenment
   -exit Exit Enlightenment
 
+  -module-list List all loaded modules
   -module-enable OPT1 Enable the module named 'OPT1'
   -module-disable OPT1 Disable the module named 'OPT1'
   -module-load OPT1 Loads the module named 'OPT1' into memory
@@ -229,6 +230,14 @@ er_module_enable(){
 }
 
 #-------------------------------------------------------------------------------
+#   E Module List
+#-------------------------------------------------------------------------------
+er_module_list(){
+   echo 'Module -- Status'
+   ERGMST org.enlightenment.wm.Module.List | \
+      sed -e 's/ 1/ -- Enabled/' -e 's/ 0/ -- Disabled/'
+}
+#-------------------------------------------------------------------------------
 #   E Module Load
 #-------------------------------------------------------------------------------
 er_module_load(){
@@ -359,6 +368,9 @@ case "$1" in
    -exit)
       er_exit 
    ;;
+   -module-list)
+      er_module_list
+   ;;
    -module-enable)
       er_module_enable "$@"
    ;;
@@ -423,7 +435,7 @@ esac
 ################################################################################
 ignore_this(){
 # IGNORE THIS SECTION
-# think at it just like as a TODO list or a list where are listed all the old options of enlightenmen_remote
+# think at it just like as a TODO list or a list where are listed all the old options of enlightenment_remote
 # Remember that the elements of this next list are removed every time they are implemented on this tool
 
 echo "
diff --git a/data/xsession/.cvsignore b/data/xsession/.cvsignore
deleted file mode 100644 (file)
index 55ea0b6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-enlightenment.desktop
old mode 100755 (executable)
new mode 100644 (file)
index b21ab13..7db2613
@@ -13,6 +13,7 @@ Comment[fr]=Ouvrir une session Enlightenment (Version @VERSION@)
 Comment[it]=Accedi con Enlightenment (Versione @VERSION@)
 Comment[pt]=Inicie a sessão com o Enlightenment (Versão @VERSION@)
 Comment[tr]=Enlightenment kullanarak giriş yaın (Version @VERSION@)
+Comment[ko]=Enlightenment 로그인(버전 @VERSION@)
 Type=XSession
 Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
 Exec=@prefix@/bin/enlightenment_start
index 28a8fe9..79657de 100644 (file)
@@ -1,4 +1,68 @@
-e17 (1:1.0.0.001+svn.60234slp2+build14) unstable; urgency=low
+e17 (1:1.0.0.001+svn.65871slp2+build09) unstable; urgency=low
+
+  * Add Feature - app-in-app window resize
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build09
+
+ -- Gwanglim Lee <gl77.lee@samsung.com>  Thu, 16 Feb 2012 14:45:34 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build08) unstable; urgency=low
+
+  * [E_RANDR ] bug fix - add null check code
+    [E_BORDER] bug fix - transient_for child's layer is not correct in border_raise/lower
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build08
+
+ -- Doyoun Kang <doyoun.kang@samsung.com>  Fri, 10 Feb 2012 13:43:12 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build07) unstable; urgency=low
+
+  * Add Feature - illume window state for app-in-app
+   - Add illume window state to E_Border structure
+  *  Add Feature
+   - COMP_MOVE_LOCK : add window's movement lock / unlock on Compositor
+                     ( it does not effect to X Geometry. it just effect to compositor's evas object geometry )
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build07
+
+ -- Gwangyeong Mun <kk.moon@samsung.com>  Thu, 02 Feb 2012 17:31:10 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build06) unstable; urgency=low
+
+  * Add Feature
+   - COMP_INPUT_REGION_SET : enable set compositor's input region
+   - Add screen_lock/unlock helper function
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build06
+
+ -- Gwangyeong Mun <kk.moon@samsung.com>  Tue, 27 Dec 2011 19:25:44 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build05) unstable; urgency=low
+
+  * Change configure.ac files
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build05
+
+ -- Doyoun Kang <doyoun.kang@samsung.com>  Thu, 22 Dec 2011 17:11:05 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build04) unstable; urgency=low
+
+  * Change configure.ac and debian/rules files
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build04
+
+ -- Doyoun Kang <doyoun.kang@samsung.com>  Wed, 21 Dec 2011 18:53:02 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build03) unstable; urgency=low
+
+  * Featuring
+    - _F_COMP_SCREEN_LOCK_          : enable screen lock/unlock feature
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build03
+
+ -- Doyoun Kang <doyoun.kang@samsung.com>  Tue, 20 Dec 2011 20:18:54 +0900
+
+e17 (1:1.0.0.001+svn.65871slp2+build02) unstable; urgency=low
 
   * Featuring
     - _F_DO_NOT_USE_SIG_HANDLER_    : not to use e's signal handler
@@ -8,10 +72,20 @@ e17 (1:1.0.0.001+svn.60234slp2+build14) unstable; urgency=low
     - _F_NOTIFICATION_LAYER_POLICY_ : enable notification layer policy
     - _F_COMP_SCREEN_LOCK_          : enable screen lock/unlock feature
   * Git: slp/pkgs/e/e17
-  * Tag: e17_1.0.0.001+svn.60234slp2+build14
+  * Tag: e17_1.0.0.001+svn.65871slp2+build02
 
  -- Doyoun Kang <doyoun.kang@samsung.com>  Tue, 20 Dec 2011 14:14:51 +0900
 
+e17 (1:1.0.0.001+svn.65871slp2+build01) unstable; urgency=low
+
+  * E17 upgrade (svn rev.65871)
+    - SLP uses X lib not XCB 
+    - SLP doesn't make enlightenment_alert binary (Because it uses XCB only)
+  * Git: slp/pkgs/e/e17
+  * Tag: e17_1.0.0.001+svn.65871slp2+build01
+
+ -- Doyoun Kang <doyoun.kang@samsung.com>  Mon, 19 Dec 2011 13:51:02 +0900
+
 e17 (1:1.0.0.001+svn.60234slp2+build13) unstable; urgency=low
 
   * Change code to find top window using e_container's stack instead of raise_stack
index 1f049ec..51b2490 100755 (executable)
@@ -8,8 +8,8 @@ DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget
 DEB_MAKE_CLEAN_TARGET := distclean
 DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
 DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-extra-features --disable-clock --disable-temperature --disable-mixer --disable-everything --disable-ibar --disable-dropshadow --disable-pager --disable-battery --disable-cpufreq --disable-ibox --disable-start --disable-exebuf --disable-winlist --disable-fileman --disable-fileman-opinfo --disable-wizard --disable-conf --disable-conf-wallpaper --disable-conf-wallpaper2 --disable-conf-theme --disable-conf-colors --disable-conf-fonts --disable-conf-borders --disable-conf-icon-theme --disable-conf-mouse-cursor --disable-conf-transitions --disable-conf-startup --disable-conf-intl --disable-conf-imc --disable-conf-profiles --disable-msgbus-lang --disable-conf-engine --disable-conf-applications --disable-conf-desks --disable-conf-desk --disable-conf-display --disable-conf-desklock --disable-conf-screensaver --disable-conf-dpms --disable-conf-shelves --disable-conf-shelves --disable-conf-keybindings --disable-conf-mousebindings --disable-conf-edgebindings --disable-conf-mouse --disable-conf-window-display --disable-conf-window-focus --disable-conf-window-remembers --disable-conf-window-manipulation --disable-conf-menus --disable-conf-clientlist --disable-conf-dialogs --disable-conf-performance --disable-conf-winlist --disable-conf-exebuf --disable-conf-paths --disable-conf-mime --disable-conf-interaction --disable-conf-scale --disable-gadman --disable-mixel --disable-connman --disable-illume --disable-syscon --disable-bluez --disable-ofono --disable-msgbus --disable-systray --disable-conf_acpibindings --disable-everything-apps --disable-everything-aspell --disable-everything-calc --disable-everything-files --disable-everything-settings --disable-everything-windows --disable-illume-bluetooth --disable-illume-home --disable-illume-toggle --disable-illume-indicator --disable-illume-kbd-toggle --disable-illume-keyboard --disable-illume-mode-toggle --disable-illume-softkey --disable-comp --disable-illume2
-CFLAGS += -fvisibility=hidden -fPIC
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-extra-features --disable-clock --disable-temperature --disable-mixer --disable-everything --disable-ibar --disable-dropshadow --disable-pager --disable-battery --disable-cpufreq --disable-ibox --disable-start --disable-exebuf --disable-winlist --disable-fileman --disable-fileman-opinfo --disable-wizard --disable-conf --disable-conf-wallpaper --disable-conf-wallpaper2 --disable-conf-theme --disable-conf-colors --disable-conf-fonts --disable-conf-borders --disable-conf-icon-theme --disable-conf-mouse-cursor --disable-conf-transitions --disable-conf-startup --disable-conf-intl --disable-conf-imc --disable-conf-profiles --disable-msgbus-lang --disable-conf-engine --disable-conf-applications --disable-conf-desks --disable-conf-desk --disable-conf-display --disable-conf-desklock --disable-conf-screensaver --disable-conf-dpms --disable-conf-shelves --disable-conf-shelves --disable-conf-keybindings --disable-conf-mousebindings --disable-conf-edgebindings --disable-conf-mouse --disable-conf-window-display --disable-conf-window-focus --disable-conf-window-remembers --disable-conf-window-manipulation --disable-conf-menus --disable-conf-clientlist --disable-conf-dialogs --disable-conf-performance --disable-conf-winlist --disable-conf-exebuf --disable-conf-paths --disable-conf-mime --disable-conf-interaction --disable-conf-scale --disable-gadman --disable-mixel --disable-connman --disable-illume --disable-syscon --disable-bluez --disable-ofono --disable-msgbus --disable-systray --disable-conf_acpibindings --disable-everything-apps --disable-everything-aspell --disable-everything-calc --disable-everything-files --disable-everything-settings --disable-everything-windows --disable-illume-bluetooth --disable-illume-home --disable-illume-toggle --disable-illume-indicator --disable-illume-kbd-toggle --disable-illume-keyboard --disable-illume-mode-toggle --disable-illume-softkey --disable-comp --disable-illume2 --disable-notification --disable-conf_randr --disable-tasks --disable-backlight --disable-shot
+CFLAGS += -fvisibility=hidden -fPIC 
 LDFLAGS += -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed
 
 #binary-predeb/e17::
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
similarity index 94%
rename from doc/Doxyfile
rename to doc/Doxyfile.in
index 2404702..7358e31 100644 (file)
@@ -1,15 +1,15 @@
 PROJECT_NAME           = Enlightenment
 PROJECT_NUMBER         =
 OUTPUT_DIRECTORY       = .
-INPUT                  = ./e.dox ../src/bin
-IMAGE_PATH             = img
+INPUT                  = e.dox @top_srcdir@/src/bin
+IMAGE_PATH             = @srcdir@/img
 OUTPUT_LANGUAGE        = English
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = head.html
-HTML_FOOTER            = foot.html
-HTML_STYLESHEET        = e.css
+HTML_HEADER            = @srcdir@/head.html
+HTML_FOOTER            = @srcdir@/foot.html
+HTML_STYLESHEET        = @srcdir@/e.css
 HTML_ALIGN_MEMBERS     = YES
 ENUM_VALUES_PER_LINE   = 1
 GENERATE_HTMLHELP      = NO
index 1855b37..29cd760 100644 (file)
@@ -7,18 +7,18 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 if EFL_BUILD_DOC
 
 doc-clean:
-       rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
+       rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
 doc: all doc-clean
        $(efl_doxygen)
-       cp img/* html/
+       cp $(srcdir)/img/* html/
        rm -rf $(PACKAGE_DOCNAME).tar*
        mkdir -p $(PACKAGE_DOCNAME)/doc
        cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
        tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
        bzip2 -9 $(PACKAGE_DOCNAME).tar
        rm -rf $(PACKAGE_DOCNAME)/
-       mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)
+       mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
 
 clean-local: doc-clean
 
@@ -38,4 +38,4 @@ cache.txt \
 enlightenment.png \
 illume2.png
 
-EXTRA_DIST = $(files_DATA) Doxyfile $(wildcard img/*.*) e.css head.html foot.html e.dox.in
+EXTRA_DIST = $(files_DATA) Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html e.dox.in
index 99a360e..541160e 100644 (file)
@@ -1,7 +1,9 @@
+%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
+
 Summary: The Enlightenment window manager
 Name: @PACKAGE@
 Version: @VERSION@
-Release: 0.%(date '+%Y%m%d')
+Release: %{_rel}
 License: BSD
 Group: User Interface/Desktops
 URL: http://www.enlightenment.org/
@@ -12,7 +14,7 @@ Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: %{_prefix}
 #BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel
 BuildRequires: evas-devel, edje-devel, edje-bin, ecore-devel, eet-devel
-BuildRequires: embryo-devel, embryo-bin
+BuildRequires: embryo-devel, embryo-bin, eeze-devel
 Requires: evas-module_loader_eet evas-module_saver_eet
 Requires: evas-module_loader_png evas-module_saver_png
 Requires: evas-module_loader_jpeg evas-module_saver_jpeg
@@ -55,9 +57,10 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING-PLAIN README
+%doc AUTHORS COPYING README
 %dir %{_sysconfdir}/enlightenment
 %config(noreplace) %{_sysconfdir}/enlightenment/*
+%config(noreplace) %{_sysconfdir}/xdg/menus/enlightenment.menu
 %{_bindir}/enlightenment
 %{_bindir}/enlightenment_*
 #%{_bindir}/eap_to_desktop
diff --git a/intl/.cvsignore b/intl/.cvsignore
deleted file mode 100644 (file)
index f2068d2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile.in
-Makefile
-*.c
-*.h
-*.in
-*.y
-*.sin
-VERSION
-ChangeLog
-config.charset
-locale.alias
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/m4/.cvsignore b/m4/.cvsignore
deleted file mode 100644 (file)
index 3f25f15..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-codeset.m4
-gettext.m4
-glibc2.m4
-glibc21.m4
-iconv.m4
-intdiv0.m4
-intmax.m4
-inttypes-pri.m4
-inttypes.m4
-inttypes_h.m4
-isc-posix.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-longdouble.m4
-longlong.m4
-nls.m4
-po.m4
-printf-posix.m4
-progtest.m4
-signed.m4
-size_max.m4
-stdint_h.m4
-uintmax_t.m4
-ulonglong.m4
-wchar_t.m4
-wint_t.m4
-xsize.m4
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644 (file)
index 4667b6b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-Makevars.template
-enlightenment.pot
-*.gmo
-*.mo
-POTFILES
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-quot.sed
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-*
index 28c7228..c0cac81 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,37 +7,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-05-13 23:07+0300\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-09-30 21:16+0300\n"
 "Last-Translator: سمير حسين <almusalimalmusalimah@gmail.com>\n"
-"Language-Team: Arabic <almusalimalmusalimah@gmail.com>\n"
+"Language-Team: Arabic <ar@li.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Language: Arabic\n"
-"X-Poedit-Country: SAUDI ARABIA\n"
 
 #: src/bin/e_about.c:14
 msgid "About Enlightenment"
 msgstr "عن إنلايتنمينت"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "إغلاق"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,27 +43,26 @@ msgstr "إنلايتنمينت"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
-"حقوق التأليف والنشر © 1999-2011 ، من قبل فريق تطوير إنلايتنمنت. <br><br>نأمل "
-"أن تستمتع باستخدام هذا البرنامج بقدر ما تمتعنا به حتى كتابة هذا التقرير. "
+"<title>حقوق التأليف والنشر © 1999-2011 ، من قبل فريق تطوير إنلايتنمنت. "
+"<br><br>نأمل أن تستمتع باستخدام هذا البرنامج بقدر ما تمتعنا به عند كتابته. "
 "<br><br>تم توفير هذا البرنامج بدون أي ضمان . كما أن هذا البرنامج مقيد بشروط "
-"الترخيص ، لذلك يرجى اﻹطلاع على ملفات الترخيص المثبتة على نظامك. "
-"<br><br>لايزال انلايتنمنت  <hilight>تحت التطوير الضخم</ hilight>كما أنه ليس "
-"مستقرا بشكل كامل. يجدر بنا اﻹشارة هنا أن العديد من الميزات غير مكتملة أو حتى "
-"غير موجودة بعد وربما تكون بها العديد من اﻷخطاء. لذا تم <hilight>تحذيرك! </ "
-"hilight>"
+"الترخيص ، لذلك يرجى اﻹطلاع على ملفات الترخيص المثبت على نظامك. "
+"<br><br>لايزال انلايتنمنت تحت <hilight>التطوير المستمر</>كما أنه ليس مستقرا "
+"بشكل كامل. يجدر بنا اﻹشارة هنا أن العديد من الميزات غير مكتملة أو حتى غير "
+"موجودة بعد وربما تكون بها العديد من اﻷخطاء. لهذا قد تم <hilight>تحذيرك!</>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>الفريق</title>"
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>الفريق</><br><br>"
 
 #: src/bin/e_actions.c:365
 #, c-format
@@ -80,611 +76,639 @@ msgstr ""
 
 #: src/bin/e_actions.c:377
 msgid "Are you sure you want to kill this window?"
-msgstr "أتريد تأكيد رغبتك في قتل هذه النافذة؟"
+msgstr "أمتأكد من أنك تريد قتل هذه النافذة؟"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "نعم"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "لا"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
-msgstr "أتريد تأكيد رغبتك في الخروج؟"
+msgstr "أمتأكد من أنك تريد الخروج؟"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "لقد طلبت الخروج من إنلايتنمينت.<br><br>هل أنت متأكد؟"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
-msgstr "أتريد تأكيد رغبتك في تسجيل الخروج؟"
+msgstr "أمتأكد من أنك تريد تسجيل الخروج؟"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr "أنت على وشك تسجيل الخروج.<br><br>أتريد تأكيد رغبتك في فعل ذلك؟"
+msgstr "أنت على وشك تسجيل الخروج.<br><br>هل أنت متأكد من أنك تريد فعل ذلك؟"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
-msgstr "أأتريد تأكيد رغبتك في اﻹطفاء؟"
+msgstr "أأنت متأكد من أنك تريد اﻹطفاء؟"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
-msgstr "لقد طلبت إطفاء حاسوبك.<br><br>أتريد تأكيد رغبتك في إطفائه؟"
+msgstr "لقد طلبت إطفاء حاسوبك.<br><br>هل أنت متأكد أنك تريد إطفائه؟"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
-msgstr "أتريد تأكيد رغبتك في إعادة التشغيل؟"
+msgstr "هل أنت متاكد أنك تريد إعادة التشغيل؟"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
-msgstr "Ù\84Ù\82د Ø·Ù\84بت Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ\8aÙ\84 Ø§Ù\84حاسÙ\88ب.<br><br>أترÙ\8aد ØªØ£Ù\83Ù\8aد Ø±ØºØ¨ØªÙ\83 Ù\81Ù\8a تشغيله؟"
+msgstr "Ù\84Ù\82د Ø·Ù\84بت Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ\8aÙ\84 Ø§Ù\84حاسÙ\88ب.<br><br>أأÙ\86ت Ù\85تاÙ\83د Ø§Ù\86Ù\83 ØªØ±Ù\8aد Ø¥Ø¹Ø§Ø¯Ø© تشغيله؟"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr "Ù\84Ù\82د Ø·Ù\84بت ØªØ¹Ù\84Ù\8aÙ\82 Ø­Ø§Ø³Ù\88بÙ\83.<br><br>أترÙ\8aد ØªØ£Ù\83Ù\8aد Ø±ØºØ¨ØªÙ\83 Ù\81Ù\8a تعليقه؟"
+msgstr "Ù\84Ù\82د Ø·Ù\84بت ØªØ¹Ù\84Ù\8aÙ\82 Ø­Ø§Ø³Ù\88بÙ\83.<br><br>أأÙ\86ت Ù\85تأÙ\83د Ø£Ù\86Ù\83 ØªØ±Ù\8aد تعليقه؟"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
-msgstr "أترÙ\8aد ØªØ£Ù\83Ù\8aد Ø±ØºØ¨ØªÙ\83 Ù\81Ù\8a تنويم حاسوبك؟"
+msgstr "أأÙ\86ت Ù\85تاÙ\83د Ø£Ù\86Ù\83 ØªØ±Ù\8aد تنويم حاسوبك؟"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
-msgstr "Ù\84Ù\82د Ø·Ù\84بت ØªÙ\86Ù\88Ù\8aÙ\85 Ø­Ø§Ø³Ù\88بÙ\83.<br><br>أترÙ\8aد ØªØ£Ù\83Ù\8aد Ø±ØºØ¨ØªÙ\83 Ù\81Ù\8a تنويمه؟"
+msgstr "Ù\84Ù\82د Ø·Ù\84بت ØªÙ\86Ù\88Ù\8aÙ\85 Ø­Ø§Ø³Ù\88بÙ\83.<br><br>أأÙ\86ت Ù\85تأÙ\83د Ø£Ù\86Ù\83 ØªØ±Ù\8aد تنويمه؟"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "النوافذ : اﻹجراءات"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "حرّك"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "تحجيم"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "القائمة"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "قائمة النافذة"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "كبر"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "صغر"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "اقتل"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "النافذة : الحالة"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "تحويل إلى وضع اﻹلتصاق"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "تحويل إلى وضع اﻷيقونات"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "تحويل إلى نمط كامل الشاشة"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "تكبير"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "تكبير رأسي"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "تكبير أفقي"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "تكبير لكامل الشاشة"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "نمط التكبير \"ذكي\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "نمط التكبير \"تكبير\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "وضع التكبير \"إمتلاء\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "التحويل لوضع الظل اﻷعلى"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "التحويل لوضع الظل اﻷسفل"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "التحويل لوضع الظل اﻷيسر"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "التحويل لوضع الظل اﻷيمن"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "تحويل إلى وضع الظل"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "حوّل إلى حالة بدون حدود"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
+#, fuzzy
 msgid "Set Border"
-msgstr "اضبط Ø§Ù\84حدÙ\88د"
+msgstr "اضبط Ø§Ù\84عÙ\86Ù\88اÙ\86"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
+#, fuzzy
 msgid "Cycle between Borders"
-msgstr ""
+msgstr "أدِر بين العناوين"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "التحول لحالة الثقب"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "سطح المكتب"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "قلب سطح المكتب لليسار"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "قلب سطح المكتب لليمين"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "قلب سطح المكتب ﻷعلى"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "قلب سطح المكتب ﻷسفل"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "قلب سطح المكتبة بواسطة..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "اعرض سطح المكتب"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "اعرض الدرج"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "قلب سطح المكتب إلى..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "قلب سطح المكتب بشكل خطي..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "تحول إلى سطح المكتب 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "تحول لسطح المكتب 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "تحول لسطح المكتب 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "تحول لسطح المكتب 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "تحول لسطح المكتب 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "تحول لسطح المكتب 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "تحول لسطح المكتب 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "تحول لسطح المكتب 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "تحول لسطح المكتب 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "تحول لسطح المكتب 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "تحول لسطح المكتب 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "تحول لسطح المكتب 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "تحول لسطح المكتب..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "قلب سطح المكتب لليسار (كل الشاشات)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "قلب سطح المكتب لليمين (كل الشاشات)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "قلب سطح المكتب ﻷعلى (كل الشاشات)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "قلب سطح المكتب ﻷسفل (كل الشاشات)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "قلب سطح المكتب بشكل بواسطة... (كل الشاشات)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "قلب سطح المكتب بشكل إلى... (كل الشاشات)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "قلب سطح المكتب بشكل بشكل خطي... (كل الشاشات)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "قلب سطح المكتب بشكل في اﻹتجاه... (كل الشاشات)"
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "تحول لسطح المكتب 0 (كل الشاشات)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "تحول لسطح المكتب 1 (كل الشاشات)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "تحول لسطح المكتب 2 (كل الشاشات)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "تحول لسطح المكتب 3 (كل الشاشات)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "تحول لسطح المكتب 4 (كل الشاشات)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "تحول لسطح المكتب 5 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "تحول لسطح المكتب 6 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "تحول لسطح المكتب 7 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "تحول لسطح المكتب 8 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "تحول لسطح المكتب 9 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "تحول لسطح المكتب 10 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "تحول لسطح المكتب 11 (كل الشاشة)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "تحول لسطح المكتب... (كل الشاشة)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "الشاشة"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "أرسل الفأرة للشاشة 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "أرسل الفأرة للشاشة 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "أرسل الفأرة للشاشة..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "ارسل الفأرة شاشة للامام"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "أرسل الفأرة شاشة للخلف"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "ارسل الفأرة أمام/خلف الشاشات"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "إِخْفِت"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "لا تُخفِت"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "ضبط اﻹضاءة الخلفية"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "إضاءة خلفية متدنية"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "إضاءة خلفية متوسطة"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "إضاءة خلفية قصوى"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "تعديل اﻹضاءة الخلفية"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "تقليل اﻹضاءة الخلفية"
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr "تقليل اﻹضاءة الخلفية"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
-msgstr "حرÙ\91Ù\90Ù\83 Ø¥Ù\84Ù\89 Ø§Ù\84Ù\85Ù\86تصÙ\81"
+msgstr "حرÙ\91Ù\90Ù\83 Ø¥Ù\84Ù\89 Ø§Ù\84Ù\88سط"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
-msgstr "انقل إلى..."
+msgstr "Ø¥نقل إلى..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
-msgstr "انقل بواسطة..."
+msgstr "Ø¥نقل بواسطة..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "حجم بواسطة:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
-msgstr "ادفع في اﻹتجاه..."
+msgstr "ادفع في الدليل..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
-msgstr "اسحب أيقونة...."
+msgstr "اسحب أيقونة..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "النافذة : تحريك"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "إلى سطح المكتب التالي"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "سطح المكتب السابق"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "بواسط سطح المكتب #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "إلى سطح المكتب..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "إظهار القائمة الرئيسية"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "إظهار قائمة المفضلات"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
-msgstr "اظهر قائمة كل البرامج"
+msgstr "Ø£ظهر قائمة كل البرامج"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
-msgstr "اظهر قائمة العملاء"
+msgstr "Ø£ظهر قائمة العملاء"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
-msgstr "اظهر القائمة..."
+msgstr "Ø£ظهر القائمة..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "تشغيل"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "اﻷمر"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "التطبيق"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
-msgstr "إعادة التشغيل"
+msgstr "إعِد التشغيل"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
-msgstr "خرÙ\88ج"
+msgstr "اخرج"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "اخرج اﻵن"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "إنلايتنمينت : النمط"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "التحول لعرض التقديم"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "التحول لوضع دون اتصال"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "النظام"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "أخرج"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "إطفاء اﻵن"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
-msgstr "إطÙ\81اء"
+msgstr "أطÙ\81ئ"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "إعادة"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
-msgstr "علق اﻵن"
+msgstr "عÙ\84Ù\91Ù\82 Ø§ï»µÙ\86"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
-msgstr "تعÙ\84Ù\8aق"
+msgstr "عÙ\84Ù\91ق"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
-msgstr "إسبات"
+msgstr "أسبÙ\90ت"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "اقفل"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
-msgstr "نظِّم النوافذ"
+msgstr "تنظيف النوافذ"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "عام : اﻹجراءات"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "الحدث المتأخر"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "إدارة الطاقة"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "أبرز الشاشة"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "ﻻ تبرز  الشاشة"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "عين كخلفية"
 
@@ -692,18 +716,16 @@ msgstr "عين كخلفية"
 msgid "Color Selector"
 msgstr "منتقي اﻵلوان"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -711,20 +733,20 @@ msgstr "منتقي اﻵلوان"
 msgid "OK"
 msgstr "موافق"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "ألغ"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -734,15 +756,15 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"تحتاج Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84ضبط Ù\84Ù\84ترÙ\82Ù\8aØ©. Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د  Ù\85Ø­Ù\8aت Ø\8c Ù\88 ØªÙ\85ت ØªÙ\87Ù\8aئة "
-"اÙ\81تراضÙ\8aات Ø¬Ø¯Ù\8aدة. Ø³Ù\8aحدث <br>Ù\87ذا Ø¨Ø´Ù\83Ù\84 Ù\85Ù\86تظÙ\85 Ø®Ù\84اÙ\84 Ø§Ù\84تطÙ\88Ù\8aر Ø\8c Ù\88باÙ\84تاÙ\84Ù\8a Ù\84ا ØªØ±Ø³ل "
-"تÙ\82رÙ\8aرا Ø¹Ù\86<br>عÙ\84Ø©. Ø¨Ø¨Ø³Ø§Ø·Ø© Ù\81Ø¥Ù\86 Ù\85ا Ù\8aعÙ\86Ù\8aÙ\87 Ù\87ذا Ø§ï»¹Ø¬Ø±Ø§Ø¡ Ù\87Ù\88 Ø£Ù\86 Ø§Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\86ت Ù\8aحتاج Ø¥Ù\84Ù\89 "
-"بيانات إعدادات جديدة كإجراء افتراضي<br>لوظيفة أكثر قابلية للإستخدام و التي "
-"كانت إعداداتك<br>تفتقر إليها بكل بساطة . هذه اﻹفتراضيات الجديدة ستصلح "
-"<br>هذا اﻷمر عبر إضافتها عليها. يمكنك إعادة تكوين اﻷشياء اﻵن<br>حسب رغبتك. "
-"Ù\86أسÙ\81 Ù\84بعثرتÙ\86ا Ù\84إعداداتÙ\83 <br>"
-
-#: src/bin/e_config.c:980
+"إعدادات Ø§Ù\84ضبط ØªØ­ØªØ§Ø¬ Ù\84Ù\84ترÙ\82Ù\8aØ©. Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د ØªÙ\85 Ù\85Ø­Ù\88Ù\87ا Ø\8c Ù\88 Ù\85جÙ\85Ù\88عة "
+"جدÙ\8aدة Ù\85Ù\86 Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84اÙ\81تراضÙ\8aØ© ØªÙ\85 ØªÙ\87Ù\8aئتÙ\87ا. <br>Ù\87ذا  Ù\8aحدث Ø¨Ø´Ù\83Ù\84 Ù\85Ù\86تظÙ\85 Ø®Ù\84ال "
+"اÙ\84تطÙ\88Ù\8aر Ø\8c Ù\88باÙ\84تاÙ\84Ù\8a Ù\84ا ØªØ±Ø³Ù\84 ØªÙ\82رÙ\8aر <br>بخطأ. Ù\87ذا Ù\8aعÙ\86Ù\8a Ø¨Ø¨Ø³Ø§Ø·Ø© Ø£Ù\86 Ø§Ù\86Ù\84Ù\8aتÙ\85Ù\86ت ØªØ­ØªØ§Ø¬ "
+"ﻹعدادات جديدة <br>البيانات اﻷساسية للوظائف المستخدمة يمكن استخدامها في "
+"اﻹعدادات <br>القديمة ببساطة . هذه مجموعة جديدة من اﻹعدادات اﻹفتراضية التي "
+"ستقوم باﻹصلاح <br>بإضافتها يمكنك إعادة إعداد اﻷشياء اﻵن إلى حسابك <br>كما "
+"Ù\83اÙ\86ت. Ø¢Ø³Ù\81 Ù\84Ù\84تدخÙ\84 Ù\81Ù\8a Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84خاصة Ø¨Ù\83. <br>"
+
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -750,173 +772,177 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"إعداداتÙ\83 Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ù\87Ø°Ù\87 . Ù\87ذا Ø§ï»·Ù\85ر<br>غرÙ\8aب. Ù\84ا Ù\8aÙ\86بغÙ\8a Ø­Ø¯Ù\88ث "
-"هذا إﻻ إذا خفضت<br>إصدارة إنلايتنمينت أو نسخت اﻹعدادات من مكان آخر<br> يحتوي "
-"عÙ\84Ù\89 Ø¥ØµØ¯Ø§Ø±Ø© Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت. Ù\87ذا Ø§ï»·Ù\85ر Ø³Ù\8aØ¡ <br>Ù\83إجراء Ø§Ø­ØªØ±Ø§Ø²Ù\8a Ù\81Ø¥Ù\86 Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 "
-"تÙ\85ت Ø¥Ø¹Ø§Ø¯ØªÙ\87ا Ø¥Ù\84Ù\89 <br>اﻹÙ\81تراضÙ\8aات. نأسف على اﻹزعاج.<br>"
+"إعداداتÙ\83 Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ù\87Ø°Ù\87 . Ù\87ذا ØºØ±Ù\8aب<br>جدا. Ù\8aجب Ø£Ù\86 Ù\84ا Ù\8aحدث "
+"هذا إلا إذا خفضت<br>إصدارة إنلايتنمينت أو نسخت إعدادات من مكان آخر<br> يحتوي "
+"عÙ\84Ù\89 Ø¥ØµØ¯Ø§Ø±Ø© Ø¬Ø¯Ù\8aدة Ù\85Ù\86 Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت. Ù\87ذا Ø³Ù\8aØ¡ <br>Ù\88 Ø§Ø­ØªÙ\8aاطا Ù\81Ø¥Ù\86 Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 ØªÙ\85 "
+"إرجاعÙ\87ا Ø¥Ù\84Ù\89 <br>اﻹÙ\81تراضÙ\8aØ©. نأسف على اﻹزعاج.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "خلل في كتابة أعدادات إنلايتنمينت"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
 "%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety."
 "<br>"
 msgstr ""
-"حصل ﻹنلايتنمينت خطأ أثناء نقل مستندات التكوين<br>من:<br>%s<br><br>إلى:<br>"
-"%s<br><br>بÙ\82Ù\8aØ© Ø§Ù\84Ù\83تابة ØªÙ\85 Ø¥Ù\84غاؤÙ\87ا ï»·Ø¬Ù\84 Ø§ï»·Ù\85اÙ\86.<br>"
+"حصل إنلايتنمينت على خطأ أثناء نقل ملفات اﻹعداد<br>من:<br>%s<br><br>إلى:<br>"
+"%s<br><br>بÙ\82Ù\8aØ© Ø§Ù\84Ù\83تابة Ø£Ù\8fÙ\84غÙ\8aت ï»·Ø¬Ù\84 Ø³Ù\84اÙ\85Ø© Ø§Ù\84Ù\85Ù\84Ù\81ات<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "تم ترقية اﻹعدادات"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
-msgstr "معالجة مستند EET كانت سيئة."
+msgstr "تعامل ملف EET سيء."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
-msgstr "معلومات المستند فارغة"
+msgstr "بيانات الملف فارغة"
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
 msgstr ""
-"المستند غير قابل للكتابة. ربما ﻷن القرص للقراءة فقط<br>أو فقدت أذوناتك "
-"لمستنداتك."
+"الملف غير قابل للكتابة عليه. ربما لكون القرص مخصصا للقراءة فقط<br>أو فقدت "
+"الأذونات إلى ملفاتك."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
-msgstr "نفدت الذاكر أثناء اﻹستعداد للكتابة<br>رجاءا حرر بعض الذاكرة."
+msgstr "نفِدت الذاكرة أثناء اﻹعداد للكتابة.<br>رجاءا حرر مساحة من الذاكرة."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "هذا خطأ عام"
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
-"مستند اﻹعدادات كبير جدا.<br>و يجب أن يكون صغير جدا ( بضع مئات من "
-"الكيلوبايتات على اﻷكثر )."
+"ملف إعدادات الضبط كبير جدا.<br>بينما يجب أن يكون صغيرا (بعض مئات من "
+"الكيلوبايتات)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
-msgstr "لديك أخطاء I/O على القرص.<br>ربما يحتاج للتغيير؟"
+msgstr "لديك أخطاء I/O على القرص.<br>ربما تحتاج لتبديله؟"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
-msgstr "نفدت لديك المساحة الكافية أثناء كتابة المستند"
+msgstr "نفِدَت المساحة الشاغرة لديك أثناء كتابة الملف"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
-msgstr ""
+msgstr "أُغلِق الملف على ذلك أثناء الكتابة"
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
-msgstr ""
+msgstr "فشِل تكوين خريطة - mmap - ذاكرة الملف "
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
-msgstr "Ù\81Ø´Ù\84 Ù\81Ù\83 Ø§Ù\84ترÙ\85Ù\8aز X509."
+msgstr "Ù\81Ø´Ù\90Ù\84 Ø§Ù\84ترÙ\85Ù\8aز X509"
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "فشل التوقيع."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
-msgstr "التوقيع غير متوفر"
+msgstr "التوقيع غير صالح"
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
-msgstr "لم يتم توقيعه"
+msgstr "لم تُوقّع"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
-msgstr ""
+msgstr "ميزة لم تنفّذ"
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "فشل التشفير."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+#, fuzzy
+msgid "Decryption failed."
 msgstr "فشل فك التشفير."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
-msgstr "الخطأ غير معروف لدى إنلايتنمينت"
+msgstr "الخطأ مجهول لدى إنلايتنمينت"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
 "%s<br><br>The file where the error occurred was:<br>%s<br><br>This file has "
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
-"حصل إنلايتنمينت على خطأ عند كتابة<br>ملف تكويناته.<br>%s<br><br>الملف الذي "
-"حدث فيه الخلل:<br>%s<br><br>تم حذف هذا الملف لتفادي البيانات المدمرة و "
-"العالقة.<br>"
+"حصل إنلايتنمينت على خطأ أثناء <br>كتابة ملف إعداداته<br>%s<br>الملف اللذي "
+"حدث فيه الخلل:<br>%s<br>تم حذف هذا الملف لتفادي تعليق أو افساد البيانات<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "متقدم"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "أساسي"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "طبق"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
-msgstr "اﻹضافات"
+msgstr "اﻹمتدادات"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
-msgstr "الوحدات "
+msgstr "وحدات "
+
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "تفضيلات"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "الحاوية %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "خلل - لا يوجد دعم بام(PAM)"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "لا يوجد دعم بام(PAM) في إنلايتنمينت, لذا<br>قفل القرص غير معطل."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "فشل القفل"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -924,15 +950,15 @@ msgstr ""
 "فشل قفل سطح المكتب لئن بعض البرامج<br>مسكت إما لوحة المفاتيح أو الفأرة أو "
 "كليهما<br>ولايمكن كسر مسكتهم."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "ادخل كلمة مرور فك القفل"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "فشل التوثيق من النظام"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -942,24 +968,24 @@ msgstr ""
 "حصلت أخطاء أثناء التوثيق عن طريق جلسة توثيق بام(PAM). كود الخلل هو <hilight>"
 "%i</hilight>. هذا سيئ ولا يجب أن يحدث. يرجى إبلاغنا بهذه العلة."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "تفعيل نمط العرض؟"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
-"Ù\84Ù\82د Ù\82Ù\85ت Ø¨Ø¥Ù\84غاء Ù\82Ù\81Ù\84 Ø³Ø·Ø­ Ø§Ù\84Ù\85Ù\83تب Ø¨Ø´Ù\83Ù\84 Ø³Ø±Ù\8aع Ø¬Ø¯Ø§.<br><br>Ù\87Ù\84 ØªØ±Ù\8aد ØªÙ\85Ù\83Ù\8aÙ\86 "
-"وضع<b>العرض</b>  و إيقاف قفل و حافظة الشاشة , وإدارة طاقتها بشكل مؤقت؟"
+"Ù\84Ù\82د Ù\82Ù\85ت Ø¨Ø¥Ù\84غاء Ù\82Ù\81Ù\84 Ø³Ø·Ø­ Ø§Ù\84Ù\85Ù\83تب Ø¨Ø´Ù\83Ù\84 ØµØ­Ù\8aØ­.<br><br>Ù\87Ù\84 ØªØ±Ù\8aد ØªÙ\85Ù\83Ù\8aÙ\86 <b>Ù\88ضع</b> "
+"العرض و إيقاف قفل و حافظة الشاشة , وإدارة طاقتها بشكل مؤقت؟"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "لا ، ولكن زد مدة المهلة"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "لا, وتوقف عن السؤال"
 
@@ -982,128 +1008,127 @@ msgstr ""
 "الرئيسية , ولم<br>يتغير."
 
 #: src/bin/e_eap_editor.c:230
+#, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "محرر مدخل سطح المكتب"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "اﻹسم"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "التعليق"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "اﻷيقونة"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "اسم عام"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "فئة النافذة"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "اﻷقسام"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "أنواع الملفات"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "ملف سطح المكتب"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "عام"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "ابدأ التنبيه"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "شغل في الطرفية"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "اظهر في قوائم"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "خيارات"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "إختر أيقونة"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "إختر ملف تنفيذي"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "حذف"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "قص"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "انسخ"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "الصق"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "اختر الكل"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
 msgstr "خلل في التشغيل"
 
 #: src/bin/e_exec.c:218
-#, fuzzy
 msgid "Enlightenment was unable to get current directory"
-msgstr "عجز Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø¹Ù\86 Ø¥Ø³ØªÙ\8aراد Ø§Ù\84صÙ\88رة<br>Ù\84سبب Ø£Ø®Ø·Ø§Ø¡ Ø§Ù\84تحÙ\88Ù\8aÙ\84"
+msgstr "عجز Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø¹Ù\86 Ø§Ù\84حصÙ\88Ù\84 Ø¹Ù\84Ù\89 Ø§Ù\84دÙ\84Ù\8aÙ\84 Ø§Ù\84حاÙ\84Ù\8a"
 
 #: src/bin/e_exec.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to change to directory:<br><br>%s"
-msgstr "Ù\84ا Ù\8aستطÙ\8aع Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø¥Ù\86شاء Ø¹Ù\85Ù\84Ù\8aات Ù\81رعÙ\8aØ©:<br><br>%s<br>"
+msgstr "Ù\84ا Ù\8aستطÙ\8aع Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø§Ù\84تغÙ\8aÙ\8aر Ø¥Ù\84Ù\89 Ø§Ù\84دÙ\84Ù\8aÙ\84:<br><br>%s<br>"
 
 #: src/bin/e_exec.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to restore to directory:<br><br>%s"
-msgstr "Ù\84ا Ù\8aستطÙ\8aع Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø¥Ù\86شاء Ø¹Ù\85Ù\84Ù\8aات Ù\81رعÙ\8aØ©:<br><br>%s<br>"
+msgstr "Ù\84ا Ù\8aستطÙ\8aع Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت Ø§ï»¹Ø³ØªØ¹Ø§Ø¯Ø© Ø¥Ù\84Ù\89 Ø§Ù\84دÙ\84Ù\8aÙ\84:<br><br>%s<br>"
 
 #: src/bin/e_exec.c:261
 #, fuzzy, c-format
@@ -1123,320 +1148,320 @@ msgstr ""
 "لا يستطيع إنلايتنمينت تشغيل البرنامج:<br><br>%s<br><br>لسبب فشل البرنامج في "
 "البدء."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "فشل تنفيذ البرنامج"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s فشل في التشغيل بشكل غير متوقع."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "أمر خروج من %i عاد من %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s تم إعتراضه بواسطة إشارة إعتراض."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s تم إعتراضه بواسطة إشارة خروج"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s تم إعتراضه بواسطة إشارة إلغاء"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s تم إعتراضه بواسطة خطأ النقطة العائمة(floating point)."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s تم إعتراضه بواسطة إشارة قتل."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s تم إعتراضه بواسطة خطأ في الترقيم(segmentation fault)."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s تم إعتراضه بسبب أنبوب مكسور (broken pipe)."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s تم اﻹعتراض بسبب إشارة إنهاء"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s تم اﻹعتراض بسبب خطأ في المسار"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
-msgstr "%s تمت مقاطعة العمل بواسطة عدد اﻹشارات %i."
+msgstr " تمت مقاطعة %s بواسطة اﻹشارة رقم %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***المخرجات المتبقية قد تم اقتطاعها. احفظ المخرجات ﻷجل عرض.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "خلل في السجلات"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "لا توجد رسالة خطأ"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "احفظ هذه الرسالة"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "سجل الخطأ هذا سيتم حفظه في ملف باسم %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "خطأ في المعلومات"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "خلل إشارة المعلومات"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "معلومات المخرجات"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "لا يوجد مخرج."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "مسار غير موجود"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s غير موجود."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "خطأ عند التوصيل"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "لا يمكن توصيل الجهاز"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "خطأ في الفصل"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "لا يمكن فصل الجهاز"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "خطأ في اﻹخراج"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "لا يمكن إخراج الجهاز"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i ملفات"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "ارتباط"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "إحباط"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 #, fuzzy
 msgid "Inherit parent settings"
-msgstr "استخدم إعدادات الوالدين"
+msgstr "Inherit parent settings"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "أسلوب العرض"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "تحديث العرض"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "اظهر الملفات المخفية"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "احفظ الترتيب"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
-msgstr "صÙ\86Ù\81 اﻵن"
+msgstr "رتب اﻵن"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "مجلد جديد"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "أعد التسمية"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "افصل"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "وصل"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "اخرج"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "خصائص التطبيق"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "إعدادات الملف"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "استخدم اﻹفتراضي"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "شيكة أيقونات"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "أيقونات مخصصة"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "قائمة"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "حجم اﻷيقونة (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "تعيين الخلفية..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "تعيين الغطاء..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "مسح"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
-msgstr "اÙ\86شئ مجلد جديد"
+msgstr "اÙ\86شء مجلد جديد"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "اسم المجلد الجديد:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "أعد تسمية %s إلى:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "غير اسم الملف"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "خلل"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "لا للجميع"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "نعم للجميع"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "تحذير"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "الملف موجود من قبل, اكتب فوقه؟<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "تجاهل هذا"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "تجاهل الكل"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "حدث خلل أثناء تنفيذ عملية.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "تأكيد الحذف"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
-msgstr "أتريد تأكيد رغبتك في حذف<br><hilight>%s</hilight> ؟"
+msgstr "هل أنك متأكد من أنك تريد خذف<br><hilight>%s</hilight> ؟"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
 msgstr ""
-"هل تريد تأكيد مسح<br>الملفات %d التي إخترتها في:<br><hilight>%s</hilight> ؟"
+"هل تريد تأكيد مسح<br>الملفات %d التي إخترتها في:<br><hilight>%s</hilight> ?"
 
 #: src/bin/e_fm_device.c:33
 #, c-format
@@ -1463,12 +1488,12 @@ msgstr "%llu كيلو.ب."
 msgid "%llu B"
 msgstr "%llu بايت"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "حجم غير معروفة"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "جهاز قابل للازالة"
 
@@ -1476,7 +1501,7 @@ msgstr "جهاز قابل للازالة"
 msgid "File:"
 msgstr "الملف:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "الحجم:"
 
@@ -1492,7 +1517,7 @@ msgstr "نوع الملف:"
 msgid "Permissions"
 msgstr "الصلاحيات"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "المالك:"
 
@@ -1512,17 +1537,17 @@ msgstr "بإمكان المالك القراءة"
 msgid "Owner can write"
 msgstr "بإمكان المالك الكتابة"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "معاينة"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "اﻹفتراضي"
 
@@ -1531,7 +1556,7 @@ msgid "Thumbnail"
 msgstr "صورة مصغرة"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "مخصص"
 
@@ -1547,50 +1572,41 @@ msgstr "اربط المعلومة"
 msgid "Select an Image"
 msgstr "إختر صورة"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "إنقل إلى"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "إبدأ تحريك/تحجيم"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "قابل للتحجيم"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "لف المحتويات في لفافة تلقائياً"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "بارز"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "داخلي"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "المظهر"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "حذف"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "أوقف تحريك/تحجيم هذه اﻷداة"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1638,21 +1654,22 @@ msgstr "الموضع"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "الحجم"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "ترصيص"
 
 #: src/bin/e_int_border_locks.c:312 src/bin/e_int_border_locks.c:331
+#, fuzzy
 msgid "Iconified state"
-msgstr "حالة مأيقنة"
+msgstr "حالة أيقونية"
 
 #: src/bin/e_int_border_locks.c:314 src/bin/e_int_border_locks.c:333
 #: src/bin/e_int_border_remember.c:723
@@ -1697,155 +1714,163 @@ msgstr "الخروج من حسابي مع فتح هذه النافذة"
 msgid "Remember these Locks"
 msgstr "تذكر هذه اﻷقفال"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "نافذة"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "دائما في اﻷعلى"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "لاصق"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "إعدادات"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "كامل الشاشة"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "كبر عمودياً"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "كبر افقياً"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "ألغ التكبير"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "عدل اﻷيقونة"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "انشئ أيقونة"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "أضف إلى قائمة المفضلات"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
-msgstr "أضف إلى IBar"
+msgstr "أضف إلى  شريط التشغيل السريع IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
-msgstr "انشئ إختصار لوحة المفاتيح"
-
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "موضع"
+msgstr "انشء إختصار لوحة المفاتيح"
 
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "تخطى"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "الحدود"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "اﻷقفال"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "تذكر"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
+#, fuzzy
 msgid "ICCCM/NetWM"
-msgstr "ICCCM/NetWM"
+msgstr "NetWM"
+
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "لاصق"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "تخطى"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "إجعله أيقونه"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
-msgstr "ظل"
+msgstr "مضلل"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
-msgstr "شاشة  %d"
+msgstr "اÙ\84شاشة %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "دائما في اﻷعلى"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "عادي"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "دائماً في اﻷسفل"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "الصق في سطح المكتب"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "أزل الصق من سطح المكتب"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "إختر نمط الحدود"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "استخدم إعدادات اﻷيقونات اﻹفتراضية ﻹي17(E17)"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "استخدم اﻷيقونة المقدمة بواسطة التطبيق "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "استخدم أيقونة المستخدم"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
-msgstr "اÙ\84Ù\85Ù\82اÙ\88Ù\85Ø©"
+msgstr "اÙ\82ترح Ù\85Ù\82اÙ\88Ù\85Ø© "
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "قائمة النوافذ"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "عارض أسطح المكاتب"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "شريط المهام"
 
@@ -1866,7 +1891,7 @@ msgid "ICCCM Properties"
 msgstr "خصائص ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "العنوان"
 
@@ -2005,9 +2030,9 @@ msgstr ""
 "الوظيفة ..... <br>مع أكثر من نافذة واحدة على الشاشة وعدم نسيان <br>أن خصائص "
 "هذه النافذة سيتم تطبيقها على كل النوافذ اﻷخرى<br>التي تطابق هذه الخصائص."
 "<br><br>هذا مجرد تحذير لك في حالة ما إذا كنت لا تنوي فعل هذا.<br>و إذا كنت "
-"Ù\82د Ø¹Ø²Ù\85ت Ø\8c Ù\81اضغط <hilight>تطبÙ\8aÙ\82</hilight> Ø£Ù\88 <hilight>Ù\85Ù\88اÙ\81Ù\82</hilight> Ø¨Ù\83Ù\84 "
-"بساطة<br>و سيتم قبول اﻹعدادات. اضغط<hilight>إلغاء</hilight> إذا<br> لم تكن "
-"واثقا و لن يحدث أي شيء."
+"Ù\82د Ø¹Ø²Ù\85ت Ø\8c Ù\81بÙ\83Ù\84 Ø¨Ø³Ø§Ø·Ø© Ø§Ø¶ØºØ· <hilight>أحد Ø²Ø±Ù\8a</hilight> ØªØ·Ø¨Ù\8aÙ\82 <hilight>Ø£Ù\88</"
+"hilight> موافق<br>و سيتم قبول اﻹعدادات. اضغط<hilight>إلغاء</hilight> إذا<br> "
+"Ù\84Ù\85 ØªÙ\83Ù\86 Ù\88اثÙ\82ا Ù\88 Ù\84Ù\86 Ù\8aحدث Ø£Ù\8a Ø´Ù\8aØ¡."
 
 #: src/bin/e_int_border_remember.c:516
 msgid "No match properties set"
@@ -2038,7 +2063,6 @@ msgid "Size, Position and Locks"
 msgstr "الحجم, المكان واﻷقفال"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "الكل"
 
@@ -2115,15 +2139,13 @@ msgid "Utilities"
 msgstr "خدمات"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "الملفات"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "مهيء اﻹقلاع"
 
@@ -2136,20 +2158,6 @@ msgstr "اللب"
 msgid "Mobile"
 msgstr "تنقل"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "إعدادات"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "إعدادات الوحدة"
@@ -2187,7 +2195,7 @@ msgstr "إضافة أداة"
 msgid "Remove Gadget"
 msgstr "إزالة أداة"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "خيارات شريط اﻷدوات"
 
@@ -2195,11 +2203,11 @@ msgstr "خيارات شريط اﻷدوات"
 msgid "Layout"
 msgstr "المظهر"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "طريقة المدخل خطأ"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2215,7 +2223,7 @@ msgstr "الرئيسية"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "البرامج المفضلة"
 
@@ -2223,76 +2231,74 @@ msgstr "البرامج المفضلة"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "التطبيقات"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "النوافذ"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "النوافذ المفقودة"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "عن"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "السمة"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "وهمي"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "الدروج"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
-msgstr "اظÙ\87ر/ Ø£Ø®Ù\81 Ù\83Ù\84 Ø§Ù\84Ù\86Ù\88اÙ\81Ø°"
+msgstr "أظÙ\87ر\\أخÙ\81Ù\8a"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(لا برامج)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "عين أسطح مكتب إفتراضية"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "( لا نوافذ )"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "لا اسم!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
-msgstr "( Ù\84ا Ø¯Ø±Ù\88ج )"
+msgstr "( Ù\84ا Ø£Ø¯Ø±ج )"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "أضف درج"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "احذف درج"
 
@@ -2327,7 +2333,7 @@ msgid "Shrink to Content Width"
 msgstr "ضيق الحجم ليتم إحتواء العرض"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "مظهر"
 
@@ -2337,11 +2343,11 @@ msgstr "إخفاء تلقائي للدرج"
 
 #: src/bin/e_int_shelf_config.c:204
 msgid "Show on mouse in"
-msgstr "اظهر عند دخول الفأرة"
+msgstr "Ø£ظهر عند دخول الفأرة"
 
 #: src/bin/e_int_shelf_config.c:208
 msgid "Show on mouse click"
-msgstr "اظهر عند الضغط بالفأرة"
+msgstr "Ø£ظهر عند الضغط بالفأرة"
 
 #: src/bin/e_int_shelf_config.c:213
 msgid "Hide timeout"
@@ -2357,7 +2363,7 @@ msgid "Hide duration"
 msgstr "إخفاء الوقت"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f ثواني"
@@ -2368,13 +2374,13 @@ msgstr "إخفاء تلقائي"
 
 #: src/bin/e_int_shelf_config.c:238
 msgid "Show on all Desktops"
-msgstr "اظهر في كل أسطح المكتب"
+msgstr "Ø£ظهر في كل أسطح المكتب"
 
 #: src/bin/e_int_shelf_config.c:240
 msgid "Show on specified Desktops"
-msgstr "اظهر في أسطح مكتب محددة"
+msgstr "Ø£ظهر في أسطح مكتب محددة"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, fuzzy, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2391,7 +2397,7 @@ msgstr ""
 "أو أنك لا تملكها . رجاء تفقد:\n"
 "%s/إنلايتنمينت-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2400,52 +2406,19 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Eina!\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء Ecore!\n"
-"ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Eet!\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لاسيتطيع إنلايتنمينت بدء نظام الملف.\n"
-"ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore!\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2453,7 +2426,7 @@ msgstr ""
 "لا يستطيع إنلايتنمينت ضبط معالج إشارة الخروج.\n"
 "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2461,7 +2434,7 @@ msgstr ""
 "لا يستطيع إنلايتنمينت ضبط معالج إشارة HUP.\n"
 "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2469,65 +2442,31 @@ msgstr ""
 "لا يستطيع إنلايتنمينت ضبط معالج إشارة المستخدم.\n"
 "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء نظام اتصال إكس .\n"
-"هل قمت بتحديد متغير العرض أي شاشة العرض ؟ "
-
-#: src/bin/e_main.c:469
-#, fuzzy
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء نظام تنبيه الطوارئ.\n"
-"هل قمت بضبط متغير العرض"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_IMF!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء نظام اﻹتصالات.\n"
-"ربما ﻷنك لا تملك المقدار الكافي من الذاكرة ؟"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_File!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء نظام IPC  .\n"
-"ربما ﻷنك لاتملك المقدار الكافي من الذاكرة؟"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_Con!\n"
 
-#: src/bin/e_main.c:509
-#, fuzzy
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"لا يستطيع إنلايتنمينت إعداد التفاف  xinerama.\n"
-" يجب عدم حدوث هذا."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_Ipc!\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"لا يستطيع إنلايتنمينت إعداد تغليف الرف.\n"
-"يجب أن لا يحدث هذا."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_X!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لا يستطيع إنلايتنمينت بدء نظام Evas.\n"
-"ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Ecore_Evas!\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 #, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
@@ -2538,17 +2477,43 @@ msgstr ""
 "في Evas. رجاء تفقد تثبيت Evas و Ecore \n"
 "و تفقد دعمهما ﻷداء محرك X11 ."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
+#, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
-"عثر إنلايتنمينت على أن ecore_evas لا تدعم أداء الرقعة البرمجية\n"
-"في Evas. رجاءا تفحص تنصيبك لـ Evas و Ecore\n"
-" و تفحص دعمهما لمحرك أداء الرقعة البرمجية."
+"Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software Buffer rendering engine."
+
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء Edje! \n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء E_Intl!.\n"
+
+#: src/bin/e_main.c:378
+#, fuzzy
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"لا يستطيع إنلايتنمينت بدء نظام تنبيه الطوارئ.\n"
+"هل قمت بضبط متغير العرض؟"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء E_Xinerama!.\n"
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "لا يستطيع إنلايتنمينت بدء E_Randr!.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2556,23 +2521,29 @@ msgstr ""
 "لا يستطيع إنلايتنمينت إنشاء مسارات في مسار المنزل \n"
 "ربما ﻷنك لا تملك مسار منزل أو أن القرص ممتلئ"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام تسجيل ملفاته"
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام اﻹعداد."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "لا يستطيع إنلايتنمينت ضبط نظام بيئته."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام المسطرة."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "لا يستطيع إنلايتنمينت على ضبط نظام المؤشر."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2580,300 +2551,371 @@ msgstr ""
 "لا يستطيع إنلايتنمينت ضبط مسارات للملفات التي عثر عليها.\n"
 "ربما ﻷنك لا تيملك المقدار الكافي من الذاكرة؟"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام الخطوط."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام السمات."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"لا يستطيع إنلايتنمسنت ضبط شاشة التهيئة.\n"
-"ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "لا يستطيع إنلايتنمينت ضبط شاشة init."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "جاري بدء الدعم الدولي"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 #, fuzzy
 msgid "Enlightenment cannot set up its intl system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام intl الخاص به."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "لا يستطيع إنلايتنمينت بدء نظام سطح مكتب FDO.\n"
-"ربما ﻷنك لاتملك المقدار الكافي من الذاكرة؟"
+"ربما ﻷنك  تفتقر للأذونات على ~/.cache/efreet أو \n"
+"لا تملك المقدار الكافي من الذاكرة أو مساحة القرص"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "جارÙ\8a Ù\81حص Ø¯Ø¹Ù\85 Ø§Ù\84صÙ\8aغة"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
+msgstr "ضبط Ø§Ù\84شاشات"
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-#, fuzzy
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
-"وجد إنلايتنمينت أن Evas لا يستطيع إنشاء رقعة الصوان. رجاء تفقد\n"
-"هل لدى Evas دعم لمحرك الصوان.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات PNG. قم بتفقد دعم  PNG \n"
-"على Evas.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات JPEG. قم بتفقد دعم  JPEG \n"
-"على Evas.\n"
+"فشل إنلايتنمينت في ضبط إدارة النافذة لكل الشاشات التي على نظامك\n"
+"ربما ﻷن هنالك مدير نافذة آخر لا يزال قيد التشغيل؟\n"
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات EET. قم بتفقد دعم  EET \n"
-"على Evas.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "ضبط إدارة الطاقة "
 
-#: src/bin/e_main.c:754
-#, fuzzy
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل الخط 'Sans'. تفقد هل يملك Evas دعم "
-"تكوين الخط\n"
-"و تعرف نظام تكوين الخط لخط 'Sans' .\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "ضبط اﻷضواء الخلفية"
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "تفقد دعم SVG"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "لا يستطيع إنلايتنمينت إعداد اﻷضواء الخلفية."
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
-msgstr "ضبط الشاشات"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "ضبط DPMS"
 
-#: src/bin/e_main.c:799
-#, fuzzy
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
-msgstr ""
-"فشل إنلايتنمينت في ضبط إدارة النافذة لكل الشاشات التي على نظامك\n"
-"ربما ﻷن هنالك مدير نافذة لا يزال قيد التشغيل؟\n"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "لا يستطيع إنلايتنمينت إعداد إعدادات DPMS ."
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "ضبط حافظة الشاشة"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "لا يستطيع إنلايتنمينت إعداد حافظة الشاشة إكس."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "اضبط أوضاع حفظ الطاقة"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "لا يستطيع إنلايتنمينت ضبط أوضاع حفظ الطاقة"
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "اضبط قفل سطح المكتب"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام قفل سطح مكتبه"
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "ضبط النوافذ المنبثقة"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام النوافذ المنبثقة"
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "ضبط نظام الرسائل"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "ضبط المسارات"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "ضبط متحكمات النظام"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "لا يستطيع إنلايتنمينت بدء نظام أوامر النظام \n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "إجراءات الضبظ"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام إﻹجراءات الخاصة به"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "ضبط نظام اﻹعدام"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام exec."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "اضبط FM "
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
+msgstr "اضبط مدير الملفات"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "لا يستطيع إنلايتنمينت بدء مدير الملفات.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "ضبط نظام الرسائل"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام الرسائل."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "اضبط DND "
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام dnd."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Grab Input Handling"
-msgstr "اضبط معالجة إدخال القبض"
+msgstr "اضبط معالجة نزع المدخلات"
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:752
 #, fuzzy
-msgid "Enlightenment cannot set up its input grab handling system."
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام معالجة أنتزاع المدخلات."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "ضبط الوحدات"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام الوحدات."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 #, fuzzy
 msgid "Setup Remembers"
 msgstr "اضبط المتذكرين"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "لا يستطيع إنلايتنمينت ضبط إعدادات التذكر."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "ضبط أصناف اﻷلوان"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام اﻷلوان."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "ضبط Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام تحكم أداته"
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "ضبط إدارة الطاقة "
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "ضبط DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "لا يستطيع إنلايتنمينت تكوين إعدادات DPMS ."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "اضبط أوضاع حفظ الطاقة"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "لا يستطيع إنلايتنمينت ضبط أوضاع حفظ الطاقة"
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "ضبط الخلفية"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام خلفية سطح المكتب"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "ضبط الفأرة"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "لا يستطيع إنلايتنمينت إعداد خيارات ضبط الفأرة"
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "ضبط اﻷغلفة"
 
-#: src/bin/e_main.c:1033
-#, fuzzy
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام اﻹرتباطات"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "ضبط الدروج"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "لا يستطيع إنلايتنمينت ضبط نظام الدروج"
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "ضبط مصغر الصور"
 
-#: src/bin/e_main.c:1053
-#, fuzzy
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr "لا يستطيع إنلايتنمينت بدء نظام التقييم\n"
+msgstr "لا يستطيع إنلايتنمينت بدء نظام المصغرات\n"
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "لا يستطيع إنلايتنمينت بدء نظام الذاكرة المخبئية اﻷيقوني \n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "لا يستطيع إنلايتنمينت بدء نظام إعدادات X\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "اضبط بيئة سطح المكتب"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "لا يستطيع إنلايتنمينت بدء بيئة سطح المكتب.\n"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "ضبط ترتيب الملفات"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "لا يستطيع إنلايتنمينت ضبط نظام ترتيب الملفات."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "تحميل الوحدات"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "التحكم في الدروج"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "بقي القليل لتكتمل"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "جاري فحص دعم الصيغة"
+
+#: src/bin/e_main.c:1430
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع إنشاء رقعة الصوان. رجاء تفقد\n"
+"هل لدى Evas دعم لمحرك الصوان.\n"
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات PNG. تفقّد دعم Evas لمحمّل "
+"SVG .\n"
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات JPEG. تفقّد دعم Evas لمحمّل "
+"JPEG .\n"
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات PNG. تفقّد دعم Evas لمحمّل "
+"PNG .\n"
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل ملفات EET.تفقّد دعم Evas لمحمِّل  "
+"EET .\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"وجد إنلايتنمينت أن Evas لا يستطيع  تحميل الخط 'Sans'. تفقّد هل يملك Evas دعم "
+"إعدادات الخط\n"
+"و تعرف نظام إعدادات الخط لخط 'Sans' .\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
@@ -2881,11 +2923,11 @@ msgstr ""
 "تحطم إنلايتنمينت للتو عند التشغيل و قد تم <br>إعادة تشغيله. كان هنالك تحميل "
 "خاطئ<br>لوحدة تدعى بـ: %s. هذه الوحدة قد تم تعطيلها<br>و لن يتم تحميلها."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "تحطم إنلايتنمينت للتو عند التشغيل و تم إعادة تشغيله "
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2895,7 +2937,7 @@ msgstr ""
 "تحطم إنلايتنمينت للتو عند التشغيل و تم إعادة تشغيله.<br>كان هناك تحميل خاطئ "
 "لوحدة تدعى: %s<br><br>Tهذه الوحدة قد تم تعطيلها و لن يتم تحميلها."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2904,9 +2946,9 @@ msgid ""
 msgstr ""
 "تحطم إنلايتنمينت للتو عند التشغيل<br>و تم إعادة تشغيله. كل الوحدات قد تم "
 "تعطيلها<br>و لن يتم تحميلها  ﻷجل المساعدة في إزالة أي مشكلة<br>وحدات من "
-"تÙ\83Ù\88Ù\8aÙ\86اتÙ\83. Ø­Ù\88ارات ØªÙ\83Ù\88Ù\8aÙ\86 الوحدة<br>ستدعك تختار<br>وحداتك مجددا."
+"إعداداتÙ\83. Ø­Ù\88ارات Ø¥Ø¹Ø¯Ø§Ø¯ الوحدة<br>ستدعك تختار<br>وحداتك مجددا."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2915,22 +2957,14 @@ msgid ""
 msgstr ""
 "تحطم إنلايتنمينت للتو عند التشغيل و تم إعادة تشغيله.<br> كل الوحدات قد تم "
 "تعطيلها و لن يتم تحميلها ﻷجل المساعدة<br> في إزالة أي مشكلة وحدات من "
-"تكويناتك.<br><br>حوارات تكوين الوحدة ستدعك تختار<br>وحداتك مجددا.."
-
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "التحكم في الدروج"
+"إعداداتك.<br><br>حوارات إعداد الوحدة ستدعك تختار<br>وحداتك مجددا.."
 
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "بقي القليل لتكتمل"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "تحميل الوحدات: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2939,11 +2973,11 @@ msgstr ""
 "كان هنالك تحميل خاطئ لوحدة تدعى: %s<br>لا يوجد وحدة تدعى %s يمكن العثور "
 "عليها في<br>مسارات بحث الوحدة.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "خلل في تحميل الوحدة"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2952,11 +2986,11 @@ msgstr ""
 "كان هنالك تحميل خاطئ لوحدة تدعى: %s<br>المسار الكامل إلى هذه الوحدة هو:<br>"
 "%s<br>الخطأ المبلغ عنه هو:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "لا تحتوي الوحدة على كل الوظائف المعتمد عليها"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2966,48 +3000,48 @@ msgstr ""
 "خطأ بوحدة API <br>خطأ بتهيئة الوحدة: %s<br>وهي تتطلب أقل إصدار لوحدة API من: "
 "%i.<br>الوحدة API التي تعمل بواسطة إنلايتنمينت هي: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "وحدة  %s ﻹنلايتنمينت"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "هل ترغب في إلغاء تحميل هذه الوحدة؟<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 "لقد عطلت حافظة الشاشة بشكل سريع جدا.<br><br>هل تريد تفعيل وضع <b>العرض</b> و "
-"تعطيل القفل و حافظة الشاشة و  حفظِ الطاقة مؤقتا؟"
+"تعطيل قفل حافظة الشاشة أو  حفظِ الطاقة مؤقتا؟"
 
 #: src/bin/e_shelf.c:165
 msgid "Shelf #"
 msgstr "الدرج #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
-msgstr "أتريد تأكيد رغبتك في حذف هذا الدرج؟"
+msgstr "هل أنت متأكد أنك تريد حذف هذا الدرج؟"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
-msgstr "لقد طلبت حذف هذا الدرج.<br><br>أتريد تأكيد رغبتك في حذفه؟"
+msgstr "لقد طلبت حذف هذا الدرج.<br><br>هل أنت متاكد أنك تريد حذفه؟"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "أوقف تحريك/تحجيم اﻷدوات"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "إبدأ تحريك/تحجيم اﻷدوات"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "المحتويات"
 
@@ -3015,16 +3049,16 @@ msgstr "المحتويات"
 msgid "Starting"
 msgstr "جار البدء"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "فحص صلاحيات النظام"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "تم فحص النظام"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3035,48 +3069,48 @@ msgstr ""
 "حال هل تريد إكمال تسجيل الخروج<br>دون البدء في إغلاق<br>هذه البرامج؟"
 "<br><br>تسجيل الخروج في  %d ثوان."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "أخطاء في تسجيل الخروج"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "تسجيل الخروج اﻵن"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "أنتظر أكثر"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "إلغاء تسجيل الخروج"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "جاري تسجيل الخروج"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "جارÙ\8a ØªØ³Ø¬Ù\8aÙ\84 Ø§Ù\84خرÙ\88ج.<br><hilight>Ù\8aرجÙ\89 Ø§ï»¹Ù\86تظار.</hilight>"
+msgstr "جارÙ\8a ØªØ³Ø¬Ù\8aÙ\84 Ø§Ù\84خرÙ\88ج.<br><hilight>Ù\8aرجÙ\89 Ø§ï»¹Ù\86تØار.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "إنلايتنمينت مشغول بطلب آخر"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"جاري تسجيل الخروج.<br>لا يمكنك تطبيق أعمال أخرى<br>فور بدء تسجيل الخروج."
+"جاري تسجيل الخروج.<br>لا يمكنك تطبيق أعمال أخرة<br>فور بدء تسجيل الخروج."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
-msgstr "جاري اﻹطفاء.<br>لا يمكنك إجراء أي عمل في النظام<br>فور بدء اﻹطفاء."
+msgstr "جاري اﻹطفاء.<br>لا بمكنك إجراء أي عمل في النظام<br>فور بدء اﻹطفاء."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3084,69 +3118,69 @@ msgstr ""
 "جاري إعادة التشغيل.<br>لا يمكنك إجراء أي عملية في النظام<br>فور بدء إعادة "
 "التشغيل."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 "جاري التعليق.<br>لا يمكنك إجراء أي عمل في النظام<br>قبل إكتمال التعليق."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
-"جاري التنويم.<br>لا يمكنك إجراء أي عملية في النظام<br>قبل إكتمال هذه العملية."
+"جاري اﻹسبات.<br>لا يمكنك إجراء أي عملية في النظام<br>قبل اكتتمال هذه العملية."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
-msgstr "Ù\85عذرة! Ù\8aجب Ø£ï»» Ù\8aحدث Ù\87ذا"
+msgstr "Ù\85عذرة! Ù\87ذا Ù\84ا Ù\8aجب Ø£Ù\86 Ù\8aحدث"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "فشل إطفاء الحاسوب."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "فشلت اﻹعادة."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "فشل التعليق."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "فشل التنويم."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "إطفاء"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "جاري اﻹطفاء.<br><hilight>يرجى اﻹنتظار.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
-msgstr "Ø¥عادة"
+msgstr "جارÙ\8a Ø§ï»¹عادة"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "جاري اﻹعادة.<br><hilight>يرجى اﻹنتظار.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "التعليق"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "جاري التعليق.<br><hilight>يرجى اﻹنتظار.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
-msgstr "تنويم"
+msgstr "جارÙ\8a Ø§Ù\84تÙ\86Ù\88Ù\8aÙ\85"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "جاري التنويم.<br><hilight>يرجى اﻹنتظار.</hilight>"
 
@@ -3154,160 +3188,159 @@ msgstr "جاري التنويم.<br><hilight>يرجى اﻹنتظار.</hilight>
 msgid "About Theme"
 msgstr "عن السمة"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "استخدمه كسمة"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
-msgstr "أوقف تحريك/تحجيم العناصر"
+msgstr "أوقف تحريك\\تحجيم العناصر"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
-msgstr "إبدء تحريك/تحجيم العناصر"
+msgstr "إبدء تحريك\\تحجيم العناصر"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "تعيين محتويات شريط اﻷدوات"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "لا يستطيع إنلايتنمينت إنشاء عمليات فرعية:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "لا يمكن الخروج - نوافذ خالدة."
 
-#: src/bin/e_utils.c:281
-#, fuzzy
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
-"بعض النوافذ تركت و لازالت ممكنة مع قفل Lifespan. و هذا يعني  <br>أن "
+"بعض النوافذ تركت و لازالت ممكنة مع قفل حفظ عمر البطارية. و هذا يعني  <br>أن "
 "إنلايتنمينت سيمنع نفسه من الخروج حتى يتم إغلاق<br>هذه النوافذ أو يتم إزالة "
-"قفل lifespan .<br>"
+"قفل حفظ عمر البطارية .<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f بايتات"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f ك.ب."
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f م.ب."
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f جيجابايت"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "في المستقبل"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "في الدقيقة اﻷخيرة"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
-msgstr "قبل %li سنة / سنوات"
+msgstr "قبل %li سنة\\سنوات"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
-msgstr "قبل %li شهر / أشهر"
+msgstr "قبل %li شهر\\أشهر"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
-msgstr "Ù\82بÙ\84 %li Ø£Ø³Ø¨Ù\88ع / Ø£سابيع"
+msgstr "Ù\82بÙ\84 %li Ø§Ø³Ø¨Ù\88ع\\اسابيع"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
-msgstr "قبل %li يوم / أيام"
+msgstr "قبل %li يوم\\أيام"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
-msgstr "قبل %li ساعة / ساعات"
+msgstr "قبل %li ساعة\\ساعات"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
-msgstr "قبل %li دقيقة / دقائق"
+msgstr "قبل %li دقيقة\\دقائق"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "إعدادات استيراد الصورة"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "استيراد"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "خيارات التعبئة و اﻹمتداد"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "تمدد"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "وسط"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "داخل"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "ملﺀ"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "جودة الملف"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "استخدم الملف اﻷصلي"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3317,20 +3350,20 @@ msgid ""
 "fix<br>that by adding it in. You can re-configure things now to "
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
-"تحتاج Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84ضبط Ù\84Ù\84ترÙ\82Ù\8aØ©. Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د Ù\85Ø­Ù\8aت Ø\8cÙ\88 ØªÙ\85ت ØªÙ\87Ù\8aئة "
-"اÙ\81تراضÙ\8aات Ø¬Ø¯Ù\8aدة. Ø³Ù\8aحدث<br>Ù\87ذا Ø¨Ø´Ù\83Ù\84 Ù\85Ù\86تظÙ\85 Ø®Ù\84اÙ\84 Ø§Ù\84تطÙ\88Ù\8aر Ø\8c Ù\84Ù\87ذا Ù\84ا ØªØ±Ø³Ù\84 ØªÙ\82رÙ\8aرا "
-"عÙ\86 <br>عÙ\84Ø©. Ø¨Ø¨Ø³Ø§Ø·Ø© Ù\81Ø¥Ù\86 Ù\85ا Ù\8aعÙ\86Ù\8aÙ\87 Ù\87ذا Ø§ï»¹Ø¬Ø±Ø§Ø¡ Ù\87Ù\88 Ø£Ù\86 Ø§Ù\84Ù\88حدة  ØªØ­ØªØ§Ø¬ Ù\84بÙ\8aاÙ\86ات "
-"تكوينات جديدة كإجراء افتراضي<br>لوظيفة أكثر قابلية للإستخدام و التي كانت "
-"تÙ\83Ù\88Ù\8aÙ\86اتÙ\83 <br>اÙ\84Ù\82دÙ\8aÙ\85Ø© ØªÙ\81تÙ\82ر Ø¥Ù\84Ù\8aÙ\87ا Ø¨Ù\83Ù\84 Ø¨Ø³Ø§Ø·Ø© . Ù\87Ø°Ù\87 Ø§ï»¹Ù\81تراضÙ\8aات Ø§Ù\84جدÙ\8aدة Ø³ØªØµÙ\84Ø­ "
-"<br>هذا اﻷمر عبر إضافتها عليها. يمكنك اﻵن إعادة تكوين اﻷشياء  <br>حسب رغبتك. "
-"نأسف للتدخل في اﻹعدادات الخاصة بك. <br>"
+"إعدادات Ø§Ù\84ضبط ØªØ­ØªØ§Ø¬ Ù\84Ù\84ترÙ\82Ù\8aØ©. Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د ØªÙ\85 Ù\85Ø­Ù\88Ù\87ا Ø\8c Ù\88Ù\85جÙ\85Ù\88عة "
+"جدÙ\8aدة Ù\85Ù\86 Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84اÙ\81تراضÙ\8aØ© ØªÙ\85 ØªÙ\87Ù\8aئتÙ\87ا. <br>Ù\87ذا  Ù\8aحدث Ø¨Ø´Ù\83Ù\84 Ù\85Ù\86تظÙ\85 Ø®Ù\84اÙ\84 "
+"اÙ\84تطÙ\88Ù\8aر Ø\8c Ù\88باÙ\84تاÙ\84Ù\8a Ù\84ا ØªØ±Ø³Ù\84 ØªÙ\82رÙ\8aر <br>بخطأ. Ù\87ذا Ù\8aعÙ\86Ù\8a Ø¨Ø¨Ø³Ø§Ø·Ø© Ø£Ù\86 Ø§Ù\84Ù\88حدة Ù\87Ø°Ù\87 "
+"تحتاج ﻹعدادات جديدة <br>كما يمكنك بكل بساطة استخدام البيانات اﻷساسية للوظائف "
+"اÙ\84Ù\85ستخدÙ\85Ø© <br>Ù\81Ù\8a Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© . Ù\87Ø°Ù\87 Ù\85جÙ\85Ù\88عة Ø¬Ø¯Ù\8aدة Ù\85Ù\86 Ø§ï»·Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ï»¹Ù\81تراضÙ\8aØ© "
+"التي ستقوم باﻹصلاح <br>عبر إضافتها يمكنك اﻵن إعادة إعداد اﻷشياء  <br>حسب "
+"رغبتك. نأسف للتدخل في اﻹعدادات الخاصة بك. <br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s تم تحديث اﻹعدادات"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3338,10 +3371,10 @@ msgid ""
 "module was running. This is bad and<br>as a precaution your configuration "
 "has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"تÙ\83Ù\88Ù\8aÙ\86اتك الخاصة بالوحدة أحدث من إصدارة الوحدة الحالية. هذا غريب<br>جدا. لن "
-"يحدث هذا إلا إذا قمت بتخفيض<br>إصدارة الوحدة أو نسخت التكوينات من مكان آخر "
+"إعداداتك الخاصة بالوحدة أحدث من إصدارة الوحدة الحالية. هذا غريب<br>جدا. لن "
+"يحدث هذا إلا إذا قمت بتخفيض<br>إصدارة الوحدة أو نسخت اﻹعدادات من مكان آخر "
 "<br>يحتوي على إصدارة جديدة من الوحدة تعمل عليه. هذا سيء<br>و كإحتياط فإن "
-"تÙ\83Ù\88Ù\8aÙ\86اتك قد تم استعادتها إلى  <br>اﻹفتراضيات. نأسف لهذا اﻹزعاج.<br>"
+"إعداداتك قد تم استعادتها إلى  <br>اﻹفتراضيات. نأسف لهذا اﻹزعاج.<br>"
 
 #: src/bin/e_widget_config_list.c:60
 #: src/modules/conf_applications/e_int_config_apps.c:235
@@ -3362,139 +3395,145 @@ msgstr "أعلى"
 msgid "Down"
 msgstr "أسفل"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "أضف إلى المفضلات"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "أذهب أعلى مجلد"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr "الدقة:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "الصلاحيات:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "عدل:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "أنت"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "محمي"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "للقراءة فقط"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "ممنوع"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "قراءة-كتابة"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "إعدادات مرقب البطارية"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
-msgstr "اظهر تنبيه عندما تكون البطارية ضعيفة"
+msgstr "Ø£ظهر تنبيه عندما تكون البطارية ضعيفة"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "افحص كل:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f لحظات"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "عِّلق عند اقل من:"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
-msgstr "الجسّ و الفحص"
+msgstr "اﻹقتراع"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "اظهر تنبيه البطارية الضعيفة"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "تنبيه عندما على:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f دقيقة"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
-msgstr "خرÙ\88ج تلقائي خلال..."
+msgstr "طرد تلقائي خلال..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f ثانية"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "تنبيه"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
-msgstr "اÙ\83تشاÙ\81 ØªÙ\84Ù\82ائÙ\8a"
+msgstr "اÙ\83تشاÙ\81 ØªÙ\84Ù\82ائÙ\89"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "داخلي"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "وضع مبهم"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
-msgstr "HAL"
+msgstr "\"هال\""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "العتاد"
 
@@ -3502,35 +3541,35 @@ msgstr "العتاد"
 msgid "Battery"
 msgstr "البطارية"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
-msgstr "اÙ\84بطارÙ\8aØ© Ø¶Ø¹Ù\8aÙ\81Ø© !"
+msgstr "بطارÙ\8aتÙ\83 Ø¶Ø¹Ù\8aÙ\81Ø©!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "يستحسن استخدام الطاقة الكهربائية."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "غير موجود"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "خطأ"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "مقياس البطارية"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "الساعة"
 
-#: src/modules/clock/e_mod_main.c:631
-#, fuzzy
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
-msgstr "اعرض Ø´Ø±Ù\8aØ· Ø§ï»·Ø¯Ù\88ات"
+msgstr "اعرض Ø§Ù\84تÙ\82Ù\88Ù\8aÙ\85"
 
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:268
 #: src/modules/conf/e_mod_main.c:367 src/modules/conf/e_mod_main.c:474
@@ -3551,13 +3590,13 @@ msgid ""
 "set of defaults will fix<br>that by adding it in. You can re-configure "
 "things now to your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
-"تحتاج Ø¨Ù\8aاÙ\86ات Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù\88حدة Ø´Ø±Ù\8aØ· Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¥Ù\84Ù\89 Ø§Ù\84ترÙ\82Ù\8aØ©. ØªÙ\83Ù\88Ù\8aÙ\86اتÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د "
-"محيت و تمت تهيئة افتراضيات جديدة . سيحدث<br>هذا بشكل منتظم خلال التطوير ، "
-"لذا لا ترسل تقريرا <br>بعلة. ببساطة فإن ما يعنيه هذا اﻹجراء هو أن الوحدة "
-"تحتاج لبيانات تكوينات جديدة كإجراء افتراضي<br>لوظيفة أكثر قابلية للإستخدام و "
-"التي كانت تكويناتك <br>القديمة تفتقر إليها بكل بساطة.  هذه اﻹفتراضيات "
-"اÙ\84جدÙ\8aدة Ø³ØªØµÙ\84Ø­ <br>Ù\87ذا Ø§ï»·Ù\85ر Ø¹Ø¨Ø± Ø¥Ø¶Ø§Ù\81تÙ\87ا Ø¹Ù\84Ù\8aÙ\87ا. Ø§ï»µÙ\86 Ù\8aÙ\85Ù\83Ù\86Ù\83 Ø¥Ø¹Ø§Ø¯Ø© ØªÙ\83Ù\88Ù\8aÙ\86 Ø§ï»·Ø´Ù\8aاء "
-"حسب  <br>رغبتÙ\83. Ù\86أسÙ\81 ï»¹Ø²Ø¹Ø§Ø¬Ù\83 <br>"
+"إعدادات Ø§Ù\84ضبط ØªØ­ØªØ§Ø¬ Ù\84Ù\84ترÙ\82Ù\8aØ©. Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø§Ù\84Ù\82دÙ\8aÙ\85Ø© <br>Ù\82د ØªÙ\85 Ù\85Ø­Ù\88Ù\87ا Ø\8c Ù\88 Ù\85جÙ\85Ù\88عة "
+"جديدة من اﻹعدادات الافتراضية تم تهيئتها. <br>هذا  يحدث بشكل منتظم خلال "
+"التطوير ، وبالتالي لا ترسل تقرير <br>بخطأ. هذا يعني ببساطة أن الوحدة هذه "
+"تحتاج ﻹعدادات جديدة <br>كما يمكنك بكل بساطة استخدام البيانات اﻷساسية للوظائف "
+"المستخدمة <br>في اﻹعدادات القديمة . و هذه مجموعة جديدة من اﻹعدادات اﻹفتراضية "
+"اÙ\84تÙ\8a Ø³ØªÙ\82Ù\88Ù\85 Ø¨Ø§ï»¹ØµÙ\84اح <br>عبر Ø¥Ø¶Ø§Ù\81تÙ\87ا Ù\8aÙ\85Ù\83Ù\86Ù\83 ï»µÙ\86 Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¹Ø¯Ø§Ø¯ Ø§ï»·Ø´Ù\8aاء  <br>حسب "
+"رغبتÙ\83. Ù\86أسÙ\81 Ù\84Ù\84تدخÙ\84 Ù\81Ù\8a Ø§ï»¹Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù\84خاصة Ø¨Ù\83. <br>"
 
 #: src/modules/conf/e_mod_main.c:312
 msgid ""
@@ -3568,10 +3607,10 @@ msgid ""
 "your configuration has been now restored to<br>defaults. Sorry for the "
 "inconvenience.<br>"
 msgstr ""
-"تÙ\83Ù\88Ù\8aÙ\86ات Ù\88حدة Ù\84Ù\88حة ØªÙ\83Ù\88Ù\8aÙ\86اتÙ\83 Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ø§Ù\84Ù\88حدة.  Ù\87ذا Ø§ï»·Ù\85ر<br>غرÙ\8aب.Ù\84ا Ù\8aÙ\86بغÙ\8a "
-"حدوث هذا إﻻ إذا خفضت<br>إصدارة الوحدة أو نسخت التكوينات من مكان آخر "
-"<br>Ù\8aحتÙ\88Ù\8a Ø¹Ù\84Ù\89 Ø¥ØµØ¯Ø§Ø±Ø© Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø§Ù\84Ù\88حدة. Ù\87ذا Ø§ï»·Ù\85ر Ø³Ù\8aØ¡ Ù\88<br> Ù\83إجراء Ø§Ø­ØªØ±Ø§Ø²Ù\8a فإن "
-"تÙ\83Ù\88Ù\8aÙ\86اتÙ\83 Ù\82د ØªÙ\85ت Ø§Ø¹Ø§Ø¯ØªÙ\87ا Ø¥Ù\84Ù\89<br>اﻹÙ\81تراضÙ\8aات. Ù\86أسÙ\81 Ù\84Ù\84Ø¥زعاج.<br>"
+"إعدادات Ù\88حدة Ù\84Ù\88حة Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ\83 Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ø§Ù\84Ù\88حدة.  Ù\87ذا ØºØ±Ù\8aب<br>جدا. Ù\84Ù\86 Ù\8aحدث "
+"هذا إلا إذا قمت بتخفيض<br>إصدارة الوحدة أو نسخت اﻹعدادات من مكان آخر "
+"<br>Ù\8aحتÙ\88Ù\8a Ø¹Ù\84Ù\89 Ø¥ØµØ¯Ø§Ø±Ø© Ø¬Ø¯Ù\8aدة Ù\85Ù\86 Ø§Ù\84Ù\88حدة ØªØ¹Ù\85Ù\84 Ø¹Ù\84Ù\8aÙ\87. Ù\87ذا Ø³Ù\8aØ¡<br>Ù\88 Ù\83إحتÙ\8aاط فإن "
+"إعداداتÙ\83 Ù\82د ØªÙ\85 Ø§Ø³ØªØ¹Ø§Ø¯ØªÙ\87ا Ø¥Ù\84Ù\89<br>اﻹÙ\81تراضÙ\8aات. Ù\86أسÙ\81 Ù\84Ù\87ذا Ø§ï»¹زعاج.<br>"
 
 #: src/modules/conf/e_mod_main.c:443
 msgid "Presentation"
@@ -3591,17 +3630,17 @@ msgstr "إعدادات لوحة اﻹعدادات تم تحديثها"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "تطبيقات IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "تطبيقات بدء التشغيل"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "أعد تشغيل البرامج"
 
@@ -3614,27 +3653,35 @@ msgid "Apps"
 msgstr "تطبيقات"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "تطبÙ\8aÙ\82 Ø¬Ø¯Ù\8aد"
+msgid "Create Launcher"
+msgstr "اÙ\86شء Ù\85Ù\82Ù\84ع"
 
-#: src/modules/conf_applications/e_mod_main.c:41
-#, fuzzy
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "امحِ المُطْلِقات الشخصية"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "التطبيقات اﻹفتراضية"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "بيئات سطح المكتب"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar أخرى"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:54
-#, fuzzy
 msgid "Profile Selector"
 msgstr "منتقي الحساب"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:106
-#, fuzzy
 msgid "Available Profiles"
 msgstr "الحسابات المتوفرة"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "اختر الحساب"
 
@@ -3672,9 +3719,9 @@ msgstr "إعدادات الحوار"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "اﻹعدادات العامة"
 
@@ -3684,7 +3731,7 @@ msgstr "عطل حوارات التأكيد"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:113
 msgid "Normal Windows"
-msgstr "النوافذ عادية"
+msgstr "اÙ\84Ù\86Ù\88اÙ\81Ø° Ø§Ù\84عادÙ\8aØ©"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:120
 #, fuzzy
@@ -3717,7 +3764,7 @@ msgstr "الحوارات"
 msgid "Profiles"
 msgstr "حسابات"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3728,7 +3775,7 @@ msgstr ""
 "إذا كان لا.<br>إذا لم تقم بضغط زر, فإن اﻷبعاد القديمة لـ<br>%dx%d على %d "
 "هيرتز سيتم اسعادتها خلال %d ثوان."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3739,7 +3786,7 @@ msgstr ""
 "إذا كان لا.<br>إذا لم تقم بضغط زر, فإن اﻷبعاد القديمة لـ<br>%dx%d سيتم "
 "اسعادتها خلال %d ثوان."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3750,7 +3797,7 @@ msgstr ""
 "إذا كان لا.<br>إذا لم تقم بضغط زر, فإن اﻷبعاد القديمة لـ<br>%dx%d على %d "
 "هيرتز سيتم اسعادتها <hilight>حالا</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3761,47 +3808,47 @@ msgstr ""
 "إذا لم يكن كذلك.<br>إذا لم تضغط زرا , فإن اﻷبعاد الرئيسية لـ<br>%dx%d سيتم "
 "إستعادتها <hilight>حالا</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "تغيير الدقة"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "حفظ"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "إسترجاع"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "إعدادات دقة الشاشة"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "الدقة"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "استعد قبل تسجيل الدخول"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "تحديث"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "الدوران"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "اﻹنعكاس"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "مميزات مفقودة"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3814,11 +3861,11 @@ msgstr ""
 "اﻹضافة. و من الممكن أن يكون<br>في الوقت الذي بنيت فيه <hilight>ecore</"
 "hilight> لم يتم اكتشاف<br>دعم لـ XRandR ."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "لا يوجد معدلات تحديث"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3831,94 +3878,74 @@ msgstr ""
 "عندها<br>سيتم إستخدام معدل التحديث عند ضبط<br>اﻷبعاد, التي ربما تسبب "
 "<hilight>ضررا</hilight> لشاشتك."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "إعدادات أسطح المكتب اﻹفتراضية"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "عدد أسطح المكتب"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
-msgstr "قلب سطح المكتب"
+msgstr "قلب فأرة سطح المكتب"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "قلب عند تحريك عناصر إلى حدود الشاشة"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 #, fuzzy
 msgid "Wrap desktops around when flipping"
 msgstr "لف أسطح المكاتب دائريا عند القلب"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "أسطح المكتب"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "لا يعمل"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "لوح"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "تكبير"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-#, fuzzy
-msgid "Background panning"
-msgstr "تثبيت الخلفية"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "سرعة الحركة"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f ثواني"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "عامل إدارة المحور السيني"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "عامل إدارة المحور الصادي"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "حركة القلب"
 
@@ -3935,7 +3962,7 @@ msgid "Desktop Wallpaper"
 msgstr "خلفية سطح المكتب"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "ضبط"
 
@@ -3945,12 +3972,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "شخصي"
 
@@ -3958,186 +3985,214 @@ msgstr "شخصي"
 msgid "Screen Lock Settings"
 msgstr "إعدادات قفل الشاشة"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "اقفل عند اﻹقلاع"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "أغلق عند التعليق"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "تخصيص قفل الشاشة "
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "اقفال"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "اعرض في كل الشاشات"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "اعرض في الشاشة الحالية"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
-msgstr "اعرض على الشاشة #:"
+msgstr "Ø£عرض على الشاشة #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "صندوق تسجيل الدخول"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "اقفل عند تفعيل حافظة الشاشة أكس"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f ثواني"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "إقفل عند تجاوز وقت الخمول"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f دقائق"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "المؤقتات"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "إقترح إذا ألغي التفعيل من قبل"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "نمط العرض"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
-msgstr "اÙ\84سÙ\85Ø© Ø§Ù\84Ù\85حددة"
+msgstr "عÙ\8aÙ\86ت Ø§Ù\84سÙ\85ة"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "خلفية السمة"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "الخلفية/الجدارية المحددة"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "الخلفية"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "إعدادات حافظة الشاشة"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "تمكين حافظة الشاشة إكس"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "التعليق"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "حتى إذا كان قيد التشغيل"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "أخِّر حتى التعليق"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "حافظة الشاشة"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "بدء المهلة"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 #, fuzzy
 msgid "Alternation timeout"
 msgstr "مهلة التعاقب"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "إفراغ"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "مفضلة"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "غير مفضلة"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 #, fuzzy
 msgid "Exposure Events"
 msgstr "كشف اﻷحداث"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "اسمح"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "لا تسمح"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "متفرقات"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "إشارة إدارة طاقة العرض"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr " خادم العرض لا يقدر على <br>نظم إدارة قواعد البيانات."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "خادم العرض لا يملك <br>إضافة نظم إدارة قواعد البيانات."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "إعدادات إدارة طاقة العرض"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "تمكين إعدادات إدارة طاقة العرض"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "وقت اﻹستعداد"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "وقت التعليق"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "وقت اﻹطفاء"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "إضاءة خلفية عادية"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "إضاءة خلفية خافتة"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "وقت اﻹضمحلال"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "اﻹضاءة الخلفية"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "أسطح المكتب اﻹفتراضية"
@@ -4171,95 +4226,92 @@ msgid "<None>"
 msgstr "<دون>"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#, fuzzy
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
-"رجاءا إختر edge,<br>أو انقر على <hilight>أغلق</hilight> ﻷجل اﻹلغاء."
-"<br><br>يمكنك تحديد تأخير لهذا<br> الحدث بإستخدام المنزلق, أو "
-"تجعله<br>يستجيب لنقرات edge:"
+"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
 #, fuzzy
 msgid "Edge Bindings Settings"
-msgstr "إعدادات Ø¥Ø±ØªØ¨Ø§Ø·Ø§Øª Ø§Ù\84Ù\87Ù\88اÙ\85Ø´"
+msgstr "إعدادات Ø¥Ø±ØªØ¨Ø§Ø·Ø§Øª Ø§Ù\84Ù\85حرÙ\83"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "ارتباطات الهوامش"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "إضافة ربط"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "حذف الربط"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "تعديل الربط"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "حذف الكل"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
-#, fuzzy
 msgid "Restore Default Bindings"
 msgstr "استعادة اﻹرتباطات اﻹفتراضية"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "اﻹجراء"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
-#, fuzzy
 msgid "Action Params"
 msgstr "دوال اﻹجراء"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "الخيارات العامة"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "تمكين تفعيل اﻹرتباطات مع نوافذ ملء الشاشة"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "تسلسل إرتباط الهوامش"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "هامش قابل للنقر"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "خطأ هامش اﻹرتباط"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4268,28 +4320,28 @@ msgstr ""
 "تسلسل مفتاح اﻹرتباط, الذي إخترته, قد استخدم بواسطة اﻹجراء <br><hilight>%s</"
 "hilight>.<br>رجاء اختر تسلسل هامش إرتباط آخر."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4368,11 +4420,11 @@ msgstr "العتبة"
 
 #: src/modules/conf_interaction/e_mod_main.c:20
 msgid "Touch"
-msgstr "لمس"
+msgstr "اللمس"
 
 #: src/modules/conf_interaction/e_mod_main.c:24
 msgid "Mouse"
-msgstr "فأرة"
+msgstr "الفأرة"
 
 #: src/modules/conf_intl/e_int_config_imc.c:104
 #: src/modules/conf_intl/e_mod_main.c:24
@@ -4424,56 +4476,69 @@ msgstr "إختر إعدادات طريقة إدخال"
 #: src/modules/conf_intl/e_int_config_imc_import.c:283
 #: src/modules/conf_intl/e_int_config_imc_import.c:299
 msgid "Input Method Config Import Error"
-msgstr "خطأ Ø¥Ø³ØªÙ\8aراد ØªÙ\83Ù\88Ù\8aÙ\86ات طريقة إدخال"
+msgstr "خطأ Ø¥Ø³ØªÙ\8aراد Ø¥Ø¹Ø¯Ø§Ø¯ات طريقة إدخال"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:284
 msgid ""
 "Enlightenment was unable to import the configuration.<br><br>Are you sure "
 "this is really a valid configuration?"
 msgstr ""
-"لا يستطيع إنلايتنمينت استيراد التكوين.<br><br>أمتأكد أنت من أن التكوين صالح ؟"
+"لا يستطيع إنلايتنمينت استيراد اﻹعداد.<br><br>أمتأكد أنت من أن اﻹعداد صالح ؟"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:300
 msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
-msgstr "لا يستطيع إنلايتنمينت إستيراد التكوين<br>نتيجة لخطأ في النسخ."
+msgstr "لا يستطيع إنلايتنمينت إستيراد اﻹعداد<br>نتيجة لخطأ في النسخ."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "إعدادات اللغة"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr "مشكلات محلية محتملة"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "إختيار اللغة"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "النظام اﻹفتراضي"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
-#, fuzzy
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
-msgstr "أختÙ\8aرت Ø§Ù\84Ù\85Ø­Ù\84Ù\8aة"
+msgstr "اÙ\84Ù\84غة Ø§Ù\84Ù\85Ø­Ù\84Ù\8aØ© Ø§Ù\84Ù\85Ù\8fختارة"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "المحليات"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "اللغة"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
-msgstr "رجاءًا اضغط sequence,<br><br>أو <hilight>ESC</hilight> ﻹلغائه."
+msgstr ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:8
 msgid "Single key"
@@ -4492,9 +4557,8 @@ msgid "Key Binding Sequence"
 msgstr "تسلسل ارتباط مفتاح"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1174
-#, fuzzy
 msgid "Binding Key Error"
-msgstr "خطأ مفتاح اﻹرتباط"
+msgstr "خطأ Ù\81Ù\8a Ù\85Ù\81تاح Ø§ï»¹Ø±ØªØ¨Ø§Ø·"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1175
 #, c-format
@@ -4531,9 +4595,8 @@ msgid "Any"
 msgstr "أيّ"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:329
-#, fuzzy
 msgid "Win List"
-msgstr "قائمة Win"
+msgstr "قائمة النافذة"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:333
 #: src/modules/pager/e_mod_config.c:135 src/modules/pager/e_mod_config.c:248
@@ -4553,34 +4616,32 @@ msgid "Manager"
 msgstr "المدير"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "لا شيء"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 #, fuzzy
 msgid "Mouse Binding Sequence"
 msgstr "تسلسل إرتباطات الفأرة"
 
 #: src/modules/conf_keybindings/e_mod_main.c:21
 msgid "Keys"
-msgstr "مفاتيح"
+msgstr "المفاتيح"
 
 #: src/modules/conf_keybindings/e_mod_main.c:25
-#, fuzzy
 msgid "Mouse Buttons"
-msgstr "إعدادات الفأرة"
+msgstr "أزرار الفأرة"
 
 #: src/modules/conf_keybindings/e_mod_main.c:29
-#, fuzzy
 msgid "Hardware Switches"
-msgstr "العتاد"
+msgstr "مفاتيح تبديل العتاد"
 
 #: src/modules/conf_menus/e_int_config_menus.c:38
 #: src/modules/conf_menus/e_mod_main.c:18
@@ -4588,23 +4649,19 @@ msgid "Menu Settings"
 msgstr "إعدادات القائمة"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
-#, fuzzy
 msgid "Enlightenment Default"
-msgstr "إنلايتنمينت"
+msgstr "اÙ\81تراضÙ\8aات Ø¥Ù\86Ù\84اÙ\8aتÙ\86Ù\85Ù\8aÙ\86ت"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
-#, fuzzy
 msgid "Personal Default"
-msgstr "شخصÙ\8a"
+msgstr "اÙ\81تراضÙ\8aات Ø´Ø®ØµÙ\8aØ©"
 
 #: src/modules/conf_menus/e_int_config_menus.c:257
 msgid "Main Menu"
 msgstr "القائمة الرئيسية"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "المفضلة"
 
@@ -4621,7 +4678,7 @@ msgid "Comments"
 msgstr "تعليقات"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4633,7 +4690,7 @@ msgid "Show gadget settings in top-level"
 msgstr "اعرض في المستوى اﻷعلى"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "القوائم"
 
@@ -4667,7 +4724,7 @@ msgstr "سرعة لف القائمة"
 #: src/modules/conf_menus/e_int_config_menus.c:303
 #, c-format
 msgid "%5.0f pixels/sec"
-msgstr "%5.0f بسكل/ثانية"
+msgstr "%5.0f بسكل\\ثانية"
 
 #: src/modules/conf_menus/e_int_config_menus.c:306
 #, fuzzy
@@ -4681,7 +4738,6 @@ msgid "%4.0f pixels/sec"
 msgstr "%4.0f بكسل ثانية"
 
 #: src/modules/conf_menus/e_int_config_menus.c:311
-#, fuzzy
 msgid "Click Drag Timeout"
 msgstr "مهلة النقر و اﻹسقاط"
 
@@ -4703,19 +4759,19 @@ msgid "Images"
 msgstr "الصور"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "الخطوط"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "السمات"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "اﻷيقونات"
 
@@ -4744,9 +4800,8 @@ msgid "Search Directories"
 msgstr "ابحث في المجلدات"
 
 #: src/modules/conf_paths/e_mod_main.c:24
-#, fuzzy
 msgid "Environment Variables"
-msgstr "صدر متغيرات البيئة"
+msgstr "متغيرات البيئة"
 
 #: src/modules/conf_performance/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4754,8 +4809,9 @@ msgstr "إعدادات المحرك"
 
 #: src/modules/conf_performance/e_int_config_engine.c:96
 #: src/modules/conf_performance/e_int_config_engine.c:138
+#, fuzzy
 msgid "Use ARGB instead of shaped windows"
-msgstr ""
+msgstr "استخدم ARGB بدلامن النوافذ المتشكلة"
 
 #: src/modules/conf_performance/e_int_config_engine.c:140
 #, fuzzy
@@ -4764,7 +4820,7 @@ msgid ""
 "does not support composite.<br><br>Are you sure you wish to enable ARGB "
 "support ?"
 msgstr ""
-"لقد إخترت تمكين دعم المركب ِِARGB<br>لكن شاشتك الحالية لا تدعم المركب."
+"لقد إخترت تمكين دعم المركب ARGB ،<br>لكن شاشتك الحالية لا تدعم المركب."
 "<br><br>أتريد تأكيد تمكين دعم المركب ARGB ؟"
 
 #: src/modules/conf_performance/e_int_config_performance.c:35
@@ -4785,9 +4841,8 @@ msgid "Applications priority"
 msgstr "التطبيقات ذات اﻷولوية"
 
 #: src/modules/conf_performance/e_int_config_performance.c:119
-#, fuzzy
 msgid "Cache flush interval"
-msgstr "اÙ\84Ù\81ترة Ø§Ù\84زÙ\85Ù\86Ù\8aØ© Ù\84Ù\85سح Ø§Ù\84ذاÙ\83رة Ø§Ù\84Ù\85ؤÙ\82تة"
+msgstr "اÙ\84Ù\81ترة Ø§Ù\84زÙ\85Ù\86Ù\8aØ© Ù\84Ù\85Ø­Ù\88 Ø§Ù\84ذاÙ\83رة Ø§Ù\84Ù\85خبئÙ\8aة"
 
 #: src/modules/conf_performance/e_int_config_performance.c:125
 msgid "Font cache size"
@@ -4861,18 +4916,18 @@ msgstr "لقد طلبت حذف \"%s\".<br><br>هل أنت متأكد من رغب
 msgid "Wallpaper Settings"
 msgstr "خيارات الخلفية"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "استخدم خلفية السمة"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "الصورة..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "متصل..."
 
@@ -4892,42 +4947,47 @@ msgstr "سطح المكتب هذا"
 msgid "This Screen"
 msgstr "هذه الشاشة"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "خيارات الخلفية..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "بلاط"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
-msgid "Select a Picture..."
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "لوح"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
+msgid "Select a Picture..."
 msgstr "اختر صورة..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "خلل في استيراد الصورة"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "عجز إنلايتنمينت عن إستيراد الصورة<br>لسبب أخطاء التحويل"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "خلل في استيراد الخلفية"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "لا يستطيع إنلايتنمينت استيراد الخلفية<br>بسبب خلل في النسخ."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4962,7 +5022,7 @@ msgid "Error: can't start the request."
 msgstr "خطأ: لا يمكن بدء الطلب"
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "نمط الحدود اﻹفتراضي"
 
@@ -4970,7 +5030,7 @@ msgstr "نمط الحدود اﻹفتراضي"
 msgid "Window Border Selection"
 msgstr "تحديد حدود النافذة"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "تذكر هذا اﻹطار لهذه النافذة عند ظهورها في المرة القادمة"
 
@@ -4985,12 +5045,12 @@ msgstr "تفعيل عنوان القائمة"
 #: src/modules/conf_theme/e_int_config_color_classes.c:77
 #, fuzzy
 msgid "Border Frame"
-msgstr "نمط الحدود"
+msgstr "إطار العنوان"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:78
 #, fuzzy
 msgid "Border Frame Active"
-msgstr "تÙ\81عÙ\8aÙ\84 Ø¹Ù\86Ù\88اÙ\86 Ø§Ù\84Ù\82ائÙ\85Ø©"
+msgstr "تÙ\81عÙ\8aÙ\84 Ø¥Ø·Ø§Ø± Ø§Ù\84عÙ\86Ù\88اÙ\86"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:79
 msgid "Error Text"
@@ -5001,7 +5061,7 @@ msgid "Menu Background Base"
 msgstr "القاعدة الخلفية للقائمة"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "عنوان القائمة"
 
@@ -5010,7 +5070,7 @@ msgid "Menu Title Active"
 msgstr "عنوان القائمة مفعل"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "عنصر قائمة"
 
@@ -5023,12 +5083,12 @@ msgid "Menu Item Disabled"
 msgstr "تم تعطيل عنصر القائمة "
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "تحريك النص"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "تحجيم النص"
 
@@ -5045,7 +5105,7 @@ msgid "Winlist Label"
 msgstr "شريط قائمة Win"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "عنوان قائمة Win"
 
@@ -5062,398 +5122,404 @@ msgid "File Manager Background Base"
 msgstr "القاعدة الخلفية لمدير الملفات"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "البؤرة"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "نصّ الزر"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "نص الزر معطل"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "افحص النص"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "فحص النص معطل"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "نص المدخلة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "نص اﻹدخال معطل"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "نص العلامة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "تم اختيار  نص عنصر القائمة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "نص عنصر قائمة (منتظم)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 #, fuzzy
 msgid "List Item Background Base (Even)"
 msgstr "قاعدة خلفية عنصر القائمة (( منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "نص عنصر قائمة (غير منتظم)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 #, fuzzy
 msgid "List Item Background Base (Odd)"
 msgstr "قاعدة خلفية عنصر القائمة (( غير منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "نص رأس القائمة (( منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 #, fuzzy
 msgid "List Header Background Base (Even)"
 msgstr "قاعدة خلفية رأس القائمة (( منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "نص رأس القائمة (( غير منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "قاعدة خلفية رأس القائمة ((غير  منتظم ))"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "نص مشع"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "نص مشع غير مفعل"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 #, fuzzy
 msgid "Slider Text"
 msgstr "نص شريحة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 #, fuzzy
 msgid "Slider Text Disabled"
 msgstr "نص شريحة غير مفعل"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "قاعدة خلفية اﻹطارات"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 #, fuzzy
 msgid "Scroller Frame Background Base"
 msgstr "قاعدة خلفية إطار شريط التمرير"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "اسم ملصق الوحدة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "لون تدريجي مركب"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "اﻷلوان"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "أصناف اﻷلوان: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "تم اختيار %u أصناف اﻷلوان المخلوطة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "تم اختيار %u أصناف اﻷلوان الغير معدة سابقا"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "تم اختيار %u أصناف اﻷلوان الموحدة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "لم يتم اختيار صنف اللون"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "تخصيص اﻷلوان"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "كائن:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "دون اتصال:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "ظل:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 #, fuzzy
 msgid "Text with applied colors."
 msgstr "نص مع ألوان مطبقة "
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "ألوان تعتمد قدرات السمة"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "مدير النوافذ"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "اﻷدوات"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "أخرى"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "شريط العنوان"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 #, fuzzy
 msgid "Textblock Plain"
 msgstr "سمك خط عادي"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 #, fuzzy
 msgid "Textblock Light"
 msgstr "سمك خط بسيط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 #, fuzzy
 msgid "Textblock Big"
 msgstr "سمك خط كبير"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "رأسية اﻹعدادات"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "عن العنوان"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "عن النسخة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "عن النص"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 #, fuzzy
 msgid "Desklock Title"
 msgstr "عنوان قفل المكتب"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "كلمة مرور قفل المكتب"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "خلل في صندوق الحوار"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "أمر Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "عنوان الشاشة الترحيبية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "نص الشاشة الترحيبية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "إصدارة الشاشة الترحيبية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "ساعة رقمية"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "اﻹدخال"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "اﻹطار"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "التسمية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "اﻷزرار"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "شريط التمرير"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 #, fuzzy
 msgid "Radio Buttons"
 msgstr "أزرار إشعاعية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "أزرار تحديد"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
-msgstr "عنصر القائمة النصية"
+msgstr "عنصر قائمة نصية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "عنصر قائمة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "رأسية القائمة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "مدير الملفات"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "أيفونة سطح المكتب"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "صغير"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "كبير"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 #, fuzzy
 msgid "Small Styled"
 msgstr "سمة صغيرة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 #, fuzzy
 msgid "Normal Styled"
 msgstr "سمة عادية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 #, fuzzy
 msgid "Large Styled"
 msgstr "سمة كبيرة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "إعدادات الخط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "صغير جدا"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "كبير"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "كبير جداً"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "ضخم"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d بكسل"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "تمكين أصناف الخطوط المخصصة المعدلة"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
-msgstr "نص عرض أساسي: 123: ABCD"
+msgstr "نص عرض أساسي: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "أصناف الخط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "تمكين صنف الخط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "خط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "نص عرض متقدم.. Advanced Preview Text "
+msgstr "نص عرض متقدم.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "التلميح"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "شفرة ثمانية"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "تلقائي"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "تراجعات الخط"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
-msgstr "اسم التراجع"
+msgstr "اسم التراجعات"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
-msgstr "تمكين التراجعات"
+msgstr "مكِّن التراجعات"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "تلميح / تراجعات"
 
@@ -5461,13 +5527,17 @@ msgstr "تلميح / تراجعات"
 msgid "Icon Theme Settings"
 msgstr "إعدادات سمة اﻷيقونات"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
-msgstr "تمكين سمة ايقونة"
+msgstr "مِّن سمة اﻷيقونة"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr "إختر سمة أيقونات للتطبيقات"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
-msgstr "Ø£Ù\8aÙ\82Ù\88Ù\86ات ØªØªØ¬Ø§Ù\88ز السمة العامة"
+msgstr "اﻷÙ\8aÙ\82Ù\88Ù\86ات ØªØªØ®Ø·Ù\89 السمة العامة"
 
 #: src/modules/conf_theme/e_int_config_cursor.c:38
 msgid "Cursor Settings"
@@ -5490,8 +5560,9 @@ msgid "Scale Settings"
 msgstr "اعدادات النطاق"
 
 #: src/modules/conf_theme/e_int_config_scale.c:99
+#, fuzzy
 msgid "Scale with DPI"
-msgstr "حجÙ\91Ù\85 Ø¨Ù\80 DPI"
+msgstr "جدÙ\88Ù\84 Ù\85ع DPI"
 
 #: src/modules/conf_theme/e_int_config_scale.c:103
 msgid "Relative"
@@ -5515,12 +5586,12 @@ msgstr ""
 #: src/modules/conf_theme/e_int_config_scale.c:170
 #, fuzzy
 msgid "Don't Scale"
-msgstr "Ù\84ا ØªØ­Ø¬Ù\91Ù\85"
+msgstr "Ù\84ا ØªØ¬Ø¯Ù\88Ù\84"
 
 #: src/modules/conf_theme/e_int_config_scale.c:173
 #, fuzzy
 msgid "Scale relative to screen DPI"
-msgstr "تحجÙ\8aÙ\85 Ù\86سبÙ\8a إلى شاشة DPI"
+msgstr "جدÙ\88Ù\84 Ø§Ù\84Ù\86سبة إلى شاشة DPI"
 
 #: src/modules/conf_theme/e_int_config_scale.c:178
 #, c-format
@@ -5532,11 +5603,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f مرات"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5547,6 +5616,12 @@ msgstr "سياسة"
 msgid "Minimum"
 msgstr "اﻷدنى"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f مرات"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "اﻷقصى"
@@ -5564,28 +5639,29 @@ msgid "Show Splash Screen on Login"
 msgstr "اعرض الشاشة الترحيبية في تسجيل الدخول"
 
 #: src/modules/conf_theme/e_int_config_transitions.c:44
+#, fuzzy
 msgid "Transition Settings"
 msgstr "إعدادات اﻹنتقال"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "اﻷحداث"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "بدء التشغيل"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "تغيير المكتب"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "تغيير الخلفية"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "اﻹنتقالات"
 
@@ -5601,15 +5677,15 @@ msgstr " استيراد..."
 msgid " Online..."
 msgstr " متصل..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "أقسام السمات"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "تعيينن"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "تفريغ الكل"
 
@@ -5637,19 +5713,19 @@ msgstr "لا يستطيع إنلايتنمينت استيراد السمة<br>ج
 msgid "Exchange themes"
 msgstr "تبادل السمات"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "الحدود"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "سمة اﻷيقونات"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "مؤشر الفأرة"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "تحجيم"
 
@@ -5671,7 +5747,7 @@ msgstr "افصل المجموعات حسب"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:114
 msgid "Using separator bars"
-msgstr "استخداÙ\85 Ø§ï»·Ø´Ø±Ø·Ø© Ø§Ù\84Ù\81اصÙ\84Ø©"
+msgstr "استخداÙ\85 Ø£Ø´Ø±Ø·Ø© Ø§Ù\84Ù\81صÙ\84"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:117
 msgid "Using menus"
@@ -5710,13 +5786,12 @@ msgid "Separate group"
 msgstr "افصل المجموعة"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:151
-#, fuzzy
 msgid "Warp to owning desktop"
-msgstr "انقل إلى سطح المكتب المالك"
+msgstr "انقل إلى سطح المكتب الحالي"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:154
 msgid "Iconified Windows"
-msgstr "نوافذ مأيقنة"
+msgstr "صغر النافذة "
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:158
 msgid "Limit caption length"
@@ -5766,6 +5841,7 @@ msgid "User defined"
 msgstr "تعريف المستخدم"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:154
+#, fuzzy
 msgid "Application provided"
 msgstr "التطبيق مدعوم"
 
@@ -5773,6 +5849,10 @@ msgstr "التطبيق مدعوم"
 msgid "Border Icon"
 msgstr "أيقونة الحدود"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "التموضع"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "تموضع ذكي"
@@ -5801,23 +5881,43 @@ msgstr "نوافذ جديدة"
 msgid "Animate"
 msgstr "حرّك"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "خطي"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "تسارع ، ثم تباطأ"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "زيادة التسارع"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "تقليل التسارع"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "تسارع ، ثم تباطأ بوضوح"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "تظليل"
 
@@ -5838,6 +5938,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "أحدث نافذة تحت الفأرة"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "انقر"
 
@@ -5869,11 +5970,6 @@ msgstr "الحوارات فقط"
 msgid "Only dialogs with focused parent"
 msgstr "الحوارات فقط مع التركيز على اﻷصول"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "البؤرة"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "إعدادات أخرى"
@@ -5892,9 +5988,8 @@ msgid "Click focuses the window"
 msgstr "نقرة تركز على النافذة"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:245
-#, fuzzy
 msgid "Refocus last window on desktop switch"
-msgstr "أعد ØªØ±Ù\83Ù\8aز Ø§Ù\84Ù\86اÙ\81ذة Ø§ï»·Ø®Ù\8aرة Ø¹Ù\84Ù\89 تغير سطح المكتب"
+msgstr "أعد Ø§Ù\84ترÙ\83Ù\8aز Ø¹Ù\84Ù\89 Ø§Ù\84Ù\86اÙ\81ذة Ø§ï»·Ø®Ù\8aرة Ø¹Ù\86د تغير سطح المكتب"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:248
 msgid "Revert focus when it is lost"
@@ -5956,11 +6051,11 @@ msgstr "حرّك بعد التحجيم"
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:22
 msgid "Window Maximize Policy"
-msgstr "Ø£سلوب تكبير نافذة"
+msgstr "Ø·Ù\8aÙ\82Ø© Ù\88 Ø§سلوب تكبير نافذة"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
 msgid "Maximize Policy"
-msgstr "Ø£سلوب التكبير"
+msgstr "طرÙ\8aÙ\82Ø© Ù\88 Ø§سلوب التكبير"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:148
@@ -5973,13 +6068,13 @@ msgid "Fill available space"
 msgstr "عبئ ما توفر من فراغ "
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "أفقي"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "عمودي"
@@ -6000,7 +6095,7 @@ msgstr "اسمح بالتعامل من النوافذ المكبرة"
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:183
 #, fuzzy
 msgid "Adjust windows on shelf hide"
-msgstr "Ù\86ظÙ\85 Ø§Ù\84Ù\86Ù\88اÙ\81Ø° Ø¹Ù\84Ù\89 Ø¹Ù\84Ù\89 إخفاء الدرج"
+msgstr "Ù\86ظÙ\85 Ø§Ù\84Ù\86Ù\88اÙ\81Ø° Ø¹Ù\86د إخفاء الدرج"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:49
 #: src/modules/conf_window_manipulation/e_mod_main.c:21
@@ -6009,9 +6104,8 @@ msgstr "ترصيص النافذة"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:123
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:144
-#, fuzzy
 msgid "Raise windows on mouse over"
-msgstr "كبر النافذة عندما تكون الفأرة على أيقونتها"
+msgstr "كبر النافذة عندما تكون الفأرة فوقها"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:127
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:169
@@ -6035,18 +6129,18 @@ msgid "Raise when starting to move or resize"
 msgstr "كبر عند بدء الحركة أو التحجيم"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:166
-#, fuzzy
 msgid "Raise when clicking to focus"
-msgstr "كبر وقت النقر ﻷجل التركيز"
+msgstr "كبر عند النقر ﻷجل التركيز"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "التركيز على النافذة"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:23
+#, fuzzy
 msgid "Client List Menu"
-msgstr "لائحة العميل أو الوكيل"
+msgstr "Client List Menu"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:33
 #: src/modules/conf_window_remembers/e_mod_main.c:17
@@ -6059,13 +6153,14 @@ msgid "Remember internal dialogs"
 msgstr "تذكر الحوارات الداخلية"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:122
+#, fuzzy
 msgid "Remember file manager windows"
 msgstr "تذكر نوافذ مدير الملف"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:126
 #, fuzzy
 msgid "Delete Remember(s)"
-msgstr "مسح المتذكر(ون)"
+msgstr "امسح المذكِّر(ون)"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:136
 msgid "Details"
@@ -6109,23 +6204,23 @@ msgstr "نسبة المعالج"
 
 #: src/modules/cpufreq/e_mod_main.c:181
 msgid "Fast (4 ticks)"
-msgstr "سريع (4 نبضات)"
+msgstr "سريع (4 دقات)"
 
 #: src/modules/cpufreq/e_mod_main.c:188
 msgid "Medium (8 ticks)"
-msgstr "متوسط (8 نبضات)"
+msgstr "متوسط (8 دقات)"
 
 #: src/modules/cpufreq/e_mod_main.c:195
 msgid "Normal (32 ticks)"
-msgstr "عادي (32 نبضة)"
+msgstr "عادي (32 دقة)"
 
 #: src/modules/cpufreq/e_mod_main.c:202
 msgid "Slow (64 ticks)"
-msgstr "بطيء (64 نبضة)"
+msgstr "بطيء (64 دقة)"
 
 #: src/modules/cpufreq/e_mod_main.c:209
 msgid "Very Slow (256 ticks)"
-msgstr "بطيء جدا (256 نبضة)"
+msgstr "بطيء جدا (256 دقة)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6182,7 +6277,7 @@ msgid ""
 "There was an error trying to set the<br>cpu frequency governor via the "
 "module's<br>setfreq utility."
 msgstr ""
-"هنالك محاولة خاطئة ﻷجل ضبط<br>المتحكم بنسبة المعالج عبر وحدة<br>ضبط النسبة."
+"هنالك محاولة خاطئة عبر<br>وحدة ضبط النسبة<br>ﻷجل ضبط المتحكم بنسبة المعالج."
 
 #: src/modules/cpufreq/e_mod_main.c:440
 msgid ""
@@ -6198,7 +6293,7 @@ msgid ""
 "There was an error trying to set the<br>cpu frequency setting via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Ù\87Ù\86اÙ\84Ù\83 Ù\85حاÙ\88Ù\84Ø© Ø®Ø§Ø·Ø¦Ø© Ù\84أجÙ\84 Ø¶Ø¨Ø·<br>إعدادات Ù\86سبة Ø§Ù\84Ù\85عاÙ\84ج Ø¹Ø¨Ø± Ù\88حدة<br>ضبط النسبة ."
+"Ù\87Ù\86اÙ\84Ù\83 Ù\85حاÙ\88Ù\84Ø© Ø®Ø§Ø·Ø¦Ø© Ù\84ضبط<br>إعدادات Ù\86سبة Ø§Ù\84Ù\85عاÙ\84ج Ø¹Ø¨Ø± Ù\88حدة<br> ضبط النسبة ."
 
 #: src/modules/dropshadow/e_mod_config.c:39
 msgid "Dropshadow Settings"
@@ -6226,11 +6321,11 @@ msgstr "نوع الغشاوة"
 
 #: src/modules/dropshadow/e_mod_config.c:121
 msgid "Very Fuzzy"
-msgstr "غير واضح جدا"
+msgstr "غير واضحجدا"
 
 #: src/modules/dropshadow/e_mod_config.c:123
 msgid "Fuzzy"
-msgstr "غير واضح"
+msgstr "مبهم"
 
 #: src/modules/dropshadow/e_mod_config.c:125
 msgid "Medium"
@@ -6296,28 +6391,28 @@ msgstr "فاتح جداً"
 msgid "Dropshadow"
 msgstr "ضل ساقط"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "مهيئ اﻹقلاع "
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
-msgstr "اعرض مطلق كل شيء"
+msgstr "اعرض مهيئ إقلاع كل شيء"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "إعدادات كل شيء"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
-msgstr "اظهر حوارات كل شيء"
+msgstr "Ø£ظهر حوارات كل شيء"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "و حدات كل شيء"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "تشغيل"
 
@@ -6325,145 +6420,146 @@ msgstr "تشغيل"
 msgid "Everything Settings"
 msgstr "إعدادات كل شيء"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "الملحقات المتاحة"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "حرّك ﻷعلى"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "حرّك ﻷسفل"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "إضبط"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "مفعل"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "اعرض في \"الكل\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
+#, fuzzy
 msgid "Show in top-level"
 msgstr "اعرض في المستوى اﻷعلى"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "أقل أحرف للبحث"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 #, fuzzy
 msgid "Plugin Trigger"
 msgstr "مطلق الملحق"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "اسم الملحق هو الخيار اﻹفتراضي"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
-msgstr "إبحث فقط عند الطلب"
+msgstr "إبحث عند بدء التشغيل فقط"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "عرض الملحق"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "التفاصيل"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "عرض افتراضي"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "حرّك بسلاسة"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "أعلى/أسفل إختر العنصر التالي في شكل أيقوني"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
-msgstr "إخÙ\81Ù\90 Ø§ï»¹Ø¯Ø®Ø§Ù\84 Ø¹Ù\86دÙ\85ا Ù\8aÙ\83Ù\88Ù\86 ØºÙ\8aر Ù\81عاÙ\84ا"
+msgstr "اخÙ\81Ù\90 Ø§Ù\84Ù\85دخÙ\84ات Ø¹Ù\86دÙ\85ا ØªÙ\83Ù\88Ù\86 ØºÙ\8aر Ù\81عاÙ\84Ø©"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "أخف القائمة"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "تحديد سريع"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "شكل و اسلوب إيماك (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "شكل و اسلوب في آي (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "عرض افتراضي"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "حرّك بسلاسة"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "أعلى/أسفل إختر العنصر التالي في شكل أيقوني"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
-msgstr "تخزÙ\8aÙ\86"
+msgstr "ترتÙ\8aب"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr "بدون ترتيب"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "بواسطة كمية اﻹستهلاك"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "الاكثر استخداما"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "آخر استخدام"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "ملحقات الموضوع"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "ملحقات اﻹجراء"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "ملحقات الكائن"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "ملحقات"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
-msgstr "مقاس و حجم النافذة المنبثقة"
+msgstr "حجم المنبثقة"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
-msgstr "عرض Ø§Ù\84Ù\86اÙ\81ذة Ø§Ù\84Ù\85Ù\86بثÙ\82Ø©"
+msgstr "عرض المنبثقة"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
-msgstr "إرتÙ\81اع منبثقة"
+msgstr "ارتÙ\81اع Ø§Ù\84منبثقة"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
-msgstr "محاذاة منبثقة"
+msgstr "محاذاة المنبثقة"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6472,35 +6568,28 @@ msgstr "محاذاة منبثقة"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
+#, fuzzy
 msgid "Edge Popup Size"
-msgstr "حجم حدود منبثقة"
+msgstr "حجم حدود منبثق"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "هندسة"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "مجموعة كل شيء"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "اﻹجراءات"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "عناصر"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "لم يتم تحميل ملحقات"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "إنسخ إلى لوحة الصور"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6521,162 +6610,76 @@ msgid ""
 "</hilight> toggle list view modes<br>    <hilight>&lt;ctrl+3&gt;</hilight> "
 "toggle thumb view modes"
 msgstr ""
-"حسنا ، سيأتيك اﻵن الشرح حول البحث عن <hilight>كل شيء</hilight>تريده<br>  فقط "
-"أكتب أحرف قليلة من الشيء الذي تبحث عنه. <br>  إستخدم مؤشر الفأرة "
-"<hilight>&lt;أعلى/أسفل&gt;</hilight> لتختر من قائمة اﻷشياء.<br>  اضغط  "
-"<hilight>&lt;TAB&gt;</hilight> ﻹختيار اﻷمر, ثم اضغط  <hilight>&lt;ENTER&gt;</"
-"hilight>.<br> لن تظهر هذه القائمة المرة القادمة لتشغيل <hilight>أي شيء</"
-"hilight>.<br>    <hilight>&lt;ESC&gt;</hilight> ﻹغلاق صفحة الحوار هذه "
-"<br>    <hilight>&lt;؟&gt;</hilight> إعرض هذه الصفحة<br>    <hilight>&lt;"
-"ENTER&gt;</hilight> تشغيل اﻷمر<br>    <hilight>&lt;CTRL+ENTER&gt;</hilight> "
-"تشغيل اﻷمر و استمرار<br>    <hilight>&lt;TAB&gt;</hilight> للتبديل بين "
-"المخيرات<br>    <hilight>&lt;CTRL+TAB&gt;</hilight> ﻹكمال اﻹدخال (تعتمد على "
-"الملحق)<br>    <hilight>&lt;CTRL+'X'&gt;</hilight> للقفز لملحق يبدأ بالحرف "
-"'X' 'x'<br>    <hilight>&lt;CTRL+يمين/يسار &gt;</hilight> لدورة من خلال "
-"الملحقات<br>    <hilight>&lt;CTRL+أعلى/أسفل&gt;</hilight> للانتقال إلى أول/"
-"آخر عنصر<br>    <hilight>&lt;CTRL+1&gt;</hilight> لتبديل أوضاع العرض (أخرج "
-"من هذه الصفحة ;)<br>    <hilight>&lt;CTRL+2&gt;</hilight> لتبديل أوضاع عرض "
-"القائمة <br>    <hilight>&lt;CTRL+3&gt;</hilight> لتبديل أوضاع عرض التقييم"
-
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "فتح بـ..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "فتح ملف..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "تعديل مدخل التطبيق"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "مدخل تطبيق جديد"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "شغل بواسطة Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "فتح بـ..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "إفتح الطرفية هنا"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "شغل التنفيذي"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+"حسنا ، سيأتيك اﻵن الشرح حول <hilight>كل شيء</hilight>...<br>  فقط أكتب أحرف "
+"قليلة من الشيء الذي تبحث عنه. <br>  إستخدم مؤشر الفأرة <hilight>&lt;أعلى/"
+"أسفل&gt;</hilight> لتختر من قائمة اﻷشياء.<br>  اضغط  <hilight>&lt;TAB&gt;</"
+"hilight> ﻹختيار اﻷمر, ثم اضغط  <hilight>&lt;ENTER&gt;</hilight>.<br> لن تظهر "
+"هذه القائمة المرة القادمة لتشغيل <hilight>أي شيء</hilight>.<br>    "
+"<hilight>&lt;ESC&gt;</hilight> ﻹغلاق صفحة الحوار هذه <br>    <hilight>&lt;؟"
+"&gt;</hilight> إعرض هذه الصفحة<br>    <hilight>&lt;ENTER&gt;</hilight> تشغيل "
+"اﻷمر<br>    <hilight>&lt;CTRL+ENTER&gt;</hilight> تشغيل اﻷمر و "
+"استمرار<br>    <hilight>&lt;TAB&gt;</hilight> للتبديل بين المخيرات<br>    "
+"<hilight>&lt;CTRL+TAB&gt;</hilight> ﻹكمال اﻹدخال (تعتمد على الملحق)<br>    "
+"<hilight>&lt;CTRL+'X'&gt;</hilight> للقفز لملحق يبدأ بالحرف 'X' 'x'<br>    "
+"<hilight>&lt;CTRL+يمين/يسار &gt;</hilight> لدورة من خلال الملحقات<br>    "
+"<hilight>&lt;CTRL+أعلى/أسفل&gt;</hilight> للانتقال إلى أول/آخر عنصر<br>    "
+"<hilight>&lt;CTRL+1&gt;</hilight> لتبديل أوضاع العرض (أخرج من هذه الصفحة ;)"
+"<br>    <hilight>&lt;CTRL+2&gt;</hilight> لتبديل أوضاع عرض القائمة <br>    "
+"<hilight>&lt;CTRL+3&gt;</hilight> لتبديل أوضاع عرض التقييم"
+
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "تطبيقات كل شيء"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "اﻷوامر"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
-msgstr "أمر طرفية"
+msgstr "Ø£Ù\85ر Ø§Ù\84طرÙ\81Ù\8aØ©"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Sudo الواجهة الرسومية"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr "ملحقات كل شئ"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "الحاسبة"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "إنسخ إلى ..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "إنقل إلى..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "إنقل إلى سلة المهملات"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "إفتح المجلد (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "رتب بواسطة التاريخ"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "رتب حسب اﻹسم"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "الملفات اﻷخيرة"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "ملفات كل شيء"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "إعرض الملفات اﻷخيرة"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "ابحث في الملفات ﻷخيرة"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "ابحث في الملفات المؤقتة"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "مسارات المخازن التي تمت زيارتها"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "نظف المخزن"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "إعرض الحوارات"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "بدل إلى النافذة"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "بدّل كامل الشاشة"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "أرسل لسطح المكتب"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "أيقونات الملف"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "أنواع الملفات"
 
@@ -6723,19 +6726,19 @@ msgid "Select an image"
 msgstr "اختر صورة"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "مدير الملفات"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "المنزل"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "الجذر"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6745,15 +6748,15 @@ msgid ""
 "defaults will fix<br>that by adding it in. You can re-configure things now "
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
-"تحتاج بيانات إعدادات مدير وحدة الملفات إلى الترقية. تكويناتك القديمة<br>قد "
-"محيت و تمت تهيئة افتراضيات جديدة. سيحدث<br>هذا بشكل منتظم خلال التطوير ، "
-"لهذا لا ترسل تقريرا عن<br>علة. ببساطة فإن ما يعنيه هذا اﻹجراء هو أن وحدة "
-"مدير الملفات تحتاج إلى بيانات تكوينات جديدة كإجراء افتراضي<br>لوظيفة أكثر "
-"قابلية للإستخدام و التي كانت تكويناتك<br>القديمة تفتقر إليها بكل بساطة.  هذه "
-"اﻹفتراضيات الجديدة ستصلح<br>هذا اﻷمر عبر إضافتها عليها. اﻵن يمكنك إعادة "
-"تكوين اﻷشياء حسب<br>رغبتك. نأسف لبعثرتنا لتكويناتك.<br>"
-
-#: src/modules/fileman/e_mod_main.c:483
+"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
+"been wiped and a new set of defaults initialized. This<br>will happen "
+"regularly during development, so don't report a<br>bug. This simply means "
+"Fileman module needs new configuration<br>data by default for usable "
+"functionality that your old<br>configuration simply lacks. This new set of "
+"defaults will fix<br>that by adding it in. You can re-configure things now "
+"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6762,13 +6765,13 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"تÙ\83Ù\88Ù\8aÙ\86ات Ù\88حدة Ù\85دÙ\8aر Ø§Ù\84Ù\85Ù\84Ù\81ات Ù\84دÙ\8aÙ\83 Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ù\88حدة Ù\85دÙ\8aر Ø§Ù\84Ù\85Ù\84Ù\81ات. هذا "
-"اﻷمر<br>غريب. لا ينبغي حدوث هذا إﻻ إذا خفضت <br>إصدارة وحدة مدير الملفات أو "
-"نسخت التكوينات من مكان آخر<br>يحتوي على إصدارة أحدث من الوحدة . هذا اﻷمر سيء "
-"و<br>كإجراء احترازي فإن تكويناتك قد تمت إعادتها إلى<br>اﻹفتراضيات. نأسف على "
+"إعداداتÙ\83 Ø§Ù\84خاصة Ø¨Ù\88حدة Ù\85دÙ\8aر Ø§Ù\84Ù\85Ù\84Ù\81ات Ø£Ø­Ø¯Ø« Ù\85Ù\86 Ø¥ØµØ¯Ø§Ø±Ø© Ø§Ù\84Ù\88حدة Ø§Ù\84حاÙ\84Ù\8aØ©. هذا "
+"<br>غريب جدا. لن يحدث هذا إلا إذا قمت بتخفيض<br>إصدارة الوحدة أو نسخت "
+"اﻹعدادات من مكان آخر<br>يحتوي على إصدارة جديدة من الوحدة تعمل عليه. هذا "
+"سيء<br>و كإحتياط فإن إعداداتك قد تم استعادتها إلى<br>اﻹفتراضيات. نأسف لهذا "
 "اﻹزعاج.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "تم تحديث إعدادات مدير الملفات"
 
@@ -6786,7 +6789,7 @@ msgstr "عرض"
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Open Dirs In Place"
-msgstr "اÙ\81تح Ø§Ù\84Ù\85سارات Ù\81Ù\8a Ù\85Ù\83اÙ\86 Ù\88احد"
+msgstr "Ø¥Ù\81تح Ù\85سارات Ù\81Ù\8a Ù\85Ù\83اÙ\86"
 
 #: src/modules/fileman/e_mod_config.c:251
 msgid "Sort Dirs First"
@@ -6794,7 +6797,7 @@ msgstr "رتب المسارات أولا "
 
 #: src/modules/fileman/e_mod_config.c:254
 msgid "Case Sensitive"
-msgstr "حساس Ù\84حاÙ\84Ø© Ø£Ù\88 Ù\86Ù\88ع Ø§Ù\84حرف"
+msgstr "حساس Ù\84حاÙ\84Ø© Ø§ï»·حرف"
 
 #: src/modules/fileman/e_mod_config.c:258
 msgid "Use Single Click"
@@ -6802,11 +6805,11 @@ msgstr "استخدم نقرة واحدة"
 
 #: src/modules/fileman/e_mod_config.c:261
 msgid "Use Alternate Selection Modifiers"
-msgstr "استخدÙ\85 Ù\85عدÙ\91Ù\90Ù\84ات Ø§ï»¹Ø®ØªÙ\8aار Ø§Ù\84بدÙ\8aÙ\84Ø©"
+msgstr "استخدم معدلات اﻹختيار البديلة"
 
 #: src/modules/fileman/e_mod_config.c:265
 msgid "Show Icon Extension"
-msgstr "اعرض اضافة اﻷيقونة"
+msgstr "اعرض امتداد اﻷيقونة"
 
 #: src/modules/fileman/e_mod_config.c:268
 msgid "Show Full Path"
@@ -6843,97 +6846,101 @@ msgstr "إفتح مدير الملفات عند الوصل"
 
 #: src/modules/fileman/e_mod_config.c:295
 msgid "Device"
-msgstr "جهاز"
+msgstr "اÙ\84جÙ\87از"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "اذهب للمجلد اﻷم"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "تطبيق آخر..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "افتح"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "فتح بـ..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "التطبيقات المعروفة"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "برامج معينة"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "كل التطبيقات"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "أمر مخصص"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "تم رفض النسخ"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "تم رفض النقل"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "تم رفض الحذف"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "عملية غير معروفة من الثانوي تم إلغاؤها"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "تم نسخ %s بنجاح"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "يجري نسخ %s (في: %d ثانية)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "تم نقل %s بنجاح"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "نقل %s (في: %d ثواني)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "تم الحذف"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "جاري حذف الملفات..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6968,9 +6975,9 @@ msgstr "معالجة عملية(ات)  %d "
 msgid "Filemanager is idle"
 msgstr "مدير اﻹتصال خامل"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
-msgstr "معلومات عملية EFM"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:53
 msgid "Gadgets Manager"
@@ -6980,35 +6987,39 @@ msgstr "مدير اﻷدوات"
 msgid "Available Gadgets"
 msgstr "اﻷدوات المتاحة"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "الوضع"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "صورة مخصصة"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "لون مخصص"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "شفاف"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "الحركة"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "الخلفية"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "خيارات الخلفية"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "إبدأ تحريك/تحجيم"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "حرّ"
@@ -7031,7 +7042,7 @@ msgstr "أضف أدوات أخرى"
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
 msgid "Show/hide gadgets"
-msgstr "اعرض/أخفِ اﻷدوات"
+msgstr "Ø£عرض/أخفِ اﻷدوات"
 
 #: src/modules/winlist/e_int_config_winlist.c:58
 msgid "Window List Settings"
@@ -7047,15 +7058,15 @@ msgstr "نوافذ من شاشات أخرى"
 
 #: src/modules/winlist/e_int_config_winlist.c:196
 msgid "Iconified"
-msgstr "مأيقنة"
+msgstr "تم تصغيره لحجم أيقونه"
 
 #: src/modules/winlist/e_int_config_winlist.c:200
 msgid "Iconified from other desks"
-msgstr "مأيقنة من أسطح مكاتب أخرى"
+msgstr "تم تصغيره لحجم أيقونه من أسطح مكاتب أخرى"
 
 #: src/modules/winlist/e_int_config_winlist.c:205
 msgid "Iconified from other screens"
-msgstr "مأيقنة من شاشات أخرى"
+msgstr "تم تصغيره لحجم أيقونه من شاشات أخرى"
 
 #: src/modules/winlist/e_int_config_winlist.c:218
 msgid "Uncover"
@@ -7066,7 +7077,6 @@ msgid "Warp mouse while selecting"
 msgstr "إنقل الفأرة وقت اﻹختيار"
 
 #: src/modules/winlist/e_int_config_winlist.c:224
-#, fuzzy
 msgid "Warp mouse at end"
 msgstr "إنقل الفأرة على النهاية"
 
@@ -7079,17 +7089,17 @@ msgid "Selecting"
 msgstr "إختيار"
 
 #: src/modules/winlist/e_int_config_winlist.c:234
-#, fuzzy
 msgid "Warp speed"
 msgstr "سرعة انتقالية"
 
 #: src/modules/winlist/e_int_config_winlist.c:242
+#, fuzzy
 msgid "Scroll Animation"
-msgstr "حركة اللفافة"
+msgstr "حركة لف العرض"
 
 #: src/modules/winlist/e_int_config_winlist.c:247
 msgid "Scroll speed"
-msgstr "سرعة اللفافة"
+msgstr "سرعة لف العرض"
 
 #: src/modules/winlist/e_int_config_winlist.c:260
 msgid "Minimum width"
@@ -7113,7 +7123,7 @@ msgstr "أدنى طول"
 
 #: src/modules/winlist/e_int_config_winlist.c:280
 msgid "Maximum height"
-msgstr "Ø£Ù\82صÙ\89 Ø¥Ø±ØªÙ\81اع"
+msgstr "Ø£Ù\82صÙ\89 Ø·Ù\88Ù\84"
 
 #: src/modules/winlist/e_int_config_winlist.c:290
 msgid "Horizontal alignment"
@@ -7156,12 +7166,14 @@ msgid "Previous window of same class"
 msgstr "النافذة السابقة من نفس الصنف"
 
 #: src/modules/winlist/e_mod_main.c:46
+#, fuzzy
 msgid "Next window class"
-msgstr "فئة و صنف النافذة التالية"
+msgstr "النافذة التالية من نفس الصنف"
 
 #: src/modules/winlist/e_mod_main.c:49
+#, fuzzy
 msgid "Previous window class"
-msgstr "فئة و صنف النافذة السابقة"
+msgstr "النافذة السابقة من نفس الصنف"
 
 #: src/modules/winlist/e_mod_main.c:51 src/modules/winlist/e_mod_main.c:78
 msgid "Window on the Left"
@@ -7201,11 +7213,11 @@ msgstr "اعرض تسمية اﻷيقونة"
 
 #: src/modules/ibar/e_mod_config.c:126
 msgid "Display App Name"
-msgstr "اعرض اسم التطبيق"
+msgstr "Ø£عرض اسم التطبيق"
 
 #: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Comment"
-msgstr "اعرض تعليق التطبيق"
+msgstr "Ø£عرض تعليق التطبيق"
 
 #: src/modules/ibar/e_mod_config.c:134
 #, fuzzy
@@ -7214,7 +7226,7 @@ msgstr "اعرض عام التطبيق "
 
 #: src/modules/ibar/e_mod_config.c:164
 msgid "Create new IBar source"
-msgstr "انشئ مصدر جديد لشريط التشغيل السريع (( IBar )) "
+msgstr "Ø£نشئ مصدر جديد لشريط التشغيل السريع (( IBar )) "
 
 #: src/modules/ibar/e_mod_config.c:165
 msgid "Enter a name for this new source:"
@@ -7231,15 +7243,15 @@ msgstr "لقد قمت بطلب محو  \"%s\".<br><br>هل تريد تأكيد 
 msgid "Are you sure you want to delete this bar source?"
 msgstr "هل تريد تأكيد مسح مصدر هذا الشريط؟"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "شريط التشغيل السريع (( IBar )) "
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "إنشاء أيقونة جديدة"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "الخصائص"
 
@@ -7264,8 +7276,9 @@ msgid "Display Icon Name"
 msgstr "اسم أيقونة العرض"
 
 #: src/modules/ibox/e_mod_config.c:121
+#, fuzzy
 msgid "Display Border Caption"
-msgstr "اظÙ\87ر Ø§Ù\84تسÙ\85Ù\8aØ© Ø§Ù\84تÙ\88ضÙ\8aØ­Ù\8aØ© ï»¹Ø·Ø§Ø± Ø§Ù\84Ù\86اÙ\81ذة"
+msgstr "اعرض ØªÙ\88ضÙ\8aØ­ Ø§Ù\84حدÙ\88د"
 
 #: src/modules/ibox/e_mod_config.c:151
 msgid "Show windows from all screens"
@@ -7277,13 +7290,13 @@ msgstr "اظهر النوافذ من الشاشة الحلية"
 
 #: src/modules/ibox/e_mod_config.c:165
 msgid "Show windows from all desktops"
-msgstr "اظÙ\87ر Ø§Ù\84Ù\86Ù\88اÙ\81Ø° Ù\85Ù\86 Ù\83Ù\84Ù\8b Ø£Ø³Ø·Ø­ Ø§Ù\84Ù\85Ù\83اتب"
+msgstr "اظÙ\87ر Ø§Ù\84Ù\86Ù\88اÙ\81Ø° Ù\85Ù\86 Ù\83Ù\84Ù\8b Ø³Ø·Ù\88Ø­ Ø§Ù\84Ù\85Ù\83تب"
 
 #: src/modules/ibox/e_mod_config.c:170
 msgid "Show windows from active desktop"
-msgstr "اظهر النوافذ من سطح المكتب المفعل"
+msgstr "Ø£ظهر النوافذ من سطح المكتب المفعل"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "حاوية أيقونات النوافذ (( IBOX ))"
 
@@ -7293,23 +7306,24 @@ msgstr "إعدادات عارض أسطح المكاتب"
 
 #: src/modules/pager/e_mod_config.c:127 src/modules/pager/e_mod_config.c:179
 msgid "Flip desktop on mouse wheel"
-msgstr "إاقلب سطح المكتب عند حركة عجلة الفأرة"
+msgstr "إقلب سطح المكتب عند حركة عجلة الفأرة"
 
 #: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:182
 msgid "Show desktop names"
-msgstr "اعرض أسماء اﻷسطح"
+msgstr "Ø£عرض أسماء اﻷسطح"
 
 #: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:218
 msgid "Show popup on desktop change"
-msgstr "اعرض نافذة منبيثقة عند تغيير سطح المكتب"
+msgstr "Ø£عرض نافذة منبيثقة عند تغيير سطح المكتب"
 
 #: src/modules/pager/e_mod_config.c:139
 msgid "Show popup for urgent windows"
-msgstr "اظهر النوافذ المنبثقة من النوافذ العاجلة"
+msgstr "Ø£ظهر النوافذ المنبثقة من النوافذ العاجلة"
 
 #: src/modules/pager/e_mod_config.c:185
+#, fuzzy
 msgid "Resistance to dragging"
-msgstr "مقاوم للسحب"
+msgstr "مقاومة السحب"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:226
 #: src/modules/pager/e_mod_config.c:245
@@ -7339,7 +7353,7 @@ msgstr "اسحب سطح المكتب بأكمله"
 #: src/modules/pager/e_mod_config.c:222
 #, fuzzy
 msgid "Popup pager height"
-msgstr "إرتÙ\81اع Ø¹Ø§Ø±Ø¶ Ø§Ù\84Ù\86Ù\88اÙ\81Ø° Ø§Ù\84Ù\85Ù\86بثÙ\82Ø©"
+msgstr "إرتفاع عارض الوافذ المنبثقة"
 
 #: src/modules/pager/e_mod_config.c:232
 msgid "Popup speed"
@@ -7353,7 +7367,7 @@ msgstr "%1.1f ثواني"
 #: src/modules/pager/e_mod_config.c:243
 #, fuzzy
 msgid "Pager action popup height"
-msgstr "إرتÙ\81اع Ù\85Ù\86بثÙ\82Ø© Ø£Ø­Ø¯Ø§Ø« Ø¹Ø§Ø±Ø¶ Ø£Ø³Ø·Ø­ Ø§Ù\84Ù\85Ù\83اتب"
+msgstr "إرتفاع منبثقة أحداث عاض أسطح المكاتب"
 
 #: src/modules/pager/e_mod_config.c:253
 msgid "Show popup on urgent window"
@@ -7361,11 +7375,11 @@ msgstr "اعرض منبثقة على النافذة المستعجلة"
 
 #: src/modules/pager/e_mod_config.c:257
 msgid "Urgent popup sticks on screen"
-msgstr "منبثقة مستعجلة مثبتة على الشاشة"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:263
 msgid "Show popup for focused windows"
-msgstr "اعرض النوافذ المنبثقة للنوافذ المحددة"
+msgstr "Ø£عرض النوافذ المنبثقة للنوافذ المحددة"
 
 #: src/modules/pager/e_mod_config.c:269
 msgid "Urgent popup speed"
@@ -7382,6 +7396,7 @@ msgid "Button %i"
 msgstr "الزر %i"
 
 #: src/modules/pager/e_mod_config.c:372
+#, fuzzy
 msgid "Pager Button Grab"
 msgstr "إمساك زر عارض أسطح المكاتب"
 
@@ -7406,36 +7421,36 @@ msgstr ""
 "لا يمكنك إستخدام زر الفأرة اﻷيمن في<br>الدرج ﻷجل هذا ، كما أنه عطل بواسطة "
 "كود<br>داخلي ﻷجل قوائم السياق.<br>لايعمل الزر هذا اﻻ في المنبثقة فقط."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "إعرض النافذة المنبثقة لعارض اسطح المكاتب "
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "يمين مكتب المنبثقة"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "يسار مكتب المنبثقة"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "أعلى مكتب المنبثقة"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "أسفل مكتب المنبثقة"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "مكتب المنبثقة التالية"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7445,143 +7460,101 @@ msgstr "إبدأ"
 
 #: src/modules/syscon/e_mod_main.c:31
 msgid "System Control"
-msgstr "Ù\88حدة Ø§Ù\84تحÙ\83Ù\85 Ø¨النظام"
+msgstr "Ù\88حدة ØªØ­Ù\83Ù\85 النظام"
 
 #: src/modules/syscon/e_mod_main.c:52
 msgid "System Controls"
-msgstr "Ù\88حدات Ø§Ù\84تحÙ\83Ù\85 Ø¨النظام"
+msgstr "Ù\88حدات ØªØ­Ù\83Ù\85 النظام"
 
 #: src/modules/temperature/e_mod_config.c:56
 msgid "Temperature Settings"
 msgstr "إعدادات درجة الحرارة"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "متحسسات"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "مئوية"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "فهرنهايت"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "وحدات العرض"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
-msgstr "تفحص الفاصل الزمني"
+msgstr "فحص الفاصل الزمني"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "درجة حرارة عالية"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 فهرنهايتية"
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 مئوية"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "درجة حرارة منخفضة"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "درجات الحرارة"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "درجة الحرارة"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "التالي"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "مرحبا بك في إنلايتنمينت"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "إختر واحدا"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "حساب"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-"لم يتم العثور على أية قائمة ملفات<br>على نظامك.<br>نرجوا منك تفقد<br>الوثائق "
-"المتواجدة بـ<br>www.enlightenment.org<br>ﻷجل العثور على تفاصيل أكثر<br>حول "
-"كيفية جعلكbr>لقوائم التطبيق<br>تعمل."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "إختر قائمة التطبيق"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "مطلق الشريط"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "إختر تطبيقات"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "ملفات سطح المكتب"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "لا يوجد أيقونات على سطح المكتب"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "تمكين أيقونات سطح المكتب"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
+msgstr "تحجيم"
 
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "وضع التركيز"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "اختر الحجم المفضل"
 
-#: src/modules/wizard/page_060.c:29
+#: src/modules/wizard/page_060.c:30
 #, fuzzy
-msgid "Click to focus windows"
-msgstr "Ø¥Ù\86Ù\82ر ï»·Ø¬Ù\84 ØªØ±Ù\83Ù\8aز Ø§Ù\84Ù\86Ù\88اÙ\81Ø°"
+msgid "Focus by ..."
+msgstr "رÙ\83Ù\91Ù\90ز Ø¨Ù\88اسطة..."
 
-#: src/modules/wizard/page_060.c:32
+#: src/modules/wizard/page_060.c:37
 #, fuzzy
-msgid "Mouse over focuses windows"
-msgstr "الفأرة على النوافذ المركزة"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "إختر أيقونات ﻷجل اﻹضافة"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "إطلاق سريع"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "إختر تطبيقات"
+msgid "Mouse Over"
+msgstr "مؤشر الفأرة"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7589,7 +7562,7 @@ msgstr "إمسك"
 
 #: src/modules/mixer/app_mixer.c:163
 msgid "Playback"
-msgstr "أعد القراءة"
+msgstr "إعادة القراءة"
 
 #: src/modules/mixer/app_mixer.c:283
 msgid "Output"
@@ -7623,12 +7596,11 @@ msgstr "يسار:"
 msgid "Right:"
 msgstr "يمين:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "أصمت"
 
 #: src/modules/mixer/app_mixer.c:404 src/modules/mixer/conf_gadget.c:194
-#, fuzzy
 msgid "Lock Sliders"
 msgstr "إقفل أشرطة التمرير"
 
@@ -7642,48 +7614,61 @@ msgstr "اعرض كِلي شريطي التمرير عند اﻹقفال"
 
 #: src/modules/mixer/conf_gadget.c:205
 msgid "Show Popup on volume change via keybindings"
-msgstr "اعرض Ø§Ù\84Ù\85Ù\86بثÙ\82Ø© Ø¹Ù\84Ù\89 تغيير الحجم عبر المفاتيح المرتبطة بذلك"
+msgstr "اعرض Ø§Ù\84Ù\85Ù\86بثÙ\82Ø© Ø¹Ù\86د تغيير الحجم عبر المفاتيح المرتبطة بذلك"
 
 #: src/modules/mixer/conf_gadget.c:316
 msgid "Sound Cards"
 msgstr "بطاقات الصوت"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "إعدادات الخالط"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
+#, fuzzy
 msgid "Mixer to use for global actions:"
-msgstr "خالط يتم إستخدامه ﻹجراءات عامة:"
+msgstr "خالط يتم إستخدامه ﻹجراءات عالمية:"
+
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr "اعرض تنبيهات سطح المكتب عند تغيير القيم و الحجم"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "أطلق خالط ....."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "إعدادات وحدة الخالط"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "حجم جديد"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "الخالط"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "تغيّر الحجم"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "تم تحديث إعدادات وحدة الخالط"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"تم تغيير بيانات إعدادات وحدة الخالط.<br>تم استبدال إعداداتك القديمة "
-"بإفتراضيات جديدة.<br>نأسف ﻹزعاجك."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
+msgstr "وحدة الخالط"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "لا يمكن تبديل وضع دون إتصال"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
-msgstr "مساعد مدير اﻹتصال لا يعمل"
+msgstr "أيقونة مرشد مدير اﻹتصال لا تعمل"
 
 #: src/modules/connman/e_mod_main.c:103
 msgid "Query system's offline mode."
@@ -7709,155 +7694,161 @@ msgstr "اعرض كلمة المرور كنص واضح و ظاهر"
 msgid "Ok"
 msgstr "حسنا"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "اقطع اﻹتصال من خدمة الشبكة"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "الخدمة لم تعد متوفرة "
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "اتصل بخدمة الشبكة"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "لا يمكن ضبط كلمة المرور الخاصة بالخدمة"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "وضع دون اتصال"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "متحكمات"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "لا يوجد مدير اتصال"
 
-#: src/modules/connman/e_mod_main.c:1389
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
-msgstr "لا يمكن العثور على خادم مدير اتصال"
+msgstr "لا يمكن العثور على خادم مدير اتصال"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "دون اتصال: كل محطات البث اﻹذاعي قد تم إطفاؤها"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "دون اتصال"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "غير متصل"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "اقطع اﻹتصال"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "اسم مجهول"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "لا أخطاء"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "خامل"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "ترابط"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "إعدادات"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "استعد"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "تسجيل الدخول"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "متصل"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "فشل"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "ممكن"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "متاح و متوفر"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "تم اﻹتصال"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "دون اتصال"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "هناك حاشية نظام أخرى متواجدة"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "لا يمكن تواجد أكثر من أداة حاشية نظام واحدة وهي موجودة بالفعل"
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "حاشية النظام"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "حاشية النظام"
 
-#, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "لا يستطيع إنلايتنمينت ضبط نظام السمات."
+#~ msgid "Resizeable"
+#~ msgstr "قابل للتحجيم"
 
-#~ msgid "Interaction"
-#~ msgstr "تÙ\81اعÙ\84"
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Ø£Ù\88Ù\82Ù\81 ØªØ­Ø±Ù\8aÙ\83/تحجÙ\8aÙ\85 Ù\87Ø°Ù\87 Ø§ï»·Ø¯Ø§Ø©"
 
-#~ msgid "Spell Checker"
-#~ msgstr "مدقق اﻹملاء"
+#, fuzzy
+#~ msgid "Background panning"
+#~ msgstr "جدارية الخلفية"
 
 #, fuzzy
-#~ msgid "Everything Aspell"
-#~ msgstr "قاموس مفردات كل شيء"
+#~ msgid "X-Axis pan factor"
+#~ msgstr "عامل إدارة المحور السيني"
 
-#~ msgid "Spell checker"
-#~ msgstr "الفاحص اﻹملائي"
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
 
-#~ msgid "Aspell"
-#~ msgstr "القاموس اﻹملائي Aspell"
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "عامل إدارة المحور الصادي"
 
-#~ msgid "Hunspell"
-#~ msgstr "القاموس اﻹملائي Hunspell"
+#~ msgid "Default is plugin name"
+#~ msgstr "اسم الملحق هو الخيار اﻹفتراضي"
 
-#~ msgid "Add Application..."
-#~ msgstr "أضÙ\81 ØªØ·Ø¨Ù\8aÙ\82..."
+#~ msgid "Acpi"
+#~ msgstr "إدارة Ø§Ù\84طاÙ\82Ø©"
 
-#~ msgid "More..."
-#~ msgstr "أكثر..."
-
-#~ msgid "To Favorites Menu"
-#~ msgstr "إلى قائمة المفضلات"
+#~ msgid "Dim Screen"
+#~ msgstr "أبرز الشاشة"
 
-#~ msgid "Selection"
-#~ msgstr "اختيار"
+#~ msgid "Undim Screen"
+#~ msgstr "ﻻ تبرز  الشاشة"
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -7903,12 +7894,237 @@ msgstr "حاشية النظام"
 #~ "<br>تعديت المساحة المخصصة لك.<br><br>الملف المتسبب في الخطأ هو:<br>"
 #~ "%s<br><br>هذا الملف قد تم مسحه لتجنب  البيانات المدمرة و العالقة.<br>"
 
+#~ msgid "Add Application..."
+#~ msgstr "أضف تطبيق..."
+
+#~ msgid "Send to Desktop"
+#~ msgstr "أرسل لسطح المكتب"
+
+#~ msgid "More..."
+#~ msgstr "أكثر..."
+
+#~ msgid "To Favorites Menu"
+#~ msgstr "إلى قائمة المفضلات"
+
+#~ msgid "To Launcher"
+#~ msgstr "إلى المشغل"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت بدء Ecore!\n"
+#~ "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لاسيتطيع إنلايتنمينت بدء نظام الملف.\n"
+#~ "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت بدء نظام اتصال إكس .\n"
+#~ "هل قمت بتحديد متغير العرض أي شاشة العرض ؟ "
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت بدء نظام اﻹتصالات.\n"
+#~ "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة ؟"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت بدء نظام IPC  .\n"
+#~ "ربما ﻷنك لاتملك المقدار الكافي من الذاكرة؟"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت إعداد التفاف  xinerama.\n"
+#~ " يجب عدم حدوث هذا."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت إعداد تغليف الرف.\n"
+#~ "يجب أن لا يحدث هذا."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمينت بدء نظام Evas.\n"
+#~ "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "لا يستطيع إنلايتنمسنت ضبط شاشة التهيئة.\n"
+#~ "ربما ﻷنك لا تملك المقدار الكافي من الذاكرة؟"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "تفقد دعم SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "اضبط FM "
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "لا يستطيع إنلايتنمينت ضبط نظام الدروج"
+
+#~ msgid "Selection"
+#~ msgstr "اختيار"
+
+#~ msgid "New Application"
+#~ msgstr "تطبيق جديد"
+
 #~ msgid "Animated flip"
 #~ msgstr "قلب متحرك"
 
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "إشارة إدارة طاقة العرض"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "خادم العرض لا يقدر على <br>نظم إدارة قواعد البيانات."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "خادم العرض لا يملك <br>إضافة نظم إدارة قواعد البيانات."
+
 #~ msgid "Enable Composite Support ?"
 #~ msgstr "تمكين دعم المركب ؟"
 
+#~ msgid "Interaction"
+#~ msgstr "تفاعل"
+
+#~ msgid "Actions"
+#~ msgstr "اﻹجراءات"
+
+#, fuzzy
+#~ msgid "Copy to Clipboard"
+#~ msgstr "إنسخ إلى لوحة الصور"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "فتح بـ..."
+
+#~ msgid "Open File..."
+#~ msgstr "فتح ملف..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "تعديل مدخل التطبيق"
+
+#~ msgid "New Application Entry"
+#~ msgstr "مدخل تطبيق جديد"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "شغل بواسطة Sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "إفتح الطرفية هنا"
+
+#~ msgid "Spell Checker"
+#~ msgstr "مدقق اﻹملاء"
+
+#, fuzzy
+#~ msgid "Everything Aspell"
+#~ msgstr "قاموس مفردات كل شيء"
+
+#~ msgid "Spell checker"
+#~ msgstr "الفاحص اﻹملائي"
+
+#~ msgid "Aspell"
+#~ msgstr "القاموس اﻹملائي Aspell"
+
+#~ msgid "Hunspell"
+#~ msgstr "القاموس اﻹملائي Hunspell"
+
+#~ msgid "Calculator"
+#~ msgstr "الحاسبة"
+
+#~ msgid "Copy To ..."
+#~ msgstr "إنسخ إلى ..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "إنقل إلى سلة المهملات"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "إفتح المجلد (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "رتب بواسطة التاريخ"
+
+#~ msgid "Sort by Name"
+#~ msgstr "رتب حسب اﻹسم"
+
+#~ msgid "Recent Files"
+#~ msgstr "الملفات اﻷخيرة"
+
+#~ msgid "Show Dialog"
+#~ msgstr "إعرض الحوارات"
+
+#~ msgid "Switch to Window"
+#~ msgstr "بدل إلى النافذة"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "بدّل كامل الشاشة"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "لم يتم العثور على أية قائمة ملفات<br>على نظامك.<br>نرجوا منك "
+#~ "تفقد<br>الوثائق المتواجدة بـ<br>www.enlightenment.org<br>ﻷجل العثور على "
+#~ "تفاصيل أكثر<br>حول كيفية جعلكbr>لقوائم التطبيق<br>تعمل."
+
+#~ msgid "Select application menu"
+#~ msgstr "إختر قائمة التطبيق"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "مطلق الشريط"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "لا يوجد أيقونات على سطح المكتب"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "تمكين أيقونات سطح المكتب"
+
+#~ msgid "Focus mode"
+#~ msgstr "وضع التركيز"
+
+#, fuzzy
+#~ msgid "Click to focus windows"
+#~ msgstr "إنقر ﻷجل تركيز النوافذ"
+
+#, fuzzy
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "الفأرة على النوافذ المركزة"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "إختر أيقونات ﻷجل اﻹضافة"
+
+#~ msgid "Quick Launch"
+#~ msgstr "إطلاق سريع"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "تم تغيير بيانات إعدادات وحدة الخالط.<br>تم استبدال إعداداتك القديمة "
+#~ "بإفتراضيات جديدة.<br>نأسف ﻹزعاجك."
+
 #~ msgid "Shelf"
 #~ msgstr "الدرج"
 
@@ -7934,6 +8150,9 @@ msgstr "حاشية النظام"
 #~ msgid "Add An Icon"
 #~ msgstr "أضِف أيقونة"
 
+#~ msgid "Executable"
+#~ msgstr "تنفيذي"
+
 #~ msgid "Set Shelf Contents"
 #~ msgstr "عين محتويات للدرج"
 
index 9061a55..6a8e1b5 100755 (executable)
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-11-06 10:39+0000\n"
 "Last-Translator: Viktor Kojouharov <Unknown>\n"
 "Language-Team: English <en@li.org>\n"
@@ -23,20 +23,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "За Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,18 +44,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Екипът</title>"
 
 #: src/bin/e_actions.c:365
@@ -73,621 +73,645 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Сигурни ли сте, че искате да убиете този прозорец?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Не"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Искате да излезете от Enlightenment.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Поискали сте да излезнете.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Сигурни ли сте, че искате да изключите компютъра?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Искате да изключите компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Сигурни ли сте, че искате да рестартирате компютъра?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Искате да рестартирате компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Искате да изключите временно компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Сигурни ли сте, че искате да превключите в режим \"hibernate\"?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Искате да изключите компютъра в режим \"hibernate\".<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Преместване"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Меню на прозореца"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Повдигане"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "По-ниско"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Убиване"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Прозорец : Състояния"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Режим на залепване"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Режим на скриване"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Режим на Цял Екран"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Уголемяване"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Уголемяване вертикално"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Уголемяване хоризонтално"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Уголемяване на цял екран"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим на уголемяване \"Умен\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим на уголемяване \"Разширяване\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим на уголемяване \"Запълване\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Режим на навиване нагоре"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Режим на навиване надолу"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Режим на навиване наляво"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Режим на навиване надясно"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Режим на навиване"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Премахване на рамката"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Рамка"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Състояние на забождане"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Поле"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Изпращане на мишката до екран 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Изпращане на мишката до екран 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Изпращане на мишката до екран..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Изпращане на мишката напред 1 екран"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Изпращане на мишката назад 1 екран"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Изпращане на мишката напред/назад екрани..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Изключване на компютъра"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Преместване на текст"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Преместване на текст"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Преместване на текст"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Избиране на икона"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Създаване на икона"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Прозорец : Движения"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "До следващото поле"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "До предишното поле"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "По поле #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "До поле..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Показване на главното меню"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Показване на предпочитаното меню"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Показване на меню \"Всички програми\""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Показване на клиентско меню"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Показване на меню..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Стартиране"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Програма"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Рестартиране"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Системни"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Рестартиране на компютъра"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Временно изключване"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Временно изключване"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Режим \"Hibernate\""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Изчистване на прозорци"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Действия"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Този екран"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Този екран"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Поставяне като фон"
 
@@ -695,18 +719,16 @@ msgstr "Поставяне като фон"
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -714,20 +736,20 @@ msgstr ""
 msgid "OK"
 msgstr "Добре"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -738,7 +760,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -747,11 +769,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -759,93 +781,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Няма прозорци)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Описание: не е зададено"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -853,57 +875,62 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Сложни"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Прости"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Прилагане"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Разширения"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Модули"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Предпочитание на икона"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Грешка - няма поддържка на PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Няма поддържка на PAM в Enlightenment, затова<br>заключването на екрана е "
 "изключено"
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Заключването е неуспешно"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -911,15 +938,15 @@ msgstr ""
 "Заключването на екрана е неуспешно, защото някоя програма<br>е прихванала "
 "клавиатурата или мишката и те не могат да се прихванат от E17"
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Моля, въведете вашата парола"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Грешка в системата за идентификация"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -927,22 +954,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -963,106 +990,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Редактор на Desktop файлове"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Име"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Икона"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Общо име"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Клас на прозорец"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Категории"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Desktop файл"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Общи"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Известие при стартиране"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Стартиране в терминал"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Показване в менюта"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Избиране на икона"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Избиране на изпълним файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Вмъкване"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Избиране на всичко"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1105,314 +1131,314 @@ msgstr ""
 "Enlightenment·не успя да пусне програмата:<br><br>%s<br><br>Програмата не "
 "успя да се стартира."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Грешка при стартиране на програмата"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s е спряла неочаквано"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Изходен код %i е върнат от·%s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s е прекъсната от сигнал Interrupt."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s е прекъсната от сигнал Quit."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s е прекъсната от сигнал Abort."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s е прекъсната от Floating Point грешка."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s е прекъсната от сигнал Uninterruptable Kill."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s е прекъсната от сигнал Segmentation Fault."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s е прекъсната от сигнал Broken Pipe."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s е прекъсната от сигнал Termination."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s е прекъсната от грешка на шината."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s е прекъсната от сигнал с номер %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Остатъкът от резултата е скрит. Запазете го за да го видите***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Дневник с грешки"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Няма съобщение с грешки"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Запазване на това съобщение"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Тези грешки ще бъдат записани като %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Информация за грешката"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Информация за сигналната грешка"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Резултат"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Няма резултат"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i файлове"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Режим за разглеждане"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Опресняване на изгледа"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Показване на скрити файлове"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Сортиране сега"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Нова директория"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Преименуване"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Категории за програми"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Файлови характеристики"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Списък"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Създаване на нова директория"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Име на новата директория:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Преименуване на %s до:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Преименуване на файл"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Потвърждаване за изтриването"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1446,12 +1472,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Непознат дял"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Сменяемо устройство"
 
@@ -1459,7 +1485,7 @@ msgstr "Сменяемо устройство"
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Размер:"
 
@@ -1475,7 +1501,7 @@ msgstr "Файлов тип:"
 msgid "Permissions"
 msgstr "Разрешения:"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Собственик:"
 
@@ -1495,17 +1521,17 @@ msgstr "Собственикът може да чете"
 msgid "Owner can write"
 msgstr "Собственикът може да пише"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Преглед"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -1514,7 +1540,7 @@ msgid "Thumbnail"
 msgstr "Миниизображение"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Друг"
 
@@ -1530,53 +1556,42 @@ msgstr "Информация за връзката"
 msgid "Select an Image"
 msgstr "Избиране на изображение"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Преместване на текст"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Започване редактирането на този инструмент"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Оразмеряване"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Автоматично плъзгане на съдържание"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Прост"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Вдълбано"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Премахване"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Спиране редактирането на този инструмент"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1624,14 +1639,14 @@ msgstr "Позиция"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Ниво"
@@ -1683,163 +1698,169 @@ msgstr "Излизане от сесията докато е отворен то
 msgid "Remember these Locks"
 msgstr "Запомняне на тези забрани"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Прозорци"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Винаги отгоре"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Залепване"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Цял екран"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Вертикално уголемяване"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Хоризонтално уголемяване"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Връщане от уголемяване"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Редактиране на икона"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Създаване на икона"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Добавяне до менюто за предпочитания"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Добавяне до предпочитаните"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Създаване на нов ibar източник"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Умно поставяне"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Пропускане"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Рамка"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Забрани"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Залепване"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Пропускане"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Скриване"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Навиване"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Екран"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Винаги отгоре"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Винаги отдолу"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Забождане върху поле"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Отбождане от поле"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Избиране стил на рамката"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Използване на икона, предоставена от E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Използване на икона, добита от програмата "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Използване на икона, дефинирана от потребителя"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Съпротивление"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Превключвател на полета"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1860,7 +1881,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM характеристики"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Заглавие"
 
@@ -2019,7 +2040,6 @@ msgid "Size, Position and Locks"
 msgstr "Размер, място и забрани"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Позволяване"
@@ -2097,15 +2117,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Файлове"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Стартиране"
@@ -2120,20 +2138,6 @@ msgstr "Главни"
 msgid "Mobile"
 msgstr "Модули"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Настройки на модули"
@@ -2174,7 +2178,7 @@ msgstr "Добавяне"
 msgid "Remove Gadget"
 msgstr "Премахване"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2182,11 +2186,11 @@ msgstr ""
 msgid "Layout"
 msgstr "Подредба"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Грешка във входовия метод"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2199,7 +2203,7 @@ msgstr "Главно"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Предпочитани програми"
 
@@ -2207,76 +2211,74 @@ msgstr "Предпочитани програми"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Програми"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Прозорци"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Изгубени прозорци"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "За"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Тема"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Виртуални"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Рафтове"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Показване/скриване на всички прозорци"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Няма програми)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Няма прозорци)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Няма име!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Няма рафтове)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Добавяне на рафт"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Изтриване на рафт"
 
@@ -2312,7 +2314,7 @@ msgid "Shrink to Content Width"
 msgstr "Смаляване до размера на съдържанието"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2342,7 +2344,7 @@ msgid "Hide duration"
 msgstr "Продължителност"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2359,7 +2361,7 @@ msgstr "Показване върху всички полета"
 msgid "Show on specified Desktops"
 msgstr "Показване върху определено поле"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2370,7 +2372,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2379,52 +2381,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да стартира Ecore!\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да стартира файловата система\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2432,7 +2404,7 @@ msgstr ""
 "Enlightenment не може да настрои секундант за изходен сигнал.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2440,7 +2412,7 @@ msgstr ""
 "Enlightenment не може да настрои секундант за HUP сигнал.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2449,64 +2421,37 @@ msgstr ""
 "Enlightenment не може да настрои секундант за HUP сигнал.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не може да стартира своята X връзка.\n"
-"Дефинирали ли сте променливата DISPLAY ?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не може да стартира своята алармена система.\n"
-"Дефинирали ли сте променливата DISPLAY ?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да стартира системата за свързване.\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да стартира IPC системата.\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не може да настрои обвивката на xinerama.\n"
-"Това не трябва да става."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не може да настрои обвивката на xinerama.\n"
-"Това не трябва да става."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да стартира Evas системата.\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2516,7 +2461,7 @@ msgstr ""
 "възпроизвеждане в Evas. Моля, проверете вашата инсталация на Evas и\n"
 "Ecore и проверете дали те поддържат Software X11 възпроизвеждане."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2526,7 +2471,35 @@ msgstr ""
 "възпроизвеждане в Evas. Моля, проверете вашата инсталация на Evas и\n"
 "Ecore и проверете дали те поддържат Software Buffer възпроизвеждане."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment не може да стартира своята алармена система.\n"
+"Дефинирали ли сте променливата DISPLAY ?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2534,23 +2507,29 @@ msgstr ""
 "Enlightenment не може да създава директории във домашната ви папка.\n"
 "Може би нямате домашна папка, или празно място?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment не може да настрои система си за файлови регистри."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment не може да настрои конфигурационната си система"
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment не може да настрои системата си за теми"
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment не може да настрои системата си за шрифтове"
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2558,90 +2537,42 @@ msgstr ""
 "Enlightenment не може да настрои пътища за намиране на файлове.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment не може да настрои системата си за шрифтове"
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment не може да настрои системата си за теми"
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може да настрои начален екран.\n"
-"Може би няма свободна памет?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment не може да настрои стартовата си система"
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment не може да настрои стартовата си система"
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment не може да стартира системата за FDO desktop файлове.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr ""
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Evas не може да създаде буферни платна. Проверете дали Evas\n"
-"има поддръжка за Software Buffer възпроизвеждане.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Evas не може да зарежда PNG файлове. Проверете дали Evas\n"
-"е компилиран с PNG модула.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Evas не може да зарежда JPEG файлове. Проверете дали Evas\n"
-"е компилиран с JPEG модула.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Evas не може да зарежда EET файлове. Проверете дали Evas\n"
-"е компилиран с поддръжка на EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Настройване на екрани"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2649,214 +2580,348 @@ msgstr ""
 "Enlightenment не можа да настрои управлението на прозорци за\n"
 "всички екрани. Може би друг администратор на прозорци е пуснат?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Настройване на пътища"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Настройване на пътища"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment не може да настрои DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment не може да настрои DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Настройване на предпазител на екрана"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment не може да настрои X screensaver."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Настройване на запомняне"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Настройване на заключване"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment не може да настрои заключващата си система"
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Настройване на изскачащи прозорци"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не може да настрои системата си за изкачащи прозорци."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Настройване на показалеца"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Настройване на пътища"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment не може да стартира системата за Системни команди.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Настройване на действията"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не може да настрои системата си за действия"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не може да настрои своята 'exec' система."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr ""
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Файлов мениджър"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment не може да настрои системата си за съобщения."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не може да настрои системата 'плъзгане и пускане'"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment не може да настрои системата си за прихващане на въвеждане."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Настройване на модули"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не може да настрои модулната си система"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Настройване на запомняне"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment не може да настрои настройките за запомняне"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Настройване на цветови класове"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не може да настрои системата си за класове на цветовете."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment не може да настрои системата си за контролиране на "
 "джунджурийки."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Настройване на пътища"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment не може да настрои DPMS."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Настройване на запомняне"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Настройване на тапети"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не може да настрои система за тапети."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Настройване на показалеца"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment не може да настрои системата си за обвързване"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Настройване на рафтове"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment не може да настрои системата си за рафтове"
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Настройване на миниизображения"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment не може да стартира системата за миниизображения:в.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment не може да стартира системата за Системни команди.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment не може да стартира системата за миниизображения:в.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment не може да настрои системата си за теми"
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не може да настрои системата за \"order\" файлове."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Зареждане на модули"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Настройване на рафтове"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Почти е готово"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Evas не може да създаде буферни платна. Проверете дали Evas\n"
+"има поддръжка за Software Buffer възпроизвеждане.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Evas не може да зарежда PNG файлове. Проверете дали Evas\n"
+"е компилиран с PNG модула.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Evas не може да зарежда JPEG файлове. Проверете дали Evas\n"
+"е компилиран с JPEG модула.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Evas не може да зарежда PNG файлове. Проверете дали Evas\n"
+"е компилиран с PNG модула.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Evas не може да зарежда EET файлове. Проверете дали Evas\n"
+"е компилиран с поддръжка на EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment е забил в самия старт и е бил рестартиран"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2864,7 +2929,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2876,7 +2941,7 @@ msgstr ""
 "проблематични модули да се отстранят. <br>Може сами да си ги включите чрез "
 "конфигурационния панел."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2888,20 +2953,12 @@ msgstr ""
 "проблематични модули да се отстранят. <br>Може сами да си ги включите чрез "
 "конфигурационния панел."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Настройване на рафтове"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Почти е готово"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Зареждане на модули"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2910,11 +2967,11 @@ msgstr ""
 "Имало е грешка при зареждане на модула %s<br>Не е бил намерен модул с име "
 "%s<br>в папките за търсене на модули<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Грешка при зареждане на модул"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2926,11 +2983,11 @@ msgstr ""
 "Съобщената грешка е:\n"
 "%s"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Модулът не съдържа всички нужни функции"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2938,16 +2995,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment·%s·Модул"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Искате ли да изключите този модул?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2958,28 +3015,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Рафт №"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Сигурни ли сте, че искате да изтриете този рафт?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Спиране на всякакво редактиране"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Започване на редактиране на всичко"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Коментар"
@@ -2988,16 +3045,16 @@ msgstr "Коментар"
 msgid "Starting"
 msgstr "Стартиране"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Преглед на системните права"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Прегледът над системата е завържен"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3007,113 +3064,113 @@ msgstr ""
 "Изходът отнема твърде много. Някои <br>програми отказват да се затворият."
 "<br>Искатели да привършите изхода<br>без да ги затваряте?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Проблем при изхода"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Незабавен изход"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Изчакайте още"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Спиране на изхода"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "В процес на изход"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment не зает с друга молба"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Опа! Това не трябва да става"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Временно рестартиране"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Преминаване в режим \"hibernate\""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3121,34 +3178,34 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Избиране като тема"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Спиране на всякакво редактиране"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Започване на редактиране на всичко"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Няма изход - безсмъртен прозорец."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3158,125 +3215,125 @@ msgstr ""
 "спрян, докато тези прозорци не бъдат затворени, или не се "
 "премахне<br>забраната им за изход."
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байтове"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f КБ"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f МБ"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ГБ"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "В бъдещето"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "В последната минута"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "Преди %li години"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "Преди %li месеца"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Преди %li седмици"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "Преди %li дни"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "Преди %li часа"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Преди %li минути"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Незнаен"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Настройки на превключватела"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Внасяне..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Настройки за запълване и разтегляне"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Разтегляне"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Центриране"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Изцяло вътре"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Запълване"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Качество на файла"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Използване от оригиналния файл"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3287,12 +3344,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Конфигурацията на файловия манипулатор е подновена"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3320,142 +3377,148 @@ msgstr "Нагоре"
 msgid "Down"
 msgstr "Надолу"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Добавяне до предпочитаните"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Една директория нагоре"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Разделителна способност"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Разрешения:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Изменен:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Ти"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Защитен"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Само за четене"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Забранен"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Четене и запис"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Показване на предупреждение при изтощение на батерията"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Режим \"Hibernate\""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Показване на предупреждение при изтощение на батерията"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Вграден(и)"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Неясни"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3463,32 +3526,33 @@ msgstr ""
 msgid "Battery"
 msgstr "Батерия"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Часовник"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Показване на лентата с инструменти"
@@ -3542,17 +3606,17 @@ msgstr "Конфигурацията на файловия манипулато
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Програми за стартера"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Начални програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Рестартиращи програми"
 
@@ -3566,10 +3630,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Нова програма"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Стартиране"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Рестартиращи програми"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Име на полето"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Други"
 
@@ -3582,7 +3661,7 @@ msgid "Available Profiles"
 msgstr "Налични профили"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3620,9 +3699,9 @@ msgstr "Диалогови настройки"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Общи настройки"
 
@@ -3664,7 +3743,7 @@ msgstr "Диалози"
 msgid "Profiles"
 msgstr "Профили"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3672,7 +3751,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3680,7 +3759,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3688,7 +3767,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3696,47 +3775,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Смяна на разделителна способност"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Настройки на разделителната способност"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Разделителна способност"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Възобновяване при влизане"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Завъртане"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Огледално изображение"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Липсващи възможности"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3745,11 +3824,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Не са намерени честоти на опресняване"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3758,91 +3837,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Настройки за виртуални полета"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Брой от полета"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Прелистване с мишката"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Прелистване на екраните когато влачите обекти до ръба"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Застъпване на полетата при прелистване"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Полета"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Изключено"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Плъзгане"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Приближаване"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Анимация на прелистване"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f·сек"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Анимация на прелистване"
 
@@ -3859,7 +3921,7 @@ msgid "Desktop Wallpaper"
 msgstr "Тапет на полето"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3870,12 +3932,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Лични"
 
@@ -3883,158 +3945,172 @@ msgstr "Лични"
 msgid "Screen Lock Settings"
 msgstr "Настройки за заключване"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Временно изключване"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Временно изключване"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Потребителско заключване на екрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Ниво"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Показване във всички зони"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Показване в текущата зона"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Показване в зона #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Настройки на входящата кутия"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Заключване при стартиране на предпазител на екрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f·секунди"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Заключване при изтичане на време на бездействие"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f минути"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Дефиниран от темата"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Тапет на полето"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Тапет"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Настройки за предпазител на екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Включване на предпазител на екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Временно изключване, запазване на информацията върху диска"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Предпазител на екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Начална фаза"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Скриване"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Предпочитано"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Не е предпочитано"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Излагане на събития"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Позволяване"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Забраняване"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4042,39 +4118,53 @@ msgstr "Забраняване"
 msgid "Miscellaneous"
 msgstr "Други настройки"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Сигнали на Енергийните настройки на монитора"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Текущия Х сървър не поддържа DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Текущия Х сървър няма <br> DPMS разширение."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Енергийни настройки на монитора"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Включване на енергийните настройки на монитора"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Време за изчакване"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Време за временно изключване"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Време за цялостно изкючване"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Назад"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Виртуални полета"
@@ -4119,102 +4209,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Настройки на бързи клавиши"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Добавяне"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Изтриване"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Промяна"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Изтриване на всички клавиши"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Връщане на стандартните настройки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Параметри на действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4364,34 +4454,47 @@ msgstr ""
 "Enlightenment не е могъл да внесе конфигурацията <br>заради грешка в "
 "копирането."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Настройки на езика"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Избор на езика"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Локалът е избран"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Локал"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Език"
 
@@ -4478,17 +4581,17 @@ msgid "Manager"
 msgstr "Манипулатор"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Без"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Серия на бутоните на мишката"
 
@@ -4511,13 +4614,11 @@ msgid "Menu Settings"
 msgstr "Настройки на менюта"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Лични"
@@ -4528,7 +4629,7 @@ msgid "Main Menu"
 msgstr "Показване на главното меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4548,7 +4649,7 @@ msgid "Comments"
 msgstr "Коментар"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4560,7 +4661,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Показване в менюта"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Менюта"
 
@@ -4631,19 +4732,19 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Шрифтове"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Теми"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Икони"
 
@@ -4790,18 +4891,18 @@ msgstr "Искате да изтриете \"%s\".<br><br>Сигурни ли с
 msgid "Wallpaper Settings"
 msgstr "Настройки на тапетите"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Картина..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4821,44 +4922,49 @@ msgstr "Това поле"
 msgid "This Screen"
 msgstr "Този екран"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "На плочки"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Плъзгане"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Избиране на картина..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Грешка при внасяне на картината"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment·не успя да внесе картината<br>заради грешки в преобразуването."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Грешка при внасяне на тапета"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment не е могъл да внесе таоета <br>заради грешка в копирането."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4896,7 +5002,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Стил на рамка по подразбиране"
 
@@ -4904,7 +5010,7 @@ msgstr "Стил на рамка по подразбиране"
 msgid "Window Border Selection"
 msgstr "Рамки на прозорци"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запомняне стила на рамката за този прозорец"
 
@@ -4937,7 +5043,7 @@ msgid "Menu Background Base"
 msgstr "Фонове"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Заглавие на меню"
 
@@ -4946,7 +5052,7 @@ msgid "Menu Title Active"
 msgstr "Активирано заглавие на менюта"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Елемент от меню"
 
@@ -4960,12 +5066,12 @@ msgid "Menu Item Disabled"
 msgstr "Активиран елемент от меню"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Преместване на текст"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Текст на оразмеряване"
 
@@ -4983,7 +5089,7 @@ msgid "Winlist Label"
 msgstr "Надпис на списък с прозорци"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Заглаение на списък с прозорци"
 
@@ -5003,389 +5109,399 @@ msgid "File Manager Background Base"
 msgstr "Файлов манипулатор"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Фокус"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Текст на бутоните"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Текст на изключен бутон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Текст на отметките"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Текст на изключена отметка"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Текст на текстови полета"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Текст на изключен бутон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Текст на надписите"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Текст на елемент от лист"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Текст на елемент от лист"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Текст на елемент от лист"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Заглавие от лист"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Заглавие от лист"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Текст на радиобутон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Текст на изклчен радиобутон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Текст на плъзгач"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Текст на изключен плъзгач"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Фонове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Надпис на модул"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Цветови класове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Настройване на цветови класове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Настройване на цветови класове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Настройване на цветови класове"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Потребителско заключване на екрана"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Цвят на обекта"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Цвят на контура"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Цвят на сянката"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Управление на прозорци"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Части на интерфейса"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Други"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Заглавна лента на прозорец"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Текстови блок (нормален)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Текстови блок (блед)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Текстови блок (голям)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "За (Заглавие)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "За (Версия)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "За (Текст)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Заглавие (Заключване)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Лична Парола"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Диалог за грешка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Командно поле"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Заглавие (Начален екран)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Начален текст"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Начална версия"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Текстово поле"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Рамка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Етикет"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Бутони"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Плъзгач"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Радиобутони"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Бутони-отметки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Елемент от текстов лист"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Елемент от лист"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Заглавие от лист"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Файлов мениджър"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Буфер за писане"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Малък"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Голям"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Малък (стилизиран)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Нормален (стилизиран)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Голям (стилизиран)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Настройки на шрифта"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Дребен"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Голям"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Много голям"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Грамаден"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d·пиксели"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Включване на шрифтови класове"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Прост текст за преглед: 123 Текст!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Шрифтов клас"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Включване на шрифтов клас"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Текст за преглед: Някакъв текст на кирилица"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Заглаждане"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Шрифтове-резерви"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Име"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Включване на резерви"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5393,12 +5509,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Настройки на темите за икони"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Включване на композиране на екрана"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5464,11 +5584,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5479,6 +5597,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5499,25 +5623,25 @@ msgstr "Показване на начален екран"
 msgid "Transition Settings"
 msgstr "Настройки на преходните ефекти"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Събития"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Настройки при зареждане"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Прелистване на полето"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Смяна на фона"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Преходни ефекти"
 
@@ -5533,15 +5657,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Категории за теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Възлагане"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Изчистване на всичко"
 
@@ -5571,19 +5695,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Рамки"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Тема за икони"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Показалец"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5714,6 +5838,11 @@ msgstr "Използване на икона, добита от програма
 msgid "Border Icon"
 msgstr "Рамка"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Умно поставяне"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Умно поставяне"
@@ -5745,24 +5874,47 @@ msgstr "Под прозорците"
 msgid "Animate"
 msgstr "Анимирано прелистване"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Линейно"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Плавно ускорение и забавяне"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Ускорение"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
-msgid "Decelerate"
-msgstr "Забавяне"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
+msgid "Decelerate"
+msgstr "Забавяне"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Ускорение на показалеца"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Забавяне"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Плавно ускорение и забавяне"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Ниво"
@@ -5784,6 +5936,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Най-нов прозорец, под показалеца"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Часовник"
@@ -5822,11 +5975,6 @@ msgstr "Диалози"
 msgid "Only dialogs with focused parent"
 msgstr "Само нови диалози получават фокус"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Фокус"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Други настройки"
@@ -5937,13 +6085,13 @@ msgid "Fill available space"
 msgstr "Запълване на свободното място"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Хоризонтално"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Вертикално"
@@ -6005,7 +6153,7 @@ msgid "Raise when clicking to focus"
 msgstr "Повдигане при щракване за фокус"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Фокус на прозорци"
 
@@ -6261,33 +6409,33 @@ msgstr "Много бледи"
 msgid "Dropshadow"
 msgstr "Сенки"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Всичко"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Всичко"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Конфигурация на превключватела на полета"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "На самото поле"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Всичко"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Всичко"
@@ -6297,165 +6445,165 @@ msgstr "Всичко"
 msgid "Everything Settings"
 msgstr "Настройки на терминала"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Налични профили"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Преместване"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Преместване"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Настройване на рафтове"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Включване"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Показване в менюта"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Показване в менюта"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Възпройзвеждане по подразбиране"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Недостъпен"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Възпройзвеждане по подразбиране"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Анимирано прелистване"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Време преди скриване"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Възпройзвеждане по подразбиране"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Анимирано прелистване"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Стартиране"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Стартиране"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Най-често употребяван"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Последна модификация:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Параметри на действие"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Цвят на обекта"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Прост"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Изкачащ прозорец"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Изкачащ прозорец"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Минимална височина"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Изкачащ прозорец"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6464,38 +6612,29 @@ msgstr "Изкачащ прозорец"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Изкачащ прозорец"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Рестартиращи програми"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Действия"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Елементи"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6517,166 +6656,68 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Буфер за писане"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Отваряне с ..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Отваряне с ..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Добавяне на стартер"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Нова програма"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Отваряне с ..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Стартиране в терминал"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Изпълним файл"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Рестартиращи програми"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Команда"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Дефинирани команди"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Всичко"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Преместване на текст"
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Сортиране сега"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Преименуване на файл"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Всичко"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Показване на скрити файлове"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Директории за търсене"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Директории на потребителя"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Изчистване"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Диалози"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Цял екран"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Изпращане до поле"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Файлови икони"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Файлови типове"
 
@@ -6723,19 +6764,19 @@ msgid "Select an image"
 msgstr "Избиране на изображение"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Файлов манипулатор"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6746,7 +6787,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6756,7 +6797,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6836,95 +6877,99 @@ msgstr ""
 msgid "Device"
 msgstr "Преглед"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Една директория нагоре"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Отваряне"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Отваряне с ..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Специфични програми"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Всички Пограми"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6959,7 +7004,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6971,37 +7016,42 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr "Налични джунджурии"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Преместване"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Фонове"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Започване редактирането на този инструмент"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7248,16 +7298,16 @@ msgstr "Искате да изтриете \"%s\".<br><br>Сигурни ли с
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Сигурни ли сте, че искате да изтриете този източник?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Създаване на икона"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Характеристики"
 
@@ -7301,7 +7351,7 @@ msgstr "Показване на прозорци от всички полета"
 msgid "Show windows from active desktop"
 msgstr "Показване на прозорци от текущо поле"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7424,31 +7474,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7468,130 +7518,93 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Сензори"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Целзий"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Фаренхайт"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Единици"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Интервал за проверяване"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Висока температура"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Ниска температура"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Температура"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Напред"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Източник на избрания ibar"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Най-често употребяван"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7633,7 +7646,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7657,38 +7670,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Смяна на разделителна способност"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Режим за разглеждане"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7715,137 +7744,302 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Време за цялостно изкючване"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Защитен"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Непознат дял"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Диалог за грешка"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "На плочки"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Преходни ефекти"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Конфигурация"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Прост"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Възпроизвеждане"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Конфигурация"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Включване"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Запълване на свободното място"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Защитен"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Възпроизвеждане"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment не може да настрои системата си за теми"
+#~ msgid "Acpi"
+#~ msgstr "Действия"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Този екран"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Този екран"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Оразмеряване"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Спиране редактирането на този инструмент"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира Ecore!\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира файловата система\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира своята X връзка.\n"
+#~ "Дефинирали ли сте променливата DISPLAY ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира системата за свързване.\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира IPC системата.\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не може да настрои обвивката на xinerama.\n"
+#~ "Това не трябва да става."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не може да настрои обвивката на xinerama.\n"
+#~ "Това не трябва да става."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да стартира Evas системата.\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може да настрои начален екран.\n"
+#~ "Може би няма свободна памет?"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment не може да настрои системата си за рафтове"
+
+#~ msgid "New Application"
+#~ msgstr "Нова програма"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Сигнали на Енергийните настройки на монитора"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Текущия Х сървър не поддържа DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Текущия Х сървър няма <br> DPMS разширение."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Възпройзвеждане по подразбиране"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Действия"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Буфер за писане"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Отваряне с ..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Отваряне с ..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Добавяне на стартер"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Нова програма"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Стартиране в терминал"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Изпълним файл"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Преместване на текст"
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Сортиране сега"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Преименуване на файл"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Диалози"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Цял екран"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Изпращане до поле"
 
 #~ msgid "Shelf"
 #~ msgstr "Рафт"
@@ -8278,12 +8472,6 @@ msgstr ""
 #~ msgid "Exit Immediately"
 #~ msgstr "Незабавен изход"
 
-#~ msgid "Shut Down"
-#~ msgstr "Изключване на компютъра"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Временно изключване, запазване на информацията върху диска"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Заключване на екрана"
 
@@ -8373,9 +8561,6 @@ msgstr ""
 #~ msgid "Temperature Configuration"
 #~ msgstr "Конфигурация на температурата"
 
-#~ msgid "Back"
-#~ msgstr "Назад"
-
 #~ msgid "Choose Language"
 #~ msgstr "Избор на език"
 
index 7106020..35ac1a7 100755 (executable)
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Marc Furtià  i Puig<br>\\\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-01-29 18:45+0100\n"
 "Last-Translator: marc furtià puig <marc.furtia@gmail.com>\n"
 "Language-Team: \n"
@@ -15,20 +15,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Tanca"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -38,14 +37,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2007, per l'equip de Desenvolupadors d'Enlightenment ."
 "<br><br>Nosaltres esperam que disfruti utilitzant aquest software tan com "
@@ -58,8 +57,9 @@ msgstr ""
 "fins i tot inexistents degut a que encara deuen tenir algun \"bug\". Se "
 "l'ha<hilight>AVISA'T!!!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>L'Equip</title>"
 
 #: src/bin/e_actions.c:365
@@ -77,74 +77,74 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Estàs segur que vols matar aquesta finestra ?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Si"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Estàs segur que vol sortir ?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "S'ha demanat sortir de l'Enlightenment,<br><br>Estàs segur de què vols "
 "sortir?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Segur que vols sortir ?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "S'ha demanat sortir.<br><br> Estàs  segur de fer això ?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Segur que vols parar el Ordinador ?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "S'ha demanat parar l'Ordinador.<br><br>Segur que el vols parar ?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Segur que vols Re-iniciar ?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "S'ha demanat Re-iniciar l'Ordinador.<br><br> Segur que el vols Re-iniciar ?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "S'ha demanat Suspendre l'Ordinador.<br><br> Segur que el vols Suspendre ?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Estàs segur que vol hibernar ?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,554 +152,578 @@ msgstr ""
 "Has demanat Hibernar el seu Ordinador.<br><br> Estàs  segur que el vols "
 "suspendre a disc ?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mou "
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Re-dimensiona"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menú de Finestra"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Augment"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Més petit"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Mata"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Finestra : Estat"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Mode enganxós"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Mode icònic "
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximitza Verticalment"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximitza Horitzontalment"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximitza a Pantalla Completa"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Mode Maximització \"Smart\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Mode Maximització \"Expand\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Mode Maximització \"Fill\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Mode d'Ombrejat Amunt Toggle"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Mode d'Ombrejat Avall Toggle"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Mode d'Ombrejat a l'Esquerrat Toggle"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Mode d'Ombrejat a Dreta Toggle"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Estat Sense Tanca de la Vora"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Vora"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Estat de la Tanca Clavada "
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Taula de Treball"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Canvia de Taula de Treball per..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mostra la Lleixa"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Canvia de Taula de Treball linealment ..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Canvia a la Taula de Treball 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Canvia a la Taula de Treball 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Canvia a la Taula de Treball 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Canvia a la Taula de Treball 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Canvia a la Taula de Treball 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Canvia a la Taula de Treball 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Canvia a la Taula de Treball 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Canvia a la Taula de Treball 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Canvia a la Taula de Treball 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Canvia a la Taula de Treball 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Canvia a la Taula de Treball 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Canvia a la Taula de Treball 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Canvia a la Taula de Treball ...."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Salta a la Taula de Treball de l'Esquerra (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Salta a la Taula de Treball de la Dreta (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Salta a la Taula de Treball de Dalt (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Salta a la Taula de Treball de Baix (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Canvia de Taula de Treball per... (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Canvia de Taula de Treball ... (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Canvia de Taula de Treball linealment ... (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Canvia de Taula de Treball en Direcció ..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Canvia a la Taula de Treball 0 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Canvia a la Taula de Treball 1 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Canvia a la Taula de Treball 2 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Canvia a la Taula de Treball 3 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Canvia a la Taula de Treball 4 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Canvia a la Taula de Treball 5 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Canvia a la Taula de Treball 6 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Canvia a la Taula de Treball 7 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Canvia a la Taula de Treball 8 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Canvia a la Taula de Treball 9 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Canvia a la Taula de Treball 10 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Canvia a la Taula de Treball 11 (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Canvia a la Taula de Treball .... (Totes les Pantalles)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Envia el Ratolí A l'Escriptori 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Envia el Ratolí A l'Escriptori 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Envia el Ratolí a la Pantalla ...."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envia el Ratolí un Escriptori més enllà"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envia el Ratolí un Escriptori previ"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envia el Ratolí Endavant/Endarrera Pantalles"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Aturada"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Mou Text"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Més..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Més..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Re-dimensiona"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Canvia de Taula de Treball en Direcció ..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Crea Icona"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Finestra : Moviment"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Següent Taula de Treball"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Envia a la Taula de Treball prèvia"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "A Taula de Treball #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "A Taula de Treball ..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Mostra el Menú Principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Mostra el Menú Favorits"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Mostra Totes les Aplicacions del Menú"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Mostra el Menú Clients"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Mostra Menú ..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Executa"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comanda"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplicació"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Re-inicia "
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Surt Ara"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Moda "
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Suspendre l'ordinador"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspendre l'ordinador"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hiberna"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Bloqueix"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Neteja Finestres"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Generiques : Accions"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Accions del Mòdul"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Acció"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Aquesta Pantalla"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Aquesta Pantalla"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Posa com a Fons de Pantalla"
 
@@ -707,18 +731,16 @@ msgstr "Posa com a Fons de Pantalla"
 msgid "Color Selector"
 msgstr "Selector de Color"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -726,20 +748,20 @@ msgstr "Selector de Color"
 msgid "OK"
 msgstr "D'acord"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Cancel·la "
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -758,7 +780,7 @@ msgstr ""
 "configuració.<br>Pot re-configurar les coses ara. Disculpa per les molèsties "
 "per la teva configuració<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -774,12 +796,12 @@ msgstr ""
 "fitxers de configuració han estat <br> restaurats per defecte. Perdona els "
 "inconvenients.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -787,97 +809,97 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paràmetres de Pantalla"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Hibernació fallada."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(No Ha Ha Finestres)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Suspensió fallada."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Suspensió fallada."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -889,57 +911,62 @@ msgstr ""
 "succeït l'error és :<br> %s <br><br> Aquest fitxer ha estat borrat per dades "
 "incorrectes ."
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Bàsic"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Aplica"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensions"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Mòduls"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Preferència d' Icona"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Contenidor %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Error- no hi ha suport per PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "No hi ha suport per PAM en l'Enlightenment, <br> per tant el bloqueig de "
 "pantalla està  des-habilitat."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Errada en el Bloqueig"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -947,15 +974,15 @@ msgstr ""
 "El bloqueig de Taula de Treball ha fallat degut a què alguna aplicació <br> "
 "ha agafat el teclat o el ratolí o ambdós i no es pot fer el bloqueig"
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Si us plau, introdueix la teva paraula clau de desbloqueig"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Error del Sistema d'Autentificació"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -966,22 +993,22 @@ msgstr ""
 "que ha succeït és <hilight>%i</hilight>.<br> Això és dolent i no hauria "
 "d'estar passant.Si us plau, reporta aquest bug."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -1007,107 +1034,106 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de l'Entrada de Taula de Treball"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nom Genèric"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe de Finestra"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categories"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 #, fuzzy
 msgid "Mime Types"
 msgstr "Tipus de fitxers"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Fitxer de Taula de Treball"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notificació d'Inici"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Executa en una Terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Mostra en els Menús"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opcions"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Seleccioneu una Icona"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Seleccioneu un Executable "
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Talla"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Còpia "
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Enganxa"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Selecciona-ho Tot"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1146,71 +1172,71 @@ msgstr ""
 "Enlightenment no està  autoritzat a fer córrer l'aplicació.<br><br>"
 "%s<br><br> L'aplicació ha fallat en arrencar"
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Error en l'Execució de l'Aplicació"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s ha parat d'executar-se inesperadament."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "El codi de sortida %i ha estat retornat per %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s ha estat interromput per una Senyal d'Interrupció."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s ha estat Interromput per una Senyal de Sortida"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s ha estat Interromput per una Senyal d'Avortament"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s ha estat Interromput per un Error Flotant"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s ha estat Interromput per una Senyal de FI DE PROCÉS"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s ha estat Interromput per un Error de Segment"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s ha estat Interromput per un Trencament de Canonada."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s ha estat Interromput per un Senyal de Fi"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s ha estat Interromput per un Error de Bus"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s ha estat Interromput pel senyal numero %i"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 #, fuzzy
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
@@ -1218,251 +1244,251 @@ msgstr ""
 "***El recordatori de sortida ha estat trancat. Guarda la sortida per veure."
 "***<br>"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Error en els Logs"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "No hi havia missatge d'error"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Desa Aquest Missatge"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Aquest log d'error ha estat guardat com %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Error d'Informació"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Error del senyal d'Informació"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Dades de sortida"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "No hi ha sortida"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Error en Montar"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Error en Desmontar"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Error en Extreure"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Fitxers"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Enllaça"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Aborta"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paràmetres de Configuració "
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Mode de Vista"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Refresca la Vista"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Mostra els Fitxers Ocults"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Recorda l'Ordre"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Ordena Ara"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nou Directori"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Canvia el Nom"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Monta"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Categories d'Aplicacions"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propietats del Fitxer"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 #, fuzzy
 msgid "Use default"
 msgstr "Ajusta a Predeterminat"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Fitxers d'Icones"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Costum"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Llista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Nom d'Icona"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Fons de Pantalla ..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Creeu un nou Directori"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nom Nou del Directori:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Canvia el nom %s a : "
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Canvia el nom del Fitxer"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Re-intentar"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Error "
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 #, fuzzy
 msgid "Warning"
 msgstr "Carregant %s"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Fitxer ja existeix, sobrescriure'l ? <br> <hilight> %s</hilight>?"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmació de Borrar"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Estàs segur que vol borrar <br> <hilight> %s</hilight>?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1496,12 +1522,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volum Desconegut"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispositiu Extraïble"
 
@@ -1509,7 +1535,7 @@ msgstr "Dispositiu Extraïble"
 msgid "File:"
 msgstr "Fitxer"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Mida"
 
@@ -1525,7 +1551,7 @@ msgstr "Tipus de Fitxer"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Propietari"
 
@@ -1545,17 +1571,17 @@ msgstr "El Propietari pot llegir"
 msgid "Owner can write"
 msgstr "El Propietari pot escriure"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Vista prèvia"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Defecte"
 
@@ -1564,7 +1590,7 @@ msgid "Thumbnail"
 msgstr "Ungla"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Costum"
 
@@ -1580,54 +1606,43 @@ msgstr "Informació d'Enllaç "
 msgid "Select an Image"
 msgstr "Seleccioneu una Imatge"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Mou Text"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Inici de moviment/re-dimensió d'aquest Gadget"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Re-dimensiona"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Mostra automàticament els continguts"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Text Pla"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Sagnat"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 #, fuzzy
 msgid "Look"
 msgstr "Bloquejos "
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Borra"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Para de moure/re-dimensionar aquest gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 #, fuzzy
 msgid ""
 "A previous instance of Enlightenment is still active\n"
@@ -1678,14 +1693,14 @@ msgstr "Posició"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Mida"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Apilant"
@@ -1737,163 +1752,171 @@ msgstr "Sortir del meu login amb aquesta finestra oberta"
 msgid "Remember these Locks"
 msgstr "Recorda aquesta aparença"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Finestres"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
 #, fuzzy
-msgid "Always on Top"
-msgstr "Sempre davant"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Enganxós"
+msgid "Settings"
+msgstr "Paràmetres de Pantalla"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximitza verticalment"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximitza horitzontalment"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Des-maximitza "
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Edita Icona"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Crea Icona"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Afegeix a Aplicacions Favorites "
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Afegeix a Aplicacions Preferents"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Teclat i Ratolí "
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Salta"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Vora"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Bloquejos "
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Recorda"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Enganxós"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Salta"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Ombrejat"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Pantalla"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Sempre davant"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Sempre Darrera"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 #, fuzzy
 msgid "Pin to Desktop"
 msgstr "Envia a la Taula de Treball"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Desbloqueja de l'Àrea de Treball "
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Selecciona Estil de Vora"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Usa l'Icona per Defecte de l'E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Usa l'Icona de l'Aplicació "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Utilitza Icones Definits per L'usuari"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Resistència"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Llista de Finestres"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Paginador"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 #, fuzzy
 msgid "Taskbar"
 msgstr "Salta Taskbar"
@@ -1915,7 +1938,7 @@ msgid "ICCCM Properties"
 msgstr "Propietats d' ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Títol"
 
@@ -2088,7 +2111,6 @@ msgid "Size, Position and Locks"
 msgstr "Mida, Posició i Presentació"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Autoritza"
@@ -2171,15 +2193,13 @@ msgid "Utilities"
 msgstr "Filipines "
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Fitxers"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Executa"
@@ -2194,21 +2214,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Mosambic "
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-#, fuzzy
-msgid "Settings"
-msgstr "Paràmetres de Pantalla"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Configuració del Mòdul"
@@ -2250,7 +2255,7 @@ msgstr "Afegir Gadget "
 msgid "Remove Gadget"
 msgstr "Borrar Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Paràmetres"
@@ -2259,11 +2264,11 @@ msgstr "Paràmetres"
 msgid "Layout"
 msgstr "Disposició "
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Error del Mètode d'Entrada"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2280,7 +2285,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Aplicacions Preferents"
 
@@ -2288,77 +2293,75 @@ msgstr "Aplicacions Preferents"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Finestres"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Finestres Perdudes"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Quant a..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtual"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Lleixes"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Mostra/Amaga Totes les Finestres"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Sense Aplicacions) "
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 #, fuzzy
 msgid "Set Virtual Desktops"
 msgstr "Taules de Treball Virtuals"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(No Ha Ha Finestres)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "No hi ha Nom!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(No existeixen Lleixes"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Afegeix una Lleixa"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Elimina la Lleixa"
 
@@ -2393,7 +2396,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Estil"
 
@@ -2423,7 +2426,7 @@ msgid "Hide duration"
 msgstr "Durada de l'ocultació "
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f segons"
@@ -2442,7 +2445,7 @@ msgstr "Mostra la Taula de Treball"
 msgid "Show on specified Desktops"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2453,7 +2456,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2462,63 +2465,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, fuzzy, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Opcions:<br>\t-pantalla DISPLAY<br>\t\t Connexió a la Pantalla anomenada "
-"DISPLAY.<br>\t\tEX: -display :1.0<br>\t-fake-xinerama-screen WxH+X+Y<br>\t"
-"\tAfegit a una pantalla de proba de xinerama(abans de posar-ho a la real)<br>"
-"\t\tagafant la geometria. Afegir com més agradi. Totes elles <br>\t\t re-"
-"emplaçarant el xinerama de la pantalla. Això pot <br> ser utilitzat per "
-"simular xinerama.<br>\t\tEX: -fake-xinerama-screen 800x600+0+0 -fake - "
-"xinerama-screen 800x600+800 +0 /n \t -profile CONF_PROFILE /n\t\tUtilitza la "
-"configuració CONF_PROFILE creada per defecte<br>\t-Bo<br>\t\t Ser bo<br>\t "
-"dolent <br>\t\t ser dolent <br>\t psicòtic<br>\t\t ser psicòtic <br>"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:400
+#: src/bin/e_main.c:229
 #, fuzzy
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot inicialitzat l'Ecore!!<br> Potser que estiguis fora de "
-"memòria ?"
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:424
+#: src/bin/e_main.c:238
 #, fuzzy
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot inicialitzar el Sistema de Fitxers.<br> Potser que "
-"estigui fora de memòria ?"
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
@@ -2527,7 +2489,7 @@ msgstr ""
 "Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
 "estigui fora de memòria ?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
@@ -2536,7 +2498,7 @@ msgstr ""
 "Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
 "estigui fora de memòria ?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2545,66 +2507,37 @@ msgstr ""
 "Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
 "estigui fora de memòria ?"
 
-#: src/bin/e_main.c:461
-#, fuzzy
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment no pot inicialitzar la connexió a X.<br>Ha posat la variable "
-"Display ?"
-
-#: src/bin/e_main.c:469
+#: src/bin/e_main.c:274
 #, fuzzy
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment no pot inicialitzar l'alerta de sistema.<br>Ha posat la "
-"variable Display ?"
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:492
+#: src/bin/e_main.c:284
 #, fuzzy
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot inicialitzar les connexions dels sistema.<br>Potser que "
-"estiguis fora de memòria ?"
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:500
+#: src/bin/e_main.c:293
 #, fuzzy
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot inicialitzar l'IPC del sistema.<br>Potser que estiguis "
-"fora de memòria ?"
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:509
+#: src/bin/e_main.c:302
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr "Enlightenment no pot fer aquestes accions de sistema."
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr "Enlightenment no pot fer aquestes accions de sistema."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:539
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot inicialitzar el sistema Evas.<br>Potser que estiguis "
-"fora de memòria ?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 #, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
@@ -2615,7 +2548,7 @@ msgstr ""
 "Software X11 en Evas. Si us plau, miri la configuració de l'evas <br> i "
 "Ecore i miri si tenen suport pel Software X11 del motor de renderització."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 #, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
@@ -2627,34 +2560,68 @@ msgstr ""
 "<br> i Ecore i comprobi que aquests suportin el <br>motor de renderització "
 "de Buffer de software "
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
 #, fuzzy
-msgid ""
-"Enlightenment cannot create directories in your home directory.\n"
-"Perhaps you have no home directory or the disk is full?"
-msgstr ""
-"Enlightenment no pot crear directoris en  el seu home.<br> Potser que no "
-"tingui home directori o bé el disc està ple ?"
-
-#: src/bin/e_main.c:582
-msgid "Enlightenment cannot set up its file registry system."
-msgstr ""
-
-#: src/bin/e_main.c:591
-msgid "Enlightenment cannot set up its config system."
-msgstr "Enlightenment no pot carregar la configuració del sistema."
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:368
 #, fuzzy
-msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment no pot configurar el sistema de Lleixes."
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:615
+#: src/bin/e_main.c:378
 #, fuzzy
-msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment no pot utilitzar aquesta font de sistema."
-
-#: src/bin/e_main.c:624
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment no pot inicialitzar l'alerta de sistema.<br>Ha posat la "
+"variable Display ?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
+
+#: src/bin/e_main.c:415
+#, fuzzy
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+"Enlightenment no pot crear directoris en  el seu home.<br> Potser que no "
+"tingui home directori o bé el disc està ple ?"
+
+#: src/bin/e_main.c:425
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:434
+msgid "Enlightenment cannot set up its config system."
+msgstr "Enlightenment no pot carregar la configuració del sistema."
+
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment no pot carregar aquest tema de sistema."
+
+#: src/bin/e_main.c:458
+#, fuzzy
+msgid "Enlightenment cannot set up its scale system."
+msgstr "Enlightenment no pot configurar el sistema de Lleixes."
+
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment no pot utilitzar aquesta font de sistema."
+
+#: src/bin/e_main.c:476
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
@@ -2663,310 +2630,401 @@ msgstr ""
 "Enlightenment no pot trobar els directoris on estan els fitxers.<br> Potser "
 "que estigui fora de memòria ?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment no pot utilitzar aquesta font de sistema."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment no pot carregar aquest tema de sistema."
 
-#: src/bin/e_main.c:667
+#: src/bin/e_main.c:526
 #, fuzzy
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
-"estigui fora de memòria ?"
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment no pot carregar aquest tema de sistema."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 #, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment no pot inicialitzar el FDO del sistema de Taules de Treball."
 "<br>Potser que estiguis fora de memòria ?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr ""
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-#, fuzzy
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment ha trobat que Evas no pot crear el Bufer canvas. Si us plau, "
-"<br> comproba que Evas té suport pel motor del Bufer de Software.<br> "
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
+msgstr "Configura Pantalles"
 
-#: src/bin/e_main.c:725
+#: src/bin/e_main.c:581
 #, fuzzy
 msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
-"Evas<br> tingui suport per PNG.<br>"
+"Enlightenment ha fallat quan intentava carregar totes les pantalles virtuals "
+"del sistema .Potser que hi hagi un altre sistema de finestres corrent ? <br> "
 
-#: src/bin/e_main.c:734
+#: src/bin/e_main.c:589
 #, fuzzy
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment ha trocat que Evas no pot carregar fitxers JPEG. Comproba que "
-"Evas<br> tingui suport per JPEG.<br>"
+msgid "Setup ACPI"
+msgstr "Inicia Aplicacions"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:596
 #, fuzzy
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment ha trocat que Evas no pot carregar fitxers EET. Comproba que "
-"Evas<br> tingui suport per EET.<br>"
+msgid "Setup Backlight"
+msgstr "Configura Tecles Ràpides"
 
-#: src/bin/e_main.c:754
+#: src/bin/e_main.c:600
 #, fuzzy
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
-"Evas<br> tingui suport per PNG.<br>"
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment no pot configurar els paràmetres DPMS"
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
-msgstr "Configura Pantalles"
-
-#: src/bin/e_main.c:799
-#, fuzzy
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
-msgstr ""
-"Enlightenment ha fallat quan intentava carregar totes les pantalles virtuals "
-"del sistema .Potser que hi hagi un altre sistema de finestres corrent ? <br> "
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment no pot configurar els paràmetres DPMS"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Configura Salva Pantalles"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment no pot configurar el Salva-Pantalles de X"
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Recorda"
+
+#: src/bin/e_main.c:633
+#, fuzzy
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment no pot carregar aquest mòdul de sistema."
+
+#: src/bin/e_main.c:640
 #, fuzzy
 msgid "Setup Desklock"
 msgstr "Envia a la Taula de Treball"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment no pot bloquejar la pantalla."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Missatges"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Inicia Aplicacions"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 #, fuzzy
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 #, fuzzy
 msgid "Setup Actions"
 msgstr "Inicia Aplicacions"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment no pot fer aquestes accions de sistema."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr ""
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Manegador de Fitxers "
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 #, fuzzy
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
+"Enlightenment no pot carregar aquesta combinació de tecles del sistema."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Configura Mòduls"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment no pot carregar aquest mòdul de sistema."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 #, fuzzy
 msgid "Setup Remembers"
 msgstr "Recorda"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment no pot guardar les opcions de recordar."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Configura Tipus de Color"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Configura la Comanda"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment no pot carregar el gadjet de control de sistema."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Inicia Aplicacions"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment no pot configurar els paràmetres DPMS"
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Recorda"
-
-#: src/bin/e_main.c:1003
-#, fuzzy
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment no pot carregar aquest mòdul de sistema."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Configura Fons de Pantalla"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment no pot carregar aquest fons de pantalla d'escriptori"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment no pot configurar els paràmetres DPMS"
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Configura Tecles Ràpides"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment no pot carregar aquesta combinació de tecles del sistema."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Configura Lleixes"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment no pot configurar el sistema de Lleixes."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 #, fuzzy
 msgid "Setup Thumbnailer"
 msgstr "Ungla"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 #, fuzzy
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment no pot carregar aquest tema de sistema."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Configura Tecles Ràpides"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Carregant Mòduls "
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configura Lleixes "
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
 #: src/bin/e_main.c:1094
+#, fuzzy, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Opcions:<br>\t-pantalla DISPLAY<br>\t\t Connexió a la Pantalla anomenada "
+"DISPLAY.<br>\t\tEX: -display :1.0<br>\t-fake-xinerama-screen WxH+X+Y<br>\t"
+"\tAfegit a una pantalla de proba de xinerama(abans de posar-ho a la real)<br>"
+"\t\tagafant la geometria. Afegir com més agradi. Totes elles <br>\t\t re-"
+"emplaçarant el xinerama de la pantalla. Això pot <br> ser utilitzat per "
+"simular xinerama.<br>\t\tEX: -fake-xinerama-screen 800x600+0+0 -fake - "
+"xinerama-screen 800x600+800 +0 /n \t -profile CONF_PROFILE /n\t\tUtilitza la "
+"configuració CONF_PROFILE creada per defecte<br>\t-Bo<br>\t\t Ser bo<br>\t "
+"dolent <br>\t\t ser dolent <br>\t psicòtic<br>\t\t ser psicòtic <br>"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment ha trobat que Evas no pot crear el Bufer canvas. Si us plau, "
+"<br> comproba que Evas té suport pel motor del Bufer de Software.<br> "
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
+"Evas<br> tingui suport per PNG.<br>"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha trocat que Evas no pot carregar fitxers JPEG. Comproba que "
+"Evas<br> tingui suport per JPEG.<br>"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
+"Evas<br> tingui suport per PNG.<br>"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha trocat que Evas no pot carregar fitxers EET. Comproba que "
+"Evas<br> tingui suport per EET.<br>"
+
+#: src/bin/e_main.c:1486
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
+"Evas<br> tingui suport per PNG.<br>"
+
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2974,11 +3032,11 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment ha fallat poc després d'arrencar i serà reiniciat."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2986,7 +3044,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2999,7 +3057,7 @@ msgstr ""
 "configuració del  mòdul <br> hauria de deixar-li carregar els mòduls un "
 "altra cop."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -3012,20 +3070,12 @@ msgstr ""
 "configuració<br>El mòdul de diàleg de configuració et permetrà "
 "seleccionar<br> el mòduls altra cop."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configura Lleixes "
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Carregant Mòduls "
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3034,11 +3084,11 @@ msgstr ""
 "Hi ha hagut un error carregant el mòdul : %s<br> No s'ha pogut trobar cap "
 "mòdul anomenat %s <br> en el directori de cerca de mòduls."
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Error Carregant el Mòdul "
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3047,11 +3097,11 @@ msgstr ""
 "Ha passat un error carregant el mòdul anomenat: %s<br> La ruta completa a "
 "aquest mòdul és <br>%s<br> L'error reportat era ::<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Mòdul que no conté totes les funcions necessàries."
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3059,16 +3109,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Mòdul  %s de Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Estàs segur que vol descarregar aquest mòdul ?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3079,29 +3129,29 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Lleixa #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Estàs Segur que Vols Eliminar aquesta Lleixa?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "S'ha demanat borrar aquesta Lleixa,<br><br>Estàs segur que la vol eliminar ?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Parar de Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Començar a Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Comentari"
@@ -3110,16 +3160,16 @@ msgstr "Comentari"
 msgid "Starting"
 msgstr "Arrancant "
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3130,36 +3180,36 @@ msgstr ""
 "tancades <br> Vol acabar de sortir<br> sense tancar aquestes aplicacions "
 "<br> primer ?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problemes de Sortida"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Sortir ara"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Espera"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Anul·la la Sortida"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Sortir està  en Procés"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Sortir està en procés.<br><hilight> Si us plau, espera</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment està  col·lapsat per un altra procés"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -3168,7 +3218,7 @@ msgstr ""
 "Enlightenment s'ha sobrecarregat sortint.<br> No es poden executar altres "
 "accions de <br> sistema fins que no s'hagi sortit"
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -3177,7 +3227,7 @@ msgstr ""
 "Enlightenment està parant el sistema. <br> No pot executar més accions del "
 "sistema <br> ja que la parada ha estat executada."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -3186,7 +3236,7 @@ msgstr ""
 "Enlightenment està  re-iniciant el sistema.<br> No es poden executar altres "
 "accions de <br> sistema ja que el sistema s'està  re-iniciant"
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -3195,65 +3245,65 @@ msgstr ""
 "Enlightenment està  suspenent el sistema.<br> Fins que la suspensió del "
 "sistema no sigui completa no <br>pot executar altres accions de sistema."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 #, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Enlightenment està  hibernant el sistema.<br>No es poden executar altres "
 "accions de sistema <br> fins que l'hibernació sigui completa"
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Re-inici fallat."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Suspensió fallada."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hibernació fallada."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Re-iniciant l'ordinador.<br> <hilight> Si us plau, espera.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Re-iniciant"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Re-iniciant.<br> <hilight> Espera, si us plau.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Suspenent "
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspenent.<br> <hilight> Espera, si us plau.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernant"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernant.<br><hilight>Espera, si us plau.</hilight>"
 
@@ -3261,159 +3311,159 @@ msgstr "Hibernant.<br><hilight>Espera, si us plau.</hilight>"
 msgid "About Theme"
 msgstr "Sobre Tema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 #, fuzzy
 msgid "Set As Theme"
 msgstr "Escull un Tema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar de Moure/Re-dimensionar Elements"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Començar a Moure/Re-dimensionar Elements"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment no ha pogut crear un procés fill:<br><br> %s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "No es pot sortir - Finestres immortals"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "En el Futur"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "En aquest últim Minut"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anys"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Mesos "
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Setmanes"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dies"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Hores"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuts"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Paràmetres"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importa"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centre"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualitat de Fitxer"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Usa el fitxer original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3432,12 +3482,12 @@ msgstr ""
 "configuració.<br>Pot re-configurar les coses ara. Disculpa per les molèsties "
 "per la teva configuració<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Configuració Actualitzada"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3472,147 +3522,153 @@ msgstr "Amunt"
 msgid "Down"
 msgstr "Avall "
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Afegeix a Aplicacions Preferents"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Puja un Directori"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Resolució"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permisos"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificat:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Tu"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protegit"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Només lectura"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Oblidat"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Escriptura-Lectura"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Configuració Monitor Bateria"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Xaqueja cada:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fitxers..."
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hiberna"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, fuzzy, c-format
+msgid "%1.0f %%"
+msgstr "%3.0f%%"
+
+#: src/modules/battery/e_mod_config.c:223
 #, fuzzy
 msgid "Polling"
 msgstr "Text Pla"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 #, fuzzy
 msgid "Alert when at:"
 msgstr "Avisa'm quan la bateria estigui per sota de :"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minuts"
 
-#: src/modules/battery/e_mod_config.c:229
-#, fuzzy, c-format
-msgid "%1.0f %%"
-msgstr "%3.0f%%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 #, fuzzy
 msgid "Alert"
 msgstr "Acceleració"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 #, fuzzy
 msgid "Auto Detect"
 msgstr "Auto oculta "
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Intern"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Inacabat"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3620,34 +3676,35 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Bateria"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Rellotge"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Color d'Ombra"
@@ -3720,17 +3777,17 @@ msgstr "Configuració Actualitzada"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplicacions de l'iBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Inicia Aplicacions"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Re-inicia Aplicacions"
 
@@ -3745,10 +3802,25 @@ msgid "Apps"
 msgstr "Aplica"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nova Aplicació "
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Executa"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Aplicacions Específiques"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Fitxer de Taula de Treball"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Altre IBar"
 
@@ -3761,7 +3833,7 @@ msgid "Available Profiles"
 msgstr "Perfils Autoritzats"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "Seleccioneu Fitxer Edj"
@@ -3803,9 +3875,9 @@ msgstr "Configuració de Diàlegs"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Configuracions Generals"
 
@@ -3849,7 +3921,7 @@ msgstr "Diàlegs "
 msgid "Profiles"
 msgstr "Perfils"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3860,7 +3932,7 @@ msgstr ""
 "No si no ho és.<br>Si no pitja un botó, la vella resolució de<br>%dx%d at %d "
 "Hz serà  restaurada en %d segons"
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3871,7 +3943,7 @@ msgstr ""
 "sinó pitja No.<br> Si no es pitja un botó, la vella resolució de <br> %dx%d "
 "serà  restaurada en %d segons."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3882,7 +3954,7 @@ msgstr ""
 "no es pitja cap botó, la vella resolució de %dx%d a %d Hz <br> serà "
 "<hilight>IMMEDIATAMENT<hilight> restaurada."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3893,47 +3965,47 @@ msgstr ""
 "<br> Si no pitja cap botó, la vella resolució de <br> %dx%d serà  re-"
 "activada <hilight>IMMEDIATAMENT</hilight>"
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Canvi de Resolució"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Guarda"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Restaura"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Configuració de Resolució de Pantalla"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Resolució"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaura en Entrar"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotació:"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -3948,11 +4020,11 @@ msgstr ""
 "significar també<br> quan es va construir <hilight>ecore</hilight> <br>no hi "
 "havia suport per XRandr."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3961,92 +4033,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Configuració de Taules de Treball Virtuals "
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Nombre de Taules de Treball"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Fitxer de Taula de Treball"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Salta quan s'arrastrin objectes a l'extrem de la Pantalla"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Taules de Treball"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Parat"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Vidre"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-#, fuzzy
-msgid "Background panning"
-msgstr "Canvia el Fons de Pantalla"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animació de Salt"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animació de Salt"
 
@@ -4063,7 +4117,7 @@ msgid "Desktop Wallpaper"
 msgstr "Fons de Taula de Treball"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 #, fuzzy
 msgid "Set"
 msgstr "Selecciona"
@@ -4075,12 +4129,12 @@ msgstr "Fons de Pantalla ..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personal"
 
@@ -4088,160 +4142,174 @@ msgstr "Personal"
 msgid "Screen Lock Settings"
 msgstr "Configuració del Bloqueig de Pantalla "
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Suspendre l'ordinador"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Suspendre l'ordinador"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Executa Comanda"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Bloqueix"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Mostra en totes les zones de pantalla"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Mostra en aquesta zona de pantalla"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Mostra en la zona de pantalla #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Paràmetres de Configuració de la Finestra d'Entrada"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Bloqueja quan el salva pantalles estigui activat"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f segons"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Bloqueja quan el temps d'espera hagi accedit "
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minuts"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 #, fuzzy
 msgid "Timers"
 msgstr "Temes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Tema Definit"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Fons de Pantalla del Tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Fons de Taula de Treball"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Fons de Pantalla"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Opcions de Salva Pantalles"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Autoritza el Salva-pantalla d' X"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Suspendre a Disc l'ordinador"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Salva Pantalles"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Estat Inicial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferit"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Autoritza"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "No Autoritzat"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4249,39 +4317,53 @@ msgstr "No Autoritzat"
 msgid "Miscellaneous"
 msgstr "Opcions Variades"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Configuració per Mostrar el Manegament d'Energia"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Autoritza Mostrar el Manegador d'Energia"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr ""
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Bàsic"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Taules de Treball Virtuals"
@@ -4326,77 +4408,77 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Opcions de Key Binding"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Bindatje de tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Afegeix Bindatge"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Elimina Combinació de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modifica Bindatge"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Elimina-ho Tot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Ajusta a predeterminat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Acció"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paràmetres d'Acció "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Opcions Generals"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Seqüència de Bindatge de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "Error de Bindatge de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4405,28 +4487,28 @@ msgstr ""
 "El Seqüència de Bindatge de tecles que ha escollit està  essent usat per "
 "l'acció <br> <hilight>%s</hilight>. Si us plau tria una altra seqüència."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4581,35 +4663,48 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Paràmetres de Llengua"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Selecció d'Idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 #, fuzzy
 msgid "System Default"
 msgstr "Ajusta a Predeterminat"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Locals Seleccionades "
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Locals"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Llengua"
 
@@ -4696,17 +4791,17 @@ msgid "Manager"
 msgstr "Managador"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Cap"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Paràmetres dels Bindings del Ratolí"
 
@@ -4730,13 +4825,11 @@ msgid "Menu Settings"
 msgstr "Paràmetres de Menú"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Personal"
@@ -4747,7 +4840,7 @@ msgid "Main Menu"
 msgstr "Mostra el Menú Principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 #, fuzzy
 msgid "Favorites"
 msgstr "Menú Favorits"
@@ -4768,7 +4861,7 @@ msgid "Comments"
 msgstr "Comentari"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 #, fuzzy
@@ -4781,7 +4874,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Mostra en els Menús"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menús"
 
@@ -4853,19 +4946,19 @@ msgid "Images"
 msgstr "Imatges"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Tipus de Lletra"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Icones"
 
@@ -5015,18 +5108,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Paràmetres de Fons de Pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Utilitza la Imatge del Tema "
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Imatge"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -5046,43 +5139,48 @@ msgstr "Aquesta Taula de Treball"
 msgid "This Screen"
 msgstr "Aquesta Pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 #, fuzzy
 msgid "Wallpaper settings..."
 msgstr "Paràmetres de Fons de Pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Teula"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Vidre"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Seleccioneu un Dibuix"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Error d'Importació d'Imatge"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "L'Enlightenment no pot importar la imatge degut a errors de conversió."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Error d'Importació de Fons d'Escriptori"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5119,7 +5217,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Estil de Vora per Defecte"
 
@@ -5127,7 +5225,7 @@ msgstr "Estil de Vora per Defecte"
 msgid "Window Border Selection"
 msgstr "Selecció de la Vora de la Finestra"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 "Recorda aquesta Vora per aquesta finestra la pròxima vegada que aquesta "
@@ -5162,7 +5260,7 @@ msgid "Menu Background Base"
 msgstr "Fons de Pantalla"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Títol del Menú"
 
@@ -5171,7 +5269,7 @@ msgid "Menu Title Active"
 msgstr "Títol del Menú Actiu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -5185,12 +5283,12 @@ msgid "Menu Item Disabled"
 msgstr "Comprovació de Text Inhabilitat "
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Mou Text"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Redimenciona Text"
 
@@ -5208,7 +5306,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -5228,391 +5326,401 @@ msgid "File Manager Background Base"
 msgstr "Manegador de Fitxers "
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Focus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Botó de Text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Botó de Text Des-habilitat "
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Comprova el Text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Comprovació de Text Inhabilitat "
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Entra Text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Botó de Text Des-habilitat "
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Text d'Etiqueta"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Text d'Element de Llista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Text d'Element de Llista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Text d'Element de Llista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Capçaleres de Llista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Capçaleres de Llista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Text de Radio"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Text de Radio Inhabilitat "
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Fons de Pantalla"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Etiqueta de Mòdul"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Colors"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Tipus de Color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Configura Tipus de Color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Configura Tipus de Color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Configura Tipus de Color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Executa Comanda"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Color d'Objecte"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Parat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Color d'Ombra"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Manegador de Finestra"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Altre IBar"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Títol de la Barra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "Paràmetres de Pantalla"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Sobre el Títol"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Sobre la Versió"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Sobre el Text"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Títol de Desbloqueig"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Contrasenya de Desbloqueig"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Error de Diàleg"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Títol de Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Text de Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Versió de Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Botons"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Botons de Radio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Botons de xequeig "
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Element de llista de Text"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Llista Element"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Capçaleres de Llista"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Manegador de Fitxers "
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 #, fuzzy
 msgid "Desktop Icon"
 msgstr "Bloqueig de Taula de Treball"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Gran"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Configuració de Font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Molt petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Tipus de Lletra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Autoritza Tipus de Lletra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5620,11 +5728,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Preferències de Tema d'Icona"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Aplicacions Específiques"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5693,11 +5806,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, fuzzy, c-format
-msgid "%1.2f times"
-msgstr "%1.0f fitxers..."
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5710,6 +5821,12 @@ msgstr "Polonès "
 msgid "Minimum"
 msgstr "Mida Mínima"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, fuzzy, c-format
+msgid "%1.2f times"
+msgstr "%1.0f fitxers..."
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 #, fuzzy
 msgid "Maximum"
@@ -5732,25 +5849,25 @@ msgstr "Mostra la Pantalla d' Splash al entrar"
 msgid "Transition Settings"
 msgstr "Paràmetres de Transició"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Arrancada"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Canvi d'Escriptori"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Canvia el Fons de Pantalla"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transicions "
 
@@ -5767,15 +5884,15 @@ msgstr "Importa..."
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Categories de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Assigna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Neteja-ho Tot"
 
@@ -5806,19 +5923,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Temes d'Icona"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Vores"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema d'Icones"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Cursor del Ratolí "
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 #, fuzzy
 msgid "Scaling"
 msgstr "Apilant"
@@ -5950,6 +6067,10 @@ msgstr "Usa l'Icona de l'Aplicació "
 msgid "Border Icon"
 msgstr "Vora"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5981,23 +6102,45 @@ msgstr "Sota Finestres"
 msgid "Animate"
 msgstr "Animació de Salt"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineal "
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Acceleració"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Desacceleració"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Acceleració del Ratolí "
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Desacceleració"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Apilant"
@@ -6019,6 +6162,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Rellotge"
@@ -6057,11 +6201,6 @@ msgstr "Diàlegs "
 msgid "Only dialogs with focused parent"
 msgstr "Només els nous diàlegs tenen focus"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Focus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Altres Configuracions"
@@ -6172,13 +6311,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horitzontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical"
@@ -6240,7 +6379,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Focus de Finestra"
 
@@ -6516,33 +6655,33 @@ msgstr "Molt Lluminós"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Tot"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Tot"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Configuració de Paginació "
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Per sota de tot"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Tot"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Tot"
@@ -6552,165 +6691,165 @@ msgstr "Tot"
 msgid "Everything Settings"
 msgstr "Configuració de la Terminal"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Perfils Autoritzats"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Mou "
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Mou "
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Configura Lleixes "
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Mostra en els Menús"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Mostra en els Menús"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Motor Defecte"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Defecte"
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:458
 #, fuzzy
-msgid "Hide list"
-msgstr "Temps d'Amagar"
+msgid "Default View"
+msgstr "Motor Defecte"
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
-msgstr ""
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Salts Animats"
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
-msgid "Default View"
-msgstr "Motor Defecte"
+msgid "Hide list"
+msgstr "Temps d'Amagar"
 
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Salts Animats"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
 msgid "Sorting"
 msgstr "Arrancant "
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Arrancant "
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Les més usades"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Última Modificació"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Paràmetres d'Acció "
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Color d'Objecte"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Text Pla"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Velocitat Desplegable"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6719,39 +6858,30 @@ msgstr "Paràmetres de Popups"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Mou la Geometria de la Finestra"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Re-inicia Aplicacions"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Acció"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Elements"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6773,166 +6903,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Obre amb ..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Obre amb ..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Afegeix Aplicació"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nova Aplicació "
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Obre amb ..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Executa en una Terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Executable"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Re-inicia Aplicacions"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Comanda"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Definició de Comanda"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Tot"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Més..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Ordena Ara"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Canvia el nom del Fitxer"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Tot"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Mostra els Fitxers Ocults"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Directoris de Cerca :"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Paràmetres d'Arrancada"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Directoris Definits per L'usuari:"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Neteja"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Diàlegs "
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Pantalla Completa"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Envia a la Taula de Treball"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Fitxers d'Icones"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipus de fitxers"
 
@@ -6979,21 +7012,21 @@ msgid "Select an image"
 msgstr "Seleccioneu una Imatge"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 #, fuzzy
 msgid "File Manager"
 msgstr "Manegador de Fitxers "
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 #, fuzzy
 msgid "Root"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -7012,7 +7045,7 @@ msgstr ""
 "configuració.<br>Pot re-configurar les coses ara. Disculpa per les molèsties "
 "per la teva configuració<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -7029,7 +7062,7 @@ msgstr ""
 "fitxers de configuració han estat <br> restaurats per defecte. Perdona els "
 "inconvenients.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Paràmetres de Menú"
@@ -7117,98 +7150,102 @@ msgstr ""
 msgid "Device"
 msgstr "Vista prèvia"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Pujar al Directori Pare"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 #, fuzzy
 msgid "Other application..."
 msgstr "Afegeix Aplicació"
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Obre"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Obre amb ..."
+
+#: src/modules/fileman/e_fwin.c:2039
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicacions"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Aplicacions Específiques"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Totes les Aplicacions"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 #, fuzzy
 msgid "Custom Command"
 msgstr "Executa Comanda"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Elimina Tecla"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Fitxer de Taula de Treball"
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7245,7 +7282,7 @@ msgstr "Durada de l'ocultació "
 msgid "Filemanager is idle"
 msgstr "Manegador de Fitxers "
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7258,42 +7295,47 @@ msgstr "Managador"
 msgid "Available Gadgets"
 msgstr "Gadgets Autoritzats "
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Mòduls"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 #, fuzzy
 msgid "Custom Image"
 msgstr "Executa Comanda"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 #, fuzzy
 msgid "Custom Color"
 msgstr "Executa Comanda"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 #, fuzzy
 msgid "Transparent"
 msgstr "Transaent per a "
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 #, fuzzy
 msgid "Animations"
 msgstr "Animació de Salt"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 #, fuzzy
 msgid "Background"
 msgstr "Fons de Pantalla"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Canvia el Fons de Pantalla"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Inici de moviment/re-dimensió d'aquest Gadget"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 #, fuzzy
 msgid "Free"
@@ -7543,16 +7585,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Estàs Segur que vol eliminar aquesta \"barra\" ?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Crea Icona"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propietats"
 
@@ -7598,7 +7640,7 @@ msgstr "Mostra les Finestres de totes les Taules de Treball"
 msgid "Show windows from active desktop"
 msgstr "Mostra les Finestres d'aquesta Taula de Treball activa"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7731,37 +7773,37 @@ msgstr ""
 "No es pot usar el botó dret del ratolí.<br> Aquest botó està  essent usat "
 "per menús de context"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
@@ -7784,145 +7826,97 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "Configuracions Generals"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensors"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius "
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Mostra Unitats"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Interval de Refresc"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Alta Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Baixa Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatura"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 #, fuzzy
 msgid "Next"
 msgstr "NetWM"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 #, fuzzy
 msgid "Welcome to Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Select one"
 msgstr "Seleccioneu una Icona"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 #, fuzzy
 msgid "Profile"
 msgstr "Perfils"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:107
-#, fuzzy
-msgid "Select application menu"
-msgstr "Aplicacions Específiques"
-
-#: src/modules/wizard/page_040.c:22
-#, fuzzy
-msgid "Launcher Bar"
-msgstr "Afegir al Llançador"
-
-#: src/modules/wizard/page_040.c:24
+#: src/modules/wizard/page_050.c:130
 #, fuzzy
-msgid "Select applications"
-msgstr "Aplicacions Específiques"
-
-#: src/modules/wizard/page_050.c:25
-#, fuzzy
-msgid "Desktop Files"
-msgstr "Fitxer de Taula de Treball"
-
-#: src/modules/wizard/page_050.c:29
-#, fuzzy
-msgid "No icons on desktop"
-msgstr "Mostra la Taula de Treball"
-
-#: src/modules/wizard/page_050.c:32
-#, fuzzy
-msgid "Enable desktop icons"
-msgstr "Mostra els icones de Taula de Treball"
-
-#: src/modules/wizard/page_060.c:25
-#, fuzzy
-msgid "Focus mode"
-msgstr "Focus"
-
-#: src/modules/wizard/page_060.c:29
-#, fuzzy
-msgid "Click to focus windows"
-msgstr "Tancant la finestra"
+msgid "Select preferred size"
+msgstr "Seleccioneu Fitxer Edj"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-#, fuzzy
-msgid "Select Icons to Add"
-msgstr "Seleccioneu una Icona"
-
-#: src/modules/wizard/page_080.c:59
+#: src/modules/wizard/page_060.c:37
 #, fuzzy
-msgid "Quick Launch"
-msgstr "Executa"
-
-#: src/modules/wizard/page_080.c:61
-#, fuzzy
-msgid "Select Applications"
-msgstr "Aplicacions Específiques"
+msgid "Mouse Over"
+msgstr "Les més usades"
 
 #: src/modules/mixer/app_mixer.c:161
 #, fuzzy
@@ -7972,7 +7966,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Lluminós"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7998,42 +7992,58 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 #, fuzzy
 msgid "Mixer Settings"
 msgstr "Configuració de la Mida"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 #, fuzzy
 msgid "Launch mixer..."
 msgstr "Afegir al Llançador"
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 #, fuzzy
 msgid "Mixer Module Settings"
 msgstr "Configuració del Mòdul"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Canvi de Resolució"
+
+#: src/modules/mixer/e_mod_main.c:187
 #, fuzzy
 msgid "Mixer Settings Updated"
 msgstr "Configuració Actualitzada"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Configuració del Mòdul"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -8060,141 +8070,334 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Parat"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 #, fuzzy
 msgid "Controls"
 msgstr "Comores"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Paràmetres de Configuració "
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Protegit"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Desconegut"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Error en Execució"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Teula"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Transicions "
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Configuració"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 #, fuzzy
 msgid "ready"
 msgstr "Irlanda "
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Text Pla"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Motor"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Configuració"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Habilitat"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Mòduls  Autoritzats "
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Protegit"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Parat"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Sistema"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 #, fuzzy
 msgid "Systray"
 msgstr "Sistema"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment no pot carregar aquest tema de sistema."
+#~ msgid "Acpi"
+#~ msgstr "Acció"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Aquesta Pantalla"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Aquesta Pantalla"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Re-dimensiona"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Para de moure/re-dimensionar aquest gadget"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzat l'Ecore!!<br> Potser que estiguis fora "
+#~ "de memòria ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzar el Sistema de Fitxers.<br> Potser que "
+#~ "estigui fora de memòria ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzar la connexió a X.<br>Ha posat la "
+#~ "variable Display ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzar les connexions dels sistema.<br>Potser "
+#~ "que estiguis fora de memòria ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzar l'IPC del sistema.<br>Potser que "
+#~ "estiguis fora de memòria ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr "Enlightenment no pot fer aquestes accions de sistema."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr "Enlightenment no pot fer aquestes accions de sistema."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot inicialitzar el sistema Evas.<br>Potser que estiguis "
+#~ "fora de memòria ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
+#~ "estigui fora de memòria ?"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment no pot configurar el sistema de Lleixes."
+
+#~ msgid "New Application"
+#~ msgstr "Nova Aplicació "
+
+#, fuzzy
+#~ msgid "Background panning"
+#~ msgstr "Canvia el Fons de Pantalla"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Motor Defecte"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Acció"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Obre amb ..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Obre amb ..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Afegeix Aplicació"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nova Aplicació "
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Executa en una Terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Executable"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Més..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Ordena Ara"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Canvia el nom del Fitxer"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Diàlegs "
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Pantalla Completa"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Envia a la Taula de Treball"
+
+#, fuzzy
+#~ msgid "Select application menu"
+#~ msgstr "Aplicacions Específiques"
+
+#, fuzzy
+#~ msgid "Launcher Bar"
+#~ msgstr "Afegir al Llançador"
+
+#, fuzzy
+#~ msgid "No icons on desktop"
+#~ msgstr "Mostra la Taula de Treball"
+
+#, fuzzy
+#~ msgid "Enable desktop icons"
+#~ msgstr "Mostra els icones de Taula de Treball"
+
+#, fuzzy
+#~ msgid "Focus mode"
+#~ msgstr "Focus"
+
+#, fuzzy
+#~ msgid "Click to focus windows"
+#~ msgstr "Tancant la finestra"
+
+#, fuzzy
+#~ msgid "Select Icons to Add"
+#~ msgstr "Seleccioneu una Icona"
+
+#, fuzzy
+#~ msgid "Quick Launch"
+#~ msgstr "Executa"
 
 #, fuzzy
 #~ msgid ""
@@ -8700,12 +8903,6 @@ msgstr "Sistema"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Surt immediatament"
 
-#~ msgid "Shut Down"
-#~ msgstr "Aturada"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Suspendre a Disc l'ordinador"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Bloqueig de Taula de Treball"
 
@@ -8799,10 +8996,6 @@ msgstr "Sistema"
 #~ msgstr "Configuració de la Lleixa"
 
 #, fuzzy
-#~ msgid "Back"
-#~ msgstr "Bàsic"
-
-#, fuzzy
 #~ msgid "Choose Language"
 #~ msgstr "Llengua"
 
index 3a6463b..02a4dd8 100755 (executable)
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,37 +2,39 @@
 # This file is put in the public domain.
 # quaker66@gmail.com
 #
+# Vít Pelčák <vit@pelcak.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-01-04 19:12+0100\n"
-"Last-Translator: quaker66 <quaker66@gmail.com>\n"
-"Language-Team: easylinux <easylinux@sachiel.eu>\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-10-23 01:26+0100\n"
+"Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/bin/e_about.c:14
 msgid "About Enlightenment"
 msgstr "O Enlightenmentu"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -42,655 +44,674 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
-msgstr ""
-"Copyright &copy; 1999-2009, Tým vývojářů Enlightenmentu.<br><br>Doufáme, že "
-"si náš software užijete stejně, jak jsme si užívali jeho tvorbu."
-"<br><br>Tento software je poskytován jak je a BEZ ZÁRUKY. Tento software je "
-"chráněn licencí, více informací najdete v souborech COPYING a COPYING-PLAIN "
-"ve vašem systému.<br><br>Enlightenment je stále <hilight>VE VÝVOJI</hilight> "
-"a není stabilní. Mnoho funkcí je nehotových, neexistují nebo mohou být "
-"zabugované. Byli jste <hilight>VAROVÁNI!</hilight>"
-
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>Tým</title>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
+msgstr ""
+"<title>Copyright &copy; 1999-2011, Tým vývojářů Enlightenmentu.</"
+"><br><br>Doufáme, že si náš software užijete stejně, jak jsme si užívali "
+"jeho tvorbu.<br><br>Tento software je poskytován jak je a BEZ ZÁRUKY. Tento "
+"software je chráněn licencí, více informací najdete v souborech COPYING a "
+"COPYING-PLAIN ve vašem systému.<br><br>Enlightenment je stále <hilight>VE "
+"VÝVOJI</hilight> a není stabilní. Mnoho funkcí je nehotových, neexistují "
+"nebo mohou obsahovat spoustu chyb. Byli jste <hilight>VAROVÁNI!</>"
+
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>Tým</><br><br>"
 
 #: src/bin/e_actions.c:365
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to kill %s.<br><br>Please keep in mind that all data from this "
 "window<br>which has not yet been saved will be lost!<br><br>Are you sure you "
 "want to kill this window?"
 msgstr ""
-"Chtěli byste zabít %s.<br><br>Prosím mějte na paměti, že všechna data,"
-"<br>která nebyla uložena, budou ztracena!<br><br>Opravdu to chcete udělat?"
+"Chtěli byste zabít %s.<br><br>Prosím mějte na paměti, že všechna data z "
+"tohoto okna,<br>která nebyla uložena, budou ztracena!<br><br>Opravdu chcete "
+"zabít toto okno?"
 
 #: src/bin/e_actions.c:377
 msgid "Are you sure you want to kill this window?"
 msgstr "Opravdu chcete zabít toto okno?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ano"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Opravdu chcete jít pryč?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
-msgstr "Opravdu chcete vypnout Enlightenment?"
+msgstr "Požádali jste o ukončení Enlightnmentu.<br><br>Opravdu chcete odejít?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Opravdu se chcete odhlásit?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr "Opravdu se chcete odhlásit?"
+msgstr "Budete odhlášeni.<br><br>Opravdu to chcete udělat?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Opravdu chcete vypnout PC?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
-msgstr "Opravdu chcete vypnout počítač?"
+msgstr "Požádali jste o vypnutí počítače.<br><br>Opravdu jej chcete vypnout?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Opravdu chcete restartovat PC?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
-msgstr "Opravdu chcete restartovat počítač?"
+msgstr ""
+"Požádali jste o restart počítače.<br><br>Opravdu jej chcete restartovat?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr "Opravdu chcete uspat počítač?"
+msgstr "Požádali jste o uspání počítače.<br><br>Opravdu jej chcete uspat?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Opravdu chcete hibernovat PC?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
-msgstr "Opravdu chcete hibernovat počítač?"
+msgstr ""
+"Požádali jste o hibernaci počítače.<<br><br>Opravdu jej chcete uspat na disk?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
-msgstr "Okno : Akce"
+msgstr "Okno : Činnosti"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Přesunout"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Změnit velikost"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
-msgstr "Menu"
+msgstr "Nabídka"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
-msgstr "Menu okna"
+msgstr "Nabídka okna"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Do popředí"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
-msgstr "Nižší"
+msgstr "Do pozadí:"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Zabít"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
-msgstr "Přepnout lepkavý mód"
+msgstr "Přepnout lepkavý režim"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
-msgstr "Přepnout ikonický mód"
+msgstr "Přepnout ikonický režim"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
-msgstr "Přepnout fullscreen mód"
+msgstr "Přepnout fullscreen režim"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
-msgstr "Maximalizovat vertikálně"
+msgstr "Maximalizovat svisle"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
-msgstr "Maximalizovat horizontálně"
+msgstr "Maximalizovat vodorovně"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovat fullscreen"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
-msgstr "Mód maximalizace \"Chytrý\""
+msgstr "Režim maximalizace \"Chytrý\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
-msgstr "Mód maximalizace \"Roztáhnout\""
+msgstr "Režim maximalizace \"Roztáhnout\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
-msgstr "Mód maxilaizace \"Vyplnit\""
+msgstr "Režim maxilaizace \"Vyplnit\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Zarolovat okno nahoru"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Zarolovat okno dolů"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Zarolovat okno doleva"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Zarolovat okno doprava"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
-msgstr "Změnit mód stínu"
+msgstr "Přepnout režim stínu"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
-msgstr "Přepnout stav bez rámů"
+msgstr "Přepnout stav bez okrajů"
 
-#: src/bin/e_actions.c:2773
-#, fuzzy
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
-msgstr "Rám"
+msgstr "Nastavit okraj"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
-msgstr ""
+msgstr "Přepínat mezi okraji"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
-msgstr "Přepnout přitlačený stav"
-
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+msgstr "Přepnout připnutý stav"
+
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
-msgstr "Překlopit desktop doleva"
+msgstr "Překlopit plochu doleva"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
-msgstr "Překlopit desktop doprava"
+msgstr "Překlopit plochu doprava"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Překlopit plochu nahoru"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
-msgstr "Překlopit desktop dolů"
+msgstr "Překlopit plochu dolů"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Překlopit plochu z..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Zobrazit plochu"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Zobrazit panel"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Překlopit plochu na..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Překlopit plochu lineárně"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Přejít na plochu 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Přejít na plochu 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Přejít na plochu 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Přejít na plochu 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Přejít na plochu 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Přejít na plochu 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Přejít na plochu 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Přejít na plochu 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Přejít na plochu 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Přejít na plochu 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Přejít na plochu 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Přejít na plochu 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Přejít na plochu..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Překlopit desktop doleva (Všechny obrazovky)"
+msgstr "Překlopit plochu doleva (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Překlopit plochu doprava (Všechny obrazovky)"
+msgstr "Překlopit plochu doprava (Všechny obr.)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Překlopit plochu nahoru (Všechny obrazovky)"
+msgstr "Překlopit plochu nahoru (Všechny obr.)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Překlopit desktop dolů (Všechny obrazovky)"
+msgstr "Překlopit plochu dolů (Všechny obr.)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Překlopit plochu z... (Všechny obrazovky)"
+msgstr "Překlopit plochu z... (Všechny obr.)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Překlopit plochu na... (Všechny obrazovkyú"
+msgstr "Překlopit plochu na... (Všechny obr.)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Překlopit plochu lineárně... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Překlopit plochu ve směru..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Přejít na plochu 0 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Přejít na plochu 1 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Přejít na plochu 2 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Přejít na plochu 3 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Přejít na plochu 4 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Přejít na plochu 5 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Přejít na plochu 6 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Přejít na plochu 7 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Přejít na plochu 8 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Přejít na plochu 9 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Přejít na plochu 10 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Přejít na plochu 11 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Přejít na plochu... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Poslat myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Poslat myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Poslat myš na obrazovku..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslat myš dopředu o jednu obrazovku"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslat myš zpět o jednu obrazovku"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslat myš dopředu/zpět..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "Zatemnit"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "Odtemnit"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "Podsvícení nastavit"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "Podsvícení min"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "Podsvícení stř"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "Podsvícení max"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "Podsvícení regulovat"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "Podsvícení výš"
+
+#: src/bin/e_actions.c:2983
 #, fuzzy
+msgid "Backlight Down"
+msgstr "Vypnout"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
-msgstr "Přesunout text"
+msgstr "Přesunout na střed"
 
-#: src/bin/e_actions.c:2942
-#, fuzzy
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
-msgstr "Další..."
+msgstr "Přesunout na..."
 
-#: src/bin/e_actions.c:2947
-#, fuzzy
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
-msgstr "Další..."
+msgstr "Posunout o..."
 
-#: src/bin/e_actions.c:2953
-#, fuzzy
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
-msgstr "Změnit velikost z:"
+msgstr "Změnit velikost o..."
 
-#: src/bin/e_actions.c:2959
-#, fuzzy
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
-msgstr "Překlopit plochu ve směru..."
+msgstr "posunout ve směru..."
 
-#: src/bin/e_actions.c:2965
-#, fuzzy
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
-msgstr "Vytvořit ikonu"
+msgstr "Přetáhnout ikonu..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Okno : Pohyb"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Na další plochu"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Na předchozí plochu"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Z plochy #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
-msgstr "Zobrazit hlavní menu"
+msgstr "Zobrazit hlavní nabídku"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
-msgstr "Zobrazit menu oblíbených"
+msgstr "Zobrazit nabídku oblíbených"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
-msgstr "Zobrazit všechny menu aplikací"
+msgstr "Zobrazit všechny nabídky aplikací"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
-msgstr "Zobrazit menu oken"
+msgstr "Zobrazit nabídky klientů"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
-msgstr "Zobrazit menu..."
+msgstr "Zobrazit nabídku..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Spustit"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplikace"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Pryč"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Pryč teď"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment : Mód"
+msgstr "Enlightenment : Režim"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
-msgstr "Přepnout mód prezentace"
+msgstr "Přepnout režim prezentace"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
-msgstr "Přepnout mód offline"
+msgstr "Přepnout režim offline"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Odhlásit se"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Vypnout nyní"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Vypnout"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:3048
-#, fuzzy
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
-msgstr "Uspat"
+msgstr "Uspat nyní"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Uspat"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernovat"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Vyčistit okna"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
-msgstr "Různé : Akce"
+msgstr "Různé : Činnosti"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
-msgstr "Zpožděná akce"
-
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Akce"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Tato obrazovka"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Tato obrazovka"
+msgstr "Zpožděná činnost"
 
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Použít jako pozadí"
 
@@ -698,18 +719,16 @@ msgstr "Použít jako pozadí"
 msgid "Color Selector"
 msgstr "Výběr barvy"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -717,20 +736,20 @@ msgstr "Výběr barvy"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -741,14 +760,14 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 "Data nastavení je třeba aktualizovat. Vaše staré nastavení<br>bylo "
-"odstraněno a nová sada standardních nastavení byla načtena.<br>Bude se to "
+"odstraněno a nová sada standardních nastavení byla načtena.<br>Toto se bude "
 "dít pravidelně při vývoji, takže neposílejte hlášení chyb.<br>Znamená to, že "
-"Enlightenment potřebuje zavést konfiguraci nových<br>vlastností, které ve "
-"vašem starém nastavení prostě ne. Nová sada nastavení<br>je doplní. Nyní "
-"můžete si můžete nastavit Enlightenment zpět k obrazu svému.<br>Omlouváme se "
-"za způsobené potíže.<br>"
+"Enlightenment potřebuje zavést nastavení nových<br>vlastností, které ve "
+"vašem starém nastavení prostě nejsou. Nová sada nastavení<br>je doplní. Nyní "
+"si můžete nastavit Enlightenment zpět k obrazu svému.<br>Omlouváme se za "
+"způsobené potíže.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -760,35 +779,35 @@ msgstr ""
 "Nemělo by se to stát, pokud jste ovšem nedowngradovali<br>Enlightenment nebo "
 "nekopírovali soubory s nastavením z místa, kde<br>běžela novější verze "
 "Enlightenmentu. Je to zlé a jako protiopatření<br>bylo vaše nastavení "
-"vráceno do původních hodnot.<br>Omlouvám se za způsobené potíže.<br>"
+"vráceno do původních hodnot.<br>Omlouváme se za způsobené potíže.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
-msgstr "Problémy při zápisu konfigurace E17"
+msgstr "Problémy při zápisu nastavení E17"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
 "%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety."
 "<br>"
 msgstr ""
-"V Enlightenmentu nastal problém při přesunu<br>konfiguračních souborů z:<br>"
+"V Enlightenmentu nastal problém při přesunu<br>souborů nastavení z:<br>"
 "%s<br><br>do:<br>%s<br><br>Zbytek byl přerušen kvůli bezpečnosti.<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Nastavení aktualizováno"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
-msgstr "EET souborový handler je špatný."
+msgstr "Rutina EET obsluhující soubory je špatná."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Data souboru jsou prázdná."
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -796,15 +815,15 @@ msgstr ""
 "Soubor není zapisovatelný. Možná je disk pouze pro<br>čtení nebo chybí práva "
 "k souborům."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr "Došla paměť při přípravě k zápisu.<br>Prosím uvolněte ji."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Toto je obecná chyba."
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -812,63 +831,60 @@ msgstr ""
 "Soubor s nastavením je moc velký.<br>Měl by být velmi malý (maximálně pár "
 "stovek KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
-msgstr "Máte I/O chyby na disku.<br>Možná potřebuje vyměnit?"
+msgstr "Máte I/O chyby na disku.<br>Nepotřebuje vyměnit?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
-msgstr "Došlo místo během zápisu souboru"
+msgstr "Během zápisu souboru došlo místo na disku"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
-msgstr "Soubor byl uzavřen při zápisu."
+msgstr "Soubor byl při zápisu uzavřen."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Mapování paměti (mmap) souboru selhalo."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
-msgstr "X509 kódování selhalo."
+msgstr "Kódování X509 selhalo."
 
-#: src/bin/e_config.c:2143
-#, fuzzy
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
-msgstr "Hibernace selhala."
+msgstr "Podpis selhal."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "Podpis byl neplatný."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Nepodepsáno."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Funkce nebyla implementována."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "PRNG nebyl nasazen."
 
-#: src/bin/e_config.c:2158
-#, fuzzy
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
-msgstr "Uspání selhalo."
+msgstr "Šifrování selhalo."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
-msgstr "Uspání selhalo."
+msgid "Decryption failed."
+msgstr "Dešifrování selhalo."
 
-#: src/bin/e_config.c:2164
-#, fuzzy
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
-msgstr "Vítejte v Enlightenmentu"
+msgstr "Chyba je Enlightenmentu neznámá."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -879,57 +895,61 @@ msgstr ""
 "velmi neobvyklé.<br><br>Poškozený soubor byl:<br>%s<br><br>Tento soubor byl "
 "smazán, aby nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Základní"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Použít"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Rozšíření"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduly"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Kontejner %i"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Chyba - žádná podpora PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM podpora nebyla do Enlightenmentu zkompilována, takže<br>zamykání plochy "
 "bylo zakázáno."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Uzamčení selhalo"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -938,15 +958,15 @@ msgstr ""
 "klávesnici nebo myši, popř. obojím,<br>a tento vyhrazený přístup se "
 "nepodařilo zrušit."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Prosím zadejte heslo pro odemčení"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Chyba systému autentizace"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -955,27 +975,27 @@ msgid ""
 msgstr ""
 "Při autentizaci přes PAM se nepodařilo vytvořit<br>autentizovanou relaci. "
 "Kód chyby je <hilight>%i</hilight>.<br> To není dobré a nemělo by se to "
-"stát. Prosím ohlaště chybu."
+"stát. Prosím nahlaste chybu."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
-msgstr "Povolit prezentační mód?"
+msgstr "Povolit prezentační režim?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 "Odemkli jste obrazovku příliš rychle.<br><br>Chtěli byste povolit "
-"<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
+"<b>prezentační režim</b> a dočasně vypnout spořič, zámek obrazovky a správu "
 "napájení?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, ale zvýšit časový limit"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne, a přestat se ptát"
 
@@ -991,7 +1011,7 @@ msgid ""
 "the window title instead. This will only<br>work if the window title is the "
 "same at<br>the time the window starts up, and does not<br>change."
 msgstr ""
-"Okno, pro které vytváříte ikonu,<br>neobsahuje vlastnosti jména a "
+"Okno, pro které vytváříte ikonu,<br>neobsahuje vlastnosti názvu a "
 "třídy<br>okna, takže potřebné vlastnosti pro<br>ikonu nemohou být zjištěny. "
 "Budete potřebovat<br>použít titulek okna. To bude fungovat<br>pouze jestli "
 "se titulek okna nemění."
@@ -1000,106 +1020,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor spouštěčů"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
-msgstr "Jméno"
+msgstr "Název"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
-msgstr "Obecné jméno"
+msgstr "Obecný název"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Třída okna"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorie"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "MIME typy"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Desktop soubor"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
-msgstr "Základní"
+msgstr "Obecné"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
-msgstr "Notifikace při startu"
+msgstr "Upozornění při startu"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Spustit v terminálu"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
-msgstr "Zobrazit v menu"
+msgstr "Zobrazit v nabídkách"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
-msgstr "Volby"
+msgstr "Možnosti"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Vyberte ikonu"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Vyberte spustitelný soubor"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Vystřihnout"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Vybrat vše"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1121,9 +1140,9 @@ msgid "Enlightenment was unable to restore to directory:<br><br>%s"
 msgstr "Enlightenment nemohl vytvořit proces potomka:<br><br>%s<br>"
 
 #: src/bin/e_exec.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s"
-msgstr "Enlightenment nemohl vytvořit proces potomka:<br><br>%s<br>"
+msgstr "Enlightenment nemohl vytvořit proces potomka:<br><br>%s"
 
 #: src/bin/e_exec.c:389
 msgid "Application run error"
@@ -1138,314 +1157,313 @@ msgstr ""
 "Enlightenment nedokázal spustit aplikaci:<br><br>%s<br><br>Aplikace selhala "
 "při startu."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Chyba při spouštění aplikace"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Proces %s se neočekávaně ukončil."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Chybový status %i byl navrácen z %s"
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s byl přerušen signálem interrupt."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s byl přerušen signálem quit."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s byl přerušen signálem abort."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s byl přerušen Floating point chybou."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s byl přerušen nepřerušitelným kill signálem."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s byl přerušen chybou při segmentaci."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s byl přerušen chybou roury."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s byl přerušen ukončovacím signálem."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s byl přerušen chybou sběrnice."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s byl přerušen signálem číslo %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Zbývající výstup byl zkrácen. Uložte výstup.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Chybové záznamy"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Nebyla zaznamenána žádná chybová zpráva."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Uložit tuto zprávu"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Chybový záznam byl uložen jako %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Chybová informace"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informace o chybovém signálu"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Výstupní data"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Nebyl zaznamenán žádný výstup."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Neexistující cesta"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neexistuje."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Chyba při připojování"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
-msgstr "Nemůžu připojit zařízení"
+msgstr "Nelze připojit zařízení"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Chyba při odpojování"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
-msgstr "Nemůžu odpojit zařízení"
+msgstr "Nelze odpojit zařízení"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Chyba při vysouvání"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
-msgstr "Nemůžu vysunout zařízení"
+msgstr "Nelze vysunout zařízení"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i souborů"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Vytvořit symlink"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Zrušit"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Nastavení odvození rodiče"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Režim zobrazení"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Obnovit"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Zobrazit skryté soubory"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Zapamatovat řazení"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Setřídit teď"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nový adresář"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Odpojit"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Připojit"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Vysunout"
 
-#: src/bin/e_fm.c:8229
-#, fuzzy
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
-msgstr "Použít ikonu poskytovanou aplikací"
+msgstr "Vlastnosti aplikace"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Vlastnosti souboru"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Použít výchozí"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Ikony v mřížce"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Vlastní ikony"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Seznam"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikon (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Nastavit pozadí..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Nastavit překrytí..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Vytvořit složku"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Název nové složky:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Přejmenovat %s na:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Přejmenovat soubor"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Zkusit znovu"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ne všem"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ano všem"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Varování"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Soubor už existuje, přepsat?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorovat"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorovat vše"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Vyskytla se chyba při provádění operace.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Odsouhlasit smazání"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Opravdu chcete smazat<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1478,12 +1496,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznámý svazek"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Výměnné zařízení"
 
@@ -1491,7 +1509,7 @@ msgstr "Výměnné zařízení"
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Velikost:"
 
@@ -1507,7 +1525,7 @@ msgstr "Typ souboru:"
 msgid "Permissions"
 msgstr "Práva"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Vlastník:"
 
@@ -1527,17 +1545,17 @@ msgstr "Vlastník může číst"
 msgid "Owner can write"
 msgstr "Vlastník může zapisovat"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Náhled"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Výchozí"
 
@@ -1546,7 +1564,7 @@ msgid "Thumbnail"
 msgstr "Náhled"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -1562,53 +1580,41 @@ msgstr "Info o odkazu"
 msgid "Select an Image"
 msgstr "Vybrat obrázek"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
-#, fuzzy
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
-msgstr "Přesunout text"
-
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Přesunout nebo změnit velikost tohoto gadgetu"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Změnit velikost"
+msgstr "Přesunout na"
 
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Automaticky skorolovat obsah"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Plochý"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Vnořený"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Vzhled"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Odebrat"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Uzamknout tento gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1639,7 +1645,7 @@ msgstr "Zabránit náhodnému uzavření tohoto okna, protože je důležité"
 
 #: src/bin/e_int_border_locks.c:289
 msgid "Do not allow the border to change on this window"
-msgstr "Zakázat změnu rámu na tomto okně"
+msgstr "Zakázat změnu okraje na tomto okně"
 
 #: src/bin/e_int_border_locks.c:292
 msgid "Remember these Locks for this window next time it appears"
@@ -1656,14 +1662,14 @@ msgstr "Pozice"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Velikost"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Skládání"
@@ -1689,7 +1695,7 @@ msgstr "Maximalizovaný stav"
 #: src/bin/e_int_border_locks.c:320 src/bin/e_int_border_locks.c:339
 #: src/bin/e_int_border_remember.c:732
 msgid "Fullscreen state"
-msgstr "Fullscreen stav"
+msgstr "Stav přes celou obrazovku"
 
 #: src/bin/e_int_border_locks.c:324
 msgid "Lock me from changing:"
@@ -1715,163 +1721,162 @@ msgstr "Odhlašuji s tímto oknem otevřeným"
 msgid "Remember these Locks"
 msgstr "Zapamatovat tyto zámky"
 
-#: src/bin/e_int_border_menu.c:82
-#, fuzzy
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
-msgstr "Okna"
-
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Vždy navrchu"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Připíchnuto"
+msgstr "Okno"
+
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Nastavení"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
-msgstr "Fullscreen"
+msgstr "Celá obrazovka"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
-msgstr "Maximalizovat vertikálně"
+msgstr "Maximalizovat svisle"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
-msgstr "Maximalizovat horizontálně"
+msgstr "Maximalizovat vodorovně"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Demaximalizovat"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Upravit ikonu"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Vytvořit ikonu"
 
-#: src/bin/e_int_border_menu.c:464
-#, fuzzy
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
-msgstr "Přidat do oblíbených"
+msgstr "Přidat do nabídky oblíbených"
 
-#: src/bin/e_int_border_menu.c:469
-#, fuzzy
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
-msgstr "Přidat do oblíbených"
+msgstr "Přidat do iBaru"
 
-#: src/bin/e_int_border_menu.c:477
-#, fuzzy
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
-msgstr "Klávesová zkratka"
-
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Chytré umisťování"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Přeskočit"
+msgstr "Vytvořit klávesovou zkratku"
 
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
-msgstr "Rám"
+msgstr "Okraj"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Zámky"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: src/bin/e_int_border_menu.c:571
-#, fuzzy
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
-msgstr "NetWM"
+msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Připíchnuto"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Přeskočit"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Ikonifikovat"
 
-#: src/bin/e_int_border_menu.c:680
-#, fuzzy
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
-msgstr "Skrytý obsah"
+msgstr "Stín"
 
-#: src/bin/e_int_border_menu.c:864
-#, fuzzy, c-format
+#: src/bin/e_int_border_menu.c:830
+#, c-format
 msgid "Screen %d"
-msgstr "Obrazovka"
+msgstr "Obrazovka %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Vždy navrchu"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normální"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Vždy pod"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Připíchnout na plochu"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Zrušit připíchnutí na plochu"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Vybrat styl okrajů"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Použít E17 výchozí vlastnosti ikony"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Použít ikonu poskytovanou aplikací"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Použít ikonu definovanou uživatelem"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Odolnost"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Seznam oken"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
-msgstr "Pager"
+msgstr "Přepínač ploch"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Seznam úloh"
 
@@ -1892,7 +1897,7 @@ msgid "ICCCM Properties"
 msgstr "Vlastnosti ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titulek"
 
@@ -1998,7 +2003,7 @@ msgstr "Přeskočit seznam úloh"
 
 #: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:741
 msgid "Skip Pager"
-msgstr "Přeskočit pager"
+msgstr "Přeskočit přepínač ploch"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
@@ -2026,8 +2031,8 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 "Chcete, aby si Enlightenment zapamatoval, že má aplikovat<br>nastavení (jako "
-"velikost, umístění, styl rámů oken atd.) pro<br>okno, které <hilight>nemá "
-"unikátní nastavení</hilight>.<br><br>To znamená, že sdílí Jméno/Třídu, "
+"velikost, umístění, styl okrajů oken atd.) pro<br>okno, které <hilight>nemá "
+"unikátní nastavení</hilight>.<br><br>To znamená, že sdílí Název/Třídu, "
 "průhlednost, úlohu a další nastavení s více než jedním oknem na obrazovce a "
 "zapamatování<br>nastavení pro toto okno se aplikuje i na všechny ostatní "
 "okna,<br>které mají stejné nastavení.<br><br>Je dobré zapnout volbu "
@@ -2050,8 +2055,8 @@ msgid ""
 "specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
 "way of remembering this window."
 msgstr ""
-"Zkoušíte Enlightenmentu nastavit<br>vlastnosti (jako velikost, lokace, styl "
-"rámů oken atd.)<br>oknu <hilight>bez upřesnění, jak si zapamatovat "
+"Zkoušíte Enlightenmentu nastavit<br>vlastnosti (jako velikost, místo, styl "
+"okrajů oken atd.)<br>oknu <hilight>bez upřesnění, jak si zapamatovat "
 "nastavení</hilight>.<br><br>Musíte upřesnit alespoň jeden způsob, jak si "
 "zapamatovat toto okno."
 
@@ -2068,10 +2073,8 @@ msgid "Size, Position and Locks"
 msgstr "Velikost, pozice a zámky"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
-#, fuzzy
 msgid "All"
-msgstr "Povolit"
+msgstr "Vše"
 
 #: src/bin/e_int_border_remember.c:638
 msgid "Remember using"
@@ -2146,18 +2149,15 @@ msgid "Utilities"
 msgstr "Nástroje"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Soubory"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
-#, fuzzy
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
-msgstr "Spustit"
+msgstr "Spouštěč"
 
 #: src/bin/e_int_config_modules.c:57
 #: src/modules/conf_theme/e_int_config_fonts.c:57
@@ -2168,38 +2168,21 @@ msgstr "Jádro"
 msgid "Mobile"
 msgstr "Mobilní"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Volby"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Nastavení modulů"
 
 #: src/bin/e_int_config_modules.c:176
-#, fuzzy
 msgid "Load"
-msgstr "Jazyk"
+msgstr "Načíst"
 
 #: src/bin/e_int_config_modules.c:181
-#, fuzzy
 msgid "Unload"
-msgstr "Deaktivovat modul"
+msgstr "Uvolnit"
 
 #: src/bin/e_int_config_modules.c:307 src/bin/e_int_config_modules.c:591
-#, fuzzy
 msgid "No modules selected."
-msgstr "Vybraná oblast"
+msgstr "Nebyl vybrán žádný modul."
 
 #: src/bin/e_int_config_modules.c:589
 msgid "More than one module selected."
@@ -2211,7 +2194,7 @@ msgstr "Obsah panelu"
 
 #: src/bin/e_int_gadcon_config.c:44
 msgid "Toolbar Contents"
-msgstr "Obsah toolbaru"
+msgstr "Obsah panelu nástrojů"
 
 #: src/bin/e_int_gadcon_config.c:155 src/modules/gadman/e_mod_config.c:118
 #: src/modules/gadman/e_mod_config.c:134
@@ -2222,7 +2205,7 @@ msgstr "Přidat gadget"
 msgid "Remove Gadget"
 msgstr "Odstranit gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Nastavení panelu nástrojů"
 
@@ -2230,11 +2213,11 @@ msgstr "Nastavení panelu nástrojů"
 msgid "Layout"
 msgstr "Rozložení"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Chyba vstupní metody"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2250,7 +2233,7 @@ msgstr "Hlavní"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Oblíbené aplikace"
 
@@ -2258,76 +2241,74 @@ msgstr "Oblíbené aplikace"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplikace"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Ztracená okna"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "O Enlightenmentu"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
-msgstr "Téma"
+msgstr "Motiv"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuální"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Panely"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Zobrazit/skrýt všechna okna"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Žádné aplikace)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Nastavit virtuální plochy"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Žádná okna)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
-msgstr "Beze jména!!"
+msgstr "Bez názvu!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Žádné panely)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Přidat panel"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Smazat panel"
 
@@ -2353,17 +2334,16 @@ msgid "Allow windows to overlap the shelf"
 msgstr "Povolit oknům překrýt panel"
 
 #: src/bin/e_int_shelf_config.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "Height (%3.0f pixels)"
-msgstr "%3.0f pixelů"
+msgstr "Výška (%3.0f pixelů)"
 
 #: src/bin/e_int_shelf_config.c:182
-#, fuzzy
 msgid "Shrink to Content Width"
-msgstr "Zúžit na velikost obsahu"
+msgstr "Zúžit na šířku obsahu"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Styl"
 
@@ -2393,7 +2373,7 @@ msgid "Hide duration"
 msgstr "Doba skrývání"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekund"
@@ -2410,7 +2390,7 @@ msgstr "Zobrazit na všech plochách"
 msgid "Show on specified Desktops"
 msgstr "Zobrazit na vybraných plochách"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2427,7 +2407,7 @@ msgstr ""
 "nebo nejste vlastníkem. Prosím zkontrolujte:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2435,89 +2415,32 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
-"IPC socket adresář nemůže být vytvořen nebo\n"
-"testován.\n"
+"Adresář IPC socket nemůže být vytvořen nebo\n"
+"prověřen.\n"
 "Prosím zkontrolujte:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Eina!\n"
+
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Eet!\n"
+
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore!\n"
+
+#: src/bin/e_main.c:250
 msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Volby:\n"
-"\t-display DISPLAY\n"
-"\t\tPřipojí se k obrazovce DISPLAY.\n"
-"\t\tpř: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tPřidá FALEŠNOU xinerama obrazovku (namísto skutečné)\n"
-"\t\ts danou geometrií. Můžete přidat kolik chcete. Všechny\n"
-"\t\tnahrazují reálné obrazovky xinerama, pokud nějaké jsou.\n"
-"\t\tPoužitelné k simulaci xineramy.\n"
-"\t\tpř: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile PROFIL\n"
-"\t\tPoužít profil PROFIL místo uživatelského výchozího nebo prostě "
-"\"výchozího\".\n"
-"\t-good\n"
-"\t\tBýt dobrý.\n"
-"\t-evil\n"
-"\t\tBýt zlý.\n"
-"\t-psychotic\n"
-"\t\tBýt psychotický.\n"
-"\t-locked\n"
-"\t\tspustit se zamčenou obrazovkou, takže bude vyžadováno heslo.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tPokud potřebujete tuto nápovědu, nepotřebujete tuto volbu.\n"
-
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit Ecore!\n"
-"Možná došla paměť?"
-
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo inicializovat souborový systém.\n"
-"Možná došla paměť?"
-
-#: src/bin/e_main.c:437
-msgid ""
-"Enlightenment cannot set up an exit signal handler.\n"
-"Perhaps you are out of memory?"
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
 msgstr ""
 "Enlightenmentu se nepodařilo spustit handler signálu exit.\n"
 "Možná došla paměť?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2525,7 +2448,7 @@ msgstr ""
 "Enlightenmentu se nepodařilo spustit handler signálu HUP.\n"
 "Možná došla paměť?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2534,64 +2457,31 @@ msgstr ""
 "Enlightenmentu se nepodařilo spustit handler signálu HUP.\n"
 "Možná došla paměť?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenmentu se nepodařilo spojit s X serverem.\n"
-"Máte nastavenou proměnnou DISPLAY?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_IMF!\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit jeho pohotovostní varovný systém.\n"
-"Máte nastavenou proměnnou DISPLAY?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_File!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit systém spojení.\n"
-"Možná došla paměť?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_Con!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit systém IPC.\n"
-"Možná došla paměť?"
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_Ipc!\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenmentu se nepodařilo nastavit xinerama wrapping.\n"
-"Tohle by se nemělo stávat."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_X!\n"
 
-#: src/bin/e_main.c:518
-#, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenmentu se nepodařilo nastavit xinerama wrapping.\n"
-"Tohle by se nemělo stávat."
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat Ecore_Evas!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit systém Evas!\n"
-"Možná došla paměť?"
-
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2601,7 +2491,7 @@ msgstr ""
 "vykreslování v Evas-u. Prosím zkontrolujte, zda Evas a Ecore podporují\n"
 "softwarové X11 vykreslování."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2611,7 +2501,32 @@ msgstr ""
 "vykreslování v Evas-u. Prosím zkontrolujte, zda Evas a Ecore podporují\n"
 "softwarové X11 vykreslování."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat souborový manažer.\n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat E_int!\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenmentu se nepodařilo spustit jeho pohotovostní varovný systém.\n"
+"Máte nastavenou proměnnou DISPLAY?"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat E_Xinerama!\n"
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenmentu se nepodařilo inicializovat E_Randr!\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2619,23 +2534,28 @@ msgstr ""
 "Enlightenment nemůže vytvářet adresáře ve vašem domovském adresáři.\n"
 "Možná žádný nemáte nebo je disk plný?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém regustrů."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenmentu se nepodařilo spustit systém nastavení."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenmentu se nepodařilo nastavit prostředí."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment nemohl nastavit systém škálování."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenmentu se nepodařilo nastavit pointer systém."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2643,97 +2563,42 @@ msgstr ""
 "Enlightenmentu se nepodařilo nastavit cesty k vyhledávání souborů.\n"
 "Možná došla paměť?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenmentu se nepodařilo spustit systém fontů."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
-msgstr "Enlightenmentu se nepodařilo spustit systém témat."
+msgstr "Enlightenmentu se nepodařilo spustit systém motivů."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo spustit úvodní obrazovku.\n"
-"Možná došla paměť?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenmentu se nepodařilo nastavit intl systém."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Nastavuji mezinárodní podporu"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenmentu se nepodařilo nastavit intl systém."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenmentu se nepodařilo inicializovat FDO desktop systém.\n"
-"Možná došla paměť?"
-
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Podpora testovacího formátu"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment zjistil, že Evas nemůže vytvořit buffer canvas. Prosím "
-"zkontroujte,\n"
-"jestli má Evas podporu Software Buffer Enginu.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment zjistil, že Evas nemůže načíst PNG soubory. Zkontrolujte, "
-"jestli má Evas podporu\n"
-"načítání PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment zjistil, že Evas nemůže načíst JPEG soubory. Zkontrolujte, "
-"jestli má Evas podporu\n"
-"načítání JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
-"Enlightenment zjistil, že Evas nemůže načíst EET soubory. Zkontrolujte, "
-"jestli má Evas podporu\n"
-"načítání EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment zjistil, že Evas nemůže nahrát 'Sans' písmo. Zkontrolujte, "
-"jestli má Evas\n"
-"podporu fontconfig a jestli fontconfig má 'Sans' písmo.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Ověřte SVG podporu"
+"Enlightenmentu se nepodařilo inicializovat systém plochy FDO.\n"
+"Možná nemáte oprávnění ke~/.cache/efreet nebo\n"
+"Vám došla paměť či místo na disku?"
 
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Nastavuji obrazovky"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2741,201 +2606,350 @@ msgstr ""
 "Nastavení manažeru okna na všech obrazovkách v systému selhalo.\n"
 "Neběží už jiný okenní manažer?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Nastavit ACPI"
+
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "Nastavení posvícení"
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment nemůže nastavit podsvícení."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Nastavuji DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment nemůže nastavit volby DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Nastavuji spořič"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr "Enlightenment nemůže konfigurovat X spořič."
+msgstr "Enlightenment nemůže nastavit spořič X."
+
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "Nastavit režimy úspory energie"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment nemůže nastavit režimy správy napájení."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Nastavuji desklock"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém zamykání plochy."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Nastavuji popupy"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenmentu se nepodařilo spustit systém pop-upů."
 
-#: src/bin/e_main.c:843
-#, fuzzy
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr "Nastavit sběrnici zpráv"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
-msgstr "Nastavuji cesty"
+msgstr "Nastavit cesty"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Nastavuji systémové ovládací prvky"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenmentu se nepodařilo spustit System Command systém.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
-msgstr "Nastavuji akce"
+msgstr "Nastavit činnosti"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenmentu se nepodařilo spustit systém akcí."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Nastavuji spouštěcí systém"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenmentu se nepovedlo nastavit systém exec."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Nastavuji souborový manažer"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
+msgstr "Nastavit správce souborů"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenmentu se nepodařilo inicializovat souborový manažer.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Nastavuji systém zpráv"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenmentu se nepodařilo nastavit msg systém."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Nastavuji DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenmentu se nepodařilo spustit systém dnd."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Nastavit správu zachycení vstupu"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém klávesových zkratek."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Nastavuji moduly"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenmentu se nepodařilo spustit systém modulů."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Nastavuji paměť"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment nemůže nastavit volby zapamatování."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Nastavuji třídy barev"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nemůže nastavit systém tříd barev"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Nastavuji gadget container"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém ovládání gadgetů"
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Nastavuji DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Nastavuji DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment nemůže konfigurovat DPMS volby."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Nastavuji módy úspory energie"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment nemůže nastavit módy správy napájení."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Nastavuji wallpaper"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém pozadí plochy."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Nastavuji myš"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nemohl nastavit myš."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Nastavuji zkratky"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenmentu se nepodařilo spustit systém klávesových zkratek."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Nastavuji panely"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenmentu se nepodařilo nastavit systém panelů."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Nastavuji náhledy"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenmentu se nepodařilo spustit systém náhledů.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenmentu se nepodařilo spustit System Command systém.\n"
+
+#: src/bin/e_main.c:868
 #, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenmentu se nepodařilo spustit systém náhledů.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "Nastavit pracovní prostředí"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenmentu se nepodařilo nastavit pracovní prostředí.\n"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
-msgstr "Nastavuji řazení souborů"
+msgstr "Nastavit řazení souborů"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment nemůže nastavit jeho order file systém."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Nahrávám moduly"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Nastavit panely"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Většinou dokončeno"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Možnosti:\n"
+"\t-display DISPLAY\n"
+"\t\tPřipojí se k obrazovce DISPLAY.\n"
+"\t\tpř: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tPřidá FALEŠNOU xinerama obrazovku (namísto skutečné)\n"
+"\t\ts danou geometrií. Můžete přidat kolik chcete. Všechny\n"
+"\t\tnahrazují reálné obrazovky xinerama, pokud nějaké jsou.\n"
+"\t\tPoužitelné k simulaci xineramy.\n"
+"\t\tpř: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile PROFIL\n"
+"\t\tPoužít profil PROFIL místo uživatelského výchozího nebo prostě "
+"\"výchozího\".\n"
+"\t-good\n"
+"\t\tBýt dobrý.\n"
+"\t-evil\n"
+"\t\tBýt zlý.\n"
+"\t-psychotic\n"
+"\t\tBýt psychotický.\n"
+"\t-locked\n"
+"\t\tspustit se zamčenou obrazovkou, takže bude vyžadováno heslo.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tPokud potřebujete tuto nápovědu, nepotřebujete tuto volbu.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Podpora testovacího formátu"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže vytvořit buffer canvas. Prosím "
+"zkontroujte,\n"
+"jestli má Evas podporu Software Buffer Enginu.\n"
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže načíst soubory SVG. Zkontrolujte, zda "
+"má Evas podporu načítání PNG.\n"
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže načíst soubory JPEG. Zkontrolujte, zda "
+"má Evas podporu načítání JPEG.\n"
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže načíst soubory PNG. Zkontrolujte, zda "
+"má Evas podporu načítání PNG.\n"
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže načíst soubory EET. Zkontrolujte, zda "
+"má Evas podporu načítání EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment zjistil, že Evas nemůže nahrát písmo 'Sans'. Zkontrolujte, "
+"jestli má Evas\n"
+"podporu fontconfig a jestli fontconfig zná písmo 'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
@@ -2943,11 +2957,11 @@ msgstr ""
 "Enlightenment spadl brzy po startu a byl<br>restartován. Chybu způsobilo "
 "načtení modulu: %s.<br>Tento modul byl zakázán a nebude načten."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment spadnul brzy po startu a byl restartován"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2957,7 +2971,7 @@ msgstr ""
 "Enlightenment spadl brzy po startu a byl<br>restartován. Chybu způsobilo "
 "načtení modulu: %s.<br><br>Tento modul byl zakázán a nebude načten."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2968,7 +2982,7 @@ msgstr ""
 "zakázány<br>a nebudou aktivovány, abyste mohli<br>zjistit svůj problém. "
 "Dialog<br>nastavení modulů vám pomůže aktivovat<br>vaše moduly znovu."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2980,20 +2994,12 @@ msgstr ""
 "problém. Dialog<br>nastavení modulů vám pomůže aktivovat<br>vaše moduly "
 "znovu."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Nastavit panely"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Většinou dokončeno"
-
-#: src/bin/e_module.c:102
-#, fuzzy, c-format
+#: src/bin/e_module.c:96
+#, c-format
 msgid "Loading Module: %s"
-msgstr "Nahrávám moduly"
+msgstr "Nahrávání modulu: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3002,11 +3008,11 @@ msgstr ""
 "Došlo k chybě při načítání modulu %s.<br>Žádný modul s názvem %s nebyl "
 "nazelen<br>v adresářích pro hledání modulů.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Chyba nahrávání modulu"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3015,11 +3021,11 @@ msgstr ""
 "Došlo k chybě při načítání modulu %s.<br>Plná cesta k modulu je:<br>"
 "%s<br>Nahlášená chyba je:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modul neobsahuje všechny nutné funkce"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3029,226 +3035,222 @@ msgstr ""
 "Chyba v API modulů.<br>Chyba nahrávání modulu: %s<br>Je zapotřebí API modul "
 "s verzí minimálně %i.<br>API modul v Enlightenmentu má verzi %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Chcete tento modul uvolnit?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 "Vypnuli jste spořič příliš rychle.<br><br>Chtěli byste povolit "
-"<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
+"<b>prezentační režim</b> a dočasně vypnout spořič, zámek obrazovky a správu "
 "napájení?"
 
 #: src/bin/e_shelf.c:165
 msgid "Shelf #"
 msgstr "Panel #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Opravdu chcete smazat tento panel?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Opravdu chcete smazat tento panel?"
 
-#: src/bin/e_shelf.c:1674
-#, fuzzy
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
-msgstr "Zastavit přesouvání/zvětšování/zmenšování prvků"
+msgstr "Ukončit přesouvání/měnění velikosti prvků"
 
-#: src/bin/e_shelf.c:1676
-#, fuzzy
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
-msgstr "Začít přesouvání/zvětšování/zmenšování prvků"
+msgstr "Začít přesouvání/měnění velikosti prvků"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
-#, fuzzy
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
-msgstr "Komentář"
+msgstr "Obsah"
 
 #: src/bin/e_startup.c:66
 msgid "Starting"
 msgstr "Spouštím"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Kontroluji práva systému"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Kontrola systému dokončena"
 
-#: src/bin/e_sys.c:305
-#, fuzzy, c-format
+#: src/bin/e_sys.c:317
+#, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
-"Odhlašování trvá příliš dlouho. Některé<br>aplikace se odmítají zavřít."
-"<br>Chcete se odhlásit<br>bez zavírání těchto<br>aplikací?"
+"Odhlašování trvá příliš dlouho.<br>Některé aplikace se odmítají zavřít.<br> "
+"Přejete si dokončit odhlášení <br>i bez zavření těchto<br>aplikací?"
+"<br><br>Automatické odhlášení za %d sekund."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problémy při odhlašování"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Odhlásit nyní"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Čekat dále"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Zrušit odhlašování"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Odhlašuji se.."
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Odhlášení probíhá.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je zaneprázdněn jinou akcí"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Odhlašuji se.<br>Nemůžete využívat ostatní funkce OS,<br>když odhlášení "
-"začne."
+"Odhlašuji se.<br>Nelze využívat ostatní funkce OS,<br>když odhlášení začne."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Vypínání.<br>Nemůžete využívat ostatní funkce systému,<br>když započne "
-"vypínání."
+"Vypínání.<br>Nelze využívat ostatní funkce systému,<br>když započne vypínání."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Restartuji.<br>Nemůžete využívat ostatní funkce systému,<br>když začne "
-"restart."
+"Restartuji.<br>Nelze využívat ostatní funkce systému,<br>když začne restart."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
-msgstr "Uspávání.<br>Než akce skončí, nemůžete<br>využívat systémové funkce."
+msgstr ""
+"Uspávání.<br>Než se uspání dokončí, nelze<br>využívat systémové funkce."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
-"Hibernuji.<br>Nemůžete využívat funkce systému, než<br>se akce dokončí."
+"Hibernuji.<br>Nelze využívat funkce systému, dokud<br>se činnost nedokončí."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Toto se nemá stát"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Vypínání selhalo."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Reset selhal."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Uspání selhalo."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hibernace selhala."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Vypínání"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Vypínám.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Restartuji."
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Restartuji.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Uspávám"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Uspávám.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernuji"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernuji.<br><hilight>Prosím čekejte.</hilight>"
 
 #: src/bin/e_theme_about.c:14
 msgid "About Theme"
-msgstr "O tématu"
+msgstr "O motivu"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
-msgstr "Použít jako téma"
+msgstr "Použít jako motiv"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Zastavit přesouvání/zvětšování/zmenšování prvků"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Začít přesouvání/zvětšování/zmenšování prvků"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
-msgstr "Nastavit obsah toolbaru"
+msgstr "Nastavit obsah panelu nástrojů"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nemohl vytvořit proces potomka:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
-msgstr "Nemůžu vypnout - některá okna neodpovídají."
+msgstr "Nelze vypnout - některá okna neodpovídají."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3258,124 +3260,123 @@ msgstr ""
 "Enlightenment will not allow itself to exit until these windows have<br>been "
 "closed or have the lifespan lock removed.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bajtů"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "V budoucnu"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "V poslední minutě"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "Před %li lety"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "Před %li měsíci"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Před %li týdny"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "Před %li dny"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "Před %li hodinami"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Před %li minutami"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
-msgstr "Volby importu obrázku"
+msgstr "Nastavení importu obrázku"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importovat"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
-msgstr "Nastavení roztažení a výplně"
+msgstr "Možnosti roztažení a výplně"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Roztáhnout"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Na střed"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Uvnitř"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Vyplnit"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Kvalita souboru"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Použít původní soubor"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
-#, fuzzy
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3385,21 +3386,20 @@ msgid ""
 "fix<br>that by adding it in. You can re-configure things now to "
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
-"Nastavení fileman modulu je třeba aktualizovat. Vaše staré nastavení<br>bylo "
-"odstraněno a nová sada standardních nastavení byla načtena.<br>Bude se to "
-"dít pravidelně při vývoji, takže neposílejte hlášení chyb.<br>Znamená to, že "
-"Fileman potřebuje zavést konfiguraci nových<br>vlastností, která ve vašem "
-"starém nastavení prostě není. Nová sada nastavení<br>je doplní. Nyní můžete "
-"si můžete nastavit modul zpět k obrazu svému.<br>Omlouváme se za způsobené "
+"Nastavení je třeba aktualizovat. Vaše staré nastavení<br>bylo odstraněno a "
+"nová sada standardních nastavení byla načtena.<br>Bude se to dít pravidelně "
+"při vývoji, takže neposílejte hlášení chyb.<br>Znamená to, že modul "
+"potřebuje zavést konfiguraci nových<br>vlastností, která ve vašem starém "
+"nastavení prostě není. Nová sada nastavení<br>je doplní. Nyní můžete si "
+"můžete nastavit modul zpět k obrazu svému.<br>Omlouváme se za způsobené "
 "potíže.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
-#, fuzzy, c-format
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
+#, c-format
 msgid "%s Configuration Updated"
-msgstr "Nastavení fileman modulu aktualizováno"
+msgstr "%s Nastavení aktualizováno"
 
-#: src/bin/e_utils.c:1560
-#, fuzzy
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3407,11 +3407,11 @@ msgid ""
 "module was running. This is bad and<br>as a precaution your configuration "
 "has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Vaše nastavení je NOVĚJŠÍ než Fileman modul. To je dost<br>zvláštní. Nemělo "
-"by se to stát, pokud jste ovšem nedowngradovali<br>Fileman modul nebo "
-"nekopírovali soubory s nastavením z místa, kde<br>běžela novější verze "
-"modulu. Je to zlé a jako protiopatření<br>bylo vaše nastavení vráceno do "
-"původních hodnot.<br>Omlouvám se za vzniklé potíže.<br>"
+"Nastavení modulu je NOVĚJŠÍ než verze modulu. To je velice divné.<br>Nemělo "
+"by to nastávat, pokud jste nesnížili verzi vašeho modulu<br>nebonenahráli "
+"nastavení z místa, kde běží novější<br>verze. Toto může způsobovatproblémy a "
+"proto bylo nastavení<br>obnoveno na výchozí jako prevenční opatření."
+"Omlouváme<br>se za možné potíže.<br>"
 
 #: src/bin/e_widget_config_list.c:60
 #: src/modules/conf_applications/e_int_config_apps.c:235
@@ -3432,142 +3432,145 @@ msgstr "Nahoru"
 msgid "Down"
 msgstr "Dolů"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Přidat do oblíbených"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Přejít nahoru o složku"
 
-#: src/bin/e_widget_fsel.c:332
-#, fuzzy
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
-msgstr "Rozlišení"
+msgstr "Rozlišení:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Práva:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Změněno:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Vy"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Chráněno"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Jen pro čtení"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Zakázaný"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Čtení-Zápis"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Nastavení sledování baterie"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Zobrazit upozornění při malé hladině baterie"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Kontrolova každých:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f taktů"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernovat pokud pod:"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Dotazy"
 
-#: src/modules/battery/e_mod_config.c:218
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Zobrazit varování, když je baterie skoro vybitá"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Upozornit, když je baterie na:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minut"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automaticky odvolat v..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Výstraha"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Autodetekce"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interní"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
-msgstr "Neostré"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3575,35 +3578,35 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Baterie"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Hladina vaší baterie je nízká!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
-msgstr "Doporučena je AC energie."
+msgstr "Je doporučeno napájení ze sítě."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Měřič baterie"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Hodiny"
 
-#: src/modules/clock/e_mod_main.c:631
-#, fuzzy
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
-msgstr "Zobrazit toolbar"
+msgstr "Zobrazit kalendář"
 
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:268
 #: src/modules/conf/e_mod_main.c:367 src/modules/conf/e_mod_main.c:474
@@ -3659,7 +3662,7 @@ msgstr "Offline"
 
 #: src/modules/conf/e_mod_main.c:479
 msgid "Modes"
-msgstr "Módy"
+msgstr "Režimy"
 
 #: src/modules/conf/e_mod_main.c:510
 #, fuzzy
@@ -3668,34 +3671,45 @@ msgstr "Nastavení fileman modulu aktualizováno"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
-msgstr "iBar aplikace"
+msgstr "Aplikace iBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplikace po startu"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Aplikace při restartu"
 
 #: src/modules/conf_applications/e_int_config_apps.c:284
-#, fuzzy
 msgid "Order"
-msgstr "Rám"
+msgstr "Pořadí"
 
 #: src/modules/conf_applications/e_mod_main.c:18
 msgid "Apps"
 msgstr "Aplikace"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nová aplikace"
+msgid "Create Launcher"
+msgstr "Vytvořit spouštěč"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "Smazat osobní spouštěče"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "Výchozí aplikace"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "Pracovní prostředí"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "iBar ostatní"
 
@@ -3708,7 +3722,7 @@ msgid "Available Profiles"
 msgstr "Dostupné profily"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Vyberte profil"
 
@@ -3717,9 +3731,9 @@ msgid "Reset"
 msgstr "Obnovit"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:268
-#, fuzzy, c-format
+#, c-format
 msgid "Selected profile: %s"
-msgstr "Vyberte profil"
+msgstr "Vybraný profil: %s"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:304
 #, c-format
@@ -3738,7 +3752,7 @@ msgstr "Přidat profil"
 #: src/modules/conf_display/e_int_config_desk.c:154
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:137
 msgid "Name:"
-msgstr "Jméno:"
+msgstr "Název:"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:38
 msgid "Dialog Settings"
@@ -3746,11 +3760,11 @@ msgstr "Nastavení dialogů"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
-msgstr "Hlavní nastavení"
+msgstr "Obecná nastavení"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:111
 msgid "Disable Confirmation Dialogs"
@@ -3762,17 +3776,17 @@ msgstr "Normální okna"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:120
 msgid "Default Settings Dialogs Mode"
-msgstr "Výchozí mód konfiguračních dialogů"
+msgstr "Výchozí režim nastavovacích dialogů"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:122
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:166
 msgid "Basic Mode"
-msgstr "Základní mód"
+msgstr "Základní režim"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:124
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:168
 msgid "Advanced Mode"
-msgstr "Pokročilý mód"
+msgstr "Pokročilý režim"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:129
 msgid "Remember size and position of dialogs"
@@ -3780,7 +3794,7 @@ msgstr "Zapamatovat velikost a pozici dialogů"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:163
 msgid "Default Dialog Mode"
-msgstr "Výchozí mód dialogů"
+msgstr "Výchozí režim dialogů"
 
 #: src/modules/conf_dialogs/e_mod_main.c:18
 msgid "Dialogs"
@@ -3790,7 +3804,7 @@ msgstr "Dialogy"
 msgid "Profiles"
 msgstr "Profily"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3801,7 +3815,7 @@ msgstr ""
 "<br>Pokud nekliknete na nic, staré rozlišení<br>%dx%d o frekvenci %d Hz bude "
 "obnoveno v %d sekundách."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3812,7 +3826,7 @@ msgstr ""
 "<br>Pokud nekliknete na nic, staré rozlišení<br>%dx%d bude obnoveno v %d "
 "sekundách."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3823,7 +3837,7 @@ msgstr ""
 "<br>Pokud nekliknete na nic, staré rozlišení<br>%dx%d o frekvenci %d Hz bude "
 "obnoveno <hilight>OKAMŽITĚ</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3834,47 +3848,47 @@ msgstr ""
 "<br>Pokud nekliknete na nic, staré rozlišení<br>%dx%d bude obnoveno "
 "<hilight>OKAMŽITĚ</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Změna rozlišení"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Uložit"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Obnovit"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Nastavení rozlišení obrazovky"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Obnovit při přihlášení"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Obnovovací frekvence"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotace"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Zrcadlení"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Chybějící funkce"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3883,15 +3897,15 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 "Váš X server nemá podporu pro<br><hilight>XRandr</hilight> (X Resize and "
-"Rotate) rozšíření.<br>Nemůžete měnit rozlišení obrazovky bez<br>podpory "
-"tohoto rozšíření. Také je možné, že<br>v době, kdy bylo <hilight>ecore</"
-"hilight> kompilováno,<br>nebyla detekována XRandr podpora."
+"Rotate) rozšíření.<br>Nelze měnit rozlišení obrazovky bez<br>podpory tohoto "
+"rozšíření. Také je možné, že<br>v době, kdy bylo <hilight>ecore</hilight> "
+"kompilováno,<br>nebyla detekována XRandr podpora."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Žádné obnovovací frekvence nenalezeny"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3904,93 +3918,72 @@ msgstr ""
 "obnovovací frekvence použita při nastavení<br>rozlišení, což může způsobit "
 "<hilight>zničení</hilight> vaší obrazovky."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Nastavení virtuálních ploch"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Počet ploch"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
-msgstr "Překlopení plochy myší"
+msgstr "Překlopení plochy"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Překlopit, když posunete objekty na kraj obrazovky"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Překlopit zpět na první plochu z poslední"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Plochy"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Vypnuto"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Pole"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Přiblížení"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Panorama"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
-msgstr "Animace"
+msgstr "Rychlost animace"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f faktor panoramatu na ose X"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f faktor panoramatu na ose Y"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animace překlopení"
 
@@ -4000,30 +3993,29 @@ msgstr "Nastavení plochy"
 
 #: src/modules/conf_display/e_int_config_desk.c:153
 msgid "Desktop Name"
-msgstr "Jméno plochy"
+msgstr "Název plochy"
 
 #: src/modules/conf_display/e_int_config_desk.c:160
 msgid "Desktop Wallpaper"
 msgstr "Pozadí plochy"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Nastavit"
 
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:41
-#, fuzzy
 msgid "Select a Background..."
-msgstr "Nastavit pozadí..."
+msgstr "Vyberte pozadí..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Osobní"
 
@@ -4031,200 +4023,211 @@ msgstr "Osobní"
 msgid "Screen Lock Settings"
 msgstr "Nastavení uzamčení obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
-msgstr "Uspat"
+msgstr "Uzamknout při spuštění"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
-msgstr "Uspat"
+msgstr "Uzamknout při uspání"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
-msgstr "Vlastní screenlock"
+msgstr "Vlastní příkaz zamčení obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
-msgstr "Zamknout"
+msgstr "Zamykání"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
-msgstr "Zobrazit na všech zónách obrazovky"
+msgstr "Zobrazit na všech obrazovkách"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
-msgstr "Zobrazit na nynější zóně obrazovky"
+msgstr "Zobrazit na současné obrazovce"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
-msgstr "Zobrazit na zóně obrazovky #:"
+msgstr "Zobrazit na obrazovce #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
-msgstr "Nastavení přihlašovací obrazovky"
+msgstr "Přihlašovací obrazovka"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
-msgstr "Uzamknout při aktivaci spořiče"
+msgstr "Uzamknout po aktivaci spořiče"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekund"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Uzamknout při překročení času klidu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minut"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Časovače"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
-msgstr "Pokud byl deaktivován před"
+msgstr "Navrhnout při deaktivaci před"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
-msgstr "Vstup do prezentačního módu"
+msgstr "Prezentační režim"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
-msgstr "Definováno tématem"
+msgstr "Definováno motivem"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
-msgstr "Pozadí tématu"
+msgstr "Pozadí motivu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
-msgstr "Pozadí plochy"
+msgstr "Aktuální tapeta"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Pozadí plochy"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Nastavení spořiče"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
-#, fuzzy
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
-msgstr "Povolit spořič"
+msgstr "Povolit spořič"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
 #, fuzzy
+msgid "Suspend on blank"
+msgstr "Uspat na disk"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "I když je napájen"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "Zpoždění uspání"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Spořič obrazovky"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
-#, fuzzy
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
-msgstr "Původní stav"
+msgstr "Počáteční prodleva"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
-msgstr ""
+msgstr "Změna prodlevy"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
-msgstr "Mazání"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferováno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Nepreferováno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Události vystavení"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Povolit"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Nepovolovat"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
-#, fuzzy
 msgid "Miscellaneous"
-msgstr "Různé volby"
-
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "DPMS(Display Power Management Signaling)"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Aktivní zobrazovací server <br>nepodporuje DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Aktivní zobrazovací server nemá <br>DPMS rozšíření."
+msgstr "Různé"
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Zobrazit nastavení správy napájení"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Povolit správu napájení obrazu"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Doba pohotovostního režimu"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Doba, po které se počítač uspí"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Doba, po které se počítač vypne"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr "DPMS"
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "Normální podsvícení"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "Zatemnit podsvícení"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr "Doba přechodu"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "Podsvícení"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtuální plochy"
@@ -4263,83 +4266,83 @@ msgid ""
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
-"Prosím vyberte okraj<br>nebo klikněte na <hilight>Zavřít</hilight> ke "
-"zrušení.<br><br>Můžete také vybrat zpoždění<br> akce použitím posuvníku nebo "
-"jej<br>udělat aktivním při kliknutí:"
+"Prosím vyberte okraj<br>nebo klikněte na <hilight>Zavřít</hilight> pro "
+"zrušení.<br><br>Můžete také vybrat zpoždění<br> činnosti použitím posuvníku "
+"nebo jej přimět<br>reagovat na kliky na okraji:"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Nastavení zkratek okrajů"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Zkratky okrajů"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Přidat zkratku"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Smazat zkratku"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modifikovat zkratku"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Smazat vše"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Obnovit výchozí zkratky"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
-msgstr "Akce"
+msgstr "Činnost"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
-msgstr "Parametry akce"
+msgstr "Parametry činnosti"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
-msgstr "Základní nastavení"
+msgstr "Obecné možnosti"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Povolit aktivaci zkratek s maximalizovanými okny"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Sekvence zkratky okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Okraj reaguje na kliknutí"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Chyba při nastavení zkratky okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4348,28 +4351,28 @@ msgstr ""
 "Vybraná sekvence už je využita <br><hilight>%s</hilight> akcí.<br>Prosím "
 "vyberte jinou sekvenci."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "Shift"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4444,14 +4447,12 @@ msgid "Threshold"
 msgstr "Práh"
 
 #: src/modules/conf_interaction/e_mod_main.c:20
-#, fuzzy
 msgid "Touch"
-msgstr "Do spouštěče"
+msgstr "Dotek"
 
 #: src/modules/conf_interaction/e_mod_main.c:24
-#, fuzzy
 msgid "Mouse"
-msgstr "Nejčastěji použité"
+msgstr "Myš"
 
 #: src/modules/conf_intl/e_int_config_imc.c:104
 #: src/modules/conf_intl/e_mod_main.c:24
@@ -4498,7 +4499,7 @@ msgstr "Exportované proměnné prostředí"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:67
 msgid "Select an Input Method Settings..."
-msgstr "Vybrat konfiguraci vstupní metody..."
+msgstr "Vybrat nastavení vstupní metody..."
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:283
 #: src/modules/conf_intl/e_int_config_imc_import.c:299
@@ -4510,42 +4511,55 @@ msgid ""
 "Enlightenment was unable to import the configuration.<br><br>Are you sure "
 "this is really a valid configuration?"
 msgstr ""
-"Enlightenment nemohl importovat konfiguraci.<br><br>Jste si jisti, že je "
-"správná?"
+"Enlightenment nemohl importovat nastavení.<br><br>Jste si jisti, že je "
+"správné?"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:300
 msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
-msgstr "Enlightenment nemohl importovat konfiguraci<br>kvůli chybě kopírování."
+msgstr "Enlightenment nemohl importovat nastavení<br>kvůli chybě kopírování."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Nastavení jazyka"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Výběr jazyka"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Výchozí systému"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Vybraná oblast"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Jazyk"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4556,12 +4570,10 @@ msgstr ""
 "Prosím zadejte zkratku,<br><br>nebo klávesou <hilight>Esc</hilight> zrušte."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:8
-#, fuzzy
 msgid "Single key"
-msgstr "Pouze jedno kliknutí"
+msgstr "Jedna klávesa"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:110
-#, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Nastavení klávesových zkratek"
 
@@ -4597,7 +4609,6 @@ msgstr ""
 "highlight> ke zrušení."
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:112
-#, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Nastavení zkratek myši"
 
@@ -4607,7 +4618,7 @@ msgstr "Zkratky myši"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:315
 msgid "Action Context"
-msgstr "Kontext akce"
+msgstr "Kontext činnosti"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:317
 msgid "Any"
@@ -4635,97 +4646,85 @@ msgid "Manager"
 msgstr "Správce"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
-msgstr "Žádný"
+msgstr "Žádné"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Zkratka myši"
 
 #: src/modules/conf_keybindings/e_mod_main.c:21
 msgid "Keys"
-msgstr ""
+msgstr "Klávesy"
 
 #: src/modules/conf_keybindings/e_mod_main.c:25
-#, fuzzy
 msgid "Mouse Buttons"
-msgstr "Nastavení myši"
+msgstr "Tlačítka myši"
 
 #: src/modules/conf_keybindings/e_mod_main.c:29
-#, fuzzy
 msgid "Hardware Switches"
-msgstr "Hardware"
+msgstr "Hardwarové přepínače"
 
 #: src/modules/conf_menus/e_int_config_menus.c:38
 #: src/modules/conf_menus/e_mod_main.c:18
 msgid "Menu Settings"
-msgstr "Nastavení menu"
+msgstr "Nastavení nabídky"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
-#, fuzzy
 msgid "Enlightenment Default"
-msgstr "Enlightenment"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
-#, fuzzy
 msgid "Personal Default"
-msgstr "Osobní"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:257
-#, fuzzy
 msgid "Main Menu"
-msgstr "Zobrazit hlavní menu"
+msgstr "Hlavní nabídka"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Oblíbené"
 
 #: src/modules/conf_menus/e_int_config_menus.c:264
-#, fuzzy
 msgid "Applications Display"
-msgstr "Aplikace"
+msgstr "Zobrazení aplikace"
 
 #: src/modules/conf_menus/e_int_config_menus.c:267
-#, fuzzy
 msgid "Generic"
-msgstr "Obecné jméno"
+msgstr "Obecné"
 
 #: src/modules/conf_menus/e_int_config_menus.c:269
-#, fuzzy
 msgid "Comments"
-msgstr "Komentář"
+msgstr "Komentáře"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
 msgstr "Gadgety"
 
 #: src/modules/conf_menus/e_int_config_menus.c:274
-#, fuzzy
 msgid "Show gadget settings in top-level"
-msgstr "Zobrazit v menu"
+msgstr "Zobrazit nastavení gadgetu v horní úrovni"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
-msgstr "Menu"
+msgstr "Nabídky"
 
 #: src/modules/conf_menus/e_int_config_menus.c:287
-#, fuzzy
 msgid "Margin"
-msgstr "Hlavní"
+msgstr "Okraj"
 
 #: src/modules/conf_menus/e_int_config_menus.c:289
 #: src/modules/conf_menus/e_int_config_menus.c:294
@@ -4739,18 +4738,16 @@ msgid "%2.0f pixels"
 msgstr "%2.0f pixelů"
 
 #: src/modules/conf_menus/e_int_config_menus.c:292
-#, fuzzy
 msgid "Cursor Margin"
-msgstr "Okraj kurzoru autoscrollu"
+msgstr "Okraj kurzoru"
 
 #: src/modules/conf_menus/e_int_config_menus.c:297
-#, fuzzy
 msgid "Autoscroll"
-msgstr "Okraj autoscrollu"
+msgstr "Automaticky rolovat"
 
 #: src/modules/conf_menus/e_int_config_menus.c:301
 msgid "Menu Scroll Speed"
-msgstr "Rychlost skrolování v menu"
+msgstr "Rychlost rolování v nabídce"
 
 #: src/modules/conf_menus/e_int_config_menus.c:303
 #, c-format
@@ -4772,9 +4769,9 @@ msgid "Click Drag Timeout"
 msgstr "Časový limit pro uchopení"
 
 #: src/modules/conf_menus/e_int_config_menus.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "%2.2f sec"
-msgstr "%1.2f sek"
+msgstr "%2.2f sek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:59
 msgid "Search Path Settings"
@@ -4789,19 +4786,19 @@ msgid "Images"
 msgstr "Obrázky"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Písma"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
-msgstr "Témata"
+msgstr "Motivy"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikony"
 
@@ -4830,9 +4827,8 @@ msgid "Search Directories"
 msgstr "Složky k vyhledávání"
 
 #: src/modules/conf_paths/e_mod_main.c:24
-#, fuzzy
 msgid "Environment Variables"
-msgstr "Exportované proměnné prostředí"
+msgstr "Proměnné prostředí"
 
 #: src/modules/conf_performance/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4844,14 +4840,13 @@ msgid "Use ARGB instead of shaped windows"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_engine.c:140
-#, fuzzy
 msgid ""
 "You have chosen to enable ARGB composite support,<br>but your current screen "
 "does not support composite.<br><br>Are you sure you wish to enable ARGB "
 "support ?"
 msgstr ""
-"Chtěli byste povolit composite(skládání obrazu),<br>ale vaše aktuální "
-"obrazovka composite nepodporuje.<br><br>Opravdu chcete composite povolit ?"
+"Chcete povolit podporu kompozice ARGB,<br>ale vaše aktuální obrazovka toto "
+"nepodporuje.<br><br>Opravdu chcete kompozitní ARGB povolit?"
 
 #: src/modules/conf_performance/e_int_config_performance.c:35
 msgid "Performance Settings"
@@ -4867,18 +4862,16 @@ msgid "%1.0f fps"
 msgstr "%1.0f fps"
 
 #: src/modules/conf_performance/e_int_config_performance.c:109
-#, fuzzy
 msgid "Applications priority"
 msgstr "Priorita aplikací"
 
 #: src/modules/conf_performance/e_int_config_performance.c:119
-#, fuzzy
 msgid "Cache flush interval"
 msgstr "Interval smazání cache"
 
 #: src/modules/conf_performance/e_int_config_performance.c:125
 msgid "Font cache size"
-msgstr ""
+msgstr "Velikost vyrovnávací paměti písem"
 
 #: src/modules/conf_performance/e_int_config_performance.c:127
 #, c-format
@@ -4887,7 +4880,7 @@ msgstr "%1.1f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:131
 msgid "Image cache size"
-msgstr ""
+msgstr "Velikost vyrovnávací paměti obrázků"
 
 #: src/modules/conf_performance/e_int_config_performance.c:133
 #, c-format
@@ -4895,9 +4888,8 @@ msgid "%1.0f MB"
 msgstr "%1.0f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:137
-#, fuzzy
 msgid "Caches"
-msgstr "Zrušit"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:141
 #, fuzzy
@@ -4952,18 +4944,18 @@ msgstr "Opravdu chcete smazat panel \"%s\"?"
 msgid "Wallpaper Settings"
 msgstr "Nastavení pozadí plochy"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
-msgstr "Použít pozadí tématu"
+msgstr "Použít tapetu motivu"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Obrázek..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Z webu..."
 
@@ -4983,42 +4975,47 @@ msgstr "Tato plocha"
 msgid "This Screen"
 msgstr "Tato obrazovka"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Nastavení pozadí plochy..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Dlaždice"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Pole"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Vybrat obrázek..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Chyba při importu obrázku"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment nemohl importovat obrázek<br>kvůli chybě při konverzi."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Chyba při importu pozadí"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment nemohl importovat pozadí<br>kvůli chybě při kopírování."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5028,104 +5025,98 @@ msgstr ""
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:162
 msgid "By"
-msgstr ""
+msgstr "Od"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:198
 msgid "Error getting data !"
-msgstr ""
+msgstr "Chyba při získávání dat!"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:233
 msgid "Exchange wallpapers"
 msgstr "Exchange pozadí"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:235
-#, fuzzy
 msgid "Download"
-msgstr "Deaktivovat modul"
+msgstr "Stáhnout"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:254
 msgid "Getting data, please wait..."
-msgstr ""
+msgstr "Získávají se data, prosím čekejte..."
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:266
 msgid "Select a background from the list."
-msgstr ""
+msgstr "Vyberte tapetu ze seznamu."
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:281
 msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Výchozí styl okrajů"
 
 #: src/modules/conf_theme/e_int_config_borders.c:50
 msgid "Window Border Selection"
-msgstr "Výběr rámu okna"
+msgstr "Výběr okraje okna"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
-msgstr "Zapamatovat rám u tohoto okna"
+msgstr "Zapamatovat si okraj u tohoto okna pro příště"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:75
 msgid "Border Title"
 msgstr "Titulek okraje"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:76
-#, fuzzy
 msgid "Border Title Active"
-msgstr "Aktivní titulek menu"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:77
-#, fuzzy
 msgid "Border Frame"
-msgstr "Styl okrajů"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:78
-#, fuzzy
 msgid "Border Frame Active"
-msgstr "Aktivní titulek menu"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:79
 msgid "Error Text"
 msgstr "Chybový text"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:80
-#, fuzzy
 msgid "Menu Background Base"
-msgstr "Pozadí"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
-msgstr "Titulek menu"
+msgstr "Titulek nabídky"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:82
 msgid "Menu Title Active"
-msgstr "Aktivní titulek menu"
+msgstr "Aktivní titulek nabídky"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
-msgstr "Položka menu"
+msgstr "Položka nabídky"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:84
 msgid "Menu Item Active"
-msgstr "Aktivní položka menu"
+msgstr "Aktivní položka nabídky"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:85
-#, fuzzy
 msgid "Menu Item Disabled"
-msgstr "Aktivní položka menu"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Přesunout text"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Změnit velikost textu"
 
@@ -5143,7 +5134,7 @@ msgid "Winlist Label"
 msgstr "Označení winlistu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Titulek seznamu oken"
 
@@ -5153,9 +5144,8 @@ msgid "Dialog Background Base"
 msgstr "Pozadí"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:93
-#, fuzzy
 msgid "Shelf Background Base"
-msgstr "Pozadí"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:94
 #, fuzzy
@@ -5163,405 +5153,412 @@ msgid "File Manager Background Base"
 msgstr "Správce souborů"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Aktivace"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Text tlačítka"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Neaktivní text tlačítka"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Text checkbuttonu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Neaktivní text checkbuttonu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Text vstupního pole"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Neaktivní text tlačítka"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Text názvu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Text pložky seznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Text pložky seznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Text pložky seznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Hlavička seznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Hlavička seznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Text radiobuttonu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Neaktivní text radiobuttonu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Text posuvníku"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Neaktivní text posuvníku"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Pozadí"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Označení modulu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
-#, fuzzy, c-format
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
+#, c-format
 msgid "Color class: %s"
-msgstr "Třídy barev"
+msgstr "Třídy barev: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Nastavuji třídy barev"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Nastavuji třídy barev"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Nastavuji třídy barev"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
-msgstr "Vlastní barva"
+msgstr "Vlastní barvy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
-msgstr "Vysunout"
+msgstr "Objekt:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
-msgstr "Offline"
+msgstr "Obrys:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
-msgstr "Barva stínu"
+msgstr "Stín:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
-msgstr ""
+msgstr "Barvy jsou závislé na shopnostech motivu."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Správce oken"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgety"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Ostatní"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Titulek"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Blok textu prostý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Blok textu světlý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Blok textu velký"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Hlavička nastavení"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "O titulku"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "O verzi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "O textu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titulek uzamčené plochy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Heslo k odemknutí plochy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Dialogová chyba"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf příkaz"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Titulek splashe"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Text splashe"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Verze splashe"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "Digitální hodiny"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Vstupní pole"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Rámec"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Nápis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Posuvník"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Radiobuttony"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Checkbuttony"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Volba textového seznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Volba seznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Hlavička seznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Správce souborů"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Ikona na ploše"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
-msgstr "Malý"
+msgstr "Malé"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Větší"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Malý styl"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normální styl"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Velký styl"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Nastavení písma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
-msgstr "Drobný"
+msgstr "Drobné"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
-msgstr "Velký"
+msgstr "Velké"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
-msgstr "Obrovský"
+msgstr "Obrovské"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
-msgstr "Mohutný"
+msgstr "Mohutné"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixelů"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Povolit vlastní třídy písma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Základní ukázkový text: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Třídy písma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Povolit třídy písma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Písmo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pokročilý ukázkový text.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Vyhlazování"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
-msgstr "Automatický"
+msgstr "Automaticky"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Rezervní písma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Název rezervy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Povolit rezervy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Vyhlazování / Rezervy"
 
 #: src/modules/conf_theme/e_int_config_icon_themes.c:53
 msgid "Icon Theme Settings"
-msgstr "Nastavení tématu ikon"
+msgstr "Nastavení motivu ikon"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
-msgstr "Povolit Composite"
+msgstr "Povolit motiv ikon"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr "Použít motiv ikon pro aplikace"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
-msgstr "Téma ikon přepisuje základní téma"
+msgstr "Motiv ikon přepisuje základní motiv"
 
 #: src/modules/conf_theme/e_int_config_cursor.c:38
 msgid "Cursor Settings"
@@ -5573,14 +5570,13 @@ msgstr "Zobrazit kurzor"
 
 #: src/modules/conf_theme/e_int_config_cursor.c:150
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: src/modules/conf_theme/e_int_config_cursor.c:160
 msgid "Idle effects"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:55
-#, fuzzy
 msgid "Scale Settings"
 msgstr "Nastavení škálování"
 
@@ -5625,10 +5621,8 @@ msgid "Custom scaling factor"
 msgstr "Vlastní faktor škálování"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
+#, fuzzy, c-format
+msgid "%1.2f x"
 msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5640,6 +5634,12 @@ msgstr "Metoda"
 msgid "Minimum"
 msgstr "Minimum"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximum"
@@ -5660,31 +5660,31 @@ msgstr "Zobrazovat splash při přihlášení"
 msgid "Transition Settings"
 msgstr "Nastavení animací"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Události"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Spuštění"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Změna plochy"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Změna pozadí"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Animace"
 
 #: src/modules/conf_theme/e_int_config_theme.c:87
 msgid "Theme Selector"
-msgstr "Výběr témat"
+msgstr "Výběr motivů"
 
 #: src/modules/conf_theme/e_int_config_theme.c:432
 msgid " Import..."
@@ -5694,55 +5694,55 @@ msgstr "Importovat..."
 msgid " Online..."
 msgstr " Z webu..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
-msgstr "Kategorie tématu"
+msgstr "Kategorie motivů"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Vymazat vše"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
-msgstr "Vybrat téma..."
+msgstr "Vyberte motiv..."
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:284
 #: src/modules/conf_theme/e_int_config_theme_import.c:293
 msgid "Theme Import Error"
-msgstr "Chyba při importu tématu"
+msgstr "Chyba při importu motivu"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:285
 msgid ""
 "Enlightenment was unable to import the theme.<br><br>Are you sure this is "
 "really a valid theme?"
 msgstr ""
-"Enlightenment nemohl importovat téma.<br><br>Jste si jistí, že je správné?"
+"Enlightenment nemohl importovat motiv.<br><br>Jste si jistí, že je správné?"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:294
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
-msgstr "Enlightenment nemohl importovat téma<br>kvůli chybě kopírování."
+msgstr "Enlightenment nemohl importovat motiv<br>kvůli chybě kopírování."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:126
 msgid "Exchange themes"
-msgstr "Exchange témata"
+msgstr "Motivy Exchange"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
-msgstr "Rámy oken"
+msgstr "Okraje"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
-msgstr "Téma ikon"
+msgstr "Motiv ikon"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Kurzor myši"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Škálování"
 
@@ -5759,22 +5759,20 @@ msgid "Include windows from other screens"
 msgstr "Zařadit i okna z ostatních obrazovek"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:110
-#, fuzzy
 msgid "Seperate Groups By"
 msgstr "Oddělit skupiny pomocí"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:114
 msgid "Using separator bars"
-msgstr "Použít separátory"
+msgstr "Použít oddělovače"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:117
 msgid "Using menus"
-msgstr "Použít menu"
+msgstr "Použít nabídku"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:121
-#, fuzzy
 msgid "Grouping"
-msgstr "Řadit podle"
+msgstr "Seskupování"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:128
 msgid "Alphabetical"
@@ -5789,9 +5787,8 @@ msgid "Most recently used"
 msgstr "Nejčastěji použité"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:137
-#, fuzzy
 msgid "Sort Order"
-msgstr "Pořadí řazení klientů"
+msgstr "Pořadí řazení"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:142
 msgid "Group with owning desktop"
@@ -5815,7 +5812,7 @@ msgstr "Ikonifikovaná okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:158
 msgid "Limit caption length"
-msgstr "Limitovat délku popisku"
+msgstr "Omezit délku popisku"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:161
 #, c-format
@@ -5823,9 +5820,8 @@ msgid "%1.0f Chars"
 msgstr "%1.0f písmen"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:165
-#, fuzzy
 msgid "Captions"
-msgstr "Volby"
+msgstr "Popisky"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:45
 #: src/modules/conf_window_manipulation/e_mod_main.c:18
@@ -5833,9 +5829,8 @@ msgid "Window Display"
 msgstr "Zobrazení okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:125
-#, fuzzy
 msgid "Move Geometry"
-msgstr "Poloha okna"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:126
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:137
@@ -5844,14 +5839,12 @@ msgstr "Zobrazit informace"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:129
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:140
-#, fuzzy
 msgid "Follows the window"
-msgstr "Zavření okna"
+msgstr "Následuje okno"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:136
-#, fuzzy
 msgid "Resize Geometry"
-msgstr "Velikost okna"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:146
 #: src/modules/winlist/e_int_config_winlist.c:210
@@ -5859,19 +5852,20 @@ msgid "Display"
 msgstr "Zobrazit"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:152
-#, fuzzy
 msgid "User defined"
-msgstr "Použít ikonu definovanou uživatelem"
+msgstr "Nastaveno uživatelem"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:154
-#, fuzzy
 msgid "Application provided"
-msgstr "Použít ikonu poskytovanou aplikací"
+msgstr "Poskytnuta aplikací"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:156
-#, fuzzy
 msgid "Border Icon"
-msgstr "Rám"
+msgstr "Ikona okraje"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Umístění"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
@@ -5890,41 +5884,57 @@ msgid "Place manually with the mouse"
 msgstr "Umístit manuálně myší"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:176
-#, fuzzy
 msgid "Switch to desktop of new window"
-msgstr "Automaticky přepnout na plochu nového okna"
+msgstr "Přepnout na plochu nového okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:179
-#, fuzzy
 msgid "New Windows"
-msgstr "Pod okny"
+msgstr "Nová okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:184
-#, fuzzy
 msgid "Animate"
-msgstr "Animace"
+msgstr "Animovat"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineární"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
-msgstr "Hladce zrychlit a zpomalit"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Akcelerovat"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Zpomalit"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+msgid "Pronounced Accelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
 #, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Zpomalit"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
-msgstr "Škálování"
+msgstr "Stínování"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:51
 msgid "Focus Settings"
@@ -5943,72 +5953,58 @@ msgid "Most recent Window under the Mouse"
 msgstr "Poslední okno pod kurzorem myši"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
-#, fuzzy
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
-msgstr "Hodiny"
+msgstr "Kliknutí"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:213
-#, fuzzy
 msgid "Pointer"
-msgstr "Aktivovat pod kurzorem"
+msgstr "Ukazatel"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:215
-#, fuzzy
 msgid "Sloppy"
-msgstr "Sloppy aktivace"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:218
 msgid "New Window Focus"
 msgstr "Aktivace nových oken"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:220
-#, fuzzy
 msgid "No window"
-msgstr "(Žádná okna)"
+msgstr "Žádné okno"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:222
-#, fuzzy
 msgid "All windows"
-msgstr "Okna"
+msgstr "Všechna okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:224
-#, fuzzy
 msgid "Only dialogs"
-msgstr "Dialogy"
+msgstr "Pouze dialogy"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:226
 #, fuzzy
 msgid "Only dialogs with focused parent"
 msgstr "Jen nové dialogy se aktivují"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Aktivace"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Jiná nastavení"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:236
-#, fuzzy
 msgid "Always pass click events to programs"
-msgstr "Vždy přeposlat zachycené události programu"
+msgstr "Vždy přeposlat události kliknutí programu"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:239
-#, fuzzy
 msgid "Click raises the window"
-msgstr "Zavření okna"
+msgstr "Kliknutí pozvedne okno"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:242
-#, fuzzy
 msgid "Click focuses the window"
-msgstr "Kliknout k aktivaci okna"
+msgstr "Klik aktivuje okno"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:245
-#, fuzzy
 msgid "Refocus last window on desktop switch"
-msgstr "Reaktivovat poslední aktivované okno při přepnutí ploch"
+msgstr "Přepnout zpět na naposled aktivované okno při přepnutí ploch"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:248
 #, fuzzy
@@ -6025,24 +6021,20 @@ msgid "Window Geometry"
 msgstr "Geometrie okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
-#, fuzzy
 msgid "Resist obstacles"
-msgstr "Odolnost"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
-#, fuzzy
 msgid "Other windows"
-msgstr "Interní okna"
+msgstr "Ostatní okna"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:141
-#, fuzzy
 msgid "Edge of the screen"
-msgstr "Odolnost na kraji obrazovky"
+msgstr "Okraj obrazovky"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:150
-#, fuzzy
 msgid "Desktop gadgets"
-msgstr "Jméno plochy"
+msgstr "Gadgety plochy"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
 msgid "Resistance"
@@ -6053,19 +6045,16 @@ msgid "Automatically accept changes after:"
 msgstr "Automaticky přijmout změny po:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
-#, fuzzy
 msgid "Move by"
-msgstr "Přesunout z:"
+msgstr "Posunout o"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:176
-#, fuzzy
 msgid "Resize by"
-msgstr "Změnit velikost z:"
+msgstr "Změnit velikost o"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:181
-#, fuzzy
 msgid "Keyboard"
-msgstr "Klávesnice a myš"
+msgstr "Zobrazit klávesnici"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:187
 msgid "Limit resize to useful geometry"
@@ -6096,35 +6085,32 @@ msgid "Fill available space"
 msgstr "Zaplnit volný prostor"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
-msgstr "Horizontální"
+msgstr "Vodorovně"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
-msgstr "Vertikální"
+msgstr "Svisle"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:165
 msgid "Both"
 msgstr "Oba"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:167
-#, fuzzy
 msgid "Direction"
-msgstr "Vyberte"
+msgstr "Směr"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:180
 msgid "Allow manipulation of maximized windows"
 msgstr "Povolit manipulaci s maximalizovanými okny"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:183
-#, fuzzy
 msgid "Adjust windows on shelf hide"
-msgstr ""
-"Automaticky posunout/zmenšit/zvětšit okno při automatickém skrývání panelu"
+msgstr "Přizpůsobit okno při skrytí panelu"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:49
 #: src/modules/conf_window_manipulation/e_mod_main.c:21
@@ -6133,15 +6119,13 @@ msgstr "Skládání oken"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:123
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:144
-#, fuzzy
 msgid "Raise windows on mouse over"
-msgstr "Automaticky přenést okno pod kurzorem do popředí"
+msgstr "Automaticky vyzvednout okno pod kurzorem"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:127
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:169
-#, fuzzy
 msgid "Allow windows above fullscreen window"
-msgstr "Povolit oknům být nad fullscreen oknem"
+msgstr "Povolit okna nad oknem jež je přes celou plochu"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:143
 msgid "Autoraise"
@@ -6164,13 +6148,13 @@ msgid "Raise when clicking to focus"
 msgstr "Přenést do popředí při aktivaci kliknutím"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Aktivace okna"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:23
 msgid "Client List Menu"
-msgstr "Menu oken"
+msgstr "Nabídka seznamu klientů"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:33
 #: src/modules/conf_window_remembers/e_mod_main.c:17
@@ -6182,7 +6166,6 @@ msgid "Remember internal dialogs"
 msgstr "Zapamatovat interní okna Enlightenmentu"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:122
-#, fuzzy
 msgid "Remember file manager windows"
 msgstr "Zapamatovat okna správce souborů"
 
@@ -6197,7 +6180,7 @@ msgstr "Detaily"
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:141
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:306
 msgid "<No Name>"
-msgstr "<Beze jména>"
+msgstr "<Bez názvu>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:144
 msgid "Class:"
@@ -6421,201 +6404,177 @@ msgstr "Velmi světlé"
 msgid "Dropshadow"
 msgstr "Stíny"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
-msgstr "Vše"
+msgstr "Spouštěč Everything"
 
-#: src/modules/everything/e_mod_main.c:60
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
-msgstr "Vše"
+msgstr "Zobrazit spouštěč Everything"
 
-#: src/modules/everything/e_mod_main.c:74
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
-msgstr "Nastavení přepínače ploch"
+msgstr "Nastavení Everything"
 
-#: src/modules/everything/e_mod_main.c:208
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
-msgstr "Pod vším"
+msgstr "Zobrazit dialog Everything"
 
-#: src/modules/everything/e_mod_main.c:409
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
-msgstr "Vše"
+msgstr "Modul Everything"
 
-#: src/modules/everything/e_mod_main.c:591
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
-msgstr "Vše"
+msgstr "Spustit Everything"
 
 #: src/modules/everything/evry_config.c:79
-#, fuzzy
 msgid "Everything Settings"
-msgstr "Nastavení terminálu"
+msgstr "Everything - Nastavení"
 
-#: src/modules/everything/evry_config.c:361
-#, fuzzy
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
-msgstr "Dostupné profily"
+msgstr "Dostupné moduly"
 
-#: src/modules/everything/evry_config.c:367
-#, fuzzy
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
-msgstr "Přesunout"
+msgstr "Posunout nahoru"
 
-#: src/modules/everything/evry_config.c:372
-#, fuzzy
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
-msgstr "Přesunout"
+msgstr "Posunout dolů"
 
-#: src/modules/everything/evry_config.c:380
-#, fuzzy
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
-msgstr "Nastavit panely"
+msgstr "Nastavit"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: src/modules/everything/evry_config.c:393
-#, fuzzy
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
-msgstr "Zobrazit v menu"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:399
-#, fuzzy
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
-msgstr "Zobrazit v menu"
+msgstr "Zobrazit v horní úrovni"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Výchozí engine"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
-#, fuzzy
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
-msgstr "Detaily"
+msgstr "Podrobný"
+
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Výchozí pohled"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Animovat rolování"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-#, fuzzy
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
-msgstr "Čas před skrytím"
+msgstr "Skrýt seznam"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
-msgstr ""
+msgstr "Rychlá navigace"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Výchozí engine"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Animované překlopení"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgstr "Styl Vi (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:512
-#, fuzzy
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
-msgstr "Spouštím"
+msgstr "Řazení"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr "Bez řazení"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
-msgstr ""
+msgstr "Podle použití"
 
-#: src/modules/everything/evry_config.c:517
-#, fuzzy
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Nejčastěji použité"
 
-#: src/modules/everything/evry_config.c:520
-#, fuzzy
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
-msgstr "Poslední změna:"
+msgstr "Naposledy použité"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
-#, fuzzy
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
-msgstr "Parametry akce"
+msgstr "Moduly činností"
 
-#: src/modules/everything/evry_config.c:542
-#, fuzzy
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
-msgstr "Barva objektu"
+msgstr "Moduly objektu"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
-#, fuzzy
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
-msgstr "Plochý"
+msgstr "Moduly"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Rychlost popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Popup plochy doprava"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Nastavení pop-up"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6624,38 +6583,27 @@ msgstr "Nastavení pop-up"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
-#, fuzzy
-msgid "Geometry"
-msgstr "Geometrie okna"
-
-#: src/modules/everything/evry_config.c:642
-#, fuzzy
-msgid "Everything Collection"
-msgstr "Aplikace při restartu"
+msgid "Geometry"
+msgstr "Geometrie"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Akce"
+#: src/modules/everything/evry_config.c:633
+msgid "Everything Collection"
+msgstr "Everything - Kolekce"
 
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Položky"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
-msgstr ""
-
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Moduly nenačteny"
 
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
@@ -6678,167 +6626,63 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Otevřít s.."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Otevřít s.."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Přidat aplikaci"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nová aplikace"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Otevřít s.."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Spustit v terminálu"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Spustitelný soubor"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
-#, fuzzy
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
-msgstr "Aplikace při restartu"
+msgstr "Everything - Aplikace"
 
-#: src/modules/everything/evry_plug_apps.c:1224
-#, fuzzy
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
-msgstr "Příkaz"
+msgstr "Příkazy"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Vlastní příkaz"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
-msgstr ""
+msgstr "GUI pro sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
-#, fuzzy
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
-msgstr "Vše"
-
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Další..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
+msgstr "Everything - Modul"
 
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Setřídit teď"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Přejmenovat soubor"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
-#, fuzzy
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
-msgstr "Vše"
+msgstr "Everything - Soubory"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Zobrazit skryté soubory"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Složky k vyhledávání"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Nastavení cest vyhledávání"
 
-#: src/modules/everything/evry_plug_files.c:1511
-#, fuzzy
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
-msgstr "Adresáře definované uživatelem"
-
-#: src/modules/everything/evry_plug_files.c:1515
-#, fuzzy
-msgid "Clear cache"
-msgstr "Vymazat"
-
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Dialogy"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
 msgstr ""
 
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Fullscreen"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Poslat na plochu"
+#: src/modules/everything/evry_plug_files.c:1514
+msgid "Clear cache"
+msgstr "Vyčistit cache"
 
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ikony souborů"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Typy souborů"
 
@@ -6860,7 +6704,7 @@ msgstr "Použít vygenerovaný náhled"
 
 #: src/modules/fileman/e_int_config_mime_edit.c:152
 msgid "Use Theme Icon"
-msgstr "Použít ikonu tématu"
+msgstr "Použít ikonu motivu"
 
 #: src/modules/fileman/e_int_config_mime_edit.c:155
 msgid "Use Edje File"
@@ -6880,24 +6724,23 @@ msgid "Select an Edje file"
 msgstr "Vybrat Edj soubor"
 
 #: src/modules/fileman/e_int_config_mime_edit.c:292
-#, fuzzy
 msgid "Select an image"
-msgstr "Vybrat obrázek"
+msgstr "Vyberte obrázek"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Správce souborů"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Domov"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Kořenový adresář"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6907,7 +6750,7 @@ msgid ""
 "defaults will fix<br>that by adding it in. You can re-configure things now "
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
-"Nastavení fileman modulu je třeba aktualizovat. Vaše staré nastavení<br>bylo "
+"Nastavení modulu fileman je třeba aktualizovat. Vaše staré nastavení<br>bylo "
 "odstraněno a nová sada standardních nastavení byla načtena.<br>Bude se to "
 "dít pravidelně při vývoji, takže neposílejte hlášení chyb.<br>Znamená to, že "
 "Fileman potřebuje zavést konfiguraci nových<br>vlastností, která ve vašem "
@@ -6915,7 +6758,7 @@ msgstr ""
 "si můžete nastavit modul zpět k obrazu svému.<br>Omlouváme se za způsobené "
 "potíže.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6930,7 +6773,7 @@ msgstr ""
 "modulu. Je to zlé a jako protiopatření<br>bylo vaše nastavení vráceno do "
 "původních hodnot.<br>Omlouvám se za vzniklé potíže.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Nastavení fileman modulu aktualizováno"
 
@@ -6980,7 +6823,7 @@ msgstr "Zobrazit ikony na ploše"
 
 #: src/modules/fileman/e_mod_config.c:274
 msgid "Show Toolbar"
-msgstr "Zobrazit toolbar"
+msgstr "Zobrazit panel nástrojů"
 
 #: src/modules/fileman/e_mod_config.c:278
 #: src/modules/gadman/e_mod_gadman.c:803
@@ -6993,9 +6836,8 @@ msgid "Show UDisks icons on desktop"
 msgstr "Zobrazit HAL ikony na ploše"
 
 #: src/modules/fileman/e_mod_config.c:284
-#, fuzzy
 msgid "Show device icons on desktop"
-msgstr "Zobrazit HAL ikony na ploše"
+msgstr "Zobrazit ikony zařízení na ploše"
 
 #: src/modules/fileman/e_mod_config.c:288
 msgid "Mount volumes on insert"
@@ -7006,99 +6848,102 @@ msgid "Open filemanager on mount"
 msgstr "Otevřít správce souborů při připojení"
 
 #: src/modules/fileman/e_mod_config.c:295
-#, fuzzy
 msgid "Device"
-msgstr "Náhled"
+msgstr "Zařízení"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Jít do předchozího adresáře"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Jiná aplikace..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Otevřít s.."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Známé aplikace"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specifické aplikace"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Všechny aplikace"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Vlastní příkaz"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopírování přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Přesouvání přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Mazání přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Neznámá operace z podřízeného přerušena"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopírování %s dokončeno"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopíruji %s (zbývá: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Přesun %s dokončen"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Přesouvám %s (zbývá: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Mazání dokončeno"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Mažu soubory..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7133,7 +6978,7 @@ msgstr "Provádím %d operaci(e)"
 msgid "Filemanager is idle"
 msgstr "Správce souborů čeká"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Info o EFM operaci"
 
@@ -7145,36 +6990,38 @@ msgstr "Správce gadgetů"
 msgid "Available Gadgets"
 msgstr "Dostupné gadgety"
 
-#: src/modules/gadman/e_mod_config.c:139
-#, fuzzy
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
-msgstr "Módy"
+msgstr "Režim"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Vlastní obrázek"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Vlastní barva"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparentní"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animace"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Pozadí"
 
-#: src/modules/gadman/e_mod_config.c:235
-#, fuzzy
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
-msgstr "Panorama"
+msgstr "Možnosti pozadí"
+
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Začít přesouvání/měnění velikosti"
 
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
@@ -7231,7 +7078,7 @@ msgstr "Zobrazit ikonifikovaná okna z ostatních obrazovek"
 
 #: src/modules/winlist/e_int_config_winlist.c:218
 msgid "Uncover"
-msgstr ""
+msgstr "Odkrýt"
 
 #: src/modules/winlist/e_int_config_winlist.c:220
 #, fuzzy
@@ -7249,27 +7096,22 @@ msgid "Jump to desk"
 msgstr "Přecházet přes plochy při výběru"
 
 #: src/modules/winlist/e_int_config_winlist.c:230
-#, fuzzy
 msgid "Selecting"
-msgstr "Vyberte"
+msgstr "Výběr"
 
 #: src/modules/winlist/e_int_config_winlist.c:234
-#, fuzzy
 msgid "Warp speed"
-msgstr "Rychlost přesouvání"
+msgstr ""
 
 #: src/modules/winlist/e_int_config_winlist.c:242
-#, fuzzy
 msgid "Scroll Animation"
-msgstr "Animovat skrolování"
+msgstr "Animovat rolování"
 
 #: src/modules/winlist/e_int_config_winlist.c:247
-#, fuzzy
 msgid "Scroll speed"
-msgstr "Rychlost skrolování"
+msgstr "Rychlost rolování"
 
 #: src/modules/winlist/e_int_config_winlist.c:260
-#, fuzzy
 msgid "Minimum width"
 msgstr "Minimální šířka"
 
@@ -7282,34 +7124,28 @@ msgid "%4.0f"
 msgstr "%4.0f"
 
 #: src/modules/winlist/e_int_config_winlist.c:267
-#, fuzzy
 msgid "Maximum width"
 msgstr "Maximální šířka"
 
 #: src/modules/winlist/e_int_config_winlist.c:273
-#, fuzzy
 msgid "Minimum height"
 msgstr "Minimální výška"
 
 #: src/modules/winlist/e_int_config_winlist.c:280
-#, fuzzy
 msgid "Maximum height"
 msgstr "Maximální výška"
 
 #: src/modules/winlist/e_int_config_winlist.c:290
-#, fuzzy
 msgid "Horizontal alignment"
-msgstr "Horizontální"
+msgstr "Vodorovné zarovnání"
 
 #: src/modules/winlist/e_int_config_winlist.c:295
-#, fuzzy
 msgid "Vertical alignment"
-msgstr "Vertikální"
+msgstr "Svislé zarovnání"
 
 #: src/modules/winlist/e_int_config_winlist.c:300
-#, fuzzy
 msgid "Alignment"
-msgstr "Enlightenment"
+msgstr "Zarovnání"
 
 #: src/modules/winlist/e_mod_main.c:35 src/modules/winlist/e_mod_main.c:37
 #: src/modules/winlist/e_mod_main.c:39 src/modules/winlist/e_mod_main.c:42
@@ -7409,7 +7245,7 @@ msgstr "Vytvořit nový iBar zdroj"
 
 #: src/modules/ibar/e_mod_config.c:165
 msgid "Enter a name for this new source:"
-msgstr "Zadejte jméno pro tento nový zdroj:"
+msgstr "Zadejte název pro tento nový zdroj:"
 
 #: src/modules/ibar/e_mod_config.c:179
 #, c-format
@@ -7423,16 +7259,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Jste si jistí, že chcete vymazat tento iBar zdroj?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
-#, fuzzy
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Vytvořit novou ikonu"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Vlastnosti"
 
@@ -7442,7 +7277,7 @@ msgstr "iBox nastavení"
 
 #: src/modules/ibox/e_mod_config.c:101
 msgid "Display Name"
-msgstr "Zobrazit jméno"
+msgstr "Zobrazit název"
 
 #: src/modules/ibox/e_mod_config.c:106
 msgid "Display Title"
@@ -7454,7 +7289,7 @@ msgstr "Zobrazit třídu"
 
 #: src/modules/ibox/e_mod_config.c:116
 msgid "Display Icon Name"
-msgstr "Zobrazit jméno ikny"
+msgstr "Zobrazit název ikony"
 
 #: src/modules/ibox/e_mod_config.c:121
 msgid "Display Border Caption"
@@ -7476,7 +7311,7 @@ msgstr "Zobrazit okna ze všech ploch"
 msgid "Show windows from active desktop"
 msgstr "Zobrazit okna z aktivní plochy"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7490,7 +7325,7 @@ msgstr "Překlopit plochy kolečkem myši"
 
 #: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:182
 msgid "Show desktop names"
-msgstr "Zobrazit jména ploch"
+msgstr "Zobrazit názvy ploch"
 
 #: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:218
 msgid "Show popup on desktop change"
@@ -7543,9 +7378,8 @@ msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
 #: src/modules/pager/e_mod_config.c:243
-#, fuzzy
 msgid "Pager action popup height"
-msgstr "Výška keyaction popup"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:253
 msgid "Show popup on urgent window"
@@ -7567,9 +7401,8 @@ msgid "Urgent popup speed"
 msgstr "Rychlost popup"
 
 #: src/modules/pager/e_mod_config.c:280
-#, fuzzy
 msgid "Urgent Windows"
-msgstr "Nastavení důležitého okna"
+msgstr "Důležitá okna"
 
 #: src/modules/pager/e_mod_config.c:340 src/modules/pager/e_mod_config.c:345
 #: src/modules/pager/e_mod_config.c:349
@@ -7579,7 +7412,7 @@ msgstr "Tlačítko %i"
 
 #: src/modules/pager/e_mod_config.c:372
 msgid "Pager Button Grab"
-msgstr "Uchopení pager tlačítka"
+msgstr "Uchopení tlačítka přepínače ploch"
 
 #: src/modules/pager/e_mod_config.c:374
 msgid ""
@@ -7590,47 +7423,45 @@ msgstr ""
 "zrušení.<br>Nebo <hilight>Del</hilight> k resetu tlačítka."
 
 #: src/modules/pager/e_mod_config.c:429
-#, fuzzy
 msgid "Attention"
 msgstr "Pozor"
 
 #: src/modules/pager/e_mod_config.c:430
-#, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
 "already taken by internal<br>code for context menus.<br>This button only "
 "works in the popup."
 msgstr ""
-"Nemůžete použít pravé tlačítko myši v<br>panelu, když už je zabráno "
-"interním<br>kódem kontextového menu. <br>Toto tlačítko bude fungovat pouze v "
-"popup."
+"Nelze použít pravé tlačítko myši v<br>panelu, když už je zabráno "
+"interním<br>kódem kontextové nabídky. <br>Toto tlačítko bude fungovat pouze "
+"ve vyskakovacím okně."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
-msgstr "Zobrazit pager popup"
+msgstr "Zobrazit popup přepínače ploch"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Popup plochy doprava"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Popup plochy doleva"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Popup plochy nahoru"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Popup plochy dolů"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Popup plochy doleva"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Popup plochy doleva"
@@ -7651,133 +7482,90 @@ msgstr "Systémové ovládací prvky"
 msgid "Temperature Settings"
 msgstr "Nastavení měřiče teploty"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Senzory"
 
-#: src/modules/temperature/e_mod_config.c:200
-#, fuzzy
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsia"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheita"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Zobrazit jednotky"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Aktualizovat"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Horní mez teploty"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Dolní mez teploty"
 
-#: src/modules/temperature/e_mod_config.c:241
-#, fuzzy
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
-msgstr "Teplota"
+msgstr "Teploty"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Další"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Vítejte v Enlightenmentu"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Vyberte"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Žádné soubory menu<br>nebyly nalezeny v systému.<br>Prosím "
-"navštivte<br>dokumentaci na<br>www.enlightenment.org<br>pro více info<br>jak "
-"zprovoznit<br>vaše menu<br>aplikací."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Vyberte menu aplikací"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Spouštěč"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Vybrat aplikace"
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Soubory plochy"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "Zvolte preferovanou velikost"
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Žádné ikony na ploše"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Povolit ikony na ploše"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Mód aktivace"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Kliknout k aktivaci okna"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Okno se aktivuje kurzorem myši"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Vyberte ikony k přidání"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Rychlé spuštění"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Vyberte aplikace"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Myš"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7819,7 +7607,7 @@ msgstr "Levý:"
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Ztlumit"
 
@@ -7843,46 +7631,59 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Zvukové karty"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Nastavení mixeru"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mixer k použití při globálních akcích:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Spustit mixer..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Nastavení modulu Mixer"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "Nová hlasitost"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "Směšovač"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "Změněna hlasitost"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Nastavení Mixer modulu aktualizováno"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Konfigurační data modulu Mixer byla změněna.<br>Vaše staré nastavení bylo "
-"nahrazeno novým výchozím.<br>Omlouváme se za vzniklé potíže."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Nastavení modulu Mixer"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
-msgstr "Nemůžu přepnout offline mód systému."
+msgstr "Nelze přepnout offline režim systému."
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnMan démon neběží."
 
 #: src/modules/connman/e_mod_main.c:103
 msgid "Query system's offline mode."
-msgstr "Dotaz systému na offline mód selhal."
+msgstr "Dotaz systému na offline režim selhal."
 
 #: src/modules/connman/e_mod_main.c:246
 msgid "ConnMan needs your passphrase"
@@ -7904,129 +7705,360 @@ msgstr "Zobrazit heslo jako čistý text"
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Odpojení ze síťové služby."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Službě už neexistuje"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Připojení do síťové služby."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
-msgstr "Nemůžu nastavit heslo služby"
+msgstr "Nelze nastavit heslo služby"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
-msgstr "Offline mód"
+msgstr "Offline režim"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Ovládací prvky"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Není ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Nenalezen ConnMan server."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
-msgstr "Offline mód: všechny přepínače vypnuty"
+msgstr "Offline režim: všechny přepínače vypnuty"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Bez připojení"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Nepřipojeno"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "odpojení"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
-msgstr "Neznámé jméno"
+msgstr "Neznámý název"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Bez chyby"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
-msgstr "stojí"
+msgstr "nečinný"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "asociace"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "nastavení"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
-msgstr "připraveno"
+msgstr "připraven"
 
-#: src/modules/connman/e_mod_main.c:1849
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
-msgstr "Plochý"
+msgstr "přihlášení"
 
-#: src/modules/connman/e_mod_main.c:1850
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
-msgstr "Engine"
+msgstr "připojen"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "selhání"
 
-#: src/modules/connman/e_mod_main.c:1853
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
-msgstr "Povoleno"
+msgstr "povoleno"
 
-#: src/modules/connman/e_mod_main.c:1854
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
-msgstr "Zaplnit volný prostor"
+msgstr "dostupné"
 
-#: src/modules/connman/e_mod_main.c:1855
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
-msgstr "Nepřipojeno"
+msgstr "připojen"
 
-#: src/modules/connman/e_mod_main.c:1856
-#, fuzzy
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
-msgstr "Offline"
+msgstr "odpojen"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
-msgstr "Jiná upozorÅ\88ovací oblast už existuje"
+msgstr "Jiný systémový panel už existuje"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Jen jeden gadget upozorňovací oblasti může běžet a jiný už existuje."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Upozorňovací oblast"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Upozorňovací oblast"
 
+#~ msgid "Resizeable"
+#~ msgstr "Lze měnit velikost"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Uzamknout tento gadget"
+
+#~ msgid "Background panning"
+#~ msgstr "Panorama"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f faktor panoramatu na ose X"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f faktor panoramatu na ose Y"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Výchozí engine"
+
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Ztmavit obrazovku"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Tato obrazovka"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spustit Ecore!\n"
+#~ "Možná došla paměť?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo inicializovat souborový systém.\n"
+#~ "Možná došla paměť?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spojit s X serverem.\n"
+#~ "Máte nastavenou proměnnou DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spustit systém spojení.\n"
+#~ "Možná došla paměť?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spustit systém IPC.\n"
+#~ "Možná došla paměť?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo nastavit xinerama wrapping.\n"
+#~ "Tohle by se nemělo stávat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo nastavit xinerama wrapping.\n"
+#~ "Tohle by se nemělo stávat."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spustit systém Evas!\n"
+#~ "Možná došla paměť?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenmentu se nepodařilo spustit úvodní obrazovku.\n"
+#~ "Možná došla paměť?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Ověřte SVG podporu"
+
+#~ msgid "Setup FM"
+#~ msgstr "Nastavuji souborový manažer"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenmentu se nepodařilo nastavit systém panelů."
+
+#~ msgid "New Application"
+#~ msgstr "Nová aplikace"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "DPMS(Display Power Management Signaling)"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Aktivní zobrazovací server <br>nepodporuje DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Aktivní zobrazovací server nemá <br>DPMS rozšíření."
+
+#~ msgid "Actions"
+#~ msgstr "Činnosti"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Zkopírovat do schránky"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "Otevřít pomocí..."
+
+#~ msgid "Open File..."
+#~ msgstr "Otevřít soubor..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Přidat aplikaci"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nová aplikace"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Spustit se sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Zde otevřít terminál"
+
+#~ msgid "Run Executable"
+#~ msgstr "Spustit spustitelný soubor"
+
+#~ msgid "Calculator"
+#~ msgstr "Kalkulačka"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Kopírovat do ..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Přesunout na ..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Přesunout do koše"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Otevřít složku (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Řadit podle data"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Seřadit podle názvu"
+
+#~ msgid "Recent Files"
+#~ msgstr "Nedávné soubory"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Dialogy"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Přepnout se na okno"
+
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenmentu se nepodařilo spustit systém témat."
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Přepnout do celoobrázkového režimu"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Poslat na plochu"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Žádné soubory nabídky<br>nebyly v systému nalezeny.<br>Prosím "
+#~ "navštivte<br>dokumentaci na<br>www.enlightenment.org<br>pro více "
+#~ "info<br>jak zprovoznit<br>vaši nabídku<br>aplikací."
+
+#~ msgid "Select application menu"
+#~ msgstr "Vyberte nabídku aplikací"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Spouštěč"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Žádné ikony na ploše"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Povolit ikony na ploše"
+
+#~ msgid "Focus mode"
+#~ msgstr "Režim aktivace"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Kliknout k aktivaci okna"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Okno se aktivuje kurzorem myši"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Vyberte ikony k přidání"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Rychlé spuštění"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Nastavení modulu Mixer bylo změněno.<br>Vaše staré nastavení bylo "
+#~ "nahrazeno novým výchozím.<br>Omlouváme se za vzniklé potíže."
 
 #~ msgid "Add Application..."
 #~ msgstr "Přidat aplikaci..."
@@ -8678,12 +8710,6 @@ msgstr "Upozorňovací oblast"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Vypnout okamžitě"
 
-#~ msgid "Shut Down"
-#~ msgstr "Vypnout"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Uspat na disk"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Zámek plochy"
 
@@ -8843,9 +8869,6 @@ msgstr "Upozorňovací oblast"
 #~ msgid "Init"
 #~ msgstr "Inicializace"
 
-#~ msgid "Back"
-#~ msgstr "Zpět"
-
 #~ msgid "Choose Language"
 #~ msgstr "Vyberte jazyk"
 
index 08e6286..7839bfb 100755 (executable)
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-12-31 01:44+0000\n"
 "Last-Translator: nanker <Unknown>\n"
 "Language-Team: Danish\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Luk"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Holdet</title>"
 
 #: src/bin/e_actions.c:365
@@ -69,621 +69,645 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Er du sikker på du vil lukke dette vindue?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Er du sikker på du vil logge af?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Du er ved at logge af.<br><br>Er du sikker på dette?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Er du sikker på du vil slukke?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Du har bedt computeren om at slukke.<br><br>Er du sikker på at du vil dette?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Er du sikker på du vil genstarte?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Træk"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Skift størrelse"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Løft"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Sænk"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Dræb"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimér lodret"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimér vandret"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Rammer"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Vend skrivebord til venstre"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Vend skrivebord til højre"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Vend skrivebord op"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Vend skrivebord ned"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Vend skrivebord med..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Vis skrivebordet"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Vis hylden"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Vend skrivebordet til..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Skift til skrivebord 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Skift til skrivebord 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Skift til skrivebord 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Skift til skrivebord 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Skift til skrivebord 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Skift til skrivebord 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Skift til skrivebord 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Skift til skrivebord 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Skift til skrivebord..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vend skrivebord til venstre (alle skærme)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vend skrivebord til højre (alle skærme)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vend skrivebord op (alle skærme)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vend skrivebord ned (alle skærme)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vend skrivebord efter... (alle skærme)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vend skrivebord til... (alle skærme)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vend skrivebord lineært... (alle skærme)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Vend skrivebord i retning..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Skift til skrivebord 0 (alle skærme)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Skift til skrivebord 1 (alle skærme)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Skift til skrivebord 2 (alle skærme)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Skærm"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Information ved flytning af vinduer"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Træk"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Træk"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Skift størrelse"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Vend skrivebord i retning..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Opret ikon"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Vis hovedmenu"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Vis menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Kør"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Program"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Genstart"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Afslut nu"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Log af"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Sluk strøm nu"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Sluk strøm"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Genstart"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Lås"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Ryd vinduer op"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Skærm"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Skærm"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -691,18 +715,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr "Farvevælger"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -710,20 +732,20 @@ msgstr "Farvevælger"
 msgid "OK"
 msgstr "O.k."
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -734,7 +756,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -743,11 +765,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -755,93 +777,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Ingen vinduer)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Desktop-fil"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -849,69 +871,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Grundlæggende"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Anvend"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Udvidelser"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduler"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -919,22 +945,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -955,106 +981,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Navn"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Generisk navn"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Desktop-fil"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Generelt"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Kør i terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Indstilinger"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Vælg en ikon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Vælg en kørbar fil"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Slet"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Klip"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Sæt ind"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Vælg alle"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1090,314 +1115,314 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Fejl log"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Gem denne meddelelse"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s eksisterer ikke."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Monteringsfejl"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Afbryd"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Genopfrisk visning"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Vis skjulte filer"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nyt katalog"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Omdøb"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Afmontér"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Montér"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Skub ud"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Program"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Brug standard"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Omdøb fil"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Fejl"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nej til alt"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ja til alt"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorér dette"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorér alle"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Bekræft sletning"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1429,12 +1454,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1442,7 +1467,7 @@ msgstr ""
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Størrelse:"
 
@@ -1458,7 +1483,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1478,17 +1503,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1497,7 +1522,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1513,52 +1538,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Træk"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Skift størrelse"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1604,14 +1619,14 @@ msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Størrelse"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Niveau"
@@ -1663,158 +1678,164 @@ msgstr "Afslutte mit logind med dette vindue åbent"
 msgid "Remember these Locks"
 msgstr "Husk disse låsninger"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Vindue"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Altid øverst"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Klæbrig"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Redigér ikon"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Opret ikon"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Smart placering"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Låsninger"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Husk"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Klæbrig"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimér"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Oprullet"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Skærm"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Altid øverst"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Altid nederst"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Modstand"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1835,7 +1856,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titel"
 
@@ -2008,7 +2029,6 @@ msgid "Size, Position and Locks"
 msgstr "Størelse, position og låsninger"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2085,15 +2105,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Filer"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Kør"
@@ -2108,20 +2126,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Moduler"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2159,7 +2163,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2167,11 +2171,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Input method fejl"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2184,7 +2188,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Favoritapplikationer"
 
@@ -2192,76 +2196,74 @@ msgstr "Favoritapplikationer"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Vinduer"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Forsvundne vinduer"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Ingen applikationer)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Ingen vinduer)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Intet navn!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2296,7 +2298,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2326,7 +2328,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2343,7 +2345,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2354,7 +2356,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2363,52 +2365,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere Ecore!\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere File-systemet.\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2416,7 +2388,7 @@ msgstr ""
 "Enlightenment kan ikke oprette en exit signal handler.\n"
 "Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2424,7 +2396,7 @@ msgstr ""
 "Enlightenment kan ikke oprette en HUP signal handler.\n"
 "Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2433,78 +2405,79 @@ msgstr ""
 "Enlightenment kan ikke oprette en HUP signal handler.\n"
 "Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan ikke initialisere sin X forbindelse.\n"
-"Har du sat din DISPLAY variabel?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan ikke initialisere sit nødalarm system.\n"
-"Har du sat din DISPLAY variabel?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere forbindelsessystemet.\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere IPC-systemet.\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan ikke initialisere xinerama wrapping.\n"
-"Dette skulle ikke ske."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan ikke initialisere xinerama wrapping.\n"
-"Dette skulle ikke ske."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere Evas-systemet.\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment kan ikke initialisere sit nødalarm system.\n"
+"Har du sat din DISPLAY variabel?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2512,23 +2485,29 @@ msgstr ""
 "Enlightenment kan ikke oprette mapper i din hjemmemappe.\n"
 "Måske har du ingen hjemmemappe eller disken er fuld?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kan ikke initialisere sit konfigurationssystem."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment kan ikke initialisere sit temasystem."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment kan ikke initialisere sit fontsystem."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2536,276 +2515,355 @@ msgstr ""
 "Enlightenment kan ikke initialisere søgestier til at finde filer.\n"
 "Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment kan ikke initialisere sit fontsystem."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment kan ikke initialisere sit temasystem."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan ikke initialisere startbilledet.\n"
-"Måske er du løbet tør for hukommelse?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment kan ikke initialisere sit internationalseringssystem."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan ikke initialisere sit internationalseringssystem."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
+"Enlightenment kan ikke initialisere File-systemet.\n"
+"Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
+"Enlightenment kunne ikke blive indsat som vindueshåndtering på alle\n"
+"skærme på dit system. Måske kører der en anden vindueshåndtering?\n"
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
-"Enlightenment kunne ikke blive indsat som vindueshåndtering på alle\n"
-"skærme på dit system. Måske kører der en anden vindueshåndtering?\n"
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan ikke initialisere sit pop up-system."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kan ikke initialisere sit handlingssystem."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan ikke initialisere sit beskedsystem."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan ikke initialisere sit dnd-system."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment kan ikke initialisere sit input grab system."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan ikke initialisere sit modulsystem."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kan ikke initialisere huskesystemet."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
+#: src/bin/e_main.c:803
+msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
+#: src/bin/e_main.c:814
+msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
+#: src/bin/e_main.c:818
+msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
+#: src/bin/e_main.c:824
+msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1008
-msgid "Setup Wallpaper"
+#: src/bin/e_main.c:828
+msgid "Enlightenment cannot set up its bindings system."
+msgstr "Enlightenment kan ikke initialisere sit bindingssystem."
+
+#: src/bin/e_main.c:835
+msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1013
-msgid "Enlightenment cannot set up its desktop background system."
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1018
-msgid "Setup Mouse"
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
+
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
 msgstr ""
 
-#: src/bin/e_main.c:1023
-msgid "Enlightenment cannot configure the mouse settings."
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment kan ikke initialisere sit temasystem."
+
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1028
-msgid "Setup Bindings"
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1033
-msgid "Enlightenment cannot set up its bindings system."
-msgstr "Enlightenment kan ikke initialisere sit bindingssystem."
+#: src/bin/e_main.c:908
+msgid "Load Modules"
+msgstr ""
 
-#: src/bin/e_main.c:1038
-msgid "Setup Shelves"
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
-
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2813,11 +2871,11 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2825,7 +2883,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2833,7 +2891,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2841,20 +2899,12 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Fejl ved indlæsning af modul"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2863,11 +2913,11 @@ msgstr ""
 "Der opstod en fejl ved indlæsning af modulet ved navn: %s<br>Intet modul ved "
 "navn %s kunne findes i søgestierne<br>for moduler.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Fejl ved indlæsning af modul"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2876,11 +2926,11 @@ msgstr ""
 "Der opstod en fejl ved indlæsning af modulet ved navn: %s<br>Den fulde sti "
 "til dette modul er:<br>%s<br>Fejlen rapporteret var:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2890,16 +2940,16 @@ msgstr ""
 "Modul-API fejl<br>Fejl ved initialisering af modul: %s<br>Mindste krævet "
 "modul-API version: %i.<br>Enlightenment modul-API version: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du gerne unloade dette modul?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2910,26 +2960,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Kommentar"
@@ -2938,16 +2988,16 @@ msgstr "Kommentar"
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2955,113 +3005,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3069,157 +3119,157 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Kan ikke afslutte - udødelige vinduer."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Andre indstillinger"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3230,12 +3280,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Konfiguration opgraderet"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3263,141 +3313,146 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Opløsning"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Rettigheder:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Udvisket"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3405,32 +3460,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Eksekverbar"
@@ -3484,17 +3540,17 @@ msgstr "Konfiguration opgraderet"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3508,10 +3564,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Kør"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Favoritapplikationer"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Desktop-fil"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3524,7 +3595,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3562,9 +3633,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3606,7 +3677,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3614,7 +3685,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3622,7 +3693,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3630,7 +3701,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3638,47 +3709,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Skift af opløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3687,11 +3758,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3700,90 +3771,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Desktop-fil"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek."
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3800,7 +3854,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3811,12 +3865,12 @@ msgstr "Vælg en ikon"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3824,147 +3878,160 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Lås"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Skærm"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -3972,37 +4039,50 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr "Diverse valgmuligheder"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -4049,102 +4129,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Advancerede indstillinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4290,34 +4370,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4400,17 +4493,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4433,13 +4526,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4449,7 +4540,7 @@ msgid "Main Menu"
 msgstr "Vis hovedmenu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4469,7 +4560,7 @@ msgid "Comments"
 msgstr "Kommentar"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4480,7 +4571,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4549,19 +4640,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temaer"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4706,18 +4797,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4737,42 +4828,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4807,7 +4902,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4815,7 +4910,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Valg af vinduesramme"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Husk denne ramme for dette vindue næste gang det vises"
 
@@ -4847,7 +4942,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4856,7 +4951,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4869,12 +4964,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4891,7 +4986,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4908,380 +5003,391 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokuséring"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Skub ud"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Oprullet"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Andre indstillinger"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+#, fuzzy
+msgid "Digital Clock"
+msgstr "Digitalur"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Lille"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Super lille"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Kæmpe"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5289,11 +5395,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5359,11 +5469,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.1f sek."
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5374,6 +5482,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5394,25 +5508,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5428,15 +5542,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5463,19 +5577,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Rammer"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5603,6 +5717,11 @@ msgstr "Program"
 msgid "Border Icon"
 msgstr "Rammer"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Smart placering"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Smart placering"
@@ -5633,24 +5752,47 @@ msgstr "Fokusering af nye vinduer"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineær"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Glat acceleration og deceleration"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Accelerér"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Decelerér"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Accelerér"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Decelerér"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Glat acceleration og deceleration"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Niveau"
@@ -5672,6 +5814,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Fokusér seneste vindue under musen"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5709,11 +5852,6 @@ msgstr "Kun nye dialoger får fokus"
 msgid "Only dialogs with focused parent"
 msgstr "Kun nye dialoger får fokus"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokuséring"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Andre indstillinger"
@@ -5820,13 +5958,13 @@ msgid "Fill available space"
 msgstr "Fyld den tilgængelige plads"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5885,7 +6023,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6135,33 +6273,33 @@ msgstr "Meget lys"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Alting"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Alting"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Enlightenment opsætning"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Alting"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Alting"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Alting"
@@ -6171,150 +6309,151 @@ msgstr "Alting"
 msgid "Everything Settings"
 msgstr "Alting"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Træk"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Træk"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Konfigurationspanel"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Vis skjulte filer"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Desktop-fil"
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
 msgid "Sorting"
 msgstr "Ingenting"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Ingenting"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6323,38 +6462,29 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Prøv igen"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Favoritapplikationer"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Indstilinger"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6376,159 +6506,66 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Omdøb fil"
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Program"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Program"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Kør i terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Eksekverbar"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Favoritapplikationer"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Kommando"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Udfør kommando"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Alting"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Omdøb fil"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Alting"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Vis skjulte filer"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Ryd"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Fuldskærm"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Send til skrivebord"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6575,19 +6612,19 @@ msgid "Select an image"
 msgstr "Vælg en ikon"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6598,7 +6635,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6608,7 +6645,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6685,95 +6722,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Åben"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6808,7 +6849,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6820,36 +6861,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Træk"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7088,16 +7133,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Opret ikon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Egenskaber"
 
@@ -7141,7 +7186,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7260,31 +7305,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7304,129 +7349,91 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Tjekinterval"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Høj temperatur"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Lav temperatur"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Lav temperatur"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Træk"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7468,7 +7475,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7492,38 +7499,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Skift af opløsning"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Moduler"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7550,131 +7573,239 @@ msgstr ""
 msgid "Ok"
 msgstr "O.k."
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Monteringsfejl"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Fil:"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Position"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfiguration"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Ingen"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Aktiv"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Fyld den tilgængelige plads"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Ingen"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment kan ikke initialisere sit temasystem."
+#~ msgid "Dim Screen"
+#~ msgstr "Skærm"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Skærm"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Skift størrelse"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere Ecore!\n"
+#~ "Måske er du løbet tør for hukommelse?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere sin X forbindelse.\n"
+#~ "Har du sat din DISPLAY variabel?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere forbindelsessystemet.\n"
+#~ "Måske er du løbet tør for hukommelse?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere IPC-systemet.\n"
+#~ "Måske er du løbet tør for hukommelse?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere xinerama wrapping.\n"
+#~ "Dette skulle ikke ske."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere xinerama wrapping.\n"
+#~ "Dette skulle ikke ske."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere Evas-systemet.\n"
+#~ "Måske er du løbet tør for hukommelse?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan ikke initialisere startbilledet.\n"
+#~ "Måske er du løbet tør for hukommelse?"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Indstilinger"
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Omdøb fil"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Program"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Program"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Kør i terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Eksekverbar"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Omdøb fil"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Fuldskærm"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Send til skrivebord"
 
 #, fuzzy
 #~ msgid "Selection"
@@ -8136,9 +8267,6 @@ msgstr ""
 #~ msgid "24 Hour"
 #~ msgstr "24 timer"
 
-#~ msgid "Digital Display"
-#~ msgstr "Digitalur"
-
 #~ msgid "Top"
 #~ msgstr "Øverst"
 
index 84215d7..93a7fa7 100755 (executable)
--- a/po/de.po
+++ b/po/de.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-11-06 10:41+0000\n"
 "Last-Translator:  Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: E17-de\n"
@@ -41,20 +41,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Über Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Schließen"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -64,14 +63,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2010 beim Enlightenment Entwicklungsteam.<br><br>Wir "
 "hoffen, dass Ihnen die Software so viel Spaß macht, wie es uns das Schreiben "
@@ -84,8 +83,9 @@ msgstr ""
 "oder existieren noch gar nicht und können viele Fehler beinhalten. Sie "
 "wurden <hilight>GEWARNT</hilight>!"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Das Team</title>"
 
 #: src/bin/e_actions.c:365
@@ -103,62 +103,62 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Möchten Sie dieses Fenster wirklich abrupt schliessen?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nein"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Möchten Sie Enlightenment wirklich beenden?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Sie sind im Begriff, Enlightenment zu beenden.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Möchten Sie sich wirklich abmelden?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Sie sind im Begriff, sich abzumelden.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Möchten Sie den Computer wirklich herunterfahren?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Sie sind im Begriff, den Computer herunterzufahren.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Möchten Sie wirklich neustarten?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Sie sind im Begriff, den Computer neuzustarten.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -166,11 +166,11 @@ msgstr ""
 "Sie sind im Begriff, den Computer in den Bereitschaftsmodus zu versetzen."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Wollen Sie den Computer wirklich in den Ruhezustand herunterfahren?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -178,540 +178,567 @@ msgstr ""
 "Sie sind im Begriff, den Computer in den Ruhezustand herunterzufahren."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fenster: Aktionen"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Fenstermenü"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "nach oben"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "nach unten"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Schließen erzwingen"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fenster: Zustand"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Klebrig-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Icon-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Vollbildmodus-Umschalter"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Vertikal maximieren"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Horizontal maximieren"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Auf Vollbild maximieren"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximierungsmodus \"Intelligent\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximieren-Modus \"Erweitern\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximierungsmodus \"Füllen\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Einklappmodus-Oben-Umschalter"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Ausklappmodus-Unten-Umschalter"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "EInklappmodus-Links-Umschalter"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Einklappmodus-Rechts-Umschalter"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Einklappmodus-Umschalter"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Rahmenloszustand umschalten"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Fensterrahmen setzen"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Zwischen Fensterrahmen wechseln"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Befestigungszustand umschalten"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Zu linker Arbeitsfläche wechseln"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Zu rechter Arbeitsfläche wechseln"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Zu oberer Arbeitsfläche wechseln"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Zu unterer Arbeitsfläche wechseln"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Arbeitsfläche um ... wechseln"
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Arbeitsfläche zeigen"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Modulablage zeigen"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Zu Arbeitsfläche ... wechseln"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Linear zu Arbeitsfläche wechseln um ... "
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Zu Arbeitsfläche 0 wechseln"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Zu Arbeitsfläche 1 wechseln"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Zu Arbeitsfläche 2 wechseln"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Zu Arbeitsfläche 3 wechseln"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Zu Arbeitsfläche 4 wechseln"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Zu Arbeitsfläche 5 wechseln"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Zu Arbeitsfläche 6 wechseln"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Zu Arbeitsfläche 7 wechseln"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Zu Arbeitsfläche 8 wechseln"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Zu Arbeitsfläche 9 wechseln"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Zu Arbeitsfläche 10 wechseln"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Zu Arbeitsfläche 11 wechseln"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Zu Arbeitsfläche ... schalten"
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Arbeitsfläche nach links klappen (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Arbeitsfläche nach rechts klappen (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Arbeitsfläche nach oben klappen (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Arbeitsfläche nach unten klappen (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "... Arbeitsflächen weiterklappen (alle Bidschirme)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Klappe Arbeitsfläche nach... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Arbeitsfläche linear nach ... klappen (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Arbeitsfläche in Richtung ... klappen"
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Zu Arbeitsfläche 0 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Zu Arbeitsfläche 1 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Zu Arbeitsfläche 2 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Zu Arbeitsfläche 3 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Zu Arbeitsfläche 4 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Zu Arbeitsfläche 5 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Zu Arbeitsfläche 6 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Zu Arbeitsfläche 7 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Zu Arbeitsfläche 8 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Zu Arbeitsfläche 9 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Zu Arbeitsfläche 10 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Zu Arbeitsfläche 11 wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Zu Arbeitsfläche ... wechseln (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Maus auf Bildschirm 0 verschieben"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Maus auf Bildschirm 1 verschieben"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Maus auf Bildschirm ... verschieben"
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Maus einen Bildschirm weiterschieben"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Maus einen Bildschirm zurückschieben"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Maus ... Bildschirme weiter/zurückschieben"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Herunterfahren"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "In Mitte verschieben"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Verschieben nach ..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr "Verschieben um ..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Größe ändern um ..."
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "Verschieben in Richtung ..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Icon ziehen ..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fenster: Bewegen"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Zur nächsten Arbeitsfläche"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Zur vorhergehenden Arbeitsfläche"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Von Arbeitsfläche #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Zu Arbeitsfläche ..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Hauptmenü zeigen"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Favoritenmenü zeigen"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Anwendungsmenü zeigen"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Fensterlistenmenü zeigen"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Menü ... zeigen"
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Ausführen"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Befehl"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Anwendung"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Neustart"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Sofort Beenden"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Modus"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Präsentationsmodus-Umschalter"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Offlinemodus-Umschalter"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Sofort abschalten"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Ausschalten"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "In Bereitschaftsmodus gehen"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Bereitschaftsmodus"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Ruhezustand"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Sperren"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Fenster aufräumen"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Allgemein: Aktionen"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Verzögerte Aktion"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "ACPI"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Bildschirm abdunkeln"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Bildschirm aufhellen"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Als Hintergrund setzen"
 
@@ -719,18 +746,16 @@ msgstr "Als Hintergrund setzen"
 msgid "Color Selector"
 msgstr "Farbwähler"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -738,20 +763,20 @@ msgstr "Farbwähler"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -769,7 +794,7 @@ msgstr ""
 "anpassen, wenn<br>Sie möchten. Bitte entschuldigen Sie die "
 "Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -785,11 +810,11 @@ msgstr ""
 "Standardeinstellungen<br>benutzt. Bitte entschuldigen Sie die "
 "Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Schreibprobleme bei den Enlightenment-Einstellungen"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -799,19 +824,19 @@ msgstr ""
 "Enlightenment konnte die Konfigurationsdateien nicht von<br>%s<br>nach<br>"
 "%s<br>verschieben.<br>Sicherheitshalber wurde der Schreibvorgang abgebrochen."
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Einstellungen wurden aktualisiert"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "Der Dateihandle für EET ist kaputt."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Die Dateidaten sind leer."
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -819,17 +844,17 @@ msgstr ""
 "Die Datei kann nicht beschrieben werden. Vielleicht ist die<br>Platte nur "
 "beschreibbar oder Sie haben die Berechtigungen<br>verloren."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 "Kein freier Speicher mehr beim Vorbereiten<br>des Schreibvorgangs. Bitte "
 "geben Sie zusätzlichen<br>Speicher frei."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Dies ist ein allgemeiner Fehler."
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -837,61 +862,62 @@ msgstr ""
 "Die Einstellungsdatei ist zu groß.<br>Sie sollte eigentlich sehr klein "
 "sein<br>(höchstens einige Hundert KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 "Es gibt Lese-/Schreib-Fehler mit Ihrer Platte.<br>Vielleicht muss sie "
 "ersetzt werden?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "Sie haben keinen freien Speicher zum Schreiben der Datei."
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "Die Datei wurde geschlossen, während auf sie geschrieben wurde."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Memory-Mapping der Datei ist fehlgeschlagen."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "X509-Kodierung ist fehlgeschlagen."
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Signatur fehlgeschlagen."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "Die Signatur ist ungültig."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Nicht signiert."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Feature nicht implementiert."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "Die Pseudoufallszahlen-Erzeugung wurde nicht mit einer Saat versehen."
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "Verschlüsseln fehlgeschlagen."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+#, fuzzy
+msgid "Decryption failed."
 msgstr "Entschlüsseln fehlgeschlagen."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "Dieser Fehler ist Enlightenment nicht bekannt."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -902,57 +928,62 @@ msgstr ""
 "unerwartet schließen.<br>%s<br><br>Folgende Datei war betroffen:<br>"
 "%s<br><br>Diese Datei wurde entfernt, um Datenverfälschung zu vermeiden.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Einfach"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Übernehmen"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Erweiterungen"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Module"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Icon-Eigenschaften"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Fehler - keine PAM-Unterstützung"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment wurde ohne PAM-Unterstützung<br>kompiliert, wodurch die "
 "Arbeitsflächensperre deaktiviert ist."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Sperrung schlug fehl"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -961,15 +992,15 @@ msgstr ""
 "Tastatur oder Maus in Beschlag nimmt<br>und eine Aufhebung dessen nicht "
 "möglich ist."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Bitte geben Sie Ihr Kennwort zum Entsperren ein"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Fehler im Authentifizierungssystem"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -980,11 +1011,11 @@ msgstr ""
 "Sitzungseinrichtung auf. Der Fehlercode lautet <hilight>%i</hilight>."
 "<br>Dies sollte nicht passieren; bitte melden Sie den Fehler."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Präsentationsmodus aktivieren?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -994,11 +1025,11 @@ msgstr ""
 "<b>Präsentationsmodus</b> aktivieren und vorübergehend Bildschirmschoner und "
 "-sperre sowie Stromsparen deaktivieren?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Nein, stattdessen Verzögerung erhöhen"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Nein, nicht mehr nachfragen"
 
@@ -1025,106 +1056,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor für Programmeinträge"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Name"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Generischer Name"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Fensterklasse"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorien"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Dateitypen"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ".desktop-Datei"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Allgemein"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Startmitteilung"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "In der Konsole ausführen"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "In den Menüs zeigen"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Optionen"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Wählen Sie ein Icon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Wählen Sie eine ausführbare Datei aus"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Entfernen"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Alle auswählen"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1164,316 +1194,316 @@ msgstr ""
 "Enlightenment konnte die Anwendung nicht ausführen:<br><br>%s<br><br>Der "
 "Anwendungsstart schlug fehl."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Fehler beim Ausführen der Anwendung"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s wurde unerwartet beendet."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Ein Fehlercode von %i wurde durch %s wiedergegeben."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s wurde durch ein Unterbrechungssignal unterbrochen."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s wurde durch ein Endesignal unterbrochen."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s wurde durch ein Abbruchssignal unterbrochen."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s wurde durch einen Fließkommafehler unterbrochen."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s wurde durch ein ununterbrechbares Kill-Signal unterbrochen."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s wurde durch einen Segmentierungsfehler unterbrochen."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s wurde durch eine defekte Weiterleitung unterbrochen."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s wurde durch ein Terminierungssignal unterbrochen."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s wurde durch einen Bus-Fehler unterbrochen."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s wurde durch das Signal %i unterbrochen."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Die verbleibende Ausgabe wurde ausgeblendet. Ausgabe zum Betrachten "
 "speichern.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Fehlerprotokolle"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Es gab keine Fehlermeldung."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Diese Nachricht speichern"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Dieses Fehlerprotokoll wird als %s/%s.log gespeichert"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Fehlerinformation"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Fehlersignalinformation"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Ausgabedaten"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Es gab keine Ausgabe."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Nicht vorhandener Pfad"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existiert nicht"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Einhängefehler"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Gerät kann nicht eingehängt werden"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Aushängefehler"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Gerät kann nicht ausgehängt werden"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Auswurffehler"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Gerät kann nicht ausgeworfen werden"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Dateien"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Verknüpfung"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Abbruch"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Übergeordnete Einstellungen übernehmen"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Ansicht"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Anzeige aktualisieren"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Versteckte Dateien zeigen"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Anordnung merken"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Jetzt sortieren"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Neues Verzeichnis"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Aushängen"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Einhängen"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Auswerfen"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Anwendungseigenschaften"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Dateieigenschaften"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Standard verwenden"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Gitter-Icons"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Angepasste Icons"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Icon-Größe (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Hintergrundbild setzen..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Überlagerung setzen..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Neues Verzeichnis erstellen"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Neuer Verzeichnisname:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Umbenennen von %s zu:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Datei umbenennen"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Fehler"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nein für alle"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ja für alle"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 "Die datei existiert bereits, wirklich überschreiben?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorieren"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignoriere alles"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Es trat ein Fehler bei der Ausführung einer Operation auf.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Löschen bestätigen"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Möchten Sie <hilight>%s</hilight> wirklich entfernen?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1507,12 +1537,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Unbekanntes Laufwerk"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Entfernbare Geräte"
 
@@ -1520,7 +1550,7 @@ msgstr "Entfernbare Geräte"
 msgid "File:"
 msgstr "Datei:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Größe:"
 
@@ -1536,7 +1566,7 @@ msgstr "Dateitype:"
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Besitzer:"
 
@@ -1556,17 +1586,17 @@ msgstr "Besitzer darf lesen"
 msgid "Owner can write"
 msgstr "Besitzer darf schreiben"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Vorschau"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Standard"
 
@@ -1575,7 +1605,7 @@ msgid "Thumbnail"
 msgstr "Minibild"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
@@ -1591,50 +1621,41 @@ msgstr "Verknüpfungsinformation"
 msgid "Select an Image"
 msgstr "Bild auswählen"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Verschieben nach"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Verschieben/Größenänderung starten"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Größe änderbar"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Inhalte automatisch scrollen"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Flach"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Eingedrückt"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Aussehen"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Verschieben/Größenänderung dieses Helfers beenden"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1683,14 +1704,14 @@ msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Größe"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Ablage"
@@ -1742,161 +1763,168 @@ msgstr "Abmelden, solange dieses Fenster geöffnet ist"
 msgid "Remember these Locks"
 msgstr "Diese Sperren merken"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Fenster"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Immer im Vordergrund"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Klebrig"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Einstellungen"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Vertikal maximieren"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Horizontal maximieren"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Maxmimierung aufheben"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Icon bearbeiten"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Icon erstellen"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Zum Favoritenmenü hinzufügen"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Zu Favoriten hinzufügen"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Tastaturkürzel"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Plazierung"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Überspringen"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Fensterrahmen"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Sperren"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Erinnern"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Klebrig"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Überspringen"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimieren"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Eingeklappt"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Bildschirm"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Immer im Vordergrund"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Immer im Hintergrund"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Auf Arbeitsfläche befestigen"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Von Arbeitsfläche lösen"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Rahmenart wählen"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "E17 Standardsymbolvoreinstellung verwenden"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Anwendungsspezifisches Icon verwenden"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Benutzerspezifisches Icon verwenden"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Widerstand anbieten"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Fensterliste"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Arbeitsflächenumschalter"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Fensterleiste"
 
@@ -1917,7 +1945,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM-Eigenschaften"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titel"
 
@@ -2089,7 +2117,6 @@ msgid "Size, Position and Locks"
 msgstr "Größe, Position und Sperren"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Alle"
 
@@ -2166,15 +2193,13 @@ msgid "Utilities"
 msgstr "Werkzeuge"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Dateien"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Starter"
 
@@ -2187,20 +2212,6 @@ msgstr "Basis"
 msgid "Mobile"
 msgstr "Mobil"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modul-Einstellungen"
@@ -2238,7 +2249,7 @@ msgstr "Helfer hinzufügen"
 msgid "Remove Gadget"
 msgstr "Helfer entfernen"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Werkzeugleisteneinstellungen"
 
@@ -2246,11 +2257,11 @@ msgstr "Werkzeugleisteneinstellungen"
 msgid "Layout"
 msgstr "Anordnung"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Eingabemethodenfehler"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2266,7 +2277,7 @@ msgstr "Hauptmenü"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Bevorzugte Anwendungen"
 
@@ -2274,76 +2285,74 @@ msgstr "Bevorzugte Anwendungen"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Fenster"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Verlorene Fenster"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Über"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Thema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuelle Arbeitsflächen"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Modulablagen"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Alle Fenster zeigen/verstecken"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Keine Anwendung)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Virtuelle Arbeitsflächen einstellen"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Keine Fenster)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Kein Name!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Keine Modulablagen)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Modulablage hinzufügen"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Modulablage entfernen"
 
@@ -2378,7 +2387,7 @@ msgid "Shrink to Content Width"
 msgstr "Auf Größe des Inhalts schrumpfen"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stil"
 
@@ -2408,7 +2417,7 @@ msgid "Hide duration"
 msgstr "Ausblenddauer"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f Sekunden"
@@ -2425,7 +2434,7 @@ msgstr "Auf allen Arbeitsflächen anzeigen"
 msgid "Show on specified Desktops"
 msgstr "Auf bestimmten Arbeitsflächen anzeigen"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2443,7 +2452,7 @@ msgstr ""
 "Besitzer. Bitte überprüfen Sie:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2456,79 +2465,22 @@ msgstr ""
 "Bitte überprüfen Sie:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Optionen:\n"
-"\t-display DISPLAY\n"
-"\t\tVerbinde zu Anzeige DISPLAY.\n"
-"\t\tEG: -display:1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tFüge einen gefälschten Xinerama-Bildschirm hinzu (anstatt eines echten)\n"
-"\t\tunter Angabe der Geometrie. Fügen Sie so viele hinzu, wie Sie möchten. "
-"Alle\n"
-"\t\tersetzen echte Xinerama-Anzeigen, sofern vorhanden. Das kann\n"
-"\t\tgenutzt werden, um Xinerama zu simulieren.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tDas Profil CONF_PROFILE anstelle des benutzerdefinierten verwenden oder "
-"einfach \"Standard\".\n"
-"\t-good\n"
-"\t\tSei brav.\n"
-"\t-evil\n"
-"\t\tSei böse.\n"
-"\t-psychotic\n"
-"\t\tSei psychotisch.\n"
-"\t-locked\n"
-"\t\tMit aktiver Bildschirmsperre starten, so dass das Passwort eingegeben "
-"werden muss.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tlfWenn Sie diese Hilfe benötigen, brauchen Sie diese Option definitiv "
-"nicht.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann das Ecore-Subsystem nicht initialisieren!\n"
-"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann das Dateisubsystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2536,7 +2488,7 @@ msgstr ""
 "Enlightenment kann den Exit-Signalhandler nicht initialisieren.\n"
 "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2544,7 +2496,7 @@ msgstr ""
 "Enlightenment kann den HUP-Signalhandler nicht initialisieren.\n"
 "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2552,63 +2504,37 @@ msgstr ""
 "Enlightenment kann einen Signalhandler nicht initialisieren.\n"
 "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kann die Verbindung mit dem X-Server nicht initialisieren.\n"
-"Haben Sie die DISPLAY-Variable gesetzt?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kann sein Notfallalarm-Subsystem nicht initialisieren.\n"
-"Haben Sie die DISPLAY-Variable gesetzt?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann das Verbindungssystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genug freien Speicherplatz?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann das IPC-Subsystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kann Xinerama nicht benutzen.\n"
-"Das sollte nicht passieren."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kann Xrandr nicht benutzen.\n"
-"Das sollte nicht passieren."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann das Evas-System nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2618,7 +2544,7 @@ msgstr ""
 "Rendering in Evas nicht unterstützt. Bitte überprüfen Sie Ihre Evas-\n"
 "und Ecore-Installation sowie deren X11-Softwarerendering-Unterstützung."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2629,7 +2555,35 @@ msgstr ""
 "und Ecore-Installation sowie deren Unterstützung von X11-\n"
 "Softwarebuffer-Rendering"
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment kann sein Notfallalarm-Subsystem nicht initialisieren.\n"
+"Haben Sie die DISPLAY-Variable gesetzt?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2639,24 +2593,30 @@ msgstr ""
 "Möglicherweise haben Sie kein persönliches Verzeichnis, oder die Festplatte "
 "ist voll?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 "Enlightenment kann sein Dateiregistrierungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kann sein Einstellungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment kann sein Themen-Subsystem nicht initialisieren."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment kann sein Skalierungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment kann sein Zeiger-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2664,95 +2624,42 @@ msgstr ""
 "Enlightenment kann seine Suchpfade nicht initialisieren.\n"
 "Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment kann sein Schriftarten-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment kann sein Themen-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kann den Startbildschirm nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment kann sein intl-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Starte Internationalisierungsunterstützung"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kann sein intl-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment kann das FDO-Arbeitsflächen-Subsystem nicht initialisieren.\n"
 "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Überprüfe Formatübestützung"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment entdeckte, dass Evas keine Buffercanvas erstellen konnte.\n"
-"Bitte überprüfen Sie Evas auf Softwarebufferengine-Unterstützung.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment entdeckte, dass Evas keine PNG-Dateien laden kann.\n"
-"Bitte überprüfen Sie Evas auf PNG-Loader-Unterstützung.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment entdeckte, dass Evas keine JPEG-Dateien laden kann.\n"
-"Bitte überprüfen Sie Evas auf JPEG-Loader-Unterstützung.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment entdeckte, dass Evas keine EET-Dateien laden kann.\n"
-"Bitte überprüfen Sie Evas auf EET-Loader-Unterstützung.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment entdeckte, dass Evas die \"Sans\"-Schriftart nicht laden "
-"kann.\n"
-"Bitte überprüfen Sie Evas auf \"fontconfig\"-Unterstützung und fontconfig "
-"darauf,\n"
-"ob es eine \"Sans\"'-Schriftart definiert.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Unterstützung von SVG überprüfen"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Bildschirme einrichten"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2760,201 +2667,369 @@ msgstr ""
 "Enlightenment konnte sich für keinen Ihrer Bildschirme als Fenstermanager\n"
 "etablieren. Vielleicht läuft schon ein anderer Fenstermanager?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "ACPI einrichten"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Belegungen einstellen"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMS einrichten"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Bildschirmschoner einrichten"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment kann den Dateimanager nicht initialisieren."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Energiesparmodi einrichten"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment kann sein Energiespar-Subsystem nicht initialisieren."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Bildschirmsperre einrichten"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment kann sein Bildschirmsperre-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Popups einrichten"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kann sein Popup-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Nachrichtensystem einrichten"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Pfade einrichten"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Systemsteuerungen einrichten"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment kann sein Systembefehls-Subsystem nicht intitialisieren.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Richte Aktionen ein"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kann sein Aktions-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Ausführungssystem einrichten"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kann sein Ausführungssystem nicht initialisieren."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "FM einrichten"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Dateimanager"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Nachrichtensystem einrichten"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kann sein Message-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "DND einrichten"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kann sein Drag'n'Drop-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Eingabehandhabung einrichten"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment kann sein Eingabeerkennungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Module einrichten"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kann sein Modul-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Erinnern einrichten"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kann die \"Merken\"-Einstellungen nicht initialisieren."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Farbklassen einrichten"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kann sein Farbklassen-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Gadcon einrichten"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment kann sein Helfersteuerungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "ACPI einrichten"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMS einrichten"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Energiesparmodi einrichten"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment kann sein Energiespar-Subsystem nicht initialisieren."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Hintergrundbild einrichten"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment kann sein Hintergrundbild-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Mauseinstellungen"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment kann die Mauseinstellungen nicht initialisieren."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Belegungen einstellen"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment kann sein Tastenbelegungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Modulablagen einrichten"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Vorschaubild-Generator einrichten"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kann sein Vorschaubild-Subsystem nicht initialisieren.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+"Enlightenment kann sein Systembefehls-Subsystem nicht intitialisieren.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment kann sein Vorschaubild-Subsystem nicht initialisieren.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment kann sein Themen-Subsystem nicht initialisieren."
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Dateisortierung einrichten"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment kann sein Anordnungsdateisystem nicht initialisieren."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Module laden"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Modulablagen einstellen"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Fast fertig"
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Optionen:\n"
+"\t-display DISPLAY\n"
+"\t\tVerbinde zu Anzeige DISPLAY.\n"
+"\t\tEG: -display:1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tFüge einen gefälschten Xinerama-Bildschirm hinzu (anstatt eines echten)\n"
+"\t\tunter Angabe der Geometrie. Fügen Sie so viele hinzu, wie Sie möchten. "
+"Alle\n"
+"\t\tersetzen echte Xinerama-Anzeigen, sofern vorhanden. Das kann\n"
+"\t\tgenutzt werden, um Xinerama zu simulieren.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tDas Profil CONF_PROFILE anstelle des benutzerdefinierten verwenden oder "
+"einfach \"Standard\".\n"
+"\t-good\n"
+"\t\tSei brav.\n"
+"\t-evil\n"
+"\t\tSei böse.\n"
+"\t-psychotic\n"
+"\t\tSei psychotisch.\n"
+"\t-locked\n"
+"\t\tMit aktiver Bildschirmsperre starten, so dass das Passwort eingegeben "
+"werden muss.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tlfWenn Sie diese Hilfe benötigen, brauchen Sie diese Option definitiv "
+"nicht.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Überprüfe Formatübestützung"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas keine Buffercanvas erstellen konnte.\n"
+"Bitte überprüfen Sie Evas auf Softwarebufferengine-Unterstützung.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas keine PNG-Dateien laden kann.\n"
+"Bitte überprüfen Sie Evas auf PNG-Loader-Unterstützung.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas keine JPEG-Dateien laden kann.\n"
+"Bitte überprüfen Sie Evas auf JPEG-Loader-Unterstützung.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas keine PNG-Dateien laden kann.\n"
+"Bitte überprüfen Sie Evas auf PNG-Loader-Unterstützung.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas keine EET-Dateien laden kann.\n"
+"Bitte überprüfen Sie Evas auf EET-Loader-Unterstützung.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment entdeckte, dass Evas die \"Sans\"-Schriftart nicht laden "
+"kann.\n"
+"Bitte überprüfen Sie Evas auf \"fontconfig\"-Unterstützung und fontconfig "
+"darauf,\n"
+"ob es eine \"Sans\"'-Schriftart definiert.\n"
+
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2965,11 +3040,11 @@ msgstr ""
 "neugestartet. Es gab einen Fehler beim Laden<br>des Moduls \"%s\".Dieses "
 "Modul wurde deaktiviert und wird nicht<br>mehr geladen."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment stürzte kurz nach dem Start ab und wurde neugestartet"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2980,7 +3055,7 @@ msgstr ""
 "neugestartet. Es gab einen Fehler beim Laden des Moduls \"%s\"<br>."
 "<br>Dieses Modul wurde deaktiviert und wird nicht mehr geladen."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2993,7 +3068,7 @@ msgstr ""
 "<br>Einstellungsmenü sollten Sie die gewünschten<br>Module wieder auswählen "
 "können."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -3005,20 +3080,12 @@ msgstr ""
 "der<br>fehlerhaften Module zu helfen. Im Modul-<br>Einstellungsmenü sollten "
 "Sie die gewünschten<br>Module wieder auswählen können."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Modulablagen einstellen"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Fast fertig"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Modul laden: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3027,11 +3094,11 @@ msgstr ""
 "Beim Laden von Modul %s ist ein Fehler aufgetreten.<br>Es wurde kein Modul "
 "mit dem Namen %s in den<br>Modul-Verzeichnissen gefunden.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Fehler beim Laden des Moduls"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3040,11 +3107,11 @@ msgstr ""
 "Beim Laden von Modul %s ist ein Fehler aufgetreten.<br>Der volle Pfad zum "
 "Modul ist:<br>%s<br>Der gemeldete Fehler lautet:<br>%s"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Das Modul enthält nicht alle benötigten Funktionen."
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3054,16 +3121,16 @@ msgstr ""
 "Fehler beim Initialisieren des Moduls %s.<br>Es wird mindestens Modul-API %i "
 "benötigt.<br>Die Enlightenment bekannte Modul-API ist %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment-Modul %s"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Möchten Sie dieses Modul abschalten?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3077,26 +3144,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Modulablage #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie diese Modulablage wirklich entfernen?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Sie wollen diese Modulablage entfernen.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Verschieben/Größenänderung von Helfern beenden"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Verschieben/Größenänderung von Helfern starten"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Inhalte"
 
@@ -3104,16 +3171,16 @@ msgstr "Inhalte"
 msgid "Starting"
 msgstr "Starten"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Systemrechte überprüfen"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Systemüberprüfung abgeschlossen"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3124,35 +3191,35 @@ msgstr ""
 "werden.<br>Möchten Sie die Abmeldung abschließen, ohne diese<br>Programme "
 "zuerst zu beenden?<br><br>Automatisches Abmelden in %d Sekunden."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Abmeldeprobleme"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Jetzt abmelden"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Länger warten"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Abmeldung abbrechen"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Abmeldevorgang im Gange"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Abmeldung ist im Gange.<br><hilight>Bitte warten.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment ist mit einer anderen Nachfrage beschäftigt"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3160,7 +3227,7 @@ msgstr ""
 "Melde ab.<br>Sie können keine anderen Systemaktionen ausführen,<br>sobald "
 "mit der Abmeldung begonnen wurde."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3168,7 +3235,7 @@ msgstr ""
 "Schalte ab.<br>Sie können keine anderen Systemaktionen ausführen,<br>sobald "
 "das Herunterfahren begonnen hat."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3176,7 +3243,7 @@ msgstr ""
 "Starte neu.<br>Sie können keine anderen Systemaktionen ausführen,<br>bis der "
 "Neustart abgeschlossen ist."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3184,63 +3251,64 @@ msgstr ""
 "Schlafmodus wird vorbereitet.<br>Erst nach dem Aufwachen können<br>weitere "
 "Systemaktionen ausgeführt werden."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Das System wird in den Ruhezustand versetzt.<br>Erst nach dem "
 "Wiedereinschalten können<br>wieder Systemaktionen ausgeführt werden."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Upps, das sollte nicht passieren."
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Herunterfahren fehlgeschlagen."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Neustart fehlgeschlagen."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Einschlafen fehlgeschlagen."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Versetzen in den Ruhezustand fehlgeschlagen."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Ausschalten"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Ausschalten.<br><hilight>Bitte warten.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Neustarten"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Neustarten.<br><hilight>Bitte warten...</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Computer in Schlafmodus versetzen"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Schlafmodus wird vorbereitet.<br><hilight>Bitte warten...</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Computer in Ruhezustand versetzen"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Das System wird in den Ruhezustand versetzt.<br><hilight>Bitte warten.</"
@@ -3250,33 +3318,33 @@ msgstr ""
 msgid "About Theme"
 msgstr "Über dieses Thema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Als Thema einstellen"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Verschieben/Größenänderung von Gegenständen beenden"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Verschieben/Größenänderung von Gegenständen starten"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Modulablageninhalte einstellen"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment konnte einen Kindprozess nicht abspalten:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Beenden unmöglich - unsterbliche Fenster."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3286,123 +3354,123 @@ msgstr ""
 "<br>dass Enlightenment sich nicht beenden kann, bis jene Fenster "
 "manuell<br>geschlossen wurden oder die Sperre entfernt wurde.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KiB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MiB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GiB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "In der Zukunft"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "In der letzten Minute"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Jahre früher"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Monate früher"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Wochen früher"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Tage früher"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Stunden früher"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuten früher"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Einstellungen für den Bildimport"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importieren"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Füll- und Streckoptionen"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Dehnen"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Innerhalb"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Füllen"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Dateiqualität"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Originaldatei verwenden"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3420,12 +3488,12 @@ msgstr ""
 "behoben. Sie können die Einstellungen wieder Ihren Wünschen anpassen."
 "<br>Entschuldigen Sie bitte die Unannehmlichkeiten.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "Einstellungen von \"%s\" aktualisiert"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3460,140 +3528,146 @@ msgstr "Nach oben"
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Ein Verzeichnis nach oben"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Bildschirmauflösung"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Berechtigungen:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Geändert:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Sie"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Geschützt"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Nur lesen"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lesen-Schreiben"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Akkuüberwachung einstellen"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Benachrichtigung bei niedrigem Akkustand"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Überprüfen alle:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: 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:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Ruhezustand"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Polling"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Alarm bei niedrigem Akkustand"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Alarm wenn Akku bei:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f Minute(n)"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatisch ablehnen in..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f Sekunde(n)"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Alarm"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automatische erkennen"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Intern"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Fuzzy-Modus"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3601,32 +3675,33 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Niedriger Akkustand"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Netzbetrieb empfohlen"
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Akkuzustand"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Uhr"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Werkzeugleiste zeigen"
@@ -3693,17 +3768,17 @@ msgstr "Einstellungen der Einstellungsleiste aktualisiert"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar-Anwendungen"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Autostartanwendungen"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Neustartanwendungen"
 
@@ -3716,10 +3791,25 @@ msgid "Apps"
 msgstr "Anwendungen"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Neue Anwendung"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Starter"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Wähle Anwendungen"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Arbeitsflächendateien"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar Andere"
 
@@ -3732,7 +3822,7 @@ msgid "Available Profiles"
 msgstr "Verfügbare Profile"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Profil auswählen"
 
@@ -3770,9 +3860,9 @@ msgstr "Dialogeinstellungen"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
@@ -3814,7 +3904,7 @@ msgstr "Dialoge"
 msgid "Profiles"
 msgstr "Profile"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3825,7 +3915,7 @@ msgstr ""
 "<hilight>Wiederherstellen</hilight>.<br> Wenn Sie nichts tun, wird die "
 "ursprüngliche Auflösung<br>%dx%d bei %d Hz in %d Sekunden wiederhergestellt."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3836,7 +3926,7 @@ msgstr ""
 "<hilight>Wiederherstellen</hilight>.<br> Wenn Sie nichts tun, wird die "
 "ursprüngliche Auflösung<br>%dx%d in %d Sekunden wiederhergestellt."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3848,7 +3938,7 @@ msgstr ""
 "ursprüngliche Auflösung<br>%dx%d bei %d Hz <hilight>SOFORT</hilight> "
 "wiederhergestellt."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3859,47 +3949,47 @@ msgstr ""
 "<hilight>Wiederherstellen</hilight>.<br>Wenn Sie nichts tun, wird die "
 "ursprüngliche Auflösung<br>%dx%d <hilight>SOFORT</hilight> wiederhergestellt."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Auflösungsänderung"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Speichern"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Auflösungseinstellungen"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Bildschirmauflösung"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Beim Anmelden wiederherstellen"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Drehung"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Spiegelung"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Fehlende Funktionen"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3913,11 +4003,11 @@ msgstr ""
 "<br>dass XRandR nicht verfügbar war, als <hilight>ecore</"
 "hilight><br>kompiliert wurde."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Keine Wiederholraten gefunden"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3931,89 +4021,72 @@ msgstr ""
 "der<br>Auflösung verwendet, was Ihren Bildschirm <hilight>beschädigen</"
 "hilight> kann."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Arbeitsflächeneinstellungen"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Anzahl der Arbeitsflächen"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Arbeitsfläche umklappen"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Beim Ziehen von Objekten an Bildschirmkante umklappen"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Durchlaufende ringförmige Anordnung der Arbeitsflächen"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Arbeitsflächen"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Aus"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Anfasser"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Vergrößerung"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Hintergrundschwenken"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Animationsgeschwindigkeit"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Schwenkfaktor für X-Achse"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Schwenkfaktor für Y-Achse"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animation beim Wechsel"
 
@@ -4030,7 +4103,7 @@ msgid "Desktop Wallpaper"
 msgstr "Arbeitsflächenhintergrundbild"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Einstellen"
 
@@ -4040,12 +4113,12 @@ msgstr "Hintergrundbild auswählen..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -4053,184 +4126,212 @@ msgstr "Persönlich"
 msgid "Screen Lock Settings"
 msgstr "Bildschirmsperre einstellen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Nach Starten sperren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Nach Ruhezustand sperren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Angepasster Befehl für die Bildschirmsperre"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Sperren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Auf allen Bildschirmen zeigen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Auf aktuellem Bildschirm zeigen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Auf Bildschirm # zeigen:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Anmeldefenster"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Bei Aktivierung des Bildschirmschoners sperren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f Sekunden"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Mit Ablauf der Leerlaufzeit sperren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f Minute(n)"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Zeitschaltuhren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Vorschlagen, falls zuvor schon deaktiviert"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Präsentationsmodus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Themenspezifisch"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Themenhintergrundbild"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Aktuelles Hintergrundbild"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Hintergrundbild"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Bildschirmschonereinstellungen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Bildschirmschoner aktivieren"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Ruhezustand"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Bildschirmschoner"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Anfänglicher Timeout"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Abwechselnder Timeout"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Schwärzen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Nicht bevorzugt"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Aufdeckungsereignisse"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Erlauben"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Nicht erlauben"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Energieverwaltungssignalisierung anzeigen"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Die aktuelle Anzeige ist nicht<br>DPMS-fähig."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Auf dem aktuellen X-Server ist keine <br>DPMS-Erweiterung aktiv."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Einstellungen für Energieverwaltung anzeigen"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Anzeigenenergieverwaltung anzeigen"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Zeit bis zum Bereitschaftsmodus"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Zeit bis zum Ruhezustand"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Abschaltzeit"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Zurück"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Arbeitsflächen"
@@ -4278,74 +4379,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Einstellungen für Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Belegung hinzufügen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Belegung löschen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Belegung ändern"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Alle entfernen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Standardbelegung wiederherstellen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Aktion"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Aktionsparameter"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Aktivierung der Belegungen bei Vollbildfenstern erlauben"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Abfolge bei Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Klickbare Bildschirmkante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Kantenbelegungsfehler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4354,28 +4455,28 @@ msgstr ""
 "Die gewählte Abfolge wird bereits von der <br><hilight>%s</hilight>-Aktion "
 "verwendet.<br>Bitte wählen Sie eine andere Kantenabfolge."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "STRG"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4526,34 +4627,47 @@ msgstr ""
 "Enlightenment war wegen eines Kopierfehlers<br>nicht in der Lage, die "
 "Einstellungen zu importieren."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Spracheinstellungen"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Sprachauswahl"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Systemstandard"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Ausgewählte Spracheinstellung"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Spracheinstellung"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Sprache"
 
@@ -4641,17 +4755,17 @@ msgid "Manager"
 msgstr "Manager"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nichts"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Mausbelegungsabfolge"
 
@@ -4676,13 +4790,11 @@ msgid "Menu Settings"
 msgstr "Menüeinstellungen"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Persönlich"
@@ -4692,7 +4804,7 @@ msgid "Main Menu"
 msgstr "Hauptmenü zeigen"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favoriten"
 
@@ -4710,7 +4822,7 @@ msgid "Comments"
 msgstr "Kommentare"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4722,7 +4834,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Auf der obersten Ebene zeigen"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menüs"
 
@@ -4790,19 +4902,19 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Schriftarten"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Erscheinungsbild"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Icons"
 
@@ -4947,18 +5059,18 @@ msgstr "Sie möchten \"%s\" entfernen.<br><br>Sind Sie sicher?"
 msgid "Wallpaper Settings"
 msgstr "Hintergrundeinstellungen"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Hintergrundbild aus Thema verwenden"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Bild..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Verbunden..."
 
@@ -4978,45 +5090,50 @@ msgstr "...dieser Arbeitsfläche"
 msgid "This Screen"
 msgstr "...diesem Bildschirm"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Hintergrundbildeinstellungen..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Kacheln"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Anfasser"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Bild auswählen..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Fehler beim Importieren des Bildes"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment konnte das Bild wegen<br>Umwandlungsfehlern nicht importieren."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Hintergrundbild-Importfehler"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment konnte das Hintergrundbild wegen<br>eines Kopierfehlers nicht "
 "importieren."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5053,7 +5170,7 @@ msgid "Error: can't start the request."
 msgstr "Fehler: Kann die Anfrage nicht starten"
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Standard-Rahmenstil"
 
@@ -5061,7 +5178,7 @@ msgstr "Standard-Rahmenstil"
 msgid "Window Border Selection"
 msgstr "Fensterrahmenauswahl"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Diesen Rahmen für zukünftiges Öffnen des Fensters merken"
 
@@ -5092,7 +5209,7 @@ msgid "Menu Background Base"
 msgstr "Hintergrundbasis in Menüs"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Menütitel"
 
@@ -5101,7 +5218,7 @@ msgid "Menu Title Active"
 msgstr "Menütitel aktiv"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menügegenstand"
 
@@ -5114,12 +5231,12 @@ msgid "Menu Item Disabled"
 msgstr "Menügegenstand deaktiviert"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Text verschieben"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Textgröße ändern"
 
@@ -5136,7 +5253,7 @@ msgid "Winlist Label"
 msgstr "Fensterlistenbeschriftung"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Winlist-Titel"
 
@@ -5153,377 +5270,387 @@ msgid "File Manager Background Base"
 msgstr "Hintergrundbasis in Datei-Manager"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Schaltflächentext"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Schaltflächentext deaktiviert"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Aktivierungsfeld-Text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Aktivierungsfeld-Text deaktiviert"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Eingabetext"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Eingabefeldtext deaktiviert"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Beschriftungstext"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Listengegenstandtext ausgewählt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Listengegenstandtext (gerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Hintergrundbasis für Listengegenstände (gerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Listengegenstandtext (ungerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Hintergrundbasis für Listengegenstände (ungerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Listenüberschrift (gerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Hintergrundbasis für Listenüberschrift (gerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Listenüberschrift (ungerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Hintergrundbasis für Listenüberschrift (ungerade)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Auswahlfeld-Text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Auswahlfeld-Text deaktiviert"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Schiebertext"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Schiebertext deaktiviert"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Hintergrundbasis für Rahmen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Hintergrundbasis für scrollbare Flächen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Modulbeschriftung"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Composite-Farbe bei Fokusverlust"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Farben"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Farbklassen: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "%u gemischte Farbklassen ausgewählt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "%u nicht eingerichtete Farbklassen ausgewählt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "%u einfarbige Farbklassen ausgewählt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Keine ausgewählte Farbklasse"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Individuelle Farben"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Objekt:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Umriss:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Schatten:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Text mit zugewiesenen Farben."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "Farben hängen vom Thema ab."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Fenstermanager"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Grafikobjekte"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Andere"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Titelleiste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Schlichter Textblock"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Schlanker Textblock"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Großer Textblock"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Titel bei Einstellungen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Über-Titel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Über die Version"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Über-Text"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titel der Arbeitsflächensperre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Passwort der Arbeitsflächensperre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Fehlerdialog"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Befehl ausführen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Startbildschirmtitel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Text des Startbildschirms"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Version des Startbildschirms"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Eintrag"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Rahmen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Beschriftung"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Schaltflächen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Schieber"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Auswahlknöpfe"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Kontrollkästchen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Textlisteneintrag"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Listeneintrag"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Listenüberschrift"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Dateimanager"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Arbeitsflächenicons"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Klein"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Groß"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Klein aussehend"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normal aussehend"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Groß aussehend"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Schriftarteneinstellungen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Winzig"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Groß"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Wirklich groß"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Riesig"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d Pixel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Benutzerdefinierte Schriftklassen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Standardvorschautext: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Schriftklasse"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Schriftklasse aktivieren"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Schrift"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Erweiterter Vorschautext... 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Zeichenabstand"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Ersatzschriftart"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Ersatznamen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Rückfallmöglichkeiten aktivieren"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Zeichenabstand / Rückfallmöglichkeiten"
 
@@ -5531,11 +5658,16 @@ msgstr "Zeichenabstand / Rückfallmöglichkeiten"
 msgid "Icon Theme Settings"
 msgstr "Einstellungen für das Icon-Thema"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Icon-Thema aktivieren"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Wähle Anwendungen"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "Icons überschreiben allgemeines Thema"
 
@@ -5600,11 +5732,9 @@ msgid "Custom scaling factor"
 msgstr "Benutzerdefinierter Skalierungsfaktor"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.0f mal"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5615,6 +5745,12 @@ msgstr "Richtlinie"
 msgid "Minimum"
 msgstr "Minimal"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.0f mal"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximal"
@@ -5635,25 +5771,25 @@ msgstr "Startbildschirm beim Anmelden zeigen"
 msgid "Transition Settings"
 msgstr "Einstellungen für Übergänge"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Ereignisse"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Startvorgang"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Arbeitsflächenwechsel"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Hintergrundwechsel"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Übergänge"
 
@@ -5669,15 +5805,15 @@ msgstr " Importieren..."
 msgid " Online..."
 msgstr " Verbunden..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Themenkategorien"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Zuweisen"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Alle leeren"
 
@@ -5708,19 +5844,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "\"Exchange\"-Themen"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Rahmen"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Icon-Thema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Mauszeiger"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skalierung"
 
@@ -5841,6 +5977,10 @@ msgstr "Anwendungsspezifisch"
 msgid "Border Icon"
 msgstr "Rahmen-Icon"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Plazierung"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Intelligente Plazierung"
@@ -5869,23 +6009,46 @@ msgstr "Neue Fenster"
 msgid "Animate"
 msgstr "Animieren"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linear"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Sanftes Beschleunigen und Abbremsen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Beschleunigen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Abbremsen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Mausbeschleunigung"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Abbremsen"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Sanftes Beschleunigen und Abbremsen"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Schattieren"
 
@@ -5906,6 +6069,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Neuestes Fenster unter dem Mauszeiger aktivieren"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Klicken"
 
@@ -5937,11 +6101,6 @@ msgstr "Nur Dialoge"
 msgid "Only dialogs with focused parent"
 msgstr "Nur Dialoge von bereits fokussierten Elternfenstern werden aktiviert"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Andere Einstellungen"
@@ -6039,13 +6198,13 @@ msgid "Fill available space"
 msgstr "Verfügbaren Platz belegen"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertikal"
@@ -6102,7 +6261,7 @@ msgid "Raise when clicking to focus"
 msgstr "Durch Anklicken hervorvorheben"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fensterfokus"
 
@@ -6359,28 +6518,28 @@ msgstr "Sehr hell"
 msgid "Dropshadow"
 msgstr "Schlagschatten"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Everything-Starter"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Everything-Starter zeigen"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Everything-Einstellung"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Everything-Dialog zeigen"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Everything-Modul"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Everything ausführen"
 
@@ -6388,144 +6547,145 @@ msgstr "Everything ausführen"
 msgid "Everything Settings"
 msgstr "Everything-Einstellungen"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Verfügbare Plugins"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Nach oben"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Nach unten"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Einstellen"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "In \"Alles\" zeigen"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Auf der obersten Ebene zeigen"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Minimale Anzahl an Zeichen für die Suche"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Pluginauslösung"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Standard ist der Name des Plugins"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Nur suchen, wenn ausgelöst"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Pluginansicht"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Detailliert"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Standard-Ansicht"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Scrollen animieren"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Hoch/runter wählen nächsten Eintrag in Icon-Ansicht aus"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Eingabe verbergen wenn nicht aktiv"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Liste verbergen"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Schnelle Navigation"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Emacs-Stil (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Vi-Stil (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Standard-Ansicht"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Scrollen animieren"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Hoch/runter wählen nächsten Eintrag in Icon-Ansicht aus"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Sortiere"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Sortiere"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "Anhand der Verwendung"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Am meisten verwendet"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Zuletzt verwendet"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Thematische Plugins"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Aktions-Plugins"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Objekt-Plugins"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Popup-Größe"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Popup-Breite"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Popup-Höhe"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Popup-Ausrichtung"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6534,35 +6694,27 @@ msgstr "Popup-Ausrichtung"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Größe des Edge-Popups"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Fenster-Geometrie"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Everything-Sammlung"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Aktionen"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Objekte"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Keine Plugins geladen"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "In Zwischenablage kopieren"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6601,146 +6753,60 @@ msgstr ""
 "hilight>schaltet die Listenansichtsmodi um<br><hilight>STRG+3</hilight> "
 "schaltet die Vorschaubildansichtsmodi um"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Öffnen mit..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Datei öffnen..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Anwendungseintrag bearbeiten"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Neuer Anwendungseintrag"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Mit \"sudo\" ausführen"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Öffnen mit..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Terminal hier öffnen"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Programm starten"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Everything-Anwendungen"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "TerminalBefehl"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Sudo-GUI"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Alles"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Taschenrechner"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Kopieren nach ..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Verschieben nach ..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "In den Papierkorb verschieben"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Ordner öffnen (FEM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Nach Datum sortieren"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Nach Namen sortieren"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Zuletzt verwendete  Dateien"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Everything-Dateien"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Zuletzt verwendete  Dateien zeigen"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Zuletzt verwendete Dateien durchsuchen"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Zwischengespeicherte Dateien durchsuchen"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Besuchte Verzeichnisse zwischenspeichern"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Zwischenspeicher leeren"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Dialog zeigen"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Zu Fenster wechseln"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Vollbild umschalten"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Auf Arbeitsfläche verschieben"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Datei-Icons"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Dateitypen"
 
@@ -6785,19 +6851,19 @@ msgid "Select an image"
 msgstr "Bild auswählen"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Dateimanager"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Persönliches Verzeichnis"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6816,7 +6882,7 @@ msgstr ""
 "Ihren Wünschen anpassen.<br>Bitte entschuldigen Sie die Unannehmlichkeiten."
 "<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6833,7 +6899,7 @@ msgstr ""
 "Standardeinstellungen<br>benutzt. Bitte entschuldigen Sie die "
 "Unannehmlichkeiten.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Dateimanager-Einstellungen aktualisiert"
 
@@ -6910,95 +6976,99 @@ msgstr "Dateimanager beim Einhängen öffnen"
 msgid "Device"
 msgstr "Gerät"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Zum übergeordneten Verzeichnis wechseln"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Andere Anwendung..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Öffnen mit..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Bekannte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Bestimmte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Alle Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Benutzerdefinierter Befehl"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiervorgang abgebrochen"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Verschieben abgebrochen"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Löschen abgebrochen"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Unbekannte Operation vom Slave wurde abgebrochen"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopie von \"%s\" beendet"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopiere \"%s\" (verbleibende Zeit: %d Sekunden)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Verschieben von \"%s\" beendet"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Verschiebe \"%s\" (verbleibende Zeit: %d Sekunden)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Löschen beendet"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Lösche Dateien..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7033,7 +7103,7 @@ msgstr "Verarbeite %d Operation(en)"
 msgid "Filemanager is idle"
 msgstr "Dateimanager ist unbeschäftigt"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Operationsinformation zu EFM"
 
@@ -7045,35 +7115,39 @@ msgstr "Helfer-Verwaltung"
 msgid "Available Gadgets"
 msgstr "Verfügbare Helfer"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Modus"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Benutzerdefiniertes Bild"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Benutzerdefinierte Farbe"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparent"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animationen"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Hintergrundeinstellungen"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Verschieben/Größenänderung starten"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Frei"
@@ -7295,15 +7369,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Sind Sie sicher, dass Sie diese IBar-Quelle löschen möchten?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Neues Icon erstellen"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -7347,7 +7421,7 @@ msgstr "Fenster aller Arbeitsflächen zeigen"
 msgid "Show windows from active desktop"
 msgstr "Fenster der aktiven Arbeitsfläche zeigen"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7469,31 +7543,31 @@ msgstr ""
 "sie bereits intern<br>für Kontextmenüs vergeben ist.<br>Diese Maustaste "
 "funktioniert nur im Popup."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Zeige Arbeitsflächenumschalter-Popup"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Popup mit rechter Arbeitsfläche"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Popup mit linker Arbeitsfläche"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Popup mit oberer Arbeitsfläche"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Popup mit unterer Arbeitsfläche"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Popup mit nächster Arbeitsfläche"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Popup mit voriger Arbeitsfläche"
 
@@ -7513,131 +7587,91 @@ msgstr "Systemeinstellungen"
 msgid "Temperature Settings"
 msgstr "Temperatur-Einstellungen"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Angezeigte Einheit"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Abfrageintervall"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Hohe Temperatur"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Niedrige Temperatur"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Temperaturanzeige"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperaturanzeige"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Weiter"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Herzlich Willkommen in Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Wählen Sie eines aus"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Keine Menüdateien wurden<br>auf Ihrem System gefunden.<br>Bitte sehen Sie "
-"die<br>Dokumentation auf<br>www.enlightenment.org<br>für mehr Details "
-"zur<br>Einrichtung Ihrer<br>Anwendungsmenüs ein."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Wählen Sie ein Anwendungsmenü aus"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Programmstartleiste"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Wähle Anwendungen"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Arbeitsflächendateien"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Keine Icons auf der Arbeitsfläche"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Zeige Icons auf der Arbeitsfläche"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Aktiviereungseinstellungen"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Zum Aktivieren anklicken"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Mauszeigerberührung aktiviert Fenster"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Wählen Sie hinzuzufügende Icons aus"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Profil auswählen"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Schnellstart"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Wähle Anwendungen"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Am meisten verwendet"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7679,7 +7713,7 @@ msgstr "Links:"
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Stumm"
 
@@ -7703,41 +7737,54 @@ msgstr "Popup bei Lautstärkenänderung über Tastenbelegungen zeigen"
 msgid "Sound Cards"
 msgstr "Soundkarten"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Klang-Einstellungen"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Zu nutzendes Mischpult für globale Aktionen:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Mischpult starten..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Mischpultmoduleinstellungen"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Auflösungsänderung"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Mischpulteinstellungen aktualisiert"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Mischpult-Moduleinstellungsdaten geändert.<br>Ihre alten Einstellungen "
-"wurden mit der neuen Standardeinstellung ersetzt.<br>Entschuldigen Sie bitte "
-"die Umstände."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Mischpultmoduleinstellungen"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Kann den Offline-Modus des Systems nicht umschalten"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "Der ConnMan-Daemon läuft nicht"
 
@@ -7766,123 +7813,353 @@ msgstr "Passwortabfrage im Klartext zeigen"
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Vom Netzwerkdienst trennen."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Dienst ist nicht mehr vorhanden"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Mit Netzwerkdienst verbinden."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Konnte die Passwortabfrage vom Dienst nicht einstellen"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Offline-Modus"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Schieberegler"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Kein ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Kein ConnMan-Server gefunden"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Offline-Modus: Alle Funkgeräte sind ausgeschaltet"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Keine Verbindung"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "Verbindungsabbau"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Unbekannter Name"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "ungenutzt"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "Verbindungsaufbau"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "Einstellung"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "Fertig"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "Anmelden"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "Online"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "Versagen"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "Aktiviert"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "Verfügbar"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "Verbunden"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "Offline"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Es existiert bereits eine andere Systemleiste"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Es kann nur eine Systemleiste geben. Eine solche existiert bereits."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Systemleiste"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Systemleiste"
 
-#, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment kann sein Themen-Subsystem nicht initialisieren."
+#~ msgid "Acpi"
+#~ msgstr "ACPI"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Bildschirm abdunkeln"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Bildschirm aufhellen"
+
+#~ msgid "Resizeable"
+#~ msgstr "Größe änderbar"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Verschieben/Größenänderung dieses Helfers beenden"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann das Ecore-Subsystem nicht initialisieren!\n"
+#~ "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann das Dateisubsystem nicht initialisieren.\n"
+#~ "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment kann die Verbindung mit dem X-Server nicht initialisieren.\n"
+#~ "Haben Sie die DISPLAY-Variable gesetzt?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann das Verbindungssystem nicht initialisieren.\n"
+#~ "Vielleicht haben Sie nicht genug freien Speicherplatz?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann das IPC-Subsystem nicht initialisieren.\n"
+#~ "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kann Xinerama nicht benutzen.\n"
+#~ "Das sollte nicht passieren."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kann Xrandr nicht benutzen.\n"
+#~ "Das sollte nicht passieren."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann das Evas-System nicht initialisieren.\n"
+#~ "Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kann den Startbildschirm nicht initialisieren.\n"
+#~ "Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Unterstützung von SVG überprüfen"
+
+#~ msgid "Setup FM"
+#~ msgstr "FM einrichten"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr ""
+#~ "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
+
+#~ msgid "New Application"
+#~ msgstr "Neue Anwendung"
+
+#~ msgid "Background panning"
+#~ msgstr "Hintergrundschwenken"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Schwenkfaktor für X-Achse"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Schwenkfaktor für Y-Achse"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Energieverwaltungssignalisierung anzeigen"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Die aktuelle Anzeige ist nicht<br>DPMS-fähig."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Auf dem aktuellen X-Server ist keine <br>DPMS-Erweiterung aktiv."
+
+#~ msgid "Default is plugin name"
+#~ msgstr "Standard ist der Name des Plugins"
+
+#~ msgid "Actions"
+#~ msgstr "Aktionen"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "In Zwischenablage kopieren"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "Öffnen mit..."
+
+#~ msgid "Open File..."
+#~ msgstr "Datei öffnen..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Anwendungseintrag bearbeiten"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Neuer Anwendungseintrag"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Mit \"sudo\" ausführen"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Terminal hier öffnen"
+
+#~ msgid "Run Executable"
+#~ msgstr "Programm starten"
+
+#~ msgid "Calculator"
+#~ msgstr "Taschenrechner"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Kopieren nach ..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Verschieben nach ..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "In den Papierkorb verschieben"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Ordner öffnen (FEM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Nach Datum sortieren"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Nach Namen sortieren"
+
+#~ msgid "Recent Files"
+#~ msgstr "Zuletzt verwendete  Dateien"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Dialog zeigen"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Zu Fenster wechseln"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Vollbild umschalten"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Auf Arbeitsfläche verschieben"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Keine Menüdateien wurden<br>auf Ihrem System gefunden.<br>Bitte sehen Sie "
+#~ "die<br>Dokumentation auf<br>www.enlightenment.org<br>für mehr Details "
+#~ "zur<br>Einrichtung Ihrer<br>Anwendungsmenüs ein."
+
+#~ msgid "Select application menu"
+#~ msgstr "Wählen Sie ein Anwendungsmenü aus"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Programmstartleiste"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Keine Icons auf der Arbeitsfläche"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Zeige Icons auf der Arbeitsfläche"
+
+#~ msgid "Focus mode"
+#~ msgstr "Aktiviereungseinstellungen"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Zum Aktivieren anklicken"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Mauszeigerberührung aktiviert Fenster"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Wählen Sie hinzuzufügende Icons aus"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Schnellstart"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Mischpult-Moduleinstellungsdaten geändert.<br>Ihre alten Einstellungen "
+#~ "wurden mit der neuen Standardeinstellung ersetzt.<br>Entschuldigen Sie "
+#~ "bitte die Umstände."
 
 #~ msgid "Add Application..."
 #~ msgstr "Anwendung hinzufügen..."
@@ -8557,12 +8834,6 @@ msgstr "Systemleiste"
 #~ msgid "Exit Immediately"
 #~ msgstr "Sofort beenden"
 
-#~ msgid "Shut Down"
-#~ msgstr "Herunterfahren"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Ruhezustand"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Arbeitsflächensperre"
 
@@ -8611,9 +8882,6 @@ msgstr "Systemleiste"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Temperatureinstellungen"
 
-#~ msgid "Back"
-#~ msgstr "Zurück"
-
 #~ msgid "Choose Language"
 #~ msgstr "Sprache auswählen"
 
index d3fe16f..f1319c2 100755 (executable)
--- a/po/el.po
+++ b/po/el.po
@@ -5,41 +5,41 @@
 # Geo Kou <ragecryx@yahoo.gr>, 2008.
 # Aron Xu <aronmalache@163.com>, 2008.
 # Giorgos RageCryX Koutsikos <ragecryx@yahoo.gr>, 2009.
-#
+# George Koutsikos <ragecryx@yahoo.gr>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-01-07 18:56+0200\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-11-20 22:33+0200\n"
 "Last-Translator: George Koutsikos <ragecryx@yahoo.gr>\n"
-"Language-Team: Ελληνικά\n"
+"Language-Team: Greek, Modern (1453-) <>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: src/bin/e_about.c:14
 msgid "About Enlightenment"
 msgstr "Σχετικά με το Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -49,27 +49,28 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
-msgstr ""
-"Πνευματική ιδιοκτησία &copy; 1999-2010, της ομάδας ανάπτυξης του "
-"Enlightenment.<br><br>Ελπίζουμε να απολαμβάνετε τη χρήση του λογισμικού όσο "
-"απολαύσαμε εμείς τη συγγραφή του.<br><br>Αυτό το λογισμικό παρέχεται όπως-"
-"είναι χωρίς καμία προσωρινή ή υποκρυπτόμενη εγγύηση. Αυτό το λογισμικό "
-"διέπεται από όρους χρήσης, γι'αυτό παρακαλώ δείτε τα COPYING και COPYING-"
-"PLAIN αρχεία αδειών που είναι εγκατεστημένα στο σύστημα σας.<br><br>Το "
-"Enlightenment είναι υπό <hilight>ΣΥΝΕΧΗ ΑΝΑΠΤΥΞΗ</hilight> και δεν είναι "
-"σταθερό. Πολλά χαρακτηριστικά είναι ημιτελή ή δεν υπάρχουν και ενδέχεται να "
-"έχουν πολλά προβλήματα. Έχετε <hilight>ΠΡΟΕΙΔΟΠΟΙΗΘΕΙ!</hilight>"
-
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
+msgstr ""
+"Πνευματική ιδιοκτησία &copy; 1999-2011, της ομάδας ανάπτυξης του "
+"Enlightenment.<br><br>Ελπίζουμε να απολαμβάνετε τη χρήση του λογισμικού "
+"αυτού, όσο απολαύσαμε εμείς τη συγγραφή του.<br><br>Αυτό το λογισμικό "
+"παρέχεται όπως-είναι χωρίς καμία προσωρινή ή υποκρυπτόμενη εγγύηση. Αυτό το "
+"λογισμικό διέπεται από όρους χρήσης, γι'αυτό παρακαλώ δείτε τα COPYING και "
+"COPYING-PLAIN αρχεία αδειών που είναι εγκατεστημένα στο σύστημα σας."
+"<br><br>Το Enlightenment είναι υπό <hilight>ΣΥΝΕΧΗ ΑΝΑΠΤΥΞΗ</hilight> και "
+"δεν είναι σταθερό. Πολλά χαρακτηριστικά είναι ημιτελή ή δεν υπάρχουν και "
+"ενδέχεται να έχουν πολλά προβλήματα. Έχετε <hilight>ΠΡΟΕΙΔΟΠΟΙΗΘΕΙ!</hilight>"
+
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Η Ομάδα</title>"
 
 #: src/bin/e_actions.c:365
@@ -87,71 +88,71 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Είστε σίγουροι ότι θέλετε να σκοτώσετε αυτό το παράθυρο?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Όχι"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Αιτήθηκε έξοδος από το Enlightenment.<br><br>Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Πρόκειται να αποσυνδεθείτε.<br><br>Είστε σίγουροι για αυτό?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Επιθυμείτε σίγουρα το κλείσιμο του συστήματος?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Αιτήθηκε κλείσιμο Η/Υ.<br><br>Είστε σίγουροι για το κλείσιμο?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Είστε σίγουροι ότι θέλετε να κάνετε επανεκκίνηση?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Αιτήθηκε επανεκκίνηση Η/Υ.<br><br>Είστε σίγουροι για την επανεκκίνηση?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Αιτήθηκε αναστολή Η/Υ.<br><br>Είστε σίγουροι για την αναστολή?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Είστε σίγουροι οτι θέλετε να κάνετε αδρανοποίηση;"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -159,548 +160,567 @@ msgstr ""
 "Ζητήσατε να αδρανοποίησετε τον Υπολογιστή.<br><br>Είστε σίγουροι οτι θέλετε "
 "να αναστείλετε τις εργασίες στον δίσκο;"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Παράθυρο : Ενέργειες"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Αλλαγή μεγέθους"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Μενού"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Μενού παραθύρου"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Ανύψωση"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Βύθιση"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Σκότωμα"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Παράθυρο : Κατάσταση"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Εναλλαγή σε κολλημένη λειτουργία"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Εναλλαγή σε εικονιδιοποιημένη λειτουργία"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Εναλλαγή σε λειτουργία πλήρους οθόνης"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Μεγιστοποίηση κάθετα"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Μεγιστοποίηση οριζόντια"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Μεγιστοποίηση σε πλήρη οθόνη"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Κατάσταση μεγιστοποίησης \"έξυπνη\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Κατάσταση μεγιστοποίησης \"επέκταση\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Κατάσταση μεγιστοποίησης \"γέμισμα\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Εναλλαγή σε Κατάσταση χωρίς περίγραμμα"
 
-#: src/bin/e_actions.c:2773
-#, fuzzy
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
-msgstr "ΠεÏ\81ίγÏ\81αμμα"
+msgstr "Î\9fÏ\81ιÏ\83μÏ\8cÏ\82 Ï\80εÏ\81ιγÏ\81άμμαÏ\84οÏ\82"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Εναλλαγή σε κατάσταση ακινητοποίησης"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Γύρισμα επιφάνειας εργασίας αριστερά"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Γύρισμα επιφάνειας εργασίας δεξιά"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Γύρισμα επιφάνειας εργασίας επάνω"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Γύρισμα επιφάνειας εργασίας κάτω"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Γύρισμα επιφάνειας εργασίας κατά..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Εμφάνιση επιφάνειας εργασίας"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Εμφάνισε το ράφι"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Γύρισμα επιφάνειας εργασίας σε..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Εναλλαγή στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας αριστερά (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας δεξιά(Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας επάνω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας κάτω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας κατά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας σε... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Εναλλαγή επιφάνειας εργασίας σε κατεύθυνση..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 0 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 1 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 2 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 3 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 4 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 5 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 6 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 7 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 8 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 9 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 10 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 11 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας... (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Αποστολή ποντικιού στη οθόνη 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Αποστολή ποντικιού στη οθόνη 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Αποστολή ποντικιού στη οθόνη..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Προώθηση ποντικιού κατά 1 οθόνη μπροστά"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Προώθηση ποντικιού κατά 1 οθόνη πίσω"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Προώθηση ποντικιού κατά ... οθόνες"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
 #, fuzzy
+msgid "Backlight Down"
+msgstr "Τερματισμός"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
-msgstr "Μετακίνηση κειμένου"
+msgstr "Μετακίνηση στο κέντρο"
 
-#: src/bin/e_actions.c:2942
-#, fuzzy
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Μετακίνηση στο..."
 
-#: src/bin/e_actions.c:2947
-#, fuzzy
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
-msgstr "Μετακίνηση στο..."
+msgstr "Μετακίνηση κατά..."
 
-#: src/bin/e_actions.c:2953
-#, fuzzy
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Αλλαγή μεγέθους κατά:"
 
-#: src/bin/e_actions.c:2959
-#, fuzzy
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
-msgstr "Εναλλαγή επιφάνειας εργασίας σε κατεύθυνση..."
+msgstr ""
 
-#: src/bin/e_actions.c:2965
-#, fuzzy
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
-msgstr "Δημιουργία εικονιδίου"
+msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Παράθυρο : Μετακίνηση"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Στην επόμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Στην προηγούμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Κατά επιφάνεια εργασίας #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Εμφάνιση κεντρικού μενού"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Εμφάνιση μενού αγαπημένων"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Εμφάνιση μενού όλων των εφαρμογών"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Εμφάνιση μενού πελατών"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Εμφάνιση μενού..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Εκτέλεση"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Εφαρμογή"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Έξοδος τώρα"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Λειτουργία"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Εναλλαγή σε λειτουργία παρουσίασης"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Εναλλαγή σε λειτουργία εκτός σύνδεσης"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Σύστημα"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Κλείσιμο τώρα"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:3048
-#, fuzzy
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
-msgstr "Αναστολή"
+msgstr "Αναστολή τώρα"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Αναστολή"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Αδρανοποίηση"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Κλείδωμα"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Καθαρισμός παραθύρων"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Γενικά : Ενέργειες"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Καθυστερημένη ενέργεια"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Εξασθένηση φωτεινότητας"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Ενίσχυση φωτεινότητας"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Ορισμός ως ταπετσαρία"
 
@@ -708,18 +728,16 @@ msgstr "Ορισμός ως ταπετσαρία"
 msgid "Color Selector"
 msgstr "Επιλογή χρώματος"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -727,20 +745,20 @@ msgstr "Επιλογή χρώματος"
 msgid "OK"
 msgstr "Εντάξει"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -751,7 +769,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -760,11 +778,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Προβλήματα εγγραφής ρυθμίσεων του Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -772,96 +790,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Ρυθμίσεις αναβαθμίστηκαν"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
-#, fuzzy
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
-msgstr "Η αδρανοποίηση απέτυχε."
+msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
-#, fuzzy
+#: src/bin/e_config.c:2182
 msgid "Not signed."
-msgstr "ΧÏ\89Ï\81ίÏ\82 Ï\80αÏ\81άθÏ\85Ï\81ο"
+msgstr "Î\9cη Ï\85Ï\80ογεγÏ\81αμμένο."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
-#, fuzzy
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
-msgstr "Î\97 Î±Î½Î±Ï\83Ï\84ολή απέτυχε."
+msgstr "Î\9aÏ\89δικοÏ\80οίηÏ\83η απέτυχε."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
-msgstr "Î\97 Î±Î½Î±Ï\83Ï\84ολή απέτυχε."
+msgid "Decryption failed."
+msgstr "Î\91Ï\80οκÏ\89δικοÏ\80οίηÏ\83η απέτυχε."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Καλώς ορίσατε στο Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -873,57 +888,62 @@ msgstr ""
 "<br><br>Το αρχείο που παρουσιάστηκε το σφάλμα ήταν:<br>%s<br><br>Αυτό το "
 "αρχείο διαγράφηκε για να αποφευχθούν φθαρμένα δεδομένα. <br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Βασικά"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Εφαρμογή"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Αρθρώματα"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Ρύθμιση εικονιδίου"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Υποδοχέας %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Σφάλμα - δεν υπάρχει PAM υποστήριξη"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Δεν έχει υλοποιηθεί υποστήριξη PAM στο Enlightenment, έτσι<br>το κλείδωμα "
 "του desk είναι απενεργοποιημένο."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Κλείδωμα απέτυχε"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -932,15 +952,15 @@ msgstr ""
 "είτε το πληκτρολόγιο είτε το ποντίκι ή και τα δύο<br>και η αρπαγή δεν είναι "
 "δυνατόν να σπάσει."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Παρακαλώ εισάγετε τον κωδικό ξεκλειδώματος"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Σφάλμα συστήματος ταυτοποίησης"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -951,22 +971,25 @@ msgstr ""
 "περίοδο. Ο κωδικός σφάλματος ήταν  <hilight>%i</hilight>.<br>Αυτό είναι "
 "άσχημο και δεν θα έπρεπε να συμβαίνει. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Ενεργοποίηση λειτουργίας παρουσίασης?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Ξεκλειδώσατε την επιφάνεια εργασίας πολύ γρήγορα.<br><br>Θα θέλατε να "
+"ενεργοποιήσετε την λειτουργία <b>παρουσίασης</b> ώστε να απενεργοποιηθεί η "
+"λειτουργία προστασίας οθόνης, κλειδώματος και εξοικονόμησης ενέργειας;"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Όχι, αλλά αύξησε το χρόνο λήξης"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Όχι, και σταμάτα να ρωτάς"
 
@@ -987,106 +1010,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Επεξεργαστής καταχωρήσεων επιφάνειας εργασίας"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Γενικό όνομα"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Κατηγορία παραθύρου"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Κατηγορίες"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Τύποι mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Αρχείο επιφάνειας εργασίας"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Γενικά"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Ειδοποίηση έναρξης"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Εκτέλεση σε τερματικό"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Εμφάνιση στα μενού"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Επιλογή εικονιδίου"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Επιλογή ενός εκτελέσιμου"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1130,314 +1152,313 @@ msgstr ""
 "Το Enlightenment δεν κατάφερε να τρέξει την εφαρμογή:<br><br>%s<br><br>Η "
 "εφαρμογή απέτυχε να ξεκινήσει."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Σφάλμα εκτέλεσης εφαρμογής"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Η εκτέλεση του %s διακόπηκε απρόοπτα."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Ένας κωδικός εξόδου απο %i επιστράφηκε απο %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s διακόπηκε από ένα σήμα διακοπής."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s διακόπηκε από ένα σήμα εξόδου."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s διακόπηκε από ένα σήμα ματαίωσης."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s διακόπηκε από ένα σήμα τερματισμού."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s διακόπηκε απο το σήμα με αριθμό %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Καταγραφές σφαλμάτων"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Δεν υπήρξε μήνυμα σφάλματος."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Αποθήκευση αυτού του μηνύματος"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Αυτή η καταγραφή σφάλματος θα αποθηκευτεί ως %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Πληροφορίες σφάλματος"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Πληροφορίες σήματος σφάλματος"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Δεδομένα εξόδου"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Δεν υπήρξε έξοδος."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Ανύπαρκτη διαδρομή"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s δεν υπάρχει."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Σφάλμα προσάρτησης"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Αδυναμία σύνδεσης συσκευής"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Σφάλμα αποπροσάρτησης"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Αδυναμία αποπροσάρτησης συσκευής"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Σφάλμα εξαγωγής"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Αδυναμία εξαγωγής συσκευής"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Αρχεία"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Σύνδεσμος"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Ακύρωση"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Κληρονόμησε τις ρυθμίσεις γονέα"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Λειτουργία προβολής"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Ανανέωση προβολής"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Εμφάνιση κρυφών αρχείων"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Απομνημόνευση σειράς"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Ταξινόμηση τώρα"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Νέος κατάλογος"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Αποπροσάρτηση"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Προσάρτηση"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Εξαγωγή"
 
-#: src/bin/e_fm.c:8229
-#, fuzzy
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
-msgstr "παρεχόμενο από την Εφαρμογή "
+msgstr "Ιδιότητες εφαρμογής"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Ιδιότητες αρχείου"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Χρήση προκαθορισμένων"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Εικονίδια πλέγματος"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Προσαρμοσμένα εικονίδια"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Λίστα"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Μέγεθος εικονιδίου (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Ορισμός ταπετσαρίας..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Ορισμός επίστρωσης..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Δημιουργία νέου καταλόγου"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Όνομα νέου καταλόγου:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Μετονομασία %s σε:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Μετονομασία αρχείου"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Προσπάθεια ξανά"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Όχι σε ολα"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ναί σε όλα"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Το αρχείο υπάρχει ήδη, αντικατάσταση?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Παράβλεψη αυτού"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Παράβλεψη όλων"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Ένα σφάλμα προέκυψε κατα την εκτέλεση μιας λειτουργίας.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Επιβεβαίωση διαγραφής"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1471,12 +1492,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "'Άγνωστος όγκος"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Αφαιρούμενη συσκευή"
 
@@ -1484,7 +1505,7 @@ msgstr "Αφαιρούμενη συσκευή"
 msgid "File:"
 msgstr "Αρχείο:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Μέγεθος:"
 
@@ -1500,7 +1521,7 @@ msgstr "Τύπος αρχείου:"
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Ιδιοκτήτης:"
 
@@ -1520,17 +1541,17 @@ msgstr "Ανάγνωση από ιδιοκτήτη"
 msgid "Owner can write"
 msgstr "Εγγραφή από ιδιοκτήτη"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
@@ -1539,7 +1560,7 @@ msgid "Thumbnail"
 msgstr "Εικόνα επισκόπησης"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
@@ -1555,51 +1576,41 @@ msgstr "Πληροφορίες συνδέσμου"
 msgid "Select an Image"
 msgstr "Επιλογή εικόνας"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Μετακίνηση σε"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Δυνατότητα αλλαγής μεγέθους"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Αυτόματη κύλιση περιεχομένων"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Απλό"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Ένθεμα"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Εμφάνιση"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1649,14 +1660,14 @@ msgstr "Θέση"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Μέγεθος"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Στοίβαγμα"
@@ -1708,163 +1719,161 @@ msgstr "Έξοδος από τη συνεδρία με αυτό το παράθ
 msgid "Remember these Locks"
 msgstr "Απομνημόνευση των κλειδαριών"
 
-#: src/bin/e_int_border_menu.c:82
-#, fuzzy
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
-msgstr "Παράθυρα"
-
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Πάντα στην κορυφή"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-#, fuzzy
-msgid "Sticky"
-msgstr "Κολλώδης"
+msgstr "Παράθυρο"
+
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Ρυθμίσεις"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Πλήρης οθόνη"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Μεγιστοποίηση κάθετα"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Μεγιστοποίηση οριζόντια"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Απο-μεγιστοποίηση"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Επεξεργασία εικονιδίου"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Δημιουργία εικονιδίου"
 
-#: src/bin/e_int_border_menu.c:464
-#, fuzzy
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Προσθήκη στα αγαπημένα"
 
-#: src/bin/e_int_border_menu.c:469
-#, fuzzy
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
-msgstr "ΠÏ\81οÏ\83θήκη Ï\83Ï\84α Î±Î³Î±Ï\80ημένα"
+msgstr "ΠÏ\81οÏ\83θήκη Ï\83Ï\84ην IBar"
 
-#: src/bin/e_int_border_menu.c:477
-#, fuzzy
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
-msgstr "Συντόμευση πληκτρολογίου"
-
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Τοποθέτηση"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Παράλειψη"
+msgstr "Δημιουργία συντόμευσης πληκτρολογίου"
 
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Περίγραμμα"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Κλειδώματα"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Ενθύμηση"
 
-#: src/bin/e_int_border_menu.c:571
-#, fuzzy
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
-msgstr "NetWM"
+msgstr "ICCCM/NetWM"
+
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Κολλώδες"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Παράλειψη"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Εικονιδιοποίηση"
 
-#: src/bin/e_int_border_menu.c:680
-#, fuzzy
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
-msgstr "ΣκιαÏ\83μένο"
+msgstr "ΣκίαÏ\83η"
 
-#: src/bin/e_int_border_menu.c:864
-#, fuzzy, c-format
+#: src/bin/e_int_border_menu.c:830
+#, c-format
 msgid "Screen %d"
-msgstr "Οθόνη"
+msgstr "Οθόνη %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Πάντα στην κορυφή"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Πάντα από κάτω"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Καρφίτσωμα στην επιφάνεια εργασίας"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Ξεκαρφίτσωμα από την επιφάνεια εργασίας"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Επιλογή στυλ περιγράμματος"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Χρήση προκαθορισμένης ρύθμισης εικονιδίου του E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Χρήση εικονιδίου παρεχόμενου από την Εφαρμογή "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Χρήση εικονιδίου καθορισμένου από το χρήστη"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
-msgstr "Î\91ντίσταση"
+msgstr "ΠÏ\81Ï\8cβαλε Î±ντίσταση"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Λίστα παραθύρων"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Διαχειριστής επιφανειών"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Γραμμή εργασιών"
 
@@ -1885,7 +1894,7 @@ msgid "ICCCM Properties"
 msgstr "Ιδιότητες ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -2044,7 +2053,6 @@ msgid "Size, Position and Locks"
 msgstr "Μέγεθος, θέση και κλειδώματα"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Όλα"
 
@@ -2118,21 +2126,18 @@ msgstr "Εκκίνηση αυτού του προγράμματος κατά τ
 
 #: src/bin/e_int_config_modules.c:52
 msgid "Utilities"
-msgstr ""
+msgstr "Βοηθήματα"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Αρχεία"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
-#, fuzzy
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
-msgstr "Εκτέλεση"
+msgstr "Εκκινητής"
 
 #: src/bin/e_int_config_modules.c:57
 #: src/modules/conf_theme/e_int_config_fonts.c:57
@@ -2140,23 +2145,8 @@ msgid "Core"
 msgstr "Πυρήνας"
 
 #: src/bin/e_int_config_modules.c:58
-#, fuzzy
 msgid "Mobile"
-msgstr "Αρθρώματα"
-
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Ρυθμίσεις"
+msgstr "Φορητό"
 
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
@@ -2195,7 +2185,7 @@ msgstr "Προσθήκη συστατικού"
 msgid "Remove Gadget"
 msgstr "Αφαίρεση συστατικού"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Ρυθμίσεις γραμμής εργαλείων"
 
@@ -2203,11 +2193,11 @@ msgstr "Ρυθμίσεις γραμμής εργαλείων"
 msgid "Layout"
 msgstr "Διάταξη"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Σφάλμα μεθόδου εισαγωγής"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2220,7 +2210,7 @@ msgstr "Κεντρικό"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Αγαπημένες εφαρμογές"
 
@@ -2228,76 +2218,74 @@ msgstr "Αγαπημένες εφαρμογές"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Εφαρμογές"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Παράθυρα"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Χαμένα παράθυρα"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Σχετικά"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Θέμα"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Εικονικό"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Ράφια"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Εμφάνιση/απόκρυψη όλων των παραθύρων"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Χωρίς εφαρμογές)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Όρισε εικονικές επιφάνειες εργασίας"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Χωρίς παράθυρα)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Χωρίς όνομα!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Χωρίς ράφια)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Προσθήκη ραφιού"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Διαγραφή ραφιού"
 
@@ -2332,7 +2320,7 @@ msgid "Shrink to Content Width"
 msgstr "Συρρίκνωση στο μέγεθος περιεχομένου"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Στυλ"
 
@@ -2362,7 +2350,7 @@ msgid "Hide duration"
 msgstr "Διάρκεια απόκρυψης"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f δευτερόλεπτα"
@@ -2379,7 +2367,7 @@ msgstr "Εμφάνιση σε όλες τις επιφάνειες εργασί
 msgid "Show on specified Desktops"
 msgstr "Εμφάνιση σε επιλεγμένες επιφάνειες εργασίας"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2390,7 +2378,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2399,130 +2387,110 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Το Enlightenment δεν μπορεί να εκκινήσει το σύστημα αρχείων.\n"
-"Πιθανόν να μην έχετε αρκετή μνήμη;"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Το Enlightenment δεν μπορεί να εκκινήσει το IPC system.\n"
-"Πιθανόν να μην έχετε αρκετή μνήμη;"
-
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Το Enlightenment δεν μπορεί να ρυθμίσει το randr.\n"
-"Αυτό δεν θα έπρεπε να συμβαίνει."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Το Enlightenment δεν μπορεί να εκκινήσει το Evas system.\n"
-"Πιθανόν να μην έχετε αρκετή μνήμη;"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Το Enlightenment δεν μπορεί να εγκαταστήσι το dnd σύστημά του."
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2530,23 +2498,29 @@ msgstr ""
 "Το Enlightenment δεν μπορεί να δημιουργήσει φακέλους στο home φάκελο σας.\n"
 "Πιθανόν δεν έχετε φάκελο home ή ο δίσκος είναι γεμάτος;"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα ρύθμισης του."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα γραμματοσειρών του."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2555,301 +2529,389 @@ msgstr ""
 "αρχεία.\n"
 "Πιθανόν να μην έχετε αρκετή μνήμη;"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα γραμματοσειρών του."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Το Enlightenment δεν μπορεί να ρυθμίσει την init οθόνη.\n"
-"Πιθανόν να μην έχετε αρκετή μνήμη;"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Έναρξη πολυεθνικής υποστήριξης"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Το Enlightenment δεν μπορεί να εκκινήσει FDO desktop system.\n"
 "Πιθανόν να μην έχετε αρκετή μνήμη;"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Δοκιμή υποστήριξης τύπων αρχείων"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
+msgstr "Ρύθμιση οθονών"
 
-#: src/bin/e_main.c:725
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει PNG αρχεία. "
-"Ελέγξτε αν το Evas έχει\n"
-"υποστήριξη για φόρτωση PNG.\n"
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει JPEG αρχεία. "
-"Ελέγξτε αν το Evas έχει\n"
-"υποστήριξη για φόρτωση JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει EET αρχεία. "
-"Ελέγξτε αν το Evas έχει\n"
-"υποστήριξη για φόρτωση EET.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Ρύθμιση ACPI"
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Ρύθμιση συνδυασμών"
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
-msgstr "Ρύθμιση οθονών"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Ρύθμιση DPMS"
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
-msgstr ""
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Ρύθμιση προφύλαξης οθόνης"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Ρύθμιση λειτουργιών εξοικονόμησης ενέργειας"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Ρύθμιση κλειδώματος οθόνης"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Ρύθμιση άμεσων ειδοποιήσεων"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 "Το Enlightenment δεν μπορεί να εγκαταστήσει το σύστημα ειδοποιήσεων του."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Ρύθμιση συστήματος μηνυμάτων"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Ορισμός διαδρομών"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Ρύθμιση χειρισμών συστήματος"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Ρύθμιση ενεργειών"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα δράσεων του."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Ρύθμιση συστήματος εκτέλεσης"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Ρύθμιση FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Διαχειριστής αρχείων"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Ρύθμιση συστήματος μηνυμάτων"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Εγκατέστησε το DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Το Enlightenment δεν μπορεί να εγκαταστήσι το dnd σύστημά του."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
-msgstr ""
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα δράσεων του."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Ρύθμιση αρθρωμάτων"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Ρύθμιση ενθυμήσεων"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Ρύθμιση Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Ρύθμιση ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Ρύθμιση DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Ρύθμιση λειτουργιών εξοικονόμησης ενέργειας"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Ρύθμιση ταπετσαρίας"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Το Enlightenment δεν μπορεί να εγκαταστήσει στο σύστημα φόντου επιφάνειας "
 "εργασίας."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Ρύθμιση ποντικιού"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 "Το Enlightenment δεν μπορεί να διαμορφώσει τις ρυθμίσεις για το ποντίκι."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Ρύθμιση συνδυασμών"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Ρύθμιση ραφιών"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Ρύθμιση του δημιουργού επισκοπήσεων"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Ρύθμιση ταξινόμησης αρχείων"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Φόρτωση αρθρωμάτων"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Ρύθμιση ραφιών"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Σχεδόν ολοκληρώθηκε"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Δοκιμή υποστήριξης τύπων αρχείων"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει PNG αρχεία. "
+"Ελέγξτε αν το Evas έχει\n"
+"υποστήριξη για φόρτωση PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει JPEG αρχεία. "
+"Ελέγξτε αν το Evas έχει\n"
+"υποστήριξη για φόρτωση JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει PNG αρχεία. "
+"Ελέγξτε αν το Evas έχει\n"
+"υποστήριξη για φόρτωση PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Το Enlightenment διαπίστωσε οτι το Evas δεν μπορεί να φορτώσει EET αρχεία. "
+"Ελέγξτε αν το Evas έχει\n"
+"υποστήριξη για φόρτωση EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2857,7 +2919,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2865,7 +2927,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2873,20 +2935,12 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Ρύθμιση ραφιών"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Σχεδόν ολοκληρώθηκε"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Φόρτωση αρθρωμάτος: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2895,22 +2949,22 @@ msgstr ""
 "Υπήρξε σφάλμα κατα τη φόρτωση του αρθρώματος με όνομα: %s<br>Κανένα άρθρωμα "
 "με όνομα %s δεν βρέθηκε<br>στους καταλόγους αρθρωμάτων.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Σφάλμα φόρτωσης αρθρώματος"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Το άρθρωμα δεν περιέχει όλες τις απαραίτητες λειτουργίες"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2918,16 +2972,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s άρθρωμα"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Θέλετε να αποφορτώσετε αυτό το άρθρωμα?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2938,11 +2992,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Ράφι #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Επιθυμείτε σίγουρα την διαγραφή αυτού του ραφιού?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2950,18 +3004,16 @@ msgstr ""
 "Αιτήθηκε διαγραφή αυτού του ραφιού.<br><br>Είστε σίγουροι για τη διαγραφή "
 "του?"
 
-#: src/bin/e_shelf.c:1674
-#, fuzzy
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
-msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αντικειμένων"
+msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους συστατικών"
 
-#: src/bin/e_shelf.c:1676
-#, fuzzy
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
-msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αντικειμένων"
+msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους συστατικών"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Περιεχόμενα"
 
@@ -2969,16 +3021,16 @@ msgstr "Περιεχόμενα"
 msgid "Starting"
 msgstr "Εκκινεί"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Έλεγχος δικαιωμάτων συστήματος"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Έλεγχος συστήματος ολοκληρώθηκε"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2989,113 +3041,113 @@ msgstr ""
 "<br>Θέλετε να ολοκληρώσετε την αποσύνδεση<br>χωρίς τον τερματισμό "
 "αυτών<br>των εφαρμογών?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Προβλήματα αποσύνδεσης"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Αποσύνδεση τώρα"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Περίμενε περισσότερο"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Ακύρωση αποσύνδεσης"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Αποσύνδεση σε εξέλιξη"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Το Enlightenment είναι απασχολημένο με ένα άλλο αίτημα"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "ΕΕΚ! Αυτό δεν θα έπρεπε να συμβαίνει"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Το κλείσιμο απέτυχε."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Η επανεκκίνηση απέτυχε."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Η αναστολή απέτυχε."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Η αδρανοποίηση απέτυχε."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Κλείσιμο.<br><hilight>Παρακαλώ περιμένετε.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Επανεκκινεί"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Επανεκκίνηση.<br><hilight>Παρακαλώ περιμένετε.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Αναστολή"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Αναστολή.<br><hilight>Παρακαλώ περιμένετε.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Αδρανοποιείται"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Αδρανοποίηση.<br><hilight>Παρακαλώ περιμένετε.</hilight>"
 
@@ -3103,157 +3155,157 @@ msgstr "Αδρανοποίηση.<br><hilight>Παρακαλώ περιμένε
 msgid "About Theme"
 msgstr "Σχετικά με αυτό το Θέμα"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Ορισμός ως Θέμα"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Ορισμός περιεχομένων"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Το Enlightenment δεν μπόρεσε να δημιουργήσει διεργασία παιδί:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Αδύνατη η εξοδος - αθάνατα παράθυρα."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Στο μέλλον"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Στο τελευταίο λεπτό"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Χρόνια πριν"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Μήνες πριν"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Εβδομάδες πριν"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Ημέρες πριν"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Ώρες πριν"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Λεπτά πριν"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Ρυθμίσεις εισαγωγής εικόνας"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Επιλογές γεμίσματος και παραμόρφωσης"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Παραμόρφωση"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Κέντρο"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Μέσα"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Γέμισμα"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Ποιότητα αρχείου"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Χρήση αυθεντικού αρχείου"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3264,12 +3316,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s ρύθμιση ανανεώθηκε"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3297,140 +3349,145 @@ msgstr "Πάνω"
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Προσθήκη στα αγαπημένα"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Μετάβαση ένα κατάλογο πάνω"
 
-#: src/bin/e_widget_fsel.c:332
-#, fuzzy
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
-msgstr "Ανάλυση"
+msgstr "Ανάλυση:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Δικαιώματα:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Τροποποίηση:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Εσύ"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Προστατευμένο"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Μόνο για ανάγνωση"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Απαγόρευση"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Ανάγνωση-εγγραφή"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Ρύθμιση επόπτη μπαταρίας"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Εμφάνιση προειδοποίησης όταν η μπαταρία τελειώνει"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Έλεγχος κάθε:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tick"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Αδρανοποίηση"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Σφυγμομέτρηση"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Εμφάνιση ειδοποίησης για χαμηλή μπαταρία"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Ειδοποίηση όταν:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f λεπτά"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Αυτόματη απόρριψη σε..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f δευτ."
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Ειδοποίηση"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Αυτόματη αναγνώριση"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Εσωτερικό"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Ασαφής λειτουργία"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Υλικό"
 
@@ -3438,32 +3495,33 @@ msgstr "Υλικό"
 msgid "Battery"
 msgstr "Μπαταρία"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Χαμηλή στάθμη μπαταριάς!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Προτείνεται πηγή εναλλασσόμενου ρεύματος."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ΣΦΑΛΜΑ"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Μετρητής μπαταρίας"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Ρολόι"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Εμφάνιση γραμμής εργαλείων"
@@ -3516,17 +3574,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Εφαρμογές IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Εφαρμογές κατά την εκκίνηση"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Επανεκκίνηση εφαρμογών"
 
@@ -3538,11 +3596,26 @@ msgstr "Σειρά"
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Νέα εφαρμογή"
+#: src/modules/conf_applications/e_mod_main.c:21
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Εκκινητής"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Επιλογή εφαρμογών"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Αρχεία επιφάνειας εργασίας"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar άλλο"
 
@@ -3555,7 +3628,7 @@ msgid "Available Profiles"
 msgstr "Διαθέσιμα προφίλ"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Επιλογή ενός προφίλ"
 
@@ -3593,9 +3666,9 @@ msgstr "Ρυθμίσεις διαλόγων"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Γενικές ρυθμίσεις"
 
@@ -3637,7 +3710,7 @@ msgstr "Διάλογοι"
 msgid "Profiles"
 msgstr "Προφίλ"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3645,7 +3718,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3653,7 +3726,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3661,7 +3734,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3669,47 +3742,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Αλλαγή ανάλυσης"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Ανάκτηση"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Ρυθμίσεις ανάλυσης οθόνης"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Επαναφορά στη σύνδεση"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Περιστροφή"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Καθρέφτισμα"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Ελλειπή χαρακτηριστικά"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3718,11 +3791,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Δεν βρέθηκαν ρυθμοί ανανέωσης"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3731,90 +3804,72 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Ρυθμίσεις εικονικών επιαφανειών εργασίας"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Αριθμός των επιφανειών εργασίας"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
-msgstr "Î\95ναλλαγή Î¼Îµ ÎºÎ¯Î½Î·Ï\83η Ï\84οÏ\85 Ï\80ονÏ\84ικιοÏ\8d"
+msgstr "Î\95ναλλαγή ÎµÏ\80ιÏ\86άνειαÏ\82 ÎµÏ\81γαÏ\83ίαÏ\82"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Εναλλαγή όταν μετακινείται αντικείμενο στην άκρη της οθόνης"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Μετά την τελευταία επιφάνεια εργασίας να έρχεται ξανά η πρώτη"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Επιφάνειες εργασίας"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Ανενεργό"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Μετακίνηση προβολής"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Εστίαση"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Αλλαγή ταπετσαρία"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Ταχύτητα κίνησης"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Παράγοντας μετακίνησης στον άξονα Χ"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Παράγοντας μετακίνησης στον άξονα Υ"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Κίνηση εναλλαγής"
 
@@ -3831,7 +3886,7 @@ msgid "Desktop Wallpaper"
 msgstr "Ταπετσαρία επιφάνειας εργασίας"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Ορισμός"
 
@@ -3841,12 +3896,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Προσωπικά αρχεία"
 
@@ -3854,187 +3909,211 @@ msgstr "Προσωπικά αρχεία"
 msgid "Screen Lock Settings"
 msgstr "Ρυθμίσεις κλειδώματος οθόνης"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Κλείδωμα με την έναρξη"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Κλείδωμα με την αναστολή"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Προσαρμοσμένη εντολή κλειδώματος"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
-#, fuzzy
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Κλειδώνει"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Εμφάνιση σε όλες τις οθόνες"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Εμφάνιση στη τρέχουσα οθόνη"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Εμφάνιση στην οθόνης #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Πλαίσιο σύνδεσης"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Κλέιδωμα με την ενεργοποίηση του X Screensaver"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f δευτερόλεπτα"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Κλείδωμα όταν ο χρόνος αδράνειας ξεπεραστεί"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f λεπτά"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Χρονόμετρα"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Λειτουργία παρουσίασης"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Θέμα ορίστηκε"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Ταπετσαρία θέματος"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Τρέχουσα ταπετσαρία"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Ταπετσαρία"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Ρυθμίσεις προφύλαξης οθόνης"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Ενεργοποίηση X Screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Αναστολή στο Δίσκο"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Προφύλαξη οθόνης"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
-#, fuzzy
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
-msgstr "Αρχική κατάσταση"
+msgstr "Αρχικό χρονικό όριο"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
-msgstr ""
+msgstr "Χρονικό όριο εναλλαγής"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
-#, fuzzy
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
-msgstr "Άδειασμα"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Μη προτιμώμενο"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Γεγονότα έκθεσης"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Επέτρεψε"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Μην επιτρέψεις"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Διάφορα"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "DPMS (Display Power Management Signaling)"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Ο τρέχων εξυπηρετητής οθόνης δεν έχει <br>δυνατότητες DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Ο τρέχων εξυπηρετητής οθόνης δεν έχει <br>την επέκταση DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Ρυθμίσεις διαχείρισης ενέργειας οθόνης"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ενεργοποίηση διαχείρισης ενέργειας οθόνης"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Χρόνος κατάστασης αναμονής"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Χρόνος αναστολής"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Χρόνος απενεργοποίησης"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Εικονικές επιφάνειες εργασίας"
@@ -4078,102 +4157,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Συντομεύσεις άκρων"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Προσθήκη συνδυασμού"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Διαγραφή συνδυασμού"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Τροποποίηση συνδυασμού"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Διαγραφή όλων"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Επαναφορά προκαθορισμένων συνδυασμών"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Παράμετροι ενέργειας"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Γενικές επιλογές"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Ακολουθία συντόμευσης άκρων"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Σφάλμα συντόμευσης άκρων"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4248,14 +4327,12 @@ msgid "Threshold"
 msgstr "Κατώτατο όριο"
 
 #: src/modules/conf_interaction/e_mod_main.c:20
-#, fuzzy
 msgid "Touch"
-msgstr "ΣÏ\84ον ÎµÎºÎºÎ¹Î½Î·Ï\84ή"
+msgstr "Î\91Ï\86ή"
 
 #: src/modules/conf_interaction/e_mod_main.c:24
-#, fuzzy
 msgid "Mouse"
-msgstr "Τα Ï\80ιο Ï\87Ï\81ηÏ\83ιμοÏ\80οιοÏ\8dμενα"
+msgstr "ΠονÏ\84ίκι"
 
 #: src/modules/conf_intl/e_int_config_imc.c:104
 #: src/modules/conf_intl/e_mod_main.c:24
@@ -4322,34 +4399,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Ρυθμίσεις γλώσσας"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Επιλογή γλώσσας"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Προκαθορισμένα συστήματος"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Επιλεγμένη εντοπιότητα"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Εντοπιότητα"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Γλώσσα"
 
@@ -4397,7 +4487,6 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:112
-#, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Ρυθμίσεις συνδυασμών ποντικιού"
 
@@ -4435,33 +4524,31 @@ msgid "Manager"
 msgstr "Διαχειριστής"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Κανένα"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Ακολουθία συνδυασμών πλήκτρων"
 
 #: src/modules/conf_keybindings/e_mod_main.c:21
 msgid "Keys"
-msgstr ""
+msgstr "Πλήκτρα"
 
 #: src/modules/conf_keybindings/e_mod_main.c:25
-#, fuzzy
 msgid "Mouse Buttons"
-msgstr "ΡÏ\85θμίÏ\83ειÏ\82 ποντικιού"
+msgstr "ΠλήκÏ\84Ï\81α ποντικιού"
 
 #: src/modules/conf_keybindings/e_mod_main.c:29
-#, fuzzy
 msgid "Hardware Switches"
-msgstr "Υλικό"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:38
 #: src/modules/conf_menus/e_mod_main.c:18
@@ -4469,30 +4556,25 @@ msgid "Menu Settings"
 msgstr "Ρυθμίσεις μενού"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
-#, fuzzy
 msgid "Enlightenment Default"
-msgstr "Enlightenment"
+msgstr "Προκαθορισμένο του Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
-#, fuzzy
 msgid "Personal Default"
-msgstr "Προσωπικά αρχεία"
+msgstr "Προσωπικά προκαθορισμένο"
 
 #: src/modules/conf_menus/e_int_config_menus.c:257
 msgid "Main Menu"
 msgstr "Κεντρικό μενού"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Αγαπημένα"
 
 #: src/modules/conf_menus/e_int_config_menus.c:264
-#, fuzzy
 msgid "Applications Display"
-msgstr "Εφαρμογές"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:267
 msgid "Generic"
@@ -4503,25 +4585,24 @@ msgid "Comments"
 msgstr "Σχόλια"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
 msgstr "Συστατικά"
 
 #: src/modules/conf_menus/e_int_config_menus.c:274
-#, fuzzy
 msgid "Show gadget settings in top-level"
-msgstr "Εμφάνιση στα μενού"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Μενού"
 
 #: src/modules/conf_menus/e_int_config_menus.c:287
 msgid "Margin"
-msgstr ""
+msgstr "Περιθώριο"
 
 #: src/modules/conf_menus/e_int_config_menus.c:289
 #: src/modules/conf_menus/e_int_config_menus.c:294
@@ -4536,7 +4617,7 @@ msgstr "%2.0f pixel"
 
 #: src/modules/conf_menus/e_int_config_menus.c:292
 msgid "Cursor Margin"
-msgstr ""
+msgstr "Περιθώριο κέρσορα"
 
 #: src/modules/conf_menus/e_int_config_menus.c:297
 msgid "Autoscroll"
@@ -4583,19 +4664,19 @@ msgid "Images"
 msgstr "Εικόνες"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Θέματα"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Εικονίδια"
 
@@ -4625,7 +4706,7 @@ msgstr "Αναζήτηση καταλόγων"
 
 #: src/modules/conf_paths/e_mod_main.c:24
 msgid "Environment Variables"
-msgstr ""
+msgstr "Μεταβλητές περιβάλλοντος"
 
 #: src/modules/conf_performance/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4661,7 +4742,6 @@ msgid "Applications priority"
 msgstr "Προτεραιότητα εφαρμογών"
 
 #: src/modules/conf_performance/e_int_config_performance.c:119
-#, fuzzy
 msgid "Cache flush interval"
 msgstr "Διάστημα καθαρισμού προσωρινής μνήμης"
 
@@ -4741,18 +4821,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Ρυθμίσεις ταπετσαρίας"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Χρήση της ταπετσαρίας θέματος"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Εικόνα..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Online..."
 
@@ -4772,46 +4852,51 @@ msgstr "Σε αυτή την επιφάνεια εργασίας"
 msgid "This Screen"
 msgstr "Σε αυτή την οθόνη"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Ρυθμίσεις ταπετσαρίας..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Παράθεση"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Μετακίνηση προβολής"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Επιλογή μιας εικόνας"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Σφάλμα εισαγωγής εικόνας"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Το Enlightenment δεν μπόρεσε να εισάγει την εικόνα<br>λόγω σφαλμάτων "
 "μετατροπής."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Σφάλμα εισαγωγής ταπετσαρίας"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Το Enlightenment δεν μπόρεσε να εισάγει την ταπετσαρία<br>λόγω ενός "
 "σφάλματος αντιγραφής."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4825,7 +4910,7 @@ msgstr "από"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:198
 msgid "Error getting data !"
-msgstr ""
+msgstr "Σφάλμα λήψης δεδομένων!"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:233
 msgid "Exchange wallpapers"
@@ -4848,7 +4933,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Προκαθορισμένο στυλ περιγράμματος"
 
@@ -4856,7 +4941,7 @@ msgstr "Προκαθορισμένο στυλ περιγράμματος"
 msgid "Window Border Selection"
 msgstr "Επιλογή περιθωρίων παραθύρου"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4869,12 +4954,10 @@ msgid "Border Title Active"
 msgstr "Ενεργός τίτλος πλαισίου"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:77
-#, fuzzy
 msgid "Border Frame"
-msgstr "Στυλ περιγράμματος"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:78
-#, fuzzy
 msgid "Border Frame Active"
 msgstr "Ενεργός τίτλος πλαισίου"
 
@@ -4887,7 +4970,7 @@ msgid "Menu Background Base"
 msgstr "Βαση φόντου μενού"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Τίτλος μενού"
 
@@ -4896,7 +4979,7 @@ msgid "Menu Title Active"
 msgstr "Τίτλος μενού ενεργός"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Αντικείμενο μενού"
 
@@ -4909,12 +4992,12 @@ msgid "Menu Item Disabled"
 msgstr "Ανενεργό αντικείμενο μενού"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Μετακίνηση κειμένου"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Αλλαγή μεγέθους κειμένου"
 
@@ -4923,16 +5006,15 @@ msgid "Winlist Item"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:89
-#, fuzzy
 msgid "Winlist Item Active"
-msgstr "Αντικείμενο μενού ενεργό"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:90
 msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4949,382 +5031,392 @@ msgid "File Manager Background Base"
 msgstr "Βαση φόντου διαχειριστή αρχείων"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Εστίαση"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Κείμενο κουμπιού"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Κείμενο κουμπιού ανενεργό"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Κείμενο καταχώρησης"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Κείμενο ετικέτας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Κείμενο αντικειμένου λίστας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Κείμενο αντικειμένου λίστας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Κείμενο αντικειμένου λίστας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Επικεφαλίδα λίστας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Επικεφαλίδα λίστας"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Κείμενο επιλογής"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Κείμενο επιλογής ανενεργό"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Κείμενο συστατικού κύλισης"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Κείμενο συστατικού κύλισης ανενεργό"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Βάση φόντου πλαισίου"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Ετικέτα αρθρώματος"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Κλάσεις χρωμάτων: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Χωρίς επιλεγμένη χρωματική τάξη"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Προσαρμοσμένα χρώματα"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Αντικείμενο:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Περίγραμμα:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Σκιά:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Κείμενο με εφαρμοσμένα χρώματα."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Διαχειριστής παραθύρων"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Συστατικά"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Άλλα"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Μπάρα Τίτλου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Απλό τμήμα κειμένου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Ελαφρύ τμήμα κειμένου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Μεγάλο τμήμα κειμένου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Τίτλος \"Σχετικά\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Έκδοση \"Σχετικά\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Κείμενο \"Σχετικά\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Τίτλος κλειδώματος οθόνης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Κωδικός κλειδώματος οθόνης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Σφάλμα διαλόγου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Τίτλος αρχικής οθόνης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Κείμενο αρχικής οθόνης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Έκδοση αρχικής οθόνης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Καταχώρηση"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Πλαίσιο"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Ετικέτα"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Κουμπιά"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Ολισθητής"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Κουμπιά επιλογής"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Κουμπιά ενεργοποίησης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Αντικείμενο λίστας κειμένου"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Αντικείμενο λίστας"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Επικεφαλίδα λίστας"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Διαχειριστής αρχείων"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Εικονίδιο επιφάνειας εργασίας"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Μικρό"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Μικρό στυλ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Κανονικό στυλ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Μεγάλο στυλ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Ρυθμίσεις γραμματοσειρών"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Πολύ μικρό"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Μεγάλο"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Πολύ μεγάλο"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Πολύ μεγάλο"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ενεργοποίηση προσαρμοσμένων κλάσεων γραμματοσειρών"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Βασικό κείμενο προεπισκόπησης: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Κλάσεις γραμματοσειρών"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Ενεργοποίηση κλάσης γραμματοσειράς"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Προχωρημένο κείμενο προεπισκόπησης.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Συμβούλευση"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Αυτόματα"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Αναπλήρωση γραμματοσειρών"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Όνομα αναπλήρωσης"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Ενεργοποίηση αναπληρώσεων"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5332,12 +5424,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Ρυθμίσεις θέματος εικονιδίων"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
-msgstr "Ενεργοποίηση composite"
+msgstr "Ενεργοποίηση θέματος εικονιδίων"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Επιλογή εφαρμογών"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Αυτό υπερκαλύπτει το γενικό θέμα"
@@ -5403,11 +5499,9 @@ msgid "Custom scaling factor"
 msgstr "Προσαρμοσμένος παράγοντας κλιμάκωσης"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f φορές"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5418,6 +5512,12 @@ msgstr "Πολιτική"
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f φορές"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Μέγιστο"
@@ -5438,25 +5538,25 @@ msgstr "Εμφάνιση αρχικής οθόνης στη σύνδεση"
 msgid "Transition Settings"
 msgstr "Ρυθμίσεις εφέ μετάβασης"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Εκκίνηση"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Αλλαγή επιφάνειας εργασίας"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Αλλαγή ταπετσαρίας"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Μεταβάσεις"
 
@@ -5472,15 +5572,15 @@ msgstr " Εισαγωγή..."
 msgid " Online..."
 msgstr " Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Κατηγορίες θεμάτων"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Ορισμός"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Καθαρισμός όλων"
 
@@ -5510,19 +5610,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Ανταλλαγή θεμάτων"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Περιγράμματα"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Θέμα εικονιδίων"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Δείκτης ποντικιού"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Κλιμάκωση"
 
@@ -5619,14 +5719,12 @@ msgstr "Εμφάνιση πληροφοριών"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:129
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:140
-#, fuzzy
 msgid "Follows the window"
-msgstr "Î\9aλείνονÏ\84αÏ\82 το παράθυρο"
+msgstr "Î\91κολοÏ\85θεί το παράθυρο"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:136
-#, fuzzy
 msgid "Resize Geometry"
-msgstr "Î\93εÏ\89μεÏ\84Ï\81ία Î±Î»Î»Î±Î³Î®Ï\82 Î¼ÎµÎ³Î­Î¸Î¿Ï\85Ï\82 Ï\80αÏ\81αθÏ\8dÏ\81οÏ\85"
+msgstr "Î\91λλαγή Î¼ÎµÎ³Î­Î¸Î¿Ï\85Ï\82 Î³ÎµÏ\89μεÏ\84Ï\81ίαÏ\82"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:146
 #: src/modules/winlist/e_int_config_winlist.c:210
@@ -5645,6 +5743,10 @@ msgstr "παρεχόμενο από την Εφαρμογή "
 msgid "Border Icon"
 msgstr "Εικονίδιο περιγράμματος"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Τοποθέτηση"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Έξυπνη τοποθέτηση"
@@ -5674,23 +5776,46 @@ msgstr "Νέα παράθυρα"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Γραμμική"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Επιτάχυνση και μετά επιβράδυνση"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Επιτάχυνση"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Επιβράδυνση"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Επιτάχυνση ποντικιού"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Επιβράδυνση"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Επιτάχυνση και μετά επιβράδυνση"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Σκίαση"
 
@@ -5711,6 +5836,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Εστίαση του πιο πρόσφατου παραθύρου κάτω από το ποντίκι"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "κλικ"
 
@@ -5719,9 +5845,8 @@ msgid "Pointer"
 msgstr "Δείκτης"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:215
-#, fuzzy
 msgid "Sloppy"
-msgstr "Î\86Ï\84Ï\83αλη ÎµÏ\83Ï\84ίαÏ\83η"
+msgstr "Î\86Ï\84Ï\83αλο"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:218
 msgid "New Window Focus"
@@ -5744,11 +5869,6 @@ msgstr "Μονο διάλογοι"
 msgid "Only dialogs with focused parent"
 msgstr "Γίνεται εστίαση μόνο στα νέα παράθυρα διαλόγων"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Εστίαση"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Άλλες ρυθμίσεις"
@@ -5758,14 +5878,12 @@ msgid "Always pass click events to programs"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:239
-#, fuzzy
 msgid "Click raises the window"
-msgstr "Î\9aλείνονÏ\84αÏ\82 Ï\84ο Ï\80αÏ\81άθÏ\85Ï\81ο"
+msgstr "Î\91νÏ\8dÏ\88Ï\89Ï\83η Ï\80αÏ\81αθÏ\8dÏ\81οÏ\85 Î¼Îµ ÎºÎ»Î¹Îº"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:242
-#, fuzzy
 msgid "Click focuses the window"
-msgstr "Î\9aλικ Î³Î¹Î± ÎµÏ\83Ï\84ίαÏ\83η Ï\80αÏ\81αθÏ\8dÏ\81Ï\89ν"
+msgstr "Î\95Ï\83Ï\84ίαÏ\83η Ï\80αÏ\81αθÏ\8dÏ\81οÏ\85 Î¼Îµ ÎºÎ»Î¹Îº"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:245
 msgid "Refocus last window on desktop switch"
@@ -5848,13 +5966,13 @@ msgid "Fill available space"
 msgstr "Γέμισμα διαθέσιμου χώρου"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Οριζόντια"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Κάθετα"
@@ -5912,7 +6030,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Εστίαση παραθύρου"
 
@@ -6163,29 +6281,28 @@ msgstr "Πολύ φωτεινή"
 msgid "Dropshadow"
 msgstr "Ρίψη σκιάς"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Εκκινητής Everything"
 
-#: src/modules/everything/e_mod_main.c:60
-#, fuzzy
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
-msgstr "Î\95κκινηÏ\84ήÏ\82 Everything"
+msgstr "Î\95μÏ\86άνιÏ\83η ÎµÎºÎºÎ¹Î½Î·Ï\84ή Î³Î¹Î± Ï\84α Ï\80άνÏ\84α"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Ρύθμιση του Everything"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Εμφάνιση διαλόγου Everything"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Αρθρώμα Everything"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Εκτέλεση Everything"
 
@@ -6193,151 +6310,145 @@ msgstr "Εκτέλεση Everything"
 msgid "Everything Settings"
 msgstr "Ρυθμίσεις Everything"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Διαθέσιμα πρόσθετα"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Μετακίνηση Επάνω"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: src/modules/everything/evry_config.c:393
-#, fuzzy
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
-msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84α Î¼ÎµÎ½Î¿Ï\8d"
+msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84ο Î¼ÎµÎ½Î¿Ï\8d \"Î\8cλα\""
 
-#: src/modules/everything/evry_config.c:399
-#, fuzzy
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
-msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84α Î¼ÎµÎ½Î¿Ï\8d"
+msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84ο ÎºÎ¿Ï\81Ï\85Ï\86αίο ÎµÏ\80ίÏ\80εδο"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
-#, fuzzy
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Προβολή πρόσθετων"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Λεπτομερές"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Προκαθορισμένη προβολή"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Κινούμενη κύληση"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Απόκρυψη λίστας"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Γρήγορη πλοήγηση"
 
-#: src/modules/everything/evry_config.c:484
+#: 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)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Στυλ Vi (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Προκαθορισμένη προβολή"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Κινούμενη κύληση"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Ταξινομεί"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Ταξινομεί"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "κατά χρήση"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Τα πιο χρησιμοποιούμενα"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Πρόσφατα χρησιμοποιημένα"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Πρόσθετα θέματος"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Πρόσθετα ενέργειας"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Πρόσθετα αντικειμένου"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: src/modules/everything/evry_config.c:552
-#, fuzzy
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
-msgstr "Î¥Ï\80ενθÏ\8dμηÏ\83η"
+msgstr "Î\9cέγεθοÏ\82 Ï\85Ï\80ενθÏ\8dμηÏ\83ηÏ\82"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
-#, fuzzy
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
-msgstr "ΤαÏ\87Ï\8dÏ\84ηÏ\84α ειδοποίησης"
+msgstr "ΠλάÏ\84οÏ\82 ειδοποίησης"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
-#, fuzzy
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
-msgstr "Ύψος πλαισίου ειδοποίησης"
+msgstr "Ύψος ειδοποίησης"
 
-#: src/modules/everything/evry_config.c:568
-#, fuzzy
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
-msgstr "ΡÏ\85θμίÏ\83ειÏ\82 Î¬Î¼ÎµÏ\83Ï\89ν ÎµÎ¹Î´Î¿Ï\80οιήÏ\83εÏ\89ν"
+msgstr "ΣÏ\84οίÏ\87ιÏ\83η ÎµÎ¹Î´Î¿Ï\80οίηÏ\83ηÏ\82"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6346,36 +6457,27 @@ msgstr "Ρυθμίσεις άμεσων ειδοποιήσεων"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
-#, fuzzy
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
-msgstr "Υπενθύμηση"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Γεωμετρία"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Συλλογή Everything"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Ενέργειες"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Αντικέιμενα"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Χωρίς φορτωμένα πρόσθετα"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6397,148 +6499,60 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Άνοιγμα με..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Άνοιγμα Αρχείου..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Επεξεργασία εγγραφής εφαρμογής"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Νέα εγγραφή εφαρμογής"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Εκτέλεση με Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Άνοιγμα με..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Άνοιγμα τερματικού εδώ"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Εκτελέσιμο"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Εφαρμογές Everything"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Εντολές"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Εντολή τερματικού"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Διεπαφή του Sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
-#, fuzzy
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
-msgstr "Τα πάντα"
-
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Αριθμομηχανή"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Αντιγραφή στο..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Μετακίνηση στο..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Μετακίνηση στα απορρίματα"
+msgstr "Πρόσθετο για τα πάντα"
 
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Άνοιγμα φακέλου (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Ταξινόμηση κατά ημερομηνία"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Ταξινόμηση κατά όνομα"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Προσωρινά αρχεία"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Αρχεία Everything"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Εμφάνιση πρόσφατων αρχείων"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Αναζήτηση πρόσφατων αρχείων"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Αναζήτηση προσωρινών αρχείων"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Κατάλογοι καθορισμένοι από το χρήστη"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Καθαρισμός προσωρινής μνήμης"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Εμφάνιση διαλόγου"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Εναλλαγή στο παράθυρο"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Εναλλαγή πλήρους οθόνης"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Αποστολή στην επιφάνεια εργασίας"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Εικονίδια αρχείων"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Τύποι αρχείων"
 
@@ -6583,19 +6597,19 @@ msgid "Select an image"
 msgstr "Επιλογή εικόνας"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Διαχειριστής αρχείων"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Αρχικός κατάλογος"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Σύστημα αρχείων"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6606,7 +6620,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6616,7 +6630,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Ρυθμίσεις Fileman ανανεώθηκαν"
 
@@ -6691,99 +6705,102 @@ msgid "Open filemanager on mount"
 msgstr "Άνοιγμα διαχειριστή αρχείων κατά την προσάρτηση"
 
 #: src/modules/fileman/e_mod_config.c:295
-#, fuzzy
 msgid "Device"
-msgstr "ΠÏ\81οεÏ\80ιÏ\83κÏ\8cÏ\80ηÏ\83η"
+msgstr "ΣÏ\85Ï\83κεÏ\85ή"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Στον γονικό κατάλογο"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Άλλη εφαρμογή..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Άνοιγμα με..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Γνωστές εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Καθορισμένες εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Όλες οι εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Προσαρμοσμένη εντολή"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Η αντιγραφή ακυρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Η μετακίνηση ακυρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Η διαγραφή ακυρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Η αντιγραφή του %s ολοκληρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Αντιγραφή του %s (ΕΤΑ: %d δευτ.)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Η μετακίνηση του %s ολοκληρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Μετακίνηση %s (ΕΤΑ: %d δευτ.)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Διαγραφή ολοκληρώθηκε"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Διαγραφή αρχείων..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6818,7 +6835,7 @@ msgstr "Επεξεργασία %d επέμβασης/ων"
 msgid "Filemanager is idle"
 msgstr "Ο διαχειριστής αρχείων είναι"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Πληροφορίες λειτουργίας του EFM"
 
@@ -6830,35 +6847,39 @@ msgstr "Διαχειριστής συστατικών"
 msgid "Available Gadgets"
 msgstr "Διαθέσιμα συστατικά"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Λειτουργία"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Προσαρμοσμένη εικόνα"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Προσαρμοσμένο χρώμα"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Διαφάνεια"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Κινούμενα γραφικά"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Φόντο"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Επιλογές ταπετσαρίας"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Ελεύθερο"
@@ -6943,7 +6964,6 @@ msgid "Scroll Animation"
 msgstr "Κίνηση κύλισης"
 
 #: src/modules/winlist/e_int_config_winlist.c:247
-#, fuzzy
 msgid "Scroll speed"
 msgstr "Ταχύτητα κύλισης"
 
@@ -7090,15 +7110,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Θέλετε να διαγράψετε αυτή την πηγή μπάρας?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Δημιουργία νέου εικονιδίου"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Ιδιότητες"
 
@@ -7142,7 +7162,7 @@ msgstr "Εμφάνιση παραθύρων από όλες τις επιφάν
 msgid "Show windows from active desktop"
 msgstr "Εμφάνιση παραθύρων από την ενεργή επιφάνεια εργασίας"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7263,33 +7283,33 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Εμφάνιση ειδοποίησης του διαχειριστή επιφανειών"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Ταχύτητα ειδοποίησης"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7309,128 +7329,91 @@ msgstr "Χειρισμοί συστήματος"
 msgid "Temperature Settings"
 msgstr "Ρυθμίσεις θερμοκρασίας"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Αισθητήρες"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Κελσίου"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Φαρενάιτ"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Εμφάνιση μονάδων"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Χρονικό διάστημα ελέγχου"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Υψηλή θερμοκρασία"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Χαμηλή θερμοκρασία"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Θερμοκρασίες"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Θερμοκρασία"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Επόμενο"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Καλώς ορίσατε στο Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Επιλογή ενός"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Μενού επιλογής εφαρμογής"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Μπάρα εκκίνησης"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Επιλογή εφαρμογών"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Αρχεία επιφάνειας εργασίας"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Χωρίς εικονίδια στην επιφάνεια εργασίας"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Ενεργοποίηση εικονιδίων επιφάνειας εργασίας"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Λειτουργία εστίασης"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Κλικ για εστίαση παραθύρων"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Εστίαση απλά με μετακίνηση του ποντικιού"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Επιλογή εικονιδίων για προσθήκη"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Επιλογή ενός προφίλ"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Γρήγορη εκκίνηση"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Επιλογή εφαρμογών"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Ποντίκι"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7472,7 +7455,7 @@ msgstr "Αριστερά"
 msgid "Right:"
 msgstr "Δεξιά:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Σίγαση"
 
@@ -7496,38 +7479,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Κάρτες ήχου"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Ρυθμίσεις μείκτη"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Μείκτης προς χρήση καθολικών ενεργειών:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Εκτέλεση μείκτη..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Ρυθμίσεις αρθρώματος μείκτη"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Αλλαγή ανάλυσης"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Ρυθμίσεις μείκτη ανανεώθηκαν"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Ρυθμίσεις αρθρώματος μείκτη"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "Ο ConnMan daemon δεν εκτελείται."
 
@@ -7556,123 +7555,303 @@ msgstr "Εμφάνιση κωδικής φράσης ως καθαρό κείμ
 msgid "Ok"
 msgstr "Οκ"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Αποσύνδεση από την υπηρεσία δικτύου."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Η υπηρεσία δεν υπάρχει πλέον"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Σύνδεση σε υπηρεσία δικτύου."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Αδύνατος ο ορισμός κωδικής φράσης για την υπηρεσία"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Λειτουργία εκτός σύνδεσης"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Έλεγχοι"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Χωρίς ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Δεν βρέθηκε εξυπηρετητής ConnMan."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Χωρίς σύνδεση"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Αποσυνδεμένο"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "αποσύνδεση"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Άγνωστο όνομα"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Χωρίς σφάλμα"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "αδρανές"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "συσχετισμός"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "ρύθμιση"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "έτοιμο"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "είσοδος"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "online"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "αποτυχία"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
-msgstr "Î\95νεργοποιημένο"
+msgstr "ενεργοποιημένο"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "διαθέσιμο"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
-msgstr "Συνδεμένο"
+msgstr "συνδεδεμένο"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
-msgstr "Î\95κτός σύνδεσης"
+msgstr "εκτός σύνδεσης"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Υπάρχει άλλο πλαίσιο συστήματος"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Μπορεί να υπάρχει μόνο ένα πλαίσιο συστήματος και έχετε ένα ήδη."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Πλαίσιο συστήματος"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Πλαίσιο συστήματος"
 
-#, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα θεμάτων του."
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Εξασθένηση φωτεινότητας"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Ενίσχυση φωτεινότητας"
+
+#~ msgid "Resizeable"
+#~ msgstr "Αλλαγή μεγέθους"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Το Enlightenment δεν μπορεί να εκκινήσει το σύστημα αρχείων.\n"
+#~ "Πιθανόν να μην έχετε αρκετή μνήμη;"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Το Enlightenment δεν μπορεί να εκκινήσει το IPC system.\n"
+#~ "Πιθανόν να μην έχετε αρκετή μνήμη;"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Το Enlightenment δεν μπορεί να ρυθμίσει το randr.\n"
+#~ "Αυτό δεν θα έπρεπε να συμβαίνει."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Το Enlightenment δεν μπορεί να εκκινήσει το Evas system.\n"
+#~ "Πιθανόν να μην έχετε αρκετή μνήμη;"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Το Enlightenment δεν μπορεί να ρυθμίσει την init οθόνη.\n"
+#~ "Πιθανόν να μην έχετε αρκετή μνήμη;"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Έλεγχος υποστήριξης SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Ρύθμιση FM"
+
+#~ msgid "New Application"
+#~ msgstr "Νέα εφαρμογή"
+
+#~ msgid "Background panning"
+#~ msgstr "Αλλαγή ταπετσαρία"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Παράγοντας μετακίνησης στον άξονα Χ"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Παράγοντας μετακίνησης στον άξονα Υ"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "DPMS (Display Power Management Signaling)"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Ο τρέχων εξυπηρετητής οθόνης δεν έχει <br>δυνατότητες DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Ο τρέχων εξυπηρετητής οθόνης δεν έχει <br>την επέκταση DPMS."
+
+#~ msgid "Actions"
+#~ msgstr "Ενέργειες"
+
+#~ msgid "Open With..."
+#~ msgstr "Άνοιγμα με..."
+
+#~ msgid "Open File..."
+#~ msgstr "Άνοιγμα Αρχείου..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Επεξεργασία εγγραφής εφαρμογής"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Νέα εγγραφή εφαρμογής"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Εκτέλεση με Sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Άνοιγμα τερματικού εδώ"
+
+#~ msgid "Run Executable"
+#~ msgstr "Έναρξη εκτελέσιμου"
+
+#~ msgid "Calculator"
+#~ msgstr "Αριθμομηχανή"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Αντιγραφή στο..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Μετακίνηση στο..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Μετακίνηση στα απορρίματα"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Άνοιγμα φακέλου (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Ταξινόμηση κατά ημερομηνία"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Ταξινόμηση κατά όνομα"
+
+#~ msgid "Recent Files"
+#~ msgstr "Προσωρινά αρχεία"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Εμφάνιση διαλόγου"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Εναλλαγή στο παράθυρο"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Εναλλαγή πλήρους οθόνης"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Αποστολή στην επιφάνεια εργασίας"
+
+#~ msgid "Select application menu"
+#~ msgstr "Μενού επιλογής εφαρμογής"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Μπάρα εκκίνησης"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Χωρίς εικονίδια στην επιφάνεια εργασίας"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Ενεργοποίηση εικονιδίων επιφάνειας εργασίας"
+
+#~ msgid "Focus mode"
+#~ msgstr "Λειτουργία εστίασης"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Κλικ για εστίαση παραθύρων"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Εστίαση απλά με μετακίνηση του ποντικιού"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Επιλογή εικονιδίων για προσθήκη"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Γρήγορη εκκίνηση"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Οι ρυθμίσεις του αρθρώματος μίκτη έχουν αλλάξει.<br>Οι παλίες σας "
+#~ "ρυθμίσεις έχουν αντικαταστάθει με τις καινούργιες προκαθορισμένες."
+#~ "<br>Συγνώμη για την ταλαιπωρία."
 
 #~ msgid "Add Application..."
 #~ msgstr "Προσθήκη εφαρμογής..."
@@ -8195,12 +8374,6 @@ msgstr "Πλαίσιο συστήματος"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Άμεση Απενεργοποίηση"
 
-#~ msgid "Shut Down"
-#~ msgstr "Τερματισμός"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Αναστολή στο Δίσκο"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Κλείδωμα Επιφάνειας Εργασίας"
 
index 6f39f8e..a2e2659 100755 (executable)
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-12-06 10:46+0100\n"
 "Last-Translator: Olivier <eliovir@nospam.gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -29,20 +29,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Pri Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Fermi"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -52,14 +51,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Kopirajto &copy; 1999-2009; de la Programada Teamo de Enlightenment."
 "<br><br>Ni esperas ke vi ĝojas uzadon de tiu programaro tiom kiel ni ĝojis "
@@ -71,8 +70,9 @@ msgstr ""
 "estas nekompletaj aŭ eĉ neĉestantaj kaj eble enhavas multajn cimojn. Vi "
 "estas <hilight>AVERTITA!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>La Skipo</title>"
 
 #: src/bin/e_actions.c:365
@@ -90,45 +90,45 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ĉu vi cestas, ke vi deziras mortigi tiun fenestron?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Jes"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Ĉu vi cestas, ke vi deziras eliri ? "
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vi petis eliri na Enlightenment.<br><br>Ĉu vi certas ke vi volas eliri ?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Ĉu vi estas certa, ke vi volas adiaŭi?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Vi baldaŭ adiaŭos.<br><br>Ĉu vi certas ke vi volas agi tiel ?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Ĉu vi cestas, ke vi deziras estingi ? "
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -136,11 +136,11 @@ msgstr ""
 "Vi petis estingi vian komputilon.<br><br>Ĉu vi certas ke vi volas estingi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Ĉu vi cestas, ke vi deziras relanĉi ? "
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -148,18 +148,18 @@ msgstr ""
 "Vi petis relanĉi vian komputilon.<br><br>Ĉu vi certas ke vi volas relanĉi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Vi petis paŭzi vian komputilon.<br><br>Ĉu vi certas ke vi volas paŭzi ?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Ĉu vi cestas, ke vi deziras diskodormi ? "
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -167,551 +167,574 @@ msgstr ""
 "Vi petis diskodormi vian komputilon.<br><br>Ĉu vi certas ke vi volas dormigi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fenestro : Agoj"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Movi"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Regrandigi"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menuo"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Fenestra Menuo"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Plialtigi"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Malplialtigi"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Mortigi"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fenestro : stato"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Inversigi Fiksan Modon"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Inversigi Piktograman Modon"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Inversigi Plenekranan Modon"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimumigi Vertikale"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimumigi Horizontale"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maksimumigi Plenekrane"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimumiga Modo \"Inteligenta\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimumiga Modo \"Ekspansia\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimumiga Modo \"Pleniga\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Baskulo de Subvolva Modo"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Baskulo de Suprvolva Modo"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Baskulo de Maldesktrvolva Modo"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Baskulo de Dekstrvolva Modo"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Inversigo de Ombriga Modo"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Inversigi Senrandan Staton"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Rando"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Inversigi Pinglatan Staton"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Labortablo"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Labortabla Ŝango al maldekstro"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Labortabla Ŝango al dekstro"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Labortabla Ŝango al supro"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Labortabla Ŝango al subo"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Labortabla Ŝango Laŭ..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Vidigi la Labortablon"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Vidigi la breton"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Labortabla Ŝango por..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Labortabla Ŝango Linie..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "InterŜanĝi kun la 0-a Labortablo"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "InterŜanĝi kun 1-a Labortablo"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "InterŜanĝi kun 2-a Labortablo"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "InterŜanĝi kun 3-a Labortablo"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "InterŜanĝi kun 4-a Labortablo"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "InterŜanĝi kun 5-a Labortablo"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "InterŜanĝi kun 6-a Labortablo"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "InterŜanĝi kun 7-a Labortablo"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "InterŜanĝi kun 8-a Labortablo"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "InterŜanĝi kun 9-a Labortablo"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "InterŜanĝi kun 10-a Labortablo"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "InterŜanĝi kun 11-a Labortablo"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "InterŜanĝi kun la Labortablo..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Labortabla Ŝango al maldekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Labortabla Ŝango al dekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Labortabla Ŝango al supro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Labortabla Ŝango al subo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Labortabla Ŝango Laŭ...(Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Labortabla Ŝango por... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Labortabla Ŝango Linie... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Labortabla Ŝango direkcien..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "InterŜanĝi kun la 0-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "InterŜanĝi kun 1-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "InterŜanĝi kun 2-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "InterŜanĝi kun 3-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "InterŜanĝi kun 4-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "InterŜanĝi kun 5-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "InterŜanĝi kun 6-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "InterŜanĝi kun 7-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "InterŜanĝi kun 8-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "InterŜanĝi kun 9-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "InterŜanĝi kun 10-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "InterŜanĝi kun 11-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "InterŜanĝi kun la Labortablo... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ekrano"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Sendi Muson al 0-a Ekrano"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Sendi Muson al 1-a Ekrano"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Sendi Muson al Ekrano..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Sendi Muson ĝis la proksima ekrano"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Sendi muson ĝis la antaŭa ekrano"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Sendi muson ĝis la antaŭa/proksima ekranoj..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Mova Teksto"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Pli..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Pli..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Regrandigi laŭ:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Labortabla Ŝango direkcien..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Krei Piktogramon"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fenestro : Movado"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Ĝis Sekvonta Labortablo"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Ĝis Antaŭa Labortablo"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Laŭ Labortablo #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Al Labortablo..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Montri ĉefMenuon"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Montri Preferatajn Menuon"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Vidigi \"Ĉiuj Aplikaĵoj\" Menuon"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Vidigi Klientan Menuon"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Vidigi Menuon..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lanĉi"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Eliri"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Eliri nun"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Reĝimo"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Inversigi la prezentan reĝimon"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Inversigi la senkonektan reĝimon"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistemo"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Elsaluti"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Kurentmalŝalti nun"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Kurentmalŝalti"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Paŭzi"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Paŭzi"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Diskodormi"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Ŝlosi"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Purigi Fenestrojn"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Ĝeneraĵoj : Agoj"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Malfruata agado"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Ago"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Tiu Ekrano"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Tiu Ekrano"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Difini kiel Tapeton"
 
@@ -719,18 +742,16 @@ msgstr "Difini kiel Tapeton"
 msgid "Color Selector"
 msgstr "Koloro-elektilo"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -738,20 +759,20 @@ msgstr "Koloro-elektilo"
 msgid "OK"
 msgstr "Konfirmi"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -769,7 +790,7 @@ msgstr ""
 "fiksos<br>tion aldonante ĝin en. Vi povas agordi de nove aferojn aktuale laŭ "
 "via<br>ŝato. Pardonon pro la momenta problemeto en via agordo.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -783,11 +804,11 @@ msgstr ""
 "estas malbone kaj<br>kiel antaŭzorgo via agordo estis restaŭrita per "
 "defaŭltoj.<br>Bonvolu pardoni por la ĝeno.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemoj de skribo de Enlightenment-agordo"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -795,96 +816,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Ĝisdatiĝis agordoj"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Diskdormigo de via sistemo malsukcesis."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Neniu Fenestro)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Diskodormigo malsukcesis."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Diskodormigo malsukcesis."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Bonvenon en Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -896,55 +917,60 @@ msgstr ""
 "estis:<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti difektadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Plidetale"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Baze"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Apliki"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Etendiloj"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduloj"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Piktograma Prefero"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Ujo %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Eraro - neniu subteno de PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "Neniu subteno de PAM estis konstruita en Enlightement, "
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Ŝloso Malsukcesis"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -952,15 +978,15 @@ msgstr ""
 "Labortabla Ŝloso malsukcesis ĉar kelka aplikaĵo ekkaptis<br>aŭ la klavaron "
 "aŭ la muson aŭ ambaŭ<br>kaj ĝia ekkapto ne eblas rompiĝi."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Bonvolu entajpi vian malŝlosan pasvorton"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Eraro de la Aŭtentiga Sistemo"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -971,11 +997,11 @@ msgstr ""
 "sesion. La erara kodo estis <hilight>%i</hilight>.<br>Tio estas malbone kaj "
 "ne devus okazi. Bonvolu raporti tiun cimon."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Ebligi la prezentan reĝimon"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -985,11 +1011,11 @@ msgstr ""
 "<b>prezentan reĝimon</b> kaj dumtempe malebligi la ekrankurtenon, ŝlosilon "
 "kaj energiŝparadon?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, sed pligrandigi la tempolimon"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne, kaj ĉesi tiun peton"
 
@@ -1016,106 +1042,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Redaktilo de Labortabla Enigo"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nomo"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komento"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Ĝenerala Nomo"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Fenestra Klaso"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorioj"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "MIME-typoj"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Labortabla dosiero"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Ĝenerala"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Atentigo de Lanĉo"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Lanĉi en Terminalon"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Vidigi en Menuoj"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opcioj"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Elekti Piktogramon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Elekti Lanĉeblon"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Forviŝi"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Eltondi"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopii"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Alglui"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Elekti Ĉion"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1155,317 +1180,317 @@ msgstr ""
 "Enlightenment ne povas lanĉi tiun aplikaĵon :<br><br>%s><br><br>La aplikaĵo "
 "malsukcesis komenci."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Eraro dum lanĉo de Aplikaĵo"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s haltis ruladon senatendite."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Elirsignala kodo %i sendita el %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s interrompiĝis per InterrompSignalo."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s interrompiĝis per ElirSignalo."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s interrompiĝis per ĉesigSignalo."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s interrompiĝis per glitpunkta eraro."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s interrompiĝis per Neinterrompebla Mortiga Signalo"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s interrompiĝis per Segmenta Misfunkcio."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s interrompiĝis per Rompita Dukto."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s interrompiĝis per FiniĝSignalo."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s interrompiĝis per Busa Eraro."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s interrompiĝis per Signala Numero %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "*** la restanta eligo estis distranĉita. Registru la eligon por vidi.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Eraraj Protokoloj"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Nenio erara mesaĝo ĉeestas."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Konservi Tiun Mesaĝon"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "La erara protokolo estos registrata kiel %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Erara Informaĵo"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Erara Signala informaĵo"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Eligitaj Datumoj"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Neniu eligo ĉeestas"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Neekzistanta vojo"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s ne ekzistas."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Eraro de surmeto"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Ne eblas surmunti aparaton"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Eraro de demunto"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Ne eblas demunti aparaton"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Eraro de elĵeto"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Ne eblas elĵeti aparaton"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosieroj"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Ligo"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Ĉesigi"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Heredas gepatrajn agordojn"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Vidiga Modo"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Refreŝigi Rigardon"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Vidigi Kaŝitajn Dosierojn"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Memorigi Ordon"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Tuj Ordigi"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nova Dosierujo"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renomi"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Demunti"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Surmunti"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Elĵeti"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Uzi donitan piktogramon de la aplikaĵo"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Dosieraj Ecoj"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Uzi defaŭltaĵon"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Kradaj Piktogramoj"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Piktogramaj Difinitaj de uzanto"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Listo"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Piktograma grandeco (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Difini tapeton..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Difini kovron..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Forviŝi"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Krei novan dosierujon"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nova Nomo de Dosierujo:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomi %s al:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renomi Dosieron"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Reprovi"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Eraro"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ne por ĉiuj"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Jes por ĉiuj"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Averto"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 "La dosiero jam ekzistas. Ĉu vi volas anstataŭigi ĝin?<br><hilight>%s</"
 "hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Malatenti tiun ĉi"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Malatenti ĉiujn"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Eraro okazis dum efektivado de funkciado.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Konfirmi Forviŝon"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ĉu vi certas ke vi deziras forviŝi<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1499,12 +1524,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nekonata Datumportilo"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Demetebla Aparato"
 
@@ -1512,7 +1537,7 @@ msgstr "Demetebla Aparato"
 msgid "File:"
 msgstr "Dosiero:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Grando:"
 
@@ -1528,7 +1553,7 @@ msgstr "Dosiera Typo:"
 msgid "Permissions"
 msgstr "Permesoj"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Proprietulo :"
 
@@ -1548,17 +1573,17 @@ msgstr "Proprietulo povas legi"
 msgid "Owner can write"
 msgstr "Proprietulo povas skribi"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Antaŭvido"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Defaŭlta"
 
@@ -1567,7 +1592,7 @@ msgid "Thumbnail"
 msgstr "Bildeto"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Difinita de uzanto"
 
@@ -1583,53 +1608,42 @@ msgstr "Ligila Informaĵo"
 msgid "Select an Image"
 msgstr "Elekti bildon"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Mova Teksto"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Komenci movon/regrandigon de ĉi tiun vanaĵon"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Regrandigi"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Aŭtomate rulumi enhavojn"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Plata"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Eniga"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Aspekto"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Forviŝi"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Ĉesi movon/regrandigon ĉi tiun vanaĵon"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1677,14 +1691,14 @@ msgstr "Pozicio"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Grando"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Stako"
@@ -1736,163 +1750,169 @@ msgstr "Elsaluti kun tiu fenestra malfermo"
 msgid "Remember these Locks"
 msgstr "Memori tiujn ŝlosojn"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Fenestroj"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Ĉiam Supre"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Glugita"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Agordoj"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Plenekrana"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Grandegigi vertikale"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Grandegigi horizontale"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Malgrandegigi"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Redakti Piktogramon"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Krei Piktogramon"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Aldoni al Preferata Menuo"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Aldoni al Preferata Menuo"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Fulmoklavo"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Inteligenta Lokado"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Preterpasi"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Rando"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "ŝlosoj"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Memori"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Glugita"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Preterpasi"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Bildsimboligi"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Volvita"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Ekrano"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Ĉiam Supre"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normala"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Ĉiam Malsupre"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Pingli sur la Labortablo"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Malpingli de la Labortablo"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Elekti Randan Stilon"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Uzi la defauxltan piktograman agordon"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Uzi donitan piktogramon de la aplikaĵo"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Uzi Piktogramon Definitan de Uzanto"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Rezisto"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Fenestrolisto"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Vokilo"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Taskopleto"
 
@@ -1913,7 +1933,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM Ecoj"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titolo"
 
@@ -2085,7 +2105,6 @@ msgid "Size, Position and Locks"
 msgstr "Grandeco, Pozicio kaj ŝlosoj"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Permesi"
@@ -2163,15 +2182,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Dosieroj"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Lanĉi"
@@ -2186,20 +2203,6 @@ msgstr "Kerno"
 msgid "Mobile"
 msgstr "Moduloj"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Agordoj"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modulaj Agordoj"
@@ -2240,7 +2243,7 @@ msgstr "Aldunu Vanaĵon"
 msgid "Remove Gadget"
 msgstr "Forviŝi Vanaĵon"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Agordoj de ilbreto"
 
@@ -2248,11 +2251,11 @@ msgstr "Agordoj de ilbreto"
 msgid "Layout"
 msgstr "Aranĝo"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Tajpo-Metoda Eraro"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2268,7 +2271,7 @@ msgstr "Ĉefa"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Preferataj Aplikaĵoj"
 
@@ -2276,76 +2279,74 @@ msgstr "Preferataj Aplikaĵoj"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Fenestroj"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Mislokitaj fenestroj"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Pri"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Etoso"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuala"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Bretoj"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Montri/Kaŝi ĉiujn Fenestrojn"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Neniu aplikaĵo)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Difini virtualajn labortablojn"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Neniu Fenestro)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Neniu nomo!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Neniu Breto)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Aldoni Breton"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Forviŝi Breton"
 
@@ -2381,7 +2382,7 @@ msgid "Shrink to Content Width"
 msgstr "Ŝrumpi al Enhava Grandeco"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stilo"
 
@@ -2411,7 +2412,7 @@ msgid "Hide duration"
 msgstr "Kaŝi daŭron"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekundoj"
@@ -2428,7 +2429,7 @@ msgstr "Vidigi en ĉiuj Labortabloj"
 msgid "Show on specified Desktops"
 msgstr "Vidigi en elektitaj Labortabloj"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2445,7 +2446,7 @@ msgstr ""
 "kaj neniu alia) aŭ ne estas posedata de vi. Bonvolu \n"
 "kontroli: %s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2458,77 +2459,22 @@ msgstr ""
 "Bonvolu kontroli\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Opcioj:\n"
-"\t-display EKRANO\n"
-"\t\tKonekti al la ekrano nomata EKRANO.\n"
-"\t\tEkz.: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAldoni FALSAN xinerama-ekranon (anstataŭe de la veraj)\n"
-"\t\tlaŭ la geometrio. Aldonu tiom kom vi volas. Ili ĉiuj\n"
-"\t\tanstataŭigas la verajn xinerama-ekranojn, se pluraj.\n"
-"\t\tTio povas esti uzita por simuli xinerama.\n"
-"\t\tEkz.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile AGORDA_PROFILO\n"
-"\t\tUzi la agordan profilon AGORDA_PROFILO anstataŭ la elektita defaŭlta "
-"aŭnur \"default\".\n"
-"\t-good\n"
-"\t\tEstu bone.\n"
-"\t-evil\n"
-"\t\tEstu malbone.\n"
-"\t-psychotic\n"
-"\t\tEstu psikoza.\n"
-"\t-locked\n"
-"\t\tStarti kun la labortablo ŝlosita, tiel pasvorto estos petata.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\t(Mi ja scias kion mi farantas kaj akcesptas plenan respondecon por tio)\n"
-"\t\tSe vi bezonas tiun helpon, vi ne bezonas tiun opction.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenement ne eblas pravalorizi Ecore !\n"
-"Eble memoro ne sufiĉas ?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenement ne eblas pravalorizi dosiersistemon !\n"
-"Eble memoro ne sufiĉas ?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2536,7 +2482,7 @@ msgstr ""
 "Enlightenment ne eblas difini foriran signaltraktilon.\n"
 "Eble memoro ne sufiĉas ?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2544,7 +2490,7 @@ msgstr ""
 "Enlightenment ne eblas difini HUP signaltraktilon.\n"
 "Eble memoro ne sufiĉas ?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2553,64 +2499,37 @@ msgstr ""
 "Enlightenment ne eblas difini HUP signaltraktilon.\n"
 "Eble memoro ne sufiĉas ?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlienghtenment ne povas difini sia X-konektado.\n"
-"Ĉu vi difinis vian variablon DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlienghtenment ne povas difini sian averto-sistemon.\n"
-"Ĉu vi difinis vian variablon DISPLAY?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne eblas difini sistemon de konektado.\n"
-"Eble memoro ne sufiĉas ?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne eblas difini IPC sistemon.\n"
-"Eble memoro ne sufiĉas ?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne povas difini la fluon de xinerama.\n"
-"Tio ne devus okazi."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne povas difini la fluon de xinerama.\n"
-"Tio ne devus okazi."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne eblas difini \"Evas\" sistemon.\n"
-"Eble memoro ne sufiĉas ?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2620,7 +2539,7 @@ msgstr ""
 "Evas. Bonvolu kontroli vian instalon de Evas kaj Ecore kaj kontroli\n"
 "ke ili eltenas la modulo de bildigo de X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2630,7 +2549,35 @@ msgstr ""
 "Evas. Bonvolu kontroli vian instalon de Evas kaj Ecore kaj kontroli\n"
 "ke ili eltenas la modulo de bildigo de Software Buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlienghtenment ne povas difini sian averto-sistemon.\n"
+"Ĉu vi difinis vian variablon DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2638,23 +2585,29 @@ msgstr ""
 "Enlightenment ne eblas krei dosierujojn en via hejma dosierujo.\n"
 "Eble vi ne havas hejman dosierujon aŭ via disko estas plena ?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ne povas difini ĝian dosier-registrejan sistemon."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ne povas difini sian agordan sistemon."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ne povas difini sian etosan sistemon."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment ne eblas difini sian skalan sistemon."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment ne povas difini sian referencan sistemon."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2662,93 +2615,42 @@ msgstr ""
 "Enlightenment ne eblas difini vojojn por trovi dosierojn.\n"
 "Eble memoro ne sufiĉas?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ne povas difini sian tiparan sistemon."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ne povas difini sian etosan sistemon."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne eblas difini komencan ekranon.\n"
-"Eble memoro ne sufiĉas?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment ne povas difini sian \"intl\"-sistemon."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Komencante eltenon de internaciigo"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne povas difini sian \"intl\"-sistemon."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ne eblas difini la FDO labortablan sistemon.\n"
 "Eble memoro ne sufiĉas ?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Provado de elteno de formato"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Laŭ Enlightenment, Evas ne povas krei bufro-areaĵon. Bonvolu kontroli\n"
-"ke Evas enhavas eltenon de programa bufrilo-modulo.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Laŭ Enlightenment, Evas ne povas ŝargi la PNG-dosierojn.\n"
-"Kontrolu ke Evas enhavas eltenon de PNG-ŝargilo.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Laŭ Enlightenment, Evas ne povas ŝargi JPEG-dosierojn.\n"
-"Kontrolu ke Evas enhavas eltenon de JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Laŭ Enlightenment, Evas ne povas ŝargi EET-dosierojn.\n"
-"Kontrolu ke Evas enhavas eltenon de EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Laŭ Enlightenment, Evas ne povas ŝargi la tiparon 'Sans'. Bonvolu kontroli "
-"ĉu Evas eltenas \"fontconfig\"\n"
-"kaj la sistema \"fontconfig\" difinas iun tiparon 'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Agordi Ekranojn"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2757,211 +2659,373 @@ msgstr ""
 "de\n"
 "via sistemo malsukcesis. Eble alia fenestradministrilo funkcias?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Agordi Bindojn"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ne povas difini la DPMS-agordojn."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne povas difini la DPMS-agordojn."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Ebligi ekrankurtenon"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne povas agordi la ekrankurtenon."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Agordi la energiŝparajn reĝimojn"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ne povas difini siajn energiŝparajn reĝimojn."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Agodi Labortablan Ŝloson"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ne povas difini sian sistemon de ekran-ŝloso."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Agordi Ŝprucfenestrojn"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne povas difini sian spruĉajan sistemon."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Agordi Mesaĝan Sistemon"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Agordado de Vojoj"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Agordi Sistemajn Kontrolojn"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne eblas difini sisteman komandan sistemon.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Agordi Agadojn"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne povas difini sian agadan sistemon."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Agordi la sistemon de lanĉo"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne povas difini sian lanĉeblan sistemon."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Agordi FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Administrilo"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Agordi Mesaĝan Sistemon"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne povas difini sian \"msg\"-sistemon."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Agordi Ŝovon kaj Demeton"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne povas difini sian \"dnd\"-sistemon."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Agordi traktadon de enigo-aparato"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment ne povas difini sian sistemon de kapto de enigo."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Agordi Modulojn"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne povas difini sian sistemon de moduloj."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Agordi Memorojn"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ne povas difini memorigajn agordojn."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Agordi Kolorajn Klasojn"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne povas difini sian sistemon de koloro-klasoj."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Elekti Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ne povas difini sian sistemon de kontrolo de vanaĵoj."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ne povas difini la DPMS-agordojn."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Agordi la energiŝparajn reĝimojn"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ne povas difini siajn energiŝparajn reĝimojn."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Agordi Tapeton"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne povas difini sian tapetan sistemon."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Agordi Muson"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne povas difini la agordojn de muso."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Agordi Bindojn"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne povas difini sian bindan sistemon."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Agordi Bretojn"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ne eblas difini sian bretan sistemon."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Agordi Bildetilo"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne povas eki la Miniaturon sistemon.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment ne eblas difini sisteman komandan sistemon.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ne povas eki la Miniaturon sistemon.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ne povas difini sian etosan sistemon."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Agordi la ordigadon de dosieroj"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne povas difini sian sistemon de dosiera ordigo."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Ŝargi Modulojn"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Agordi Bretojn"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Preskaŭ Finita"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Opcioj:\n"
+"\t-display EKRANO\n"
+"\t\tKonekti al la ekrano nomata EKRANO.\n"
+"\t\tEkz.: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAldoni FALSAN xinerama-ekranon (anstataŭe de la veraj)\n"
+"\t\tlaŭ la geometrio. Aldonu tiom kom vi volas. Ili ĉiuj\n"
+"\t\tanstataŭigas la verajn xinerama-ekranojn, se pluraj.\n"
+"\t\tTio povas esti uzita por simuli xinerama.\n"
+"\t\tEkz.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile AGORDA_PROFILO\n"
+"\t\tUzi la agordan profilon AGORDA_PROFILO anstataŭ la elektita defaŭlta "
+"aŭnur \"default\".\n"
+"\t-good\n"
+"\t\tEstu bone.\n"
+"\t-evil\n"
+"\t\tEstu malbone.\n"
+"\t-psychotic\n"
+"\t\tEstu psikoza.\n"
+"\t-locked\n"
+"\t\tStarti kun la labortablo ŝlosita, tiel pasvorto estos petata.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\t(Mi ja scias kion mi farantas kaj akcesptas plenan respondecon por tio)\n"
+"\t\tSe vi bezonas tiun helpon, vi ne bezonas tiun opction.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Provado de elteno de formato"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas krei bufro-areaĵon. Bonvolu kontroli\n"
+"ke Evas enhavas eltenon de programa bufrilo-modulo.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi la PNG-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de PNG-ŝargilo.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi JPEG-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi la PNG-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de PNG-ŝargilo.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi EET-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi la tiparon 'Sans'. Bonvolu kontroli "
+"ĉu Evas eltenas \"fontconfig\"\n"
+"kaj la sistema \"fontconfig\" difinas iun tiparon 'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment fuŝis frue dum komenco kaj restartiĝis."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2969,7 +3033,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2981,7 +3045,7 @@ msgstr ""
 "de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
 "nove."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2993,20 +3057,12 @@ msgstr ""
 "de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
 "nove."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Agordi Bretojn"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Preskaŭ Finita"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Ŝargi Modulojn"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3015,11 +3071,11 @@ msgstr ""
 "Okazis eraro dum ŝarĝo de la modulo %s<br>Neniu modulo nomata %s povas esti "
 "trovita en la<br>dosierujoj de modula serĉo.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Eraro dum ŝarĝo de Modulo"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3028,11 +3084,11 @@ msgstr ""
 "Okazis eraro dum ŝargo de modulo nomata:%s<br>La plena vojo de tiu modulo "
 "estas:<br>%s<br>La eraro raportata estis:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modulo ne enhavas ĉiujn bezonatajn funkciojn"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3043,16 +3099,16 @@ msgstr ""
 "minimumeversion de modulo-API %i.<br>La modulo-API bezonata de Enlightenment "
 "estas: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment-a \"%s\" Modulo"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "ĉu vi volas malŝarĝi tiun modulon ?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3066,29 +3122,29 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Breto numero"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ĉu vi estas certa, ke vi deziras forviŝi tiun breton ?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "Vi petis foriviŝi tiun breton.<br><br>Ĉu vi certas ke vi volas foriviŝi ĝin ?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Halti Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Komenci Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Komento"
@@ -3097,16 +3153,16 @@ msgstr "Komento"
 msgid "Starting"
 msgstr "Komencante"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Kontrolado de sistemaj permesoj"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Kontrolo de sistemo finita."
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3116,42 +3172,42 @@ msgstr ""
 "Elsaluto daŭras tro longtempe. Kelkaj<br>aplikaĵoj rifuzas fermi.<br>Ĉu vi "
 "volas fini la elsaluton<br>iel sen fermi tiujn ĉi<br>aplikaĵojn unue ?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Elsalutaj malfacilecoj"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Elsaluti nun"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Atendu pli longtempe"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Rezigni Elsaluton"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Elsalutante"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Elsalutante.<br><hilight>Bonvolu atendi.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment estas okupata de alia peto"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "Elsalutante.<br>Vi ne povas plenumi aliajn sistemajn agojn ĝis tio finiĝos."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3159,7 +3215,7 @@ msgstr ""
 "Kurentmalŝaltante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
 "agadojn<br>antaŭ estingo ekis."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3167,7 +3223,7 @@ msgstr ""
 "Restartigante.<br>Vi ne povas fari aliajn sistemajn agadoj<br>antaŭ la "
 "relanĉo ekos."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3175,63 +3231,64 @@ msgstr ""
 "Sistempaŭzigante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
 "agadoj<br>antaŭ la paŭzigo ekos."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Diskdormigante.<br>Vi ne povas plenumi aliajn sistemajn agojn<br>ĝis tio "
 "finiĝos."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "HUJ! Tio ne devus okazi"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "La kurentmalŝalto malsukcesis."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "La restartigo malsukcesis."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Diskodormigo malsukcesis."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Diskdormigo de via sistemo malsukcesis."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Kurentmalŝalti"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kurentmalŝalto.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Restartigante"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Restartigante.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Dormigante"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Dormigante.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Diskdormigante"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Diskdormigante.<br><hilight>Bonvolu atendi.</hilight>"
 
@@ -3239,33 +3296,33 @@ msgstr "Diskdormigante.<br><hilight>Bonvolu atendi.</hilight>"
 msgid "About Theme"
 msgstr "Pri tiu etoso"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Difini kiel Etoson"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Halti Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Komenci Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Difini la ilobretan enhavon"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment ne povis forki idan procezo:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Ne eblas foriri - nemortigitaj fenestroj."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3275,125 +3332,125 @@ msgstr ""
 "Enlightenment ne permesos sin ĉesigi ĝis tiujn fenestoj<br>estos fermitaj aŭ "
 "kies la ŝlosilo foriĝis.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Je futuro"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Je lasta minuto"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "Antaŭ %li Jaroj"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "Antaŭ %li Monatoj"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Antaŭ %li Semajnoj"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "Antaŭ %li Tagoj"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "Antaŭ %li Horoj"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Antaŭ %li minutoj"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Paĝilaj Agordoj"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Eluzi..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Plenigi kaj Streĉi Opcioj"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Streĉi"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrigi"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Ene de"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Plenigi"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Dosiera Kvalito"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Uzi originan dosieron"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3413,12 +3470,12 @@ msgstr ""
 "aktuale laŭ via<br>ŝato. Pardonon pro la momenta problemeto en via agordo."
 "<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "(Neniu informo)"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3453,142 +3510,148 @@ msgstr "Supren"
 msgid "Down"
 msgstr "Suben"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Aldoni al Preferata Menuo"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Distingivo"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Rajtoj :"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modifita:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Vi"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protektita"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Nurlega"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lege skribe"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Agordo de Bateria monitoro"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Montri antaŭgardon kiam baterio estas baznivela"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Inspekti je ĉiuj:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tempunuoj"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Diskodormi"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Ĝisdatigante"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Montri averton kiam baterio estas baznivela"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Avertii kiam baterio estas je:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minutoj"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Aŭtomate forigi post..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sekundoj"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Averto"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Aŭtomate detekti"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interna"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Nebula"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Aparataro"
 
@@ -3596,32 +3659,33 @@ msgstr "Aparataro"
 msgid "Battery"
 msgstr "Baterio"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Via baterio estas baznivela!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Alterna kurento estas rekomendita."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Neaplikebla"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ERARO"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Baterio-mesurilo"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Horloĝo"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Vidigi Ilobreton"
@@ -3691,17 +3755,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplikaĵoj en IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplikaĵoj post startigo"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Aplikaĵoj post relanĉo"
 
@@ -3715,10 +3779,25 @@ msgid "Apps"
 msgstr "Aplikaĵoj"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nova Aplikaĵo"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Lanĉi"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Elekti aplikaĵojn"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Labortablaj dosieroj"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Aliaj de IBar"
 
@@ -3731,7 +3810,7 @@ msgid "Available Profiles"
 msgstr "Uzeblaj aspektoj"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Elekti profilon"
 
@@ -3771,9 +3850,9 @@ msgstr "Agordoj de Dialogoj"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Ĝeneralaj Agordoj"
 
@@ -3815,7 +3894,7 @@ msgstr "Dialogoj"
 msgid "Profiles"
 msgstr "Aspektoj"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3826,7 +3905,7 @@ msgstr ""
 "ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d "
 "je %d Hz) estos<br> restaŭrigita post %d sekundoj."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3837,7 +3916,7 @@ msgstr ""
 "ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d) "
 "estos<br> restaŭrigita post %d sekundoj."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3848,7 +3927,7 @@ msgstr ""
 "estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d je %d "
 "Hz) estos<br> restaŭrigita <hilight>TUJ</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3859,47 +3938,47 @@ msgstr ""
 "ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d) "
 "estos<br> restaŭrigita <hilight>TUJ</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Distingiva ŝanĝo"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Konservi"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Restarigi"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Agordoj de Ekrana Distingivo"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaŭri dum ensalutado"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Aktualigi"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Turno"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Spegulado"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Mankaj Funkcioj"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3912,11 +3991,11 @@ msgstr ""
 "la elteno de tiu<br> kromaĵo. Ankaŭ povas okazi la konstruo de la iama "
 "<hilight>ecore</hilight><br> ne trovis la eltenon de XRandr."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Neniu ofteco de aktualigo trovita"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3930,93 +4009,74 @@ msgstr ""
 "ekrandistingivo, kiu povas kaŭzi <hilight>domaĝon</hilight><br> al via "
 "ekrano."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Agordoj de Virtualaj Labortabloj"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Nombro de Labortabloj"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Labortabla Ŝango per Muso"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Ŝanĝi labortablon dum objektoj demetiĝas al ekrana rando"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Ŝanĝi labortablon cirkle"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Labortabloj"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "For"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Panelo"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Pligrandigo"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Panorama ekranfono"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animaĵoj"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sekundoj"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f panorama faktoro laŭ X-akso"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f panorama faktoro laŭ Y-akso"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Spegula Animaĵo"
 
@@ -4033,7 +4093,7 @@ msgid "Desktop Wallpaper"
 msgstr "Labortabla Tapeto"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Meti"
 
@@ -4044,12 +4104,12 @@ msgstr "Difini tapeton..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Persona"
 
@@ -4057,160 +4117,174 @@ msgstr "Persona"
 msgid "Screen Lock Settings"
 msgstr "Agordoj de Ekrana Ŝloso"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Paŭzi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Paŭzi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Propra ekrena ŝloso"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Ŝlosi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Montri en ĉiuj ekranaj zonoj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Montri en nuna ekrana zono"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Montri en ekrana zono #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Agordoj de EnsalutadoSkatolo"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Ŝlosi kiam ekrankurteno komencas"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekundoj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Ŝlosi kiam tempo de senokupo trapasita"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutoj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Tempmezurilo"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "se malebligita antaŭe"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Startigi la prezentan reĝimon"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Difinita de Etoso"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Tapeto de Etoso"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Labortabla Tapeto"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Tapeto"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Agordoj de Ekrenkurteno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Ebligi Ekrankurtenon XScreensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Paŭzi"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Ekrankurteno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Komenca Stato"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Malplenado"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferata"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Ne Preferata"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Eventoj de ekspono"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Permesi"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne permesi"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4218,39 +4292,52 @@ msgstr "Ne permesi"
 msgid "Miscellaneous"
 msgstr "Diversaj opcioj"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Vidigo de Signalado de Administrado de Potenco"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "La nuna servilo de vidigo ne scipovas DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "La nuna servilo de vidigo ne havas DPMS-kromaĵon."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Vidigo de agordojn de Administrado de Potenco"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ebligi Vidigon de Administrado de Potenco"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Atenda tempo"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Diskodormiga tempo"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Estinga tempo"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtualaj Labortabloj"
@@ -4298,74 +4385,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Agordoj de Edje-Bindoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Edje-Bindoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Aldoni Bindon"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Forigi Bindon"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Ŝanĝi Bindon"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Forviŝi Ĉion"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Restaŭrigu la apriorajn bindojn"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ago"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Agaj Parametroj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Ĝeneralaj opcioj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permesas ebligadon de fulmklavoj kun plenekranaj fenestroj."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Sekvenco de Edje-fulmklavoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Randa klako"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Eraro de Edje-Bindo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4375,28 +4462,28 @@ msgstr ""
 "\"<br><hilight>%s</hilight>\".<br>Bonvolu elekti alian bindadon de Edje-"
 "sekvenco."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "KTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "MAJUSKL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4546,34 +4633,47 @@ msgid ""
 msgstr ""
 "\"Enlightenment\" ne eblas importi la agordon<br>ĉar okazis eraro dum kopio."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Lingvoagordo"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Lingva Elektilo"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Sistema apriora valoro"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Lokaĵo elektita"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Lokaĵo"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Lingvo"
 
@@ -4665,17 +4765,17 @@ msgid "Manager"
 msgstr "Administrilo"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Neniu"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Sekvenco de Musaj Bindoj"
 
@@ -4699,13 +4799,11 @@ msgid "Menu Settings"
 msgstr "Menuaj Agordoj"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Persona"
@@ -4716,7 +4814,7 @@ msgid "Main Menu"
 msgstr "Montri ĉefMenuon"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Preferaĵoj"
 
@@ -4736,7 +4834,7 @@ msgid "Comments"
 msgstr "Komento"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4748,7 +4846,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Vidigi en Menuoj"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menuoj"
 
@@ -4819,19 +4917,19 @@ msgid "Images"
 msgstr "Bildoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Tiparoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Etosoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Piktogramoj"
 
@@ -4984,18 +5082,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Tapetaj Agordoj"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Uzi Etosan Tapeton"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Bildo..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Enrete..."
 
@@ -5015,44 +5113,49 @@ msgstr "Tiu ĉi labortablo"
 msgid "This Screen"
 msgstr "Tiu Ekrano"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Tapetaj agordoj.."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Kaheligi"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Panelo"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Elekti Bildon..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Bilda Importada Eraro"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "\"Enlightenment\" ne eblas importi bildon<br>kial okazis eraroj dum konverto."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Tapeta Importada Eraro"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "\"Enlightenment\" ne eblas importi tapeton<br>ĉar okazis eraroj dum kopio."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5090,7 +5193,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Defauxlta Randa Stilo"
 
@@ -5098,7 +5201,7 @@ msgstr "Defauxlta Randa Stilo"
 msgid "Window Border Selection"
 msgstr "Fenestra Randa Areo"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Memori tiun randon pri tiu fenestro je proksima foje ĝi aperos"
 
@@ -5131,7 +5234,7 @@ msgid "Menu Background Base"
 msgstr "Tapetoj"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Titolo de Menuo"
 
@@ -5140,7 +5243,7 @@ msgid "Menu Title Active"
 msgstr "Titolo de la aktiva menuo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menua Elemento"
 
@@ -5154,12 +5257,12 @@ msgid "Menu Item Disabled"
 msgstr "Elemento de la aktiva menuo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Mova Teksto"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Regrandigi tekston"
 
@@ -5177,7 +5280,7 @@ msgid "Winlist Label"
 msgstr "Fenestrolista Etikedo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Fenestrolista Titolo"
 
@@ -5197,389 +5300,399 @@ msgid "File Manager Background Base"
 msgstr "Dosiera administrilo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokuso"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Butona Teksto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Teksto de butono malebligita"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Teksto de markobutono"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Teksto de markobutono malebligita"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Elementa Teksto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Teksto de butono malebligita"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Etikeda Teksto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Teksto de ero de listo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Teksto de ero de listo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Teksto de ero de listo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Lista Titolo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Lista Titolo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Teksto de radiobutono"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Teksto de radiobutono malebligita"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Teksto de ŝovilo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Teksto de malebligita ŝovilo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Tapetoj"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Modula Etikedo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Koloroj"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Piktogramaj Klasoj"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Agordi Kolorajn Klasojn"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Agordi Kolorajn Klasojn"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Agordi Kolorajn Klasojn"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Propra koloro"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Elĵeti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Senkonekte"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Ombra Koloro"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Fenestradministrilo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Fenestraĵoj"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Alia"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Titola Breto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Tekstbloko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Tekstbloko eta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Tekstbloko granda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Kapo de agordoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Pri Titolo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Pri Versio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Pri Teksto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titolo de Labortabla Ŝloso"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Pasvorto de Labortabla Ŝloso"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Dialoga Eraro"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Lanĉobuf Komando"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Salutŝilda Titolo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Salutŝilda Teksto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Salutŝilda Versio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Enigo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Kadro"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etikedo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Butonoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "ŝovilo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Radiaj Butonoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Kontrolaj Butonoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Tekstolista Elemento"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Lista Elemento"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Lista Titolo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Administrilo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Ĉeno-bufro"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Labortabla Piktogramo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Malgranda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Granda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Malgrande Stiligita"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normale Stiligita"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Grande Stiligita"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Tiparaj Agordoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Malgrandega"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Granda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Tre Granda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Grandega"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d rastrumeroj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Aktivigi Proprajn Tiparajn Klasojn"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Baza antaŭrigardo teksto: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Piktogramaj Klasoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Aktivigi Tiparan Klason"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Tiparo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Teksto de Detala Antaŭrigardo: 我真的会写中文ĉĝĥĵŝŭ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Aludado"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bajtkodo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Alternativaj Tiparoj"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Alternativa Nomo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Aktivigi Alternativecojn"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Aludado / Alternativecoj"
 
@@ -5587,12 +5700,17 @@ msgstr "Aludado / Alternativecoj"
 msgid "Icon Theme Settings"
 msgstr "Agordoj de Piktograma Etoso"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Ebligi Composite-on"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Elekti aplikaĵojn"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Piktograma Etoso anstataŭigas ĝeneralan etoson"
@@ -5659,11 +5777,9 @@ msgid "Custom scaling factor"
 msgstr "Propra skala faktoro"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f fojoj"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5674,6 +5790,12 @@ msgstr "Strategio"
 msgid "Minimum"
 msgstr "Minimume"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f fojoj"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maksimume"
@@ -5694,25 +5816,25 @@ msgstr "Vidigi komencan ekranon dum startigo"
 msgid "Transition Settings"
 msgstr "Agordo de transpaso"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Eventoj"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Komenco"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Labortabla Ŝanĝo"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Tapeta Ŝanĝo"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transiroj"
 
@@ -5728,15 +5850,15 @@ msgstr "Enporti..."
 msgid " Online..."
 msgstr " Enrete..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Etosaj Kategorioj"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Atribui"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Forviŝi ĉion"
 
@@ -5766,19 +5888,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Interŝanĝi etosojn"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Randoj"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Piktograma Etoso"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Musa kursoro"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skalado"
 
@@ -5909,6 +6031,11 @@ msgstr "Uzi donitan piktogramon de la aplikaĵo"
 msgid "Border Icon"
 msgstr "Rando"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Inteligenta Lokado"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Inteligenta Lokado"
@@ -5940,24 +6067,47 @@ msgstr "Malsupre Fenestroj"
 msgid "Animate"
 msgstr "Animaĵoj"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linia"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Glata plirapidigo kaj malplirapidigo"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Plirapidigi"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Malplirapidigi"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Akcelado de la muso"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Malplirapidigi"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Glata plirapidigo kaj malplirapidigo"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Skalado"
@@ -5979,6 +6129,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Plej freŝdata fenestro sube muso"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Horloĝo"
@@ -6017,11 +6168,6 @@ msgstr "Dialogoj"
 msgid "Only dialogs with focused parent"
 msgstr "Nur novaj dialogoj fokusiĝas"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokuso"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Aliaj Agordoj"
@@ -6132,13 +6278,13 @@ msgid "Fill available space"
 msgstr "Plenigi disponeblan  spacon"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontale"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertikale"
@@ -6199,7 +6345,7 @@ msgid "Raise when clicking to focus"
 msgstr "Altigi dum klakado por fokusigi"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fenestra Fokuso"
 
@@ -6457,33 +6603,33 @@ msgstr "Helega"
 msgid "Dropshadow"
 msgstr "Ĵetita ombro"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Ĉio"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Ĉio"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "(Neniu informo)"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Malsupre ĉio"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Ĉio"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Ĉio"
@@ -6493,165 +6639,165 @@ msgstr "Ĉio"
 msgid "Everything Settings"
 msgstr "Terminalaj Agordoj"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Uzeblaj aspektoj"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Movi"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Movi"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Agordi Bretojn"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Ebligita"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Vidigi en Menuoj"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Vidigi en Menuoj"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
-msgid "Plugin Trigger"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Defaŭlta Motoro"
+#: src/modules/everything/evry_config.c:412
+msgid "Plugin Trigger"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Detaloj"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Defaŭlta Motoro"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animata Spegulo"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Tempolimo de kaŝo"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Defaŭlta Motoro"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Animata Spegulo"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Komencante"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Komencante"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Plej freŝdate uzitaj"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Laste Ŝanĝita:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Agaj Parametroj"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Objekta Koloro"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Plata"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Ŝpruco"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Rapideco de ŝprucfenestro"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Ŝprucfenestr dekstren de labortablo"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Agordoj de ŝprucfenestro"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6660,39 +6806,30 @@ msgstr "Agordoj de ŝprucfenestro"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Ŝpruco"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Geometrio de fenestro"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Aplikaĵoj post relanĉo"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Ago"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6714,167 +6851,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Ĉeno-bufro"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Malfermi per..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Malfermi per..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Aldoni Aplikaĵon"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nova Aplikaĵo"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Malfermi per..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Lanĉi en Terminalon"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Lanĉebla"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Aplikaĵoj post relanĉo"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Komando"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Lanĉi komandon"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Ĉio"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Pli..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Tuj Ordigi"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Renomi Dosieron"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Ĉio"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Vidigi Kaŝitajn Dosierojn"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Serĉaj Dosierujoj"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Agordoj de serĉovojoj"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Dosierujoj Definita de Uzanto"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Forviŝi"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Dialogoj"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Plenekrana"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Sendi en Labortablo"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Dosieraj Piktogramoj"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Dosieraj Typoj"
 
@@ -6921,19 +6960,19 @@ msgid "Select an image"
 msgstr "Elekti bildon"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Dosiera administrilo"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Hejmo"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Radiko"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6952,7 +6991,7 @@ msgstr ""
 "aktuale laŭ via<br>ŝato. Pardonon pro la momenta problemeto en via agordo."
 "<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6968,7 +7007,7 @@ msgstr ""
 "kaj<br>kiel antaŭzorgo via agordo estis restaŭrita per defaŭltaĵoj."
 "<br>Bonvolu pardoni por la ĝeno.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Agordoj de \"Fileman\" ĝisdatigitaj"
 
@@ -7048,95 +7087,99 @@ msgstr "Lanĉi dosieradministrilon post surmunto"
 msgid "Device"
 msgstr "Antaŭvido"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Alia aplikaĵo..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Malfermi"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Malfermi per..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Konataj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specialaj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Ĉiuj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Propran komandon"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiado estis ĉesigita"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Movado estis ĉesigita"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Forigo estis ĉesigita"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Nekonata operacio el sklavo estis ĉesigita"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopiado de %s farita"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopiante %s (estimata tempo: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Movado de %s farita"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Movante %s (estimata tempo: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Forigado farita"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Forigado de dosieroj..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7171,7 +7214,7 @@ msgstr "Procezante %d operacio(j)n"
 msgid "Filemanager is idle"
 msgstr "Administrilo estas senokupa"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Aktualaj operacioj en EFM"
 
@@ -7183,37 +7226,42 @@ msgstr "Administrilo de akcesoraĵoj"
 msgid "Available Gadgets"
 msgstr "Disponeblaj Vanaĵoj"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Reĝimoj"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Propra bildo"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Propra koloro"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Travidebla"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animaĵoj"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Fono"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Panorama ekranfono"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Komenci movon/regrandigon de ĉi tiun vanaĵon"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Libera"
@@ -7461,16 +7509,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ĉu vi certas, ke vi deziras forigi tiun bar-fonton ?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Krei novan piktogramon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Ecoj"
 
@@ -7514,7 +7562,7 @@ msgstr "Montri fenestrojn de ĉiuj labortabloj"
 msgid "Show windows from active desktop"
 msgstr "Montri fenestrojn de nuna labortablo"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7643,32 +7691,32 @@ msgstr ""
 "ĝi estas jam kaptata de interna kodo<br> por la kuntekstaj menuoj. Tiu "
 "butono nur funkcias en<br> la ŝprucfenestro"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Vidigi la ŝprucfenestron de tabulpaĝilo"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Ŝprucfenestr dekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Ŝprucfenestr maldekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Ŝprucfenestr supren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Ŝprucfenestr malsupren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Ŝprucfenestr maldekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Ŝprucfenestr maldekstren de labortablo"
@@ -7689,133 +7737,93 @@ msgstr "Sistemaj Kontroloj"
 msgid "Temperature Settings"
 msgstr "Agordoj de temperaturo"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensiloj"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Vidigi Unuoj"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Inspekta Intervalo"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Alta Temperaturo"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Malalta Temperaturo"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperaturo"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperaturo"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Sekva"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Bonvenon en Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Elekti iun"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profilo"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Neniu dosiero de menu estis<br> trovita en via sistemo.<br> Bonvolu legi la "
-"dokumentaron<br> ĉe www.enlightenment.org<br> por pliaj detaloj pri kiel "
-"funkciigi<br> viajn menuoj de apliakoj."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Elekti menuon de aplikaĵoj"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Lanĉo-breto"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Elekti aplikaĵojn"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Labortablaj dosieroj"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Neniu piktogramo sur labortablo"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Ebligi la labortablajn piktogramojn"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Reĝimo de fokuso"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Klaki por fokusigi fenestrojn"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Supra muso fokusigas fenestrojn"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Elektu piktogramojn aldonendajn"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Elekti profilon"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Rapida lanĉo"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Elekti aplikaĵojn"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Plej freŝdate uzitaj"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7857,7 +7865,7 @@ msgstr "&Maldekstre:"
 msgid "Right:"
 msgstr "Dekstre:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Muti"
 
@@ -7881,40 +7889,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Sonkartoj"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Agordoj de sonmiksilo"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Sonmiksilo uzenda por ĝeneralaj agoj:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Startigi miksilon..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Agordoj de la modulo Sonmiksilo"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Distingiva ŝanĝo"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Agordo de la modulo Sonmiksilo ĝisdatigita"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Agordaj datumoj de la modulo sonmiksilo ŝanĝis.<br>Via malnova agordo estis "
-"anstataŭigita de defaŭltoj.<br>Bonvolu pardoni por la ĝeno."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Agordoj de la modulo Sonmiksilo"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7941,137 +7963,360 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Senkonekte"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Kontroloj"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Agordoj de retkonekto"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Protektita"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Nekonata Datumportilo"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Eraro de surmeto"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Kaheligi"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Transiroj"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "(Neniu informo)"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Plata"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Motoro"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Ebligita"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Plenigi disponeblan  spacon"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Protektita"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Senkonekte"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Alia taskopleto ekzistas"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Nu unu akcesoraĵo de taskopleto povas esti kaj alia jam ekzistas."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Taskopleto"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Taskopleto"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ne povas difini sian etosan sistemon."
+#~ msgid "Acpi"
+#~ msgstr "Ago"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Tiu Ekrano"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Tiu Ekrano"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Regrandigi"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Ĉesi movon/regrandigon ĉi tiun vanaĵon"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenement ne eblas pravalorizi Ecore !\n"
+#~ "Eble memoro ne sufiĉas ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenement ne eblas pravalorizi dosiersistemon !\n"
+#~ "Eble memoro ne sufiĉas ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlienghtenment ne povas difini sia X-konektado.\n"
+#~ "Ĉu vi difinis vian variablon DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne eblas difini sistemon de konektado.\n"
+#~ "Eble memoro ne sufiĉas ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne eblas difini IPC sistemon.\n"
+#~ "Eble memoro ne sufiĉas ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne povas difini la fluon de xinerama.\n"
+#~ "Tio ne devus okazi."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne povas difini la fluon de xinerama.\n"
+#~ "Tio ne devus okazi."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne eblas difini \"Evas\" sistemon.\n"
+#~ "Eble memoro ne sufiĉas ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne eblas difini komencan ekranon.\n"
+#~ "Eble memoro ne sufiĉas?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Agordi FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ne eblas difini sian bretan sistemon."
+
+#~ msgid "New Application"
+#~ msgstr "Nova Aplikaĵo"
+
+#~ msgid "Background panning"
+#~ msgstr "Panorama ekranfono"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f panorama faktoro laŭ X-akso"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f panorama faktoro laŭ Y-akso"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Vidigo de Signalado de Administrado de Potenco"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "La nuna servilo de vidigo ne scipovas DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "La nuna servilo de vidigo ne havas DPMS-kromaĵon."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Defaŭlta Motoro"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Ago"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Ĉeno-bufro"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Malfermi per..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Malfermi per..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Aldoni Aplikaĵon"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nova Aplikaĵo"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Lanĉi en Terminalon"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Lanĉebla"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Pli..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Tuj Ordigi"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Renomi Dosieron"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Dialogoj"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Plenekrana"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Sendi en Labortablo"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Neniu dosiero de menu estis<br> trovita en via sistemo.<br> Bonvolu legi "
+#~ "la dokumentaron<br> ĉe www.enlightenment.org<br> por pliaj detaloj pri "
+#~ "kiel funkciigi<br> viajn menuoj de apliakoj."
+
+#~ msgid "Select application menu"
+#~ msgstr "Elekti menuon de aplikaĵoj"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Lanĉo-breto"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Neniu piktogramo sur labortablo"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Ebligi la labortablajn piktogramojn"
+
+#~ msgid "Focus mode"
+#~ msgstr "Reĝimo de fokuso"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Klaki por fokusigi fenestrojn"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Supra muso fokusigas fenestrojn"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Elektu piktogramojn aldonendajn"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Rapida lanĉo"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Agordaj datumoj de la modulo sonmiksilo ŝanĝis.<br>Via malnova agordo "
+#~ "estis anstataŭigita de defaŭltoj.<br>Bonvolu pardoni por la ĝeno."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
index 5b253ef..cd853ba 100755 (executable)
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-07-19 16:59+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Spanish <>\n"
@@ -24,20 +24,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Acerca de Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,18 +45,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>El equipo</title>"
 
 #: src/bin/e_actions.c:365
@@ -75,623 +75,647 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "¿Está seguro de que quiere matar esta ventana?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Sí"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "¿Está seguro de que quiere salir?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Eligió salir de Enlightenment.<br><br>¿Está seguro de que quiere salir?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "¿Está seguro de que desea terminar la sesión?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Está a punto de desconectarse. <br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "¿Está seguro de que quiere apagar?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Pidió apagar su equipo.<br><br>¿Está seguro de querer hacerlo?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "¿Está seguro de que quiere reiniciar?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Pidió reiniciar su equipo.<br><br>¿Está seguro de que quiere reiniciarlo?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Pidió suspender su equipo.<br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "¿Está seguro de que quiere hibernar?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "Pidió hibernar su equipo.<br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Ventana: Acciones"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menú de ventana"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Levantar"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Bajar"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Terminar"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Ventana: Estado"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Activar/Desactivar modo pegajoso"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Activar/Desactivar modo iconificado"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Activar/Desactivar modo a pantalla completa"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximizar a pantalla completa"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de maximizado \"inteligente\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de maximizado \"expandido\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de maximizado \"llenado\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra superior"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra inferior"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra izquierda"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra derecha"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Activar/Desactivar estado sin bordes"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Borde"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Activar/Desactivar estado fijo"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Voltear Escritorio al lado Izquierdo"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Voltear Escritorio al lado Derecho"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Voltear Escritorio para Arriba"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Voltear escritorio hacia abajo"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Voltear el escritorio por..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Mostrar escritorio"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mostrar el contenedor"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Voltear el escritorio a..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Voltear el escritorio linealmente..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Cambiar al escritorio 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Cambiar al escritorio 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Cambiar al escritorio 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Cambiar al escritorio 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Cambiar al escritorio 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Cambiar al escritorio 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Cambiar al escritorio 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Cambiar al escritorio 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Cambiar al escritorio 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Cambiar al escritorio 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Cambiar al escritorio 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Cambiar al escritorio 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Cambiar al escritorio..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Voltear escritorio Izquierda (todas las pantallas)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Voltear escritorio derecha (todas las pantallas)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Voltear escritorio arriba (todas las pantallas)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Voltear escritorio abajo (todas las pantallas)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Voltear escritorio por... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Voltear escritorio a... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Voltear escritorio linealmente... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Girar el escritorio en dirección..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Cambiar al escritorio 0 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Cambiar al escritorio 1 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Cambiar al escritorio 2 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Cambiar al escritorio 3 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Cambiar al escritorio 4 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Cambiar al escritorio 5 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Cambiar al escritorio 6 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Cambiar al escritorio 7 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Cambiar al escritorio 8 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Cambiar al escritorio 9 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Cambiar al escritorio 10 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Cambiar al escritorio 11 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Cambiar al escritorio... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar ratón a la pantalla 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar ratón a la pantalla 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Enviar ratón a la pantalla..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar ratón 1 pantalla adelante"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar ratón 1 pantalla atrás"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar ratón adelante/atrás pantallas..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Apagar"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Mover texto"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Más..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Más..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Redimensionar por:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Girar el escritorio en dirección..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Crear icono"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Ventana: moviendo"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Al escritorio siguiente"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Al escritorio anterior"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Por escritorio #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Al escritorio..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Mostrar menú principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Mostrar menú de favoritos"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Mostrar menú con todas las aplicaciones"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Mostrar menú de clientes"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Mostrar menú..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lanzar"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Ejecutar"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplicación"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Salir"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Salir ahora"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Modo"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Activar/Desactivar modo presentación"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Activar/Desactivar modo desconexión"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Cerrar sesión"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Apagar ahora"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Apagar"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Limpiar ventanas"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Acciones : Genéricas"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Acción retardada"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Acción"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Esta pantalla"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Esta pantalla"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Poner como fondo de escritorio"
 
@@ -699,18 +723,16 @@ msgstr "Poner como fondo de escritorio"
 msgid "Color Selector"
 msgstr "Selector de color"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -718,20 +740,20 @@ msgstr "Selector de color"
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -751,7 +773,7 @@ msgstr ""
 "reconfigurar las cosas a su<br>gusto. Disculpe por las dificultades creadas "
 "en su configuración.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -766,11 +788,11 @@ msgstr ""
 "precaución, su configuración ha sido restaurada a los<br>valores por "
 "defecto. Disculpe por las molestias.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas de escritura en las preferencias de Elightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -778,96 +800,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Opciones mejoradas"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "La hibernación falló."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Sin ventanas)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "La suspensión falló."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "La suspensión falló."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Bienvenido a Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -879,57 +901,62 @@ msgstr ""
 "ocurrió el error es:<br>%s<br><br> Dicho archivo ha sido eliminado para "
 "evitar corrupción de datos.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Básica"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Aplicar"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Complementos"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Módulos"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Preferencia de iconos"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Contenedor %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Error - no hay soporte para PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "No hay soporte PAM dentro de Enlightenment, así<br>que el bloqueo del "
 "escritorio está deshabilitado."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Falló el bloqueo"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -937,15 +964,15 @@ msgstr ""
 "El bloqueo del escritorio falló porque alguna aplicación<br>ha capturado al "
 "ratón, al teclado o a ambos<br>y su captura no puede ser desactivada."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Introduzca su contraseña para desbloquear"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Error del sistema de autentificación"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -956,11 +983,11 @@ msgstr ""
 "autentificación. El código de error fue <hilight>%i</hilight>.<br>Esto es "
 "malo y no debería estar pasando. Por favor, avise de este error."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "¿Activar modo presentación?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -970,11 +997,11 @@ msgstr ""
 "<b>presentación</b> y desactivar  temporalmente el salvapantallas, el "
 "bloqueo y ahorro de energía?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "No, pero incrementar el tiempo de vencimiento"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "No, y parar de preguntar"
 
@@ -1001,106 +1028,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de entrada de escritorio"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nombre"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icono"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nombre genérico"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Clase de la ventana"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorías"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Tipos MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Archivo de escritorio"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notificación de inicio"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Ejecutar en un terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Mostrar en menús"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opciones"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Elegir un icono"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Elegir un ejecutable"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Seleccionar todo"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1141,316 +1167,316 @@ msgstr ""
 "Enlightenment no pudo ejecutar la aplicación:<br><br>%s<br><br>La aplicación "
 "falló al iniciarse."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Error de ejecución de la aplicación"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s dejó de funcionar inesperadamente."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Se devolvió el código de salida %i desde %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s fue interrumpido por una señal de interrupción."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s fue interrumpido por una señal de salida."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s fue interrumpido por una señal de abortar."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s fue interrumpido por un error de coma flotante."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s fue interrumpido por una señal de matar ininterrumpible."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s fue interrumpido por una violación de segmento."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s fue interrumpido por una tubería rota."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%sfue interrumpido por una señal de terminación."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s fue interrumpido por un error de Bus."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s fue interrumpido por la señal número %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***La parte de la salida que falta fue cortada. Guarde la salida para verla."
 "***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Informe de errores"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "No hubo mensaje de error"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Guardar el mensaje"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Este mensaje de error fue guardado como %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Información de error"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Información de señal de error"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Información de salida"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "No hubo salida"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Direccion inexistente"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s no existe."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Error al montar"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "No se puede montar el dispositivo"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Error al desmontar"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "No se puede desmontar el dispositivo"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Error al expulsar"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "No se puede expulsar el dispositivo"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i archivos"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Enlace"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Heredar configuración del padre"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Modo de vista"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Actualizar vista"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Mostrar archivos ocultos"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Recordar orden"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Ordenar ahora"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nuevo directorio"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Montar"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Expulsar"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Categorías de aplicaciones"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propiedades del archivo"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Usar por defecto"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Iconos de malla"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Iconos personalizados"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamaño de icono (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Poner como fondo..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Crear un nuevo directorio"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nombre del nuevo directorio:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renombrar %s a:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renombrar archivo"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Reintentar"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Error"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "No a todos"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Sí a todos"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "El archivo ya existe, ¿desea sobrescribirlo? <br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorar éste"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Ocurrió un error mientras se finalizaba la operación.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmar eliminación"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "¿Está seguro de que quiere eliminar<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1484,12 +1510,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volumen desconocido"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispositivo extraíble"
 
@@ -1497,7 +1523,7 @@ msgstr "Dispositivo extraíble"
 msgid "File:"
 msgstr "Archivo:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -1513,7 +1539,7 @@ msgstr "Tipo de archivo:"
 msgid "Permissions"
 msgstr "Permisos:"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Propietario:"
 
@@ -1533,17 +1559,17 @@ msgstr "El propietario puede leer"
 msgid "Owner can write"
 msgstr "El propietario puede escribir"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Previsualizar"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -1552,7 +1578,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -1568,53 +1594,42 @@ msgstr "Información del enlace"
 msgid "Select an Image"
 msgstr "Elija una imagen"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Mover texto"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Comenzar a mover/cambiar tamaño de este gadget"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Redimensionar"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Desplazar el contenido automáticamente"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Recorte"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Apariencia"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Parar mover/cambiar tamaño del dispositivo"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1663,14 +1678,14 @@ msgstr "Posición"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Tamaño"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Apilamiento"
@@ -1722,162 +1737,168 @@ msgstr "Saliendo al login con esta ventana abierta"
 msgid "Remember these Locks"
 msgstr "Recordar estos bloqueos"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Ventana"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Siempre arriba"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Pegajoso"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Preferencias"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximizado vertical"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximizado horizontal"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Editar icono"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Crear icono"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Agregar al menú favoritos"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Añadir a favoritos"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Acceso rápido de teclado"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Emplazamiento inteligente"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Omitir"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Borde"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Bloqueos"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Recordar"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Pegajoso"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Omitir"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimizar"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Sombreado"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Pantalla"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Siempre arriba"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Siempre debajo"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Pegar al escritorio"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Despegar del escritorio"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Elegir estilo del borde"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Usar las preferencias de iconos de e17 de forma predeterminada"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Usar icono de la aplicación "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Usar los iconos definidos por el usuario"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Resistencia"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista de ventanas"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Paginador"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Barra de tareas"
 
@@ -1898,7 +1919,7 @@ msgid "ICCCM Properties"
 msgstr "Propiedades de ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Título"
 
@@ -2072,7 +2093,6 @@ msgid "Size, Position and Locks"
 msgstr "Tamaño, posición y bloqueos"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Permitir"
@@ -2150,15 +2170,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Archivos"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Lanzar"
@@ -2173,20 +2191,6 @@ msgstr "Núcleo"
 msgid "Mobile"
 msgstr "Módulos"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Preferencias"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Opciones de módulo"
@@ -2227,7 +2231,7 @@ msgstr "Añadir gadget"
 msgid "Remove Gadget"
 msgstr "Eliminar gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Preferencias de barra de herramientas"
 
@@ -2235,11 +2239,11 @@ msgstr "Preferencias de barra de herramientas"
 msgid "Layout"
 msgstr "Diseño"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Error en el método de entrada"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2255,7 +2259,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Aplicaciones favoritas"
 
@@ -2263,76 +2267,74 @@ msgstr "Aplicaciones favoritas"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Ventanas"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Ventanas perdidas"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Acerca de"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtual"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Contenedor"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Mostrar/Ocultar todas las ventanas"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Sin aplicaciones)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Asignar escritorios virtuales"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Sin ventanas)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "¡Sin nombre!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Sin contenedores)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Agregar un contenedor"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Eliminar un contenedor"
 
@@ -2368,7 +2370,7 @@ msgid "Shrink to Content Width"
 msgstr "Ajustar al tamaño del contenido"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2398,7 +2400,7 @@ msgid "Hide duration"
 msgstr "Ocultar duración"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -2415,7 +2417,7 @@ msgstr "Mostrar en todos los escritorios"
 msgid "Show on specified Desktops"
 msgstr "Mostrar en escritorios específicos"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2432,7 +2434,7 @@ msgstr ""
 "o usted no es el dueño. Por favor, revise:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2445,52 +2447,22 @@ msgstr ""
 "Por favor, verifique:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"¡Enlightenment no puede iniciar Ecore!\n"
-"¿Quizás no tiene memoria suficiente?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no puede iniciar el sistema de archivos.\n"
-"¿Quizás no tiene memoria suficiente?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2498,7 +2470,7 @@ msgstr ""
 "Enlightenment no puede elegir un manejador de la señal de salida.\n"
 "¿Quizás no tiene memoria suficiente?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2506,7 +2478,7 @@ msgstr ""
 "Enlightenment no puede iniciar el manejador de la señal HUP.\n"
 "¿Quizás no tiene memoria suficiente?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2515,64 +2487,37 @@ msgstr ""
 "Enlightenment no puede iniciar el manejador de la señal HUP.\n"
 "¿Quizás no tiene memoria suficiente?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment no puede iniciar la conexion con las X.\n"
-"¿Tiene establecida la variable DISPLAY?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment no puede iniciar su sistema de alertas de emergencia.\n"
-"¿Tiene establecida la variable DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no puede iniciar el sistema de conexiones.\n"
-"¿Quizás no tiene memoria suficiente?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no puede iniciar el sistema IPC.\n"
-"¿Quizás no tiene memoria suficiente?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment no puede iniciar xinerama.\n"
-"Esto no debería ocurrir."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment no puede iniciar xinerama.\n"
-"Esto no debería ocurrir."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no puede iniciar el sistema Evas.\n"
-"¿Quizás no tiene memoria suficiente?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2583,7 +2528,7 @@ msgstr ""
 "de Evas y Ecore y compruebe que soportan el renderizado por\n"
 "software de X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2594,7 +2539,35 @@ msgstr ""
 "de Evas y Ecore y compruebe que soportan el renderizado por\n"
 "búfer de software."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment no puede iniciar su sistema de alertas de emergencia.\n"
+"¿Tiene establecida la variable DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2602,23 +2575,29 @@ msgstr ""
 "Enlightenment no puede crear carpetas en su directorio personal.\n"
 "¿Quizás no tiene un directorio personal o el disco está lleno?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment no puede iniciar su sistema de registro de archivos."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment no puede iniciar su sistema de configuración"
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment no puede iniciar su sistema de temas."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenement no puede iniciar su sistema de escalado."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment no puede iniciar su sistema de puntero."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2626,97 +2605,42 @@ msgstr ""
 "Enlightenment no puede establecer las rutas para encontrar archivos.\n"
 "¿Tiene la memoria suficiente?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment no puede iniciar su sistema de tipografías."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment no puede iniciar su sistema de temas."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment no puede iniciar su pantalla de inicio.\n"
-"¿Quizás no tiene suficiente memoria?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment no puede iniciar su sistema internacional"
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Iniciando soporte internacional"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment no puede iniciar su sistema internacional"
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment no puede iniciar el sistema de escritorio FDO.\n"
 "¿Tiene la memoria suficiente?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Probando el soporte del formato"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment encontró que Evas no puede crear el bufer del lienzo. "
-"Verifique\n"
-"si Evas tiene el soporte del motor de búfer por software.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment encontró que Evas no puede cargar imágenes PNG. Verifique que "
-"Evas tiene soporte\n"
-"para cargar imágenes PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment encontró que Evas no puede cargar imágenes JPEG. Verifique que "
-"Evas tiene soporte\n"
-"para cargar imágenes JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment encontró que Evas no puede cargar imágenes EET. Verifique que "
-"Evas tiene soporte\n"
-"para cargar imágenes EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightment encontró que Evas no puede cargar la fuente 'Sans'. Comprueba "
-"que Evas tiene soporte\n"
-"para fontconfig  y el sistema fontconfig define una fuente 'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Configurar pantallas"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2725,214 +2649,356 @@ msgstr ""
 "sus pantallas.\n"
 "¿Quizás hay otro manejador de ventanas ejecutándose?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Preparando DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Preparando vinculos"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment no puede configurar las opciones de DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Preparando DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment no puede configurar las opciones de DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Preparando salvapantallas"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment no puede configurar el salvapantallas de X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Configurar modos de ahorro de energía"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment no puede configurar los modos de ahorro de energía."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Configurar bloqueo de escritorio"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment no puede configurar su sistema para bloquear el escritorio."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Preparando Ventanas emergentes"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment no puede iniciar su sitema de ventanas emergentes."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Preparando el sistema de mensajes"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Configurando rutas"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Configurar controles del sistema"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment no puede iniciar el sistema de órdenes del sistema.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Configurar acciones"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment no puede iniciar su sistema de acciones."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Preparando el sistema de ejecución"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment no puede iniciar su sistema de ejecución."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Preparando FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Administrador de archivos"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Preparando el sistema de mensajes"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment no puede iniciar sus sistema de mensajes."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Preparando DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment no puede iniciar su sistema de dnd."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment no puede iniciar su sistema de manejadores de apropiación de "
 "entradas."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Configurar módulos"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment no puede iniciar su sistema de módulos."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Configuración de memoria"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment no puede iniciar su sistema de recuerdos."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Configurar clases de color"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment no puede iniciar su sistema de clases de color."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Configurar control de dispositivos"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment no puede configurar sus sistema de control."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Preparando DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Preparando DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment no puede configurar las opciones de DPMS."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Configurar modos de ahorro de energía"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment no puede configurar los modos de ahorro de energía."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Preparando el fondo de escritorio"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment no puede iniciar su sistema fondo de escritorio."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Configurar ratón"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenement no puede configurar las preferencias del ratón."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Preparando vinculos"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment no puede iniciar su sistema de vínculos."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Configurar contenedores"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment no puede configurar su sistema de contenedores."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Preparando el miniaturizador"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment no puede iniciar el sistema de miniaturas.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment no puede iniciar el sistema de órdenes del sistema.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment no puede iniciar el sistema de miniaturas.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment no puede iniciar su sistema de temas."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Preparando el orden de archivos"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment no puede configurar su sistema de orden de archivos."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Cargar módulos"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configurar contenedores"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Casi terminado"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Probando el soporte del formato"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment encontró que Evas no puede crear el bufer del lienzo. "
+"Verifique\n"
+"si Evas tiene el soporte del motor de búfer por software.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment encontró que Evas no puede cargar imágenes PNG. Verifique que "
+"Evas tiene soporte\n"
+"para cargar imágenes PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment encontró que Evas no puede cargar imágenes JPEG. Verifique que "
+"Evas tiene soporte\n"
+"para cargar imágenes JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment encontró que Evas no puede cargar imágenes PNG. Verifique que "
+"Evas tiene soporte\n"
+"para cargar imágenes PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment encontró que Evas no puede cargar imágenes EET. Verifique que "
+"Evas tiene soporte\n"
+"para cargar imágenes EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightment encontró que Evas no puede cargar la fuente 'Sans'. Comprueba "
+"que Evas tiene soporte\n"
+"para fontconfig  y el sistema fontconfig define una fuente 'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment se bloqueó al comenzar y fue reiniciado."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2940,7 +3006,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2952,7 +3018,7 @@ msgstr ""
 "cualquier problema<br> de los módulos en su configuración. El diálogo de "
 "configuración<br>de módulos le permitirá elegir nuevamente<br>sus módulos."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2964,20 +3030,12 @@ msgstr ""
 "cualquier problema<br> de los módulos en su configuración. El diálogo de "
 "configuración<br>de módulos le permitirá elegir nuevamente<br>sus módulos."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configurar contenedores"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Casi terminado"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Cargar módulos"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2986,11 +3044,11 @@ msgstr ""
 "Ocurrió un error cargando el módulo: %s<br>No se pudo encontrar ningún "
 "módulo llamado %s en<br>los directorios de búsqueda de módulos.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Error cargando un Módulo"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3002,11 +3060,11 @@ msgstr ""
 "El error producido fué:\n"
 "%s"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Los módulos no contienen todas las funciones necesarias"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3017,16 +3075,16 @@ msgstr ""
 "%s<br>Necesita una versión mínimadel API del módulo: %i.<br>La advertencia "
 "de Enlightenment para el API del módulo es: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s de Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "¿Quiere deshabilitar este módulo?"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3037,28 +3095,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Contenedor #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Está seguro de que quiere borara este contenedor?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Eligió borrar este contenedor.<br><br>¿Está seguro de querer borrarlo?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Parar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Comenzar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Comentario"
@@ -3067,16 +3125,16 @@ msgstr "Comentario"
 msgid "Starting"
 msgstr "Iniciando"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Comprobando permisos del sistema"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Comprobación del sistema terminada"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3087,35 +3145,35 @@ msgstr ""
 "niegan a cerrarse.<br>¿Quiere terminar de salir<br>sin cerrar estas "
 "aplicaciones<br>antes?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problemas al salir"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Salir ya"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Esperar más"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Cancelar salida"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Salida en progreso"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Saliendo.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment está ocupado con otra petición"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3123,7 +3181,7 @@ msgstr ""
 "Saliendo.<br>No puede realizar otras acciones de sistema<br>cuando se está "
 "cerrando sesión."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3131,7 +3189,7 @@ msgstr ""
 "Apagando.<br>No puede ejecutar acciones de sistema<br>una vez que el proceso "
 "de apagado ha comenzado."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3139,7 +3197,7 @@ msgstr ""
 "Reiniciando.<br>No puede ejecutar acciones de sistema<br>después de comenzar "
 "un reinicio."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3147,63 +3205,64 @@ msgstr ""
 "Suspendiendo.<br>No puede ejecutar acciones de sistema<br>después de "
 "comenzar una suspensión."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Hibernando.<br>No puede ejecutar acciones de sistema<br>después de comenzar "
 "una hibernación."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "¡EEK! Esto no debería pasar"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "El apagado falló."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "El reinicio falló."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "La suspensión falló."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "La hibernación falló."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Apagar."
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Apagando.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Reiniciando"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Reiniciando.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Suspendiendo"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspendiendo.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernando"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernando.<br><hilight>Espere, por favor.</hilight>"
 
@@ -3211,33 +3270,33 @@ msgstr "Hibernando.<br><hilight>Espere, por favor.</hilight>"
 msgid "About Theme"
 msgstr "Acerca del tema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Elegir como tema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Comenzar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Seleccionar contenido de barra de herramientas"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment no es capaz de crear un proceso hijo:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "No se puede salir - ventanas inmortales"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3248,125 +3307,125 @@ msgstr ""
 "ventanas<br>hayan sido cerradas o se les haya quitado el bloqueo de ciclo de "
 "vida.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "En el futuro"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "En el último minuto"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "hace %li años"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "hace %li meses"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "hace %li semanas"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "hace %li días"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "hace %li horas"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "hace %li minutos"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Opciones del paginador"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importar..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opciones de llenado y estiramiento"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Ajustar"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centro"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Dentro"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Llenar"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Calidad del archivo"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Usar archivo original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3386,12 +3445,12 @@ msgstr ""
 "el nuevo conjunto de datos. Ahora usted puede reconfigurar las<br>cosas a su "
 "gusto.Lamentamos las molestias causadas por la configuración.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Configuración de Fileman actualizada"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3426,142 +3485,148 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Añadir a favoritos"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Subir un directorio"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Resolución"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permisos:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Usted"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Sólo lectura"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lectura-Escritura"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Opciones de monitorización de batería"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta cuando la batería esté baja"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Comprobar cada:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: 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:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernar"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Sondeo"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Mostrar alerta de batería baja"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Mostrar alerta cuando:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Auto descartar en..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f seg"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Alerta"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Auto Detectar"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interna"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Difusa"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3569,32 +3634,33 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Batería"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "¡Bateria baja!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Se recomienda corriente directa."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Medidor de batería"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Reloj"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Mostrar barra de herramientas"
@@ -3665,17 +3731,17 @@ msgstr "Configuración de Fileman actualizada"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplicaciones de iBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplicaciones al inicio"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Reiniciar aplicaciones"
 
@@ -3684,15 +3750,30 @@ msgstr "Reiniciar aplicaciones"
 msgid "Order"
 msgstr "Borde"
 
-#: src/modules/conf_applications/e_mod_main.c:18
-msgid "Apps"
-msgstr "Aplicaciones"
+#: src/modules/conf_applications/e_mod_main.c:18
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: src/modules/conf_applications/e_mod_main.c:21
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Lanzar"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Seleccione Aplicaciones"
 
-#: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nueva aplicación"
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Archivos de escritorio"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Otro iBar"
 
@@ -3705,7 +3786,7 @@ msgid "Available Profiles"
 msgstr "Perfiles disponibles"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Seleccionar un perfil"
 
@@ -3743,9 +3824,9 @@ msgstr "Opciones de diálogo"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Opciones generales"
 
@@ -3787,7 +3868,7 @@ msgstr "Diálogos"
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3798,7 +3879,7 @@ msgstr ""
 "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d a %d Hz será "
 "restaurada en %d segundos."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3809,7 +3890,7 @@ msgstr ""
 "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d será "
 "restaurada en %d segundos."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3820,7 +3901,7 @@ msgstr ""
 "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d a %d Hz será "
 "restaurada <hilight>INMEDIATAMENTE</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3831,47 +3912,47 @@ msgstr ""
 "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d será "
 "restaurada <hilight>INMEDIATAMENTE</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Cambiar resolución"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Guardar"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Restaurar"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Opciones de resolución de la pantalla"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaurar al inicio"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotación"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Espejando"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Características faltantes"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3885,11 +3966,11 @@ msgstr ""
 "también pasara que en el momento<br> en el que se compilase <hilight>ecore</"
 "hilight> no se detectase<br> el soporte para XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "No se encontraron tasas de refresco"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3903,92 +3984,75 @@ msgstr ""
 "usada cuando se ajuste<br>la resolución, lo que puede causar <hilight>daño</"
 "hilight> a su pantalla."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Opciones de escritorios virtuales"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Número de escritorios"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Cambio de escritorio con el mouse"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 "Cambiar de escritorios cuando se arrastren objetos al borde de la pantalla"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Ajustar escritorios cuando se voltean"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Escritorios"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Afuera"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Cara"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animaciones"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.f seg"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animación del cambio"
 
@@ -4005,7 +4069,7 @@ msgid "Desktop Wallpaper"
 msgstr "Fondo de pantalla del escritorio"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Asiganr"
 
@@ -4016,12 +4080,12 @@ msgstr "Poner como fondo..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personal"
 
@@ -4029,160 +4093,174 @@ msgstr "Personal"
 msgid "Screen Lock Settings"
 msgstr "Opciones de bloqueo de pantalla"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Suspender"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Suspender"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Bloqueo de pantalla personalizado"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Bloquear"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Mostrar en todas las zonas de la pantalla"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Mostrar en la zona de la pantalla actual"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Mostrar en la zona de la pantalla #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Opciones de caja de ingreso"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Bloquear cuando se activa el salvapantallas de X"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f segundos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Bloquear cuando se excede el tiempo de espera"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Temporizadores"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Si se desactivó antes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Entrar en modo presentación"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Tema definido"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Tema del fondo de pantall"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Fondo de pantalla del escritorio"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Fondo de pantalla"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Opciones de salva-pantallas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Habilitar el salva-pantallas de X"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Suspender a Disco"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Salva pantallas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Estado inicial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Vaciando"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferidos"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "No preferidos"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Eventos expuestos"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "No permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4190,39 +4268,53 @@ msgstr "No permitir"
 msgid "Miscellaneous"
 msgstr "Otras opciones"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Manejo de la señales de muestra de Energía"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "El actual servidor de pantalla no es<br>apto para DPMS"
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "El servidor de imagen actual no<br>tiene la extensión DPMS"
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Opciones de manejo de la energía del monitor"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Habilitar el administrador de Energía de Pantalla"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Tiempo de espera"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Tiempo de suspensión"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Tiempo para apagar"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Atrás"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Escritorios virtuales"
@@ -4267,74 +4359,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Preferencias de vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Añadir atajo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Borrar atajo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modificar atajo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Borrar todas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Restaurar atajos predeterminados"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parámetros de la acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Opciones Generales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir activación de vinculaciones en ventallas a pantalla completa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Secuencia de vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Error de vinculación de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4343,28 +4435,28 @@ msgstr ""
 "La combinación de teclas que eligió ya se está usando por <br>la "
 "acción<hilight>%s</hilight>.<br>Por favor, elija otra combinación de teclas."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4514,34 +4606,47 @@ msgid ""
 msgstr ""
 "Enlightenment n pudo importar la configuración<br>por un error de copia."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Opciones del idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Selector de idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Predeterminado del Sistema"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Idioma elegido"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Idioma"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Idioma"
 
@@ -4632,17 +4737,17 @@ msgid "Manager"
 msgstr "Manejador"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ninguno"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Combinación de atajo de mouse"
 
@@ -4666,13 +4771,11 @@ msgid "Menu Settings"
 msgstr "Opciones del menú"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Personal"
@@ -4683,7 +4786,7 @@ msgid "Main Menu"
 msgstr "Mostrar menú principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favoritos"
 
@@ -4703,7 +4806,7 @@ msgid "Comments"
 msgstr "Comentario"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4715,7 +4818,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Mostrar en menús"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menúes"
 
@@ -4786,19 +4889,19 @@ msgid "Images"
 msgstr "Imágenes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Fuentes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temas"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Iconos"
 
@@ -4951,18 +5054,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Opciones de fondo de pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Usar el fondo de pantalla del tema"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Imagen..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "En linea..."
 
@@ -4982,46 +5085,51 @@ msgstr "Este escritorio"
 msgid "This Screen"
 msgstr "Esta pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Preferencias de fondo de escritorio..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Mosaico"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Cara"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Elija una imagen..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Error al importar imagen"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment no pudo importar la imagen<br>porque hubo errores de "
 "conversión."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Error importando el fondo de pantalla"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment no pudo importar el fondo de pantalla<br>por un error en la "
 "copia."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5059,7 +5167,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Estilo del borde predeterminado"
 
@@ -5067,7 +5175,7 @@ msgstr "Estilo del borde predeterminado"
 msgid "Window Border Selection"
 msgstr "Selección del borde de la ventana"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Recordar los bordes para esta ventana la próxima vez que aparezca"
 
@@ -5100,7 +5208,7 @@ msgid "Menu Background Base"
 msgstr "Fondos de pantalla"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Título del menú"
 
@@ -5109,7 +5217,7 @@ msgid "Menu Title Active"
 msgstr "Título del menú activo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Elemento del menú"
 
@@ -5123,12 +5231,12 @@ msgid "Menu Item Disabled"
 msgstr "Elemento del menú activo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Mover texto"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Redimensionar texto"
 
@@ -5146,7 +5254,7 @@ msgid "Winlist Label"
 msgstr "Etiqueta de elemento de ventana"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Título de la lista de ventanas"
 
@@ -5166,389 +5274,400 @@ msgid "File Manager Background Base"
 msgstr "Administrador de archivos"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Foco"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Botón de texto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Botón de texto deshabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Verificar texto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Verificar texto deshabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Entrada de texto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Botón de texto deshabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Etiqueta de texto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Texto de elemento de lista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Texto de elemento de lista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Texto de elemento de lista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Encabezado de lista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Encabezado de lista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Texto de radio"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Texto de radio deshabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Texto de deslizador"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "TExto de deslizador deshabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Fondos de pantalla"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Etiqueta del módulo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Colores"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Clases de color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Configurar clases de color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Configurar clases de color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Configurar clases de color"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Color personalizado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Expulsar"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Desconectado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Color de sombra"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Administrador de ventana"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Dispositivos"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Otros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Barra de título"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Bloque de texto plano"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Bloque de texto resaltado"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Bloque de texto grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Cabecera de preferencias"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Título de Acerca"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Sobre la versión"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Texto de Acerca"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Título del bloqueador de escritorio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Contraseña del bloqueador de teclado"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Diálogo de error"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Ejecutar Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Título de inicio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Texto de inicio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Versión del inicio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+#, fuzzy
+msgid "Digital Clock"
+msgstr "Visor digital"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Marco"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Botones"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Deslizador"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Botones de radio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Botones de chequeo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Elementos de lista de texto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Elemento de lista"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Encabezado de lista"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Administrador de archivos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Icono del escritorio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Estilo pequeño"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Estilo normal"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Estilo grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Opciones de fuente"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Diminuto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Realmente grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Habilitar clases de fuentes personalizadas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Previsualización básica de texto: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Clases de fuentes"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Habilitar clases de fuente"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Previsualización avanzada de texto.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Sugiriendo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Fuentes de apoyo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nombre del apoyo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Habilitar apoyos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5556,12 +5675,17 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Opciones de tema de iconos"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Habilitar Composite"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Seleccionar aplicaciones"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "El tema de iconos sobrescribe el tema general"
@@ -5628,11 +5752,9 @@ msgid "Custom scaling factor"
 msgstr "Factor de escala personalizada"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f veces"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5643,6 +5765,12 @@ msgstr "Política"
 msgid "Minimum"
 msgstr "Minima"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f veces"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maxima"
@@ -5663,25 +5791,25 @@ msgstr "Mostrar pantalla de inicio al entrar"
 msgid "Transition Settings"
 msgstr "Opciones de transición"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Eventos"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Inicio"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Cambio de escritorio"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Cambio de fondo de pantalla"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transiciones"
 
@@ -5697,15 +5825,15 @@ msgstr " Importar..."
 msgid " Online..."
 msgstr " En linea..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Categoría de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Asignar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Limpiar todo"
 
@@ -5735,19 +5863,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Cambiar temas"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordes"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema de icono"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Cursor del mouse"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Escala"
 
@@ -5878,6 +6006,11 @@ msgstr "Usar icono de la aplicación "
 msgid "Border Icon"
 msgstr "Borde"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Emplazamiento inteligente"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Emplazamiento inteligente"
@@ -5909,24 +6042,47 @@ msgstr "Debajo de las ventanas"
 msgid "Animate"
 msgstr "Animaciones"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linear"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Aceleración y desaceleración lenta"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Desacelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Aceleración del mouse"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Desacelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Aceleración y desaceleración lenta"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Escala"
@@ -5948,6 +6104,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "La ventana más reciente bajo el mouse"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Reloj"
@@ -5986,11 +6143,6 @@ msgstr "Diálogos"
 msgid "Only dialogs with focused parent"
 msgstr "Sólo los diálogos nuevos obtienen el foco"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Foco"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Otras configuraciones"
@@ -6101,13 +6253,13 @@ msgid "Fill available space"
 msgstr "Llenar el espacio disponible"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical"
@@ -6171,7 +6323,7 @@ msgid "Raise when clicking to focus"
 msgstr "Levantar cuando se elija para foco"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Foco de ventanas"
 
@@ -6429,33 +6581,33 @@ msgstr "Muy suave"
 msgid "Dropshadow"
 msgstr "Sombra caida"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Todo"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Todo"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Configuración del paginador"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Debajo de todo"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Todo"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Todo"
@@ -6465,165 +6617,165 @@ msgstr "Todo"
 msgid "Everything Settings"
 msgstr "Opciones de terminal"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Perfiles disponibles"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Mover"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Mover"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Configurar contenedores"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Disponible"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Mostrar en menús"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Mostrar en menús"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Motor predeterminado"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Detalles"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Motor predeterminado"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animar volteado"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Tiempo para ocultar"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Motor predeterminado"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Animar volteado"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Iniciando"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Iniciando"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Usados más recientemente"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Última modificación:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Parámetros de la acción"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Color del objeto"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Plano"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Ventana Emergente"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Velocidad a que emerge"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Emerger Escritorio Derecha"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Opciones del paginador emergente"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6632,39 +6784,30 @@ msgstr "Opciones del paginador emergente"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Ventana Emergente"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Geometria de la ventana"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Reiniciar aplicaciones"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Acción"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Elementos"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6686,167 +6829,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Abrir con..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Abrir con..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Añadir Aplicación"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nueva aplicación"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Abrir con..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Ejecutar en un terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Ejecutable"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Reiniciar aplicaciones"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Ejecutar"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Comando Definido"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Todo"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Más..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Ordenar ahora"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Renombrar archivo"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Todo"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Mostrar archivos ocultos"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Directorios de búsqueda"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Buscar opciones de ruta"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Directorios definidos por el usuario"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Limpiar"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Diálogos"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Pantalla completa"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Enviar al escritorio"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Íconos de archivos"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipos de archivos"
 
@@ -6893,19 +6938,19 @@ msgid "Select an image"
 msgstr "Elija una imagen"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Administrador de archivos"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Inicio"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Administrador"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6924,7 +6969,7 @@ msgstr ""
 "Puede reconfigurar las cosas que desee.<br>Disculpe el que se haya borrado "
 "su configuración.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6940,7 +6985,7 @@ msgstr ""
 "ejecutando. Esto esta mal<br>como precaución su configuración ha sido "
 "restablecida a los<br>valores por defecto. Perdone por las molestias<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Configuraciones de Fileman actualizadas"
 
@@ -7020,95 +7065,99 @@ msgstr "Abrir gestor de archivos al montar"
 msgid "Device"
 msgstr "Previsualizar"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Ir al directorio padre"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Otra aplicación..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Abrir con..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Aplicaciones conocidas"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Aplicaciones específicas"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Todas las aplicaciones"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Comando personalizado"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Copia abortada"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Eliminación borrada"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Abortada la operación desconocida del esclavo"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Copia de %s completada"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Copiando %s (tiempo estimado: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Moviendo %s (tiempo estimado: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Eliminación completada"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Eliminando archivos..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7143,7 +7192,7 @@ msgstr "Procesando %d operación(es)"
 msgid "Filemanager is idle"
 msgstr "El gestor de archivos está ocioso"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Inf. de la operación EFM"
 
@@ -7155,37 +7204,42 @@ msgstr "Manejador de herramientas"
 msgid "Available Gadgets"
 msgstr "Gadgets habilitados"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Modos"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Imagen personalizada"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Color personalizado"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparente"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animaciones"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Fondo"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Fondos de pantalla"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Comenzar a mover/cambiar tamaño de este gadget"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Libre"
@@ -7434,16 +7488,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "¿Está seguro de querer borrar la fuente de esta barra?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Crear Un Icono Nuevo"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -7487,7 +7541,7 @@ msgstr "Mostrar ventanas de todos los escritorios"
 msgid "Show windows from active desktop"
 msgstr "Mostrar ventanas del escritorio activo"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7616,32 +7670,32 @@ msgstr ""
 "ya esta tomado por un<br>código interno para menús contextuales. <br>Este "
 "botón solo funciona en lo Emergente"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Mostrar Paginador Emergente"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Emerger Escritorio Derecha"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Emerger Escritorio Izquierda"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Emerger Escritorio Arriba"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Emerger Escritorio Abajo"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Emerger Escritorio Izquierda"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Emerger Escritorio Izquierda"
@@ -7662,133 +7716,93 @@ msgstr "Controles del Sistema"
 msgid "Temperature Settings"
 msgstr "Configuraciones del Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Mostrar unidades"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Intervalo de chequeo"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Temperatura baja"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Temperatura baja"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatura"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenido a Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Seleccione uno"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"No se encontraron archivos de menú<br>en tu sistema.<br>Por favor, vea "
-"la<br>documentación en<br>www.enlightenment.org<br>para más detalles "
-"sobre<br>como hacer para que tu<br>menú de aplicaciones<br>funcione."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Seleccionar menú de aplicación"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Barra lanzadora"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Seleccionar aplicaciones"
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Archivos de escritorio"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Sin iconos en escritorio"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Activar iconos en escritorio"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Modo de foco"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Clic sobre ventana el hace tomar el foco"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Ratón sobre ventana le hace tomar el foco"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Selecciones los Iconos a Agregar"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Seleccionar un perfil"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Inicio rápido"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Seleccione Aplicaciones"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Usados más recientemente"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7830,7 +7844,7 @@ msgstr "Izquierda:"
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -7854,41 +7868,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Tarjetas de sonido"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Configuración del mezclador"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mezclador a usar para acciones globales:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Iniciar mixer..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Preferencias del módulo mezclador"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Cambiar resolución"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Preferencias del mezclador actualizadas"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Los datos de las Configuraciones del Módulo Mixer han cambiado.<br>Tu vieja "
-"configuración ha sido reemplazada con la nueva predeterminada.<br>Disculpe "
-"por los inconvenientes."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Preferencias del módulo mezclador"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7915,138 +7942,351 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Desconectado"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Controles"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Opciones de la conexión de red"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Protegido"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Volumen desconocido"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Error al montar"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Mosaico"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Transiciones"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Configuración"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Plano"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Motor"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Configurar"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Disponible"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Llenar el espacio disponible"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Protegido"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Desconectado"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Otra bandeja del sistema sale"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Sólo puede haber un gadget en la bandeja de sistema y ya existe otro."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Bandeja de sistema"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Bandeja de sistema"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment no puede iniciar su sistema de temas."
+#~ msgid "Acpi"
+#~ msgstr "Acción"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Esta pantalla"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Esta pantalla"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Redimensionar"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Parar mover/cambiar tamaño del dispositivo"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "¡Enlightenment no puede iniciar Ecore!\n"
+#~ "¿Quizás no tiene memoria suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar el sistema de archivos.\n"
+#~ "¿Quizás no tiene memoria suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar la conexion con las X.\n"
+#~ "¿Tiene establecida la variable DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar el sistema de conexiones.\n"
+#~ "¿Quizás no tiene memoria suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar el sistema IPC.\n"
+#~ "¿Quizás no tiene memoria suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar xinerama.\n"
+#~ "Esto no debería ocurrir."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar xinerama.\n"
+#~ "Esto no debería ocurrir."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar el sistema Evas.\n"
+#~ "¿Quizás no tiene memoria suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment no puede iniciar su pantalla de inicio.\n"
+#~ "¿Quizás no tiene suficiente memoria?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Preparando FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment no puede configurar su sistema de contenedores."
+
+#~ msgid "New Application"
+#~ msgstr "Nueva aplicación"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Manejo de la señales de muestra de Energía"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "El actual servidor de pantalla no es<br>apto para DPMS"
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "El servidor de imagen actual no<br>tiene la extensión DPMS"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Motor predeterminado"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Acción"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Abrir con..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Abrir con..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Añadir Aplicación"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nueva aplicación"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Ejecutar en un terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Ejecutable"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Más..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Ordenar ahora"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Renombrar archivo"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Diálogos"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Pantalla completa"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Enviar al escritorio"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "No se encontraron archivos de menú<br>en tu sistema.<br>Por favor, vea "
+#~ "la<br>documentación en<br>www.enlightenment.org<br>para más detalles "
+#~ "sobre<br>como hacer para que tu<br>menú de aplicaciones<br>funcione."
+
+#~ msgid "Select application menu"
+#~ msgstr "Seleccionar menú de aplicación"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Barra lanzadora"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Sin iconos en escritorio"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Activar iconos en escritorio"
+
+#~ msgid "Focus mode"
+#~ msgstr "Modo de foco"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Clic sobre ventana el hace tomar el foco"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Ratón sobre ventana le hace tomar el foco"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Selecciones los Iconos a Agregar"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Inicio rápido"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Los datos de las Configuraciones del Módulo Mixer han cambiado.<br>Tu "
+#~ "vieja configuración ha sido reemplazada con la nueva predeterminada."
+#~ "<br>Disculpe por los inconvenientes."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -8678,12 +8918,6 @@ msgstr "Bandeja de sistema"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Apagar inmediatamente"
 
-#~ msgid "Shut Down"
-#~ msgstr "Apagar"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Suspender a Disco"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Bloquear Escritorio"
 
@@ -9332,9 +9566,6 @@ msgstr "Bandeja de sistema"
 #~ msgid "24 Hour"
 #~ msgstr "24 horas"
 
-#~ msgid "Digital Display"
-#~ msgstr "Visor digital"
-
 #~ msgid "Top"
 #~ msgstr "Arriba"
 
@@ -9403,9 +9634,6 @@ msgstr "Bandeja de sistema"
 #~ msgid "Check Very Slow (60 sec)"
 #~ msgstr "Chequeo muy lento (60 seg.)"
 
-#~ msgid "Back"
-#~ msgstr "Atrás"
-
 #~ msgid "Choose Language"
 #~ msgstr "Escoja el idioma"
 
index add8de3..7a26517 100755 (executable)
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-01-07 07:56+0000\n"
 "Last-Translator: René Pärts <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Teave Enlightment'ist"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Sulge"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,14 +44,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Autoriõigus &copy; 1999-2009 Enlightenment Development Team.<br><br>Loodame, "
 "et teile meeldis seda tarkvara kasutada sama palju, kui meil seda kirjutada."
@@ -62,8 +61,9 @@ msgstr ""
 "hilight> ega ole stabiilne. Paljud funktsioonid pole valmis või ei "
 "eksisteeri ning paljudel esineb vigu. Olete <hilight>HOIATATUD!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Meeskond</title>"
 
 #: src/bin/e_actions.c:365
@@ -78,609 +78,635 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Jah"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ei"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Kas olete kindel, et soovite väljuda?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr ""
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr ""
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr ""
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -688,18 +714,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -707,20 +731,20 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -731,7 +755,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -740,11 +764,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -752,91 +776,91 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr ""
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -844,69 +868,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr ""
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr ""
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr ""
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr ""
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -914,22 +942,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -950,106 +978,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr ""
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr ""
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1085,313 +1112,313 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1423,12 +1450,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1436,7 +1463,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr ""
 
@@ -1452,7 +1479,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1472,17 +1499,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1491,7 +1518,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1507,50 +1534,41 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1596,14 +1614,14 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr ""
@@ -1655,154 +1673,161 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1823,7 +1848,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1982,7 +2007,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2059,15 +2083,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr ""
 
@@ -2080,20 +2102,6 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2131,7 +2139,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2139,11 +2147,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2156,7 +2164,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2164,76 +2172,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2268,7 +2274,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2298,7 +2304,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2315,7 +2321,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2326,7 +2332,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2335,427 +2341,478 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
 msgstr ""
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr ""
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr ""
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2763,7 +2820,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2771,7 +2828,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2779,42 +2836,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2822,16 +2871,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2842,26 +2891,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr ""
 
@@ -2869,16 +2918,16 @@ msgstr ""
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2886,113 +2935,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3000,156 +3049,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3160,12 +3209,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3193,139 +3242,144 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3333,32 +3387,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr ""
 
@@ -3410,17 +3465,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3433,10 +3488,22 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+msgid "Create Launcher"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3449,7 +3516,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3487,9 +3554,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3531,7 +3598,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3539,7 +3606,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3547,7 +3614,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3555,7 +3622,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3563,47 +3630,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3612,11 +3679,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3625,89 +3692,72 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3724,7 +3774,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3734,12 +3784,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3747,182 +3797,208 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3968,102 +4044,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4209,34 +4285,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4317,17 +4406,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4349,13 +4438,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4364,7 +4451,7 @@ msgid "Main Menu"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4381,7 +4468,7 @@ msgid "Comments"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4392,7 +4479,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4460,19 +4547,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4613,18 +4700,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4644,42 +4731,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4714,7 +4805,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4722,7 +4813,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4751,7 +4842,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4760,7 +4851,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4773,12 +4864,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4795,7 +4886,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4812,377 +4903,387 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5190,11 +5291,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5259,10 +5364,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5274,6 +5377,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5294,25 +5403,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5328,15 +5437,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5363,19 +5472,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5496,6 +5605,10 @@ msgstr ""
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5524,23 +5637,43 @@ msgstr ""
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr ""
 
@@ -5561,6 +5694,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5592,11 +5726,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5694,13 +5823,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5757,7 +5886,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6007,28 +6136,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6036,144 +6165,144 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr ""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6182,35 +6311,27 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr ""
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr ""
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6232,145 +6353,59 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr ""
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6415,19 +6450,19 @@ msgid "Select an image"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6438,7 +6473,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6448,7 +6483,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6525,95 +6560,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6648,7 +6687,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6660,35 +6699,39 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6909,15 +6952,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr ""
 
@@ -6961,7 +7004,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7078,31 +7121,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7122,128 +7165,90 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Sulge"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7285,7 +7290,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7309,38 +7314,52 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7367,116 +7386,124 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
index 7db290e..4509e02 100755 (executable)
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment (e17) CVS\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-12-31 07:00+0000\n"
 "Last-Translator: Jussi Aalto <jta_lnx@dnainternet.net>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Tietoa Enlightenmentista"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Sulje"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,14 +43,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Tekijänoikeudet &copy; 1999-2009, Englightenmentin kehitystiimi."
 "<br><br>Toivomme että nautit tämän ohjelmiston käyttämisestä yhtä paljon "
@@ -63,8 +62,9 @@ msgstr ""
 "keskeneräisiä tai eivät edes olemassa ja saattavat sisältää useita bugeja. "
 "Sinua on <hilight>VAROITETTU!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Tiimi</title>"
 
 #: src/bin/e_actions.c:365
@@ -82,55 +82,55 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Haluatko varmasti tappaa tämän ikkunan?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ei"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Haluatko varmasti poistua?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vaadit Enlightenmentista poistumista.<br><br>Haluatko varmasti poistua?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Haluatko varmasti uloskirjautua?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Olet uloskirjautumassa.<br><br>Haluatko varmasti tehdä tämän?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Haluatko varmasti sammuttaa?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Vaadit tietokoneesi sammuttamista.<br><br>Haluatko varmasti sammuttaa?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Haluatko varmasti uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -138,7 +138,7 @@ msgstr ""
 "Vaadit tietokoneesi uudelleenkäynnistämistä.<br><br>Haluatko varmasti "
 "uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -146,11 +146,11 @@ msgstr ""
 "Vaadit tietokoneesi asettamista valmiustilaan.<br><br>Haluatko varmasti "
 "asettua valmiustilaan?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Haluatko varmasti asettua lepotilaan?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -158,551 +158,575 @@ msgstr ""
 "Vaadit koneesi asettamista lepotilaan.<br><br>Haluatko varmasti asettua "
 "lepotilaan?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Ikkuna : Toiminnot"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Siirrä"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Muuta kokoa"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Valikko"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Ikkunavalikko"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Nosta"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Laske"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Tapa"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Ikkuna : Tila"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Tarttuva tila"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Ikonisoitu tila"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimoi leveyssuunnassa"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maksimoi Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimointitila \"Älykäs\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimointitila \"Laajennus\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimointitila \"Täyttö\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Varjo ylhäällä"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Varjo alhaalla"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Varjo vasemmalla"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Varjo oikealla"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Varjo"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Kehyksetön tila"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Kehys"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Kiinnitetty tila"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Näytä työpöytä"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Näytä hylly"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Vaihda työpöytään 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vaihda oikeanpuoleiseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vaihda yläpuoliseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vaihda alapuoliseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vaihda työpöytä... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vaihda työpöytään... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vaihda työpöytä lineaarisesti (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Vaihda työpöytää suunnassa..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Vaihda työpöytään 0 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Vaihda työpöytään 1 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Vaihda työpöytään 2 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Vaihda työpöytään 3 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Vaihda työpöytään 4 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Vaihda työpöytään 5 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Vaihda työpöytään 6 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Vaihda työpöytään 7 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Vaihda työpöytään 8 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Vaihda työpöytään 9 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Vaihda työpöytään 10 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Vaihda työpöytään 11 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Vaihda työpöytään... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Näyttö"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Lähetä hiiri näytölle 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Lähetä hiiri näytölle 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Lähetä hiiri näytölle..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Lähetä hiiri ruudun verran eteenpäin"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Lähetä hiiri ruudun verran taaksepäin"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Lähetä hiiri eteenpäin/taaksepäin..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Sammuta"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Ikkunan siirtoteksti"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Lisää..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Lisää..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Painallus muuttaa kokoa:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Vaihda työpöytää suunnassa..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Luo kuvake"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Ikkuna : Siirtäminen"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Seuraavalle työpöydälle"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Edelliselle työpöydälle"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Työpöydältä #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Työpöydälle..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Näytä päävalikko"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Näytä Suosikkisovellukset-valikko"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Näytä Kaikki sovellukset -valikko"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Näytä Asiakkaat-valikko"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Näytä valikko..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Käynnistä"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komento"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Sovellus"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Poistu nyt"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Tila"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Esitystilaan vaihto"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Offline-tilaan vaihto"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Järjestelmä"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Uloskirjaudu"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Sammuta nyt"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Sammuta"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Valmiustila"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Lukitse"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Siivoa ikkunat"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Yleiset : Toiminnot"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Viivästetty toiminto"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Toiminto"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Tälle näytölle"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Tälle näytölle"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Aseta taustakuvaksi"
 
@@ -710,18 +734,16 @@ msgstr "Aseta taustakuvaksi"
 msgid "Color Selector"
 msgstr "Värivalitsin"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -729,20 +751,20 @@ msgstr "Värivalitsin"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -760,7 +782,7 @@ msgstr ""
 "korjaavat tämän lisäämällä nämä uudet<br>ominaisuudet. Voit tehdä haluamasi "
 "asetukset uudelleen.<br>Olemme pahoillamme häiriöstä.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -774,11 +796,11 @@ msgstr ""
 "versio Enlightenmentista. Tämä on<br>huono asia, ja varokeinona asetuksesi "
 "on nyt palautettu<br> oletusasetuksiin. Olemme pahoillamme häiriöstä.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Ongelmia Enlightenmentin asetusten kirjoituksessa"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -786,96 +808,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Asetukset päivitetty"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Lepotilaan siirtyminen epäonnistui."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Ei ikkunoita)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Valmiustilaan siirtyminen epäonnistui."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Valmiustilaan siirtyminen epäonnistui."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Tervetuloa Enlightenmentiin"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -887,57 +909,62 @@ msgstr ""
 "ilmeni, oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
 "välttämiseksi.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Perusasetukset"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Käytä"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Lisäosat"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduulit"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Kuvakkeen ominaisuudet"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Säiliö %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Virhe - ei PAM-tukea"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM-tukea ei rakennettu Enlightenmentiin, joten<br>työpöydän lukitus on "
 "poistettu käytöstä."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Lukitseminen epäonnistui"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -945,15 +972,15 @@ msgstr ""
 "Työpöydän lukitseminen epäonnistui, koska jokin sovellus<br>on kaapannut "
 "joko näppäimistön, hiiren tai molemmat<br>ja kaappausta on mahdoton rikkoa."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Syötä lukituksen avaava salasanasi, kiitos"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Todennusjärjestelmän virhe"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -964,11 +991,11 @@ msgstr ""
 "todennusistunnon aloittamisessa. Virhekoodi oli <hilight>%i</hilight>.\n"
 "Tämä on paha juttu, eikä tätä pitäisi tapahtua. Raportoi tämä bugi, kiitos."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktivoidaanko esitystila?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -978,11 +1005,11 @@ msgstr ""
 "käyttöön <b>esitys</b>tila ja poistetaan näytönsäästäjä, näytön lukitus ja "
 "virransäästötila tilapäisesti käytöstä?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ei, mutta lisää aikaviivettä"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ei, äläkä kysele enää"
 
@@ -1008,106 +1035,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Työpöydän alkioeditori"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nimi"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Yleinen nimi"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Ikkunan luokka"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Luokat"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime-tyypit"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Työpöytätiedosto"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Yleiset"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Käynnistyksen huomautus"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Aja päätteessä"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Näytä valikoissa"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Valinnat"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Valitse kuvake"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Valitse suoritettava ohjelma"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Poista"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Liitä"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Valitse kaikki"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1146,316 +1172,316 @@ msgstr ""
 "Enlightenment ei voinut suorittaa sovellusta:<br><br>%s<br><br>Sovelluksen "
 "käynnistys epäonnistui."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Sovelluksen suoritusvirhe"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Sovelluksen %s suoritus loppui odottamatta."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Lopetuskoodi %i palautettiin sovelluksesta %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s keskeytyi keskeytyssignaaliin."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s keskeytyi lopetussignaaliin."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s keskeytyi poikkeussignaaliin."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s keskeytyi liukulukuvirheeseen."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s keskeytyi keskeyttämättömään kill-signaaliin."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s keskeytyi segmentointivirheeseen."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s keskeytyi rikkoutuneeseen putkeen."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s keskeytyi terminaatiosignaaliin."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s keskeytyi väylävirheeseen."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s keskeytyi signaaliin %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Loput tulosteesta jätettiin pois. Tallenna tuloste katseltavaksi.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Virhelogit"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Virheviestiä ei ollut."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Tallenna tämä viesti"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Tämä virhelogi tallennetaan tiedostoon %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Virheinfo"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Virhesignaalin info"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Tulosteen data"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Tulostetta ei ollut."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Virheellinen polku"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "Polkua %s ei ole."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Liitosvirhe"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Laitetta ei voida liittää"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Irrotusvirhe"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Laitetta ei voida irrottaa"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Virhe poistettaessa"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Laitetta ei voida poistaa"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i tiedostoa"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Tee linkki"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Keskeytä"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Käytä ylemmän tason asetuksia"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Näkymän tila"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Päivitä näkymä"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Näytä piilotiedostot"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Muista järjestys"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Lajittele nyt"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Uusi hakemisto"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Irrota"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Liitä"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Poista"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Käytä sovelluksen tarjoamaa kuvaketta "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Tiedoston ominaisuudet"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Käytä oletusta"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Ruudukoidut kuvakkeet"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Mukautetut kuvakkeet"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Listaa"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Kuvakkeen koko (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Aseta taustakuva..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Aseta peitto..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Poista käytöstä"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Luo uusi hakemisto"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Uuden hakemiston nimi:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Uudelleennimeä %s:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Uudelleennimeä tiedosto"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Virhe"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ei kaikkiin"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Kyllä kaikkiin"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 "Tiedosto on jo olemassa, haluatko korvata sen?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ohita tämä"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ohita kaikki"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Toimintoa suoritettaessa tapahtui virhe.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Vahvista poisto"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Haluatko varmasti poistaa tiedoston<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1489,12 +1515,12 @@ msgstr "%llu kt"
 msgid "%llu B"
 msgstr "%llu t"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Tuntematon tilavuus"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Irroitettava laite"
 
@@ -1502,7 +1528,7 @@ msgstr "Irroitettava laite"
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Koko:"
 
@@ -1518,7 +1544,7 @@ msgstr "Tiedostotyyppi:"
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Omistaja:"
 
@@ -1538,17 +1564,17 @@ msgstr "Omistaja saa lukea"
 msgid "Owner can write"
 msgstr "Omistaja saa kirjoittaa"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Esikatselu"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Oletus"
 
@@ -1557,7 +1583,7 @@ msgid "Thumbnail"
 msgstr "Pikkukuva"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Mukautettu"
 
@@ -1573,53 +1599,42 @@ msgstr "Linkin tiedot"
 msgid "Select an Image"
 msgstr "Valitse kuva"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Ikkunan siirtoteksti"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Vempain: siirrä/muuta kokoa"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Muuta kokoa"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Vieritä sisältöä automaattisesti"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Paljas"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Upotettu"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Ulkoasu"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Poista"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Vempain: lopeta siirtäminen/koon muuttaminen"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1667,14 +1682,14 @@ msgstr "Sijainti"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Koko"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Pinoutuminen"
@@ -1726,163 +1741,169 @@ msgstr "Uloskirjautumasta, kun tämä ikkuna on auki"
 msgid "Remember these Locks"
 msgstr "Muista nämä lukot"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Ikkunat"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Aina päällä"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Tarttuva"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Asetukset"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Koko näyttö"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maksimoi leveyssuunnassa"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Poista maksimointi"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Muokkaa kuvaketta"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Luo kuvake"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Lisää Suosikkisovellukset-valikkoon"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Lisää Suosikkeihin"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Pikanäppäin"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Älykäs sijoittaminen"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Ohita"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Kehys"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Lukot"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Muista"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Tarttuva"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Ohita"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Ikonisoi"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Varjostettu"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Näyttö"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Aina päällä"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Aina alla"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Kiinnitä työpöydälle"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Irrota työpöydältä"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Valitse kehyksen tyyli"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Käytä E17:n oletuskuvakeasetuksia"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Käytä sovelluksen tarjoamaa kuvaketta "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Käytä käyttäjän määrittämää kuvaketta"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Vastustus"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Ikkunalista"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Sivuttaja"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Tehtäväpalkki"
 
@@ -1903,7 +1924,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM:n ominaisuudet"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Otsikko"
 
@@ -2077,7 +2098,6 @@ msgid "Size, Position and Locks"
 msgstr "Koko, sijainti ja lukot"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Salli"
@@ -2155,15 +2175,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Tiedostot"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Käynnistä"
@@ -2178,20 +2196,6 @@ msgstr "Ydin"
 msgid "Mobile"
 msgstr "Moduulit"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Asetukset"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Moduulien asetukset"
@@ -2232,7 +2236,7 @@ msgstr "Lisää vempain"
 msgid "Remove Gadget"
 msgstr "Poista vempain"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Työkalurivin asetukset"
 
@@ -2240,11 +2244,11 @@ msgstr "Työkalurivin asetukset"
 msgid "Layout"
 msgstr "Asettelu"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Syöttötavan virhe"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2260,7 +2264,7 @@ msgstr "Päävalikko"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Suosikkisovellukset"
 
@@ -2268,76 +2272,74 @@ msgstr "Suosikkisovellukset"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Ikkunat"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Kadonneet ikkunat"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Tietoa"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Teema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuaali:"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Hyllyt"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Näytä/Piilota kaikki ikkunat"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Ei sovelluksia)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Määritä virtuaalityöpöydät"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Ei ikkunoita)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Ei nimeä!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Ei hyllyjä)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Lisää hylly"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Poista hylly"
 
@@ -2373,7 +2375,7 @@ msgid "Shrink to Content Width"
 msgstr "Kutista sisältöä vastaavaksi"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Tyyli"
 
@@ -2403,7 +2405,7 @@ msgid "Hide duration"
 msgstr "Piiloutumisen kesto"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekuntia"
@@ -2420,7 +2422,7 @@ msgstr "Näytä kaikilla työpöydillä"
 msgid "Show on specified Desktops"
 msgstr "Näytä määritetyillä työpöydillä"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2437,7 +2439,7 @@ msgstr ""
 "tai sinä et ole sen omistaja. Tarkistaisitko:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2450,76 +2452,22 @@ msgstr ""
 "Tarkistaisitko:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Valitsimet:\n"
-"\t-display NÄYTTÖ\n"
-"\t\tYhdistä näyttöön NÄYTTÖ.\n"
-"\t\tESIM: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tLisää keinotekoinen xinerama-näyttö (oikeiden sijaan)\n"
-"\t\tannetulla geometrialla. Lisää niin monta kuin haluat. Ne kaikki\n"
-"\t\tkorvaavat oikeat xinerama-näytöt, jos yhtäkään. Tätä voidaan\n"
-"\t\tkäyttää xineraman simulointiin.\n"
-"\t\tESIM: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tKäytä asetusprofiilia CONF_PROFILE käyttäjän valitseman vakion sijaan "
-"tai vain \"default\".\n"
-"\t-good\n"
-"\t\tOle hyvä.\n"
-"\t-evil\n"
-"\t\tOle paha.\n"
-"\t-psychotic\n"
-"\t\tOle psykoottinen.\n"
-"\t-locked\n"
-"\t\tKäynnistyy lukitulla ruudulla, eli salasana kysytään.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tJos tarvitset tätä ohjetta, et tarvitse tätä valitsinta.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää Ecorea!\n"
-"Ehkäpä muisti on lopussa?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää tiedostojärjestelmää.\n"
-"Ehkäpä muisti on lopussa?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2527,7 +2475,7 @@ msgstr ""
 "Enlightenment ei voi käynnistää poistumissignaalinkäsittelijää.\n"
 "Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2535,7 +2483,7 @@ msgstr ""
 "Enlightenment ei voi käynnistää HUP-signaalin käsittelijää.\n"
 "Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2544,64 +2492,37 @@ msgstr ""
 "Enlightenment ei voi käynnistää HUP-signaalin käsittelijää.\n"
 "Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ei voi käynnistää X-yhteyttään.\n"
-"Oletko asettanut DISPLAY-muuttujan?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ei voi käynnistää hätähälytysjärjestelmäänsä.\n"
-"Oletko asettanut DISPLAY-muuttujan?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää yhteysjärjestelmäänsä.\n"
-"Ehkäpä muisti on lopussa?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää IPC-järjestelmäänsä.\n"
-"Ehkäpä muisti on lopussa?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ei voi asettaa xineraman käärimistä.\n"
-"Tätä ei pitäisi tapahtua."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ei voi asettaa xineraman käärimistä.\n"
-"Tätä ei pitäisi tapahtua."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää Evas-järjestelmää.\n"
-"Ehkäpä muisti on lopussa?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2611,7 +2532,7 @@ msgstr ""
 "X11-renderöintiä Evasissa. Tarkista Evas- ja Ecore-asennuksesi ja tarkista\n"
 "että ne tukevat ohjelmistopohjaista X11-renderöintiä."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2622,7 +2543,35 @@ msgstr ""
 "tarkista\n"
 "että ne tukevat ohjelmistopohjaista puskurirenderöintimoottoria."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ei voi käynnistää hätähälytysjärjestelmäänsä.\n"
+"Oletko asettanut DISPLAY-muuttujan?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2630,23 +2579,29 @@ msgstr ""
 "Enlightenment ei voi luoda hakemistoja kotihakemistoosi.\n"
 "Ehkä sinulla ei ole kotihakemistoa, tai levy on täynnä?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ei voi käynnistää tiedostorekisterijärjestelmäänsä."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ei voi käynnistää asetusjärjestelmäänsä."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ei voi käynnistää teemajärjestelmäänsä."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment ei voi asettaa skaalausjärjestelmäänsä."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment ei voi käynnistää osoitinjärjestelmää."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2654,96 +2609,42 @@ msgstr ""
 "Enlightenment ei voi asettaa reittejä tiedostojen löytämiselle.\n"
 "Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ei voi käynnistää fonttijärjestelmäänsä."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ei voi käynnistää teemajärjestelmäänsä."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ei voi käynnistää aloitusruutua.\n"
-"Ehkäpä muisti on lopussa?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment ei voi käynnistää kansainvälisyyden järjestelmäänsä."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Käynnistetään kansainvälisyyden tuki"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ei voi käynnistää kansainvälisyyden järjestelmäänsä."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ei voi käynnistää FDO-työpöytäjärjestelmää.\n"
 "Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testataan formaattitukea"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment selvitti, että Evas ei voi luoda puskurikangasta. "
-"Tarkistaisitko,\n"
-"että Evasilla on ohjelmistopohjainen puskurimoottorin tuki.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment selvitti, että Evas ei voi ladata PNG-tiedostoja. Tarkista, "
-"että\n"
-"Evasilla on PNG-latauksen tuki.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment selvitti, että Evas ei voi ladata JPEG-tiedostoja. Tarkista,\n"
-"että Evasilla on JPEG-latauksen tuki.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment selvitti, että Evas ei voi ladata EET-tiedostoja. Tarkista,\n"
-"että Evasilla on EET-latauksen tuki.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment havaitsi että Evas ei pysty lataamaan \"Sans\"-fonttia. "
-"Tarkista että Evas\n"
-"sisältää fontconfig-tuen ja että järjestelmän fontconfig määrittelee \"Sans"
-"\"-fontin.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Aseta näytöt"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2751,213 +2652,378 @@ msgstr ""
 "Enlightenment asettama ikkunanhallinta kaikille järjestelmäsi näytöille\n"
 "epäonnistui. Ehkäpä toinen ikkunamanageri on käynnissä?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Aseta DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Aseta hiiri/näppäimistötoiminnot"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ei voi säätää DPMS-asetuksia."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Aseta DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ei voi säätää DPMS-asetuksia."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Aseta näytönsäästäjä"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ei voi säätää X-näytönsäästäjää."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Aseta virransäästötilat"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ei voi asettaa virransäästötiloja."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Aseta työpöydän lukko"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ei voi asettaa työpöydän lukitusjärjestelmäänsä."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Aseta ponnahdukset"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ei voi asettaa ponnahdusjärjestelmäänsä."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Aseta viestijärjestelmä"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Asetetaan polkuja"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Aseta järjestelmän kontrollit"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ei voi käynnistää järjestelmäkomentojärjestelmää.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Aseta toiminnot"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ei voi asettaa toimintojärjestelmäänsä."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Aseta suoritusjärjestelmä"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ei voi asettaa suoritusjärjestelmäänsä."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Aseta tiedostonhallinta"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Tiedostonhallinta"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Aseta viestijärjestelmä"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ei voi asettaa viestijärjestelmäänsä."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Aseta Drag & Drop (DND)"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ei voi asettaa Drag & Drop -järjestelmäänsä."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Aseta syötteenkaappauksen hallintajärjestelmä"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment ei voi asettaa syötteenkaappauksen hallintajärjestelmäänsä."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Aseta moduulit"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ei voi asettaa moduulijärjestelmäänsä."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Aseta muistamiset"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ei voi asettaa muistamisasetuksia."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Aseta väriluokat"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ei voi asettaa väriluokkajärjestelmäänsä."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Aseta vempaimenhallinta (Gadcon)"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ei voi asettaa vempaimenhallintajärjestelmäänsä."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Aseta DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Aseta DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ei voi säätää DPMS-asetuksia."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Aseta virransäästötilat"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ei voi asettaa virransäästötiloja."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Aseta taustakuva"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ei voi asettaa työpöydän taustakuvajärjestelmäänsä."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Aseta hiiri"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ei voi säätää hiiren asetuksia."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Aseta hiiri/näppäimistötoiminnot"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ei voi asettaa hiiri/näppäimistötoimintojärjestelmäänsä."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Aseta hyllyt"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ei voi asettaa hyllyjärjestelmäänsä."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Asetetaan pikkukuvien tekijä"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ei voi käynnistää pikkukuvajärjestelmäänsä.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment ei voi käynnistää järjestelmäkomentojärjestelmää.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ei voi käynnistää pikkukuvajärjestelmäänsä.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ei voi käynnistää teemajärjestelmäänsä."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Aseta tiedostojen järjestely"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ei voi asettaa tiedostojenjärjestelyjärjestelmäänsä."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Lataa moduulit"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Muokkaa hyllyjä"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Melkein valmis"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Valitsimet:\n"
+"\t-display NÄYTTÖ\n"
+"\t\tYhdistä näyttöön NÄYTTÖ.\n"
+"\t\tESIM: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tLisää keinotekoinen xinerama-näyttö (oikeiden sijaan)\n"
+"\t\tannetulla geometrialla. Lisää niin monta kuin haluat. Ne kaikki\n"
+"\t\tkorvaavat oikeat xinerama-näytöt, jos yhtäkään. Tätä voidaan\n"
+"\t\tkäyttää xineraman simulointiin.\n"
+"\t\tESIM: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tKäytä asetusprofiilia CONF_PROFILE käyttäjän valitseman vakion sijaan "
+"tai vain \"default\".\n"
+"\t-good\n"
+"\t\tOle hyvä.\n"
+"\t-evil\n"
+"\t\tOle paha.\n"
+"\t-psychotic\n"
+"\t\tOle psykoottinen.\n"
+"\t-locked\n"
+"\t\tKäynnistyy lukitulla ruudulla, eli salasana kysytään.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tJos tarvitset tätä ohjetta, et tarvitse tätä valitsinta.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testataan formaattitukea"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment selvitti, että Evas ei voi luoda puskurikangasta. "
+"Tarkistaisitko,\n"
+"että Evasilla on ohjelmistopohjainen puskurimoottorin tuki.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment selvitti, että Evas ei voi ladata PNG-tiedostoja. Tarkista, "
+"että\n"
+"Evasilla on PNG-latauksen tuki.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment selvitti, että Evas ei voi ladata JPEG-tiedostoja. Tarkista,\n"
+"että Evasilla on JPEG-latauksen tuki.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment selvitti, että Evas ei voi ladata PNG-tiedostoja. Tarkista, "
+"että\n"
+"Evasilla on PNG-latauksen tuki.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment selvitti, että Evas ei voi ladata EET-tiedostoja. Tarkista,\n"
+"että Evasilla on EET-latauksen tuki.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment havaitsi että Evas ei pysty lataamaan \"Sans\"-fonttia. "
+"Tarkista että Evas\n"
+"sisältää fontconfig-tuen ja että järjestelmän fontconfig määrittelee \"Sans"
+"\"-fontin.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 "Enlightenment kaatui varhaisessa vaiheessa ja on käynnistetty uudelleen."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2965,7 +3031,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2977,7 +3043,7 @@ msgstr ""
 "poistaa<br>ongelmamoduulit kokoonpanostasi. Moduulien<br>asetusvalikon "
 "tulisi antaa sinun valita moduulisi<br>uudestaan."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2989,20 +3055,12 @@ msgstr ""
 "poistaa<br>ongelmamoduulit kokoonpanostasi. Moduulien<br>asetusvalikon "
 "tulisi antaa sinun valita moduulisi<br>uudestaan."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Muokkaa hyllyjä"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Melkein valmis"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Lataa moduulit"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3011,11 +3069,11 @@ msgstr ""
 "Virhe moduulin %s lataamisessa.<br>Yhtäkään moduulia nimeltä %s ei "
 "löytynyt<br>etsityistä hakemistoista.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Virhe moduulin lataamisessa"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3024,11 +3082,11 @@ msgstr ""
 "Moduulin %s lataamisessa tapahtui virhe<br>Täydellinen polku tähän moduuliin "
 "on:<br>%s<br>Raportoitu virhe oli:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Moduuli ei sisällä kaikkia tarvittuja funktioita"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3039,16 +3097,16 @@ msgstr ""
 "vähintään moduuli-API:n version %i.<br>Enlightenmentin ilmoittama moduuli-"
 "API on: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenmentin %s-moduuli"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Haluaisitko poistaa käytöstä tämän moduulin?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3062,28 +3120,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Hylly #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Haluatko varmasti poistaa tämän hyllyn?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Vaadit tämän hyllyn poistamista.<br><br>Haluatko varmasti poistaa sen?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Lopeta kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Aloita kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Kommentti"
@@ -3092,16 +3150,16 @@ msgstr "Kommentti"
 msgid "Starting"
 msgstr "Aloitetaan"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Tarkistetaan järjestelmän oikeuksia"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Järjestelmän tarkistus valmis"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3112,35 +3170,35 @@ msgstr ""
 "sulkeutumasta.<br>Haluatko suorittaa uloskirjautumisen loppuun<br>joka "
 "tapauksessa sulkematta näitä<br>sovelluksia ensin?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Sisäänkirjautumisen ongelmat"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Kirjaudu ulos nyt"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Odota pidempään"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Peruuta uloskirjautuminen"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Uloskirjautuminen käynnissä"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Uloskirjautuminen käynnissä.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment on kiireinen toisen vaatimuksen takia"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3148,7 +3206,7 @@ msgstr ""
 "Kirjaudutaan ulos järjestelmästä.<br>Muita järjestelmätoimintoja ei voi "
 "suorittaa<br>kun uloskirjautuminen on alkanut."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3156,7 +3214,7 @@ msgstr ""
 "Kone sammutetaan.<br>Mitään muita järjestelmätoimintoja ei voida suorittaa "
 "sammutusprosessin käynnistyttyä."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3164,7 +3222,7 @@ msgstr ""
 "Järjestelmä käynnistetään uudelleen.<br>Muita järjestelmätoimintoja ei voi "
 "suorittaa,<br>kun uudelleenkäynnistys on alkanut."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3172,63 +3230,64 @@ msgstr ""
 "Asetutaan valmiustilaan.<br>Ennen valmiustilan loppuunsaattamista ei voi "
 "suorittaa<br>muita järjestelmätoimintoja."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Asetutaan lepotilaan.<br>Ennen lepotilan loppuunsaattamista ei voi "
 "suorittaa<br>muita järjestelmätoimintoja."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "IIK! Tätä ei pitäisi tapahtua"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Koneen sammutus epäonnistui."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Uudelleenkäynnistys epäonnistui."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Valmiustilaan siirtyminen epäonnistui."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Lepotilaan siirtyminen epäonnistui."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Sammuta"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kone sammutetaan.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Käynnistetään uudelleen"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Kone käynnistetään uudelleen.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Asetutaan valmiustilaan"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Asetutaan valmiustilaan.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Asetutaan lepotilaan"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Asetutaan lepotilaan.<br><hilight>Odota hetki.</hilight>"
 
@@ -3236,33 +3295,33 @@ msgstr "Asetutaan lepotilaan.<br><hilight>Odota hetki.</hilight>"
 msgid "About Theme"
 msgstr "Tietoja teemasta"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Aseta teemaksi"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Lopeta kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Aloita kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Määritä työkalurivin sisältö"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment ei pystynyt alustamaan lapsiprosessia:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Ei voi poistua - kuolemattomia ikkunoita."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3272,125 +3331,125 @@ msgstr ""
 "Tämä tarkoittaa sitä,<br>että Enlightenment ei salli itseään suljettavan "
 "ennen kuin nämä ikkunat on<br>suljettu tai elinaikalukko poistettu.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f tavua"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kt"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mt"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Gt"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Tulevaisuudessa"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Viimeisimmän minuutin aikana"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li vuotta sitten"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li kuukautta sitten"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li viikkoa sitten"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li päivää sitten"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li tuntia sitten"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuuttia sitten"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Sivuttajan asetukset"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Tuo..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Täytön ja venytyksen valinnat"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Täytä"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Keskitä"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Sisäkkäin"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Täytä"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Tiedoston laatu"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Käytä alkuperäistä tiedostoa"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3410,12 +3469,12 @@ msgstr ""
 "asettaa asetukset uudelleen<br>mieleiseksesi. Anteeksi asetuksiesi "
 "sorkkiminen.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Filemanin asetukset päivitetty"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3450,142 +3509,148 @@ msgstr "Ylös"
 msgid "Down"
 msgstr "Alas"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Lisää Suosikkeihin"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Siirry ylös hakemistossa"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Tarkkuus"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Oikeudet:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Muokattu:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Sinä"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Suojattu"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Vain luku"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Kielletty"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Luku-Kirjoitus"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Akkumittarin asetukset"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Näytä varoitus akun alhaisesta varauksesta"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Tarkistusväli:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tickiä"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Lepotila"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Seuranta"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Varoita kun akun varaustaso on alhainen"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Varoita kun varausta on jäljellä:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Varoituksen piilotusviive..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f s"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Varoitus"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automaattinen tunnistus"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Sisäinen"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Sumea"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Laitteisto"
 
@@ -3593,32 +3658,33 @@ msgstr "Laitteisto"
 msgid "Battery"
 msgstr "Akku"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Akun varaustaso on alhainen!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Verkkovirran käyttö on suositeltavaa."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Akkumittari"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Kello"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Näytä työkalurivi"
@@ -3688,17 +3754,17 @@ msgstr "Filemanin asetukset päivitetty"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar-sovellukset"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Käynnistyksen sovellukset"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
@@ -3711,11 +3777,26 @@ msgstr "Kehys"
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Uusi sovellus"
+#: src/modules/conf_applications/e_mod_main.c:21
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Käynnistä"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Valitse sovellukset"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Työpöytätiedostot"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar muut"
 
@@ -3728,7 +3809,7 @@ msgid "Available Profiles"
 msgstr "Käytettävissä olevat profiilit"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Valitse profiili"
 
@@ -3766,9 +3847,9 @@ msgstr "Valintaikkunan asetukset"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Yleisasetukset"
 
@@ -3810,7 +3891,7 @@ msgstr "Valintaikkunat"
 msgid "Profiles"
 msgstr "Profiilit"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3821,7 +3902,7 @@ msgstr ""
 "muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
 "@ %d Hz palautetaan %d sekunnin kuluttua."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3832,7 +3913,7 @@ msgstr ""
 "muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
 "palautetaan %d sekunnin kuluttua."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3843,7 +3924,7 @@ msgstr ""
 "muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
 "@ %d Hz palautetaan <hilight>VÄLITTÖMÄSTI</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3854,47 +3935,47 @@ msgstr ""
 "muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
 "palautetaan <hilight>VÄLITTÖMÄSTI</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Tarkkuuden vaihto"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Palauta"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Näytön tarkkuuden asetukset"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Tarkkuus"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Palauta sisäänkirjauduttaessa"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Päivitys"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Kierto"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Peilaus"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Puuttuvia ominaisuuksia"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3907,11 +3988,11 @@ msgstr ""
 "laajennoksen tuki puuttuu. On myös mahdollista<br>että <hilight>ecore</"
 "hilight>a käännettäessä<br>XRandR-tukea ei havaittu."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Ei löydettyjä ruudunpäivityksen arvoja"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3925,93 +4006,74 @@ msgstr ""
 "käytetään resoluutiota asetettaessa,<br>mikä voi aiheuttaa "
 "<hilight>vahinkoa</hilight> sinun näytöllesi."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Virtuaalityöpöytien asetukset"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Työpöytien lukumäärä"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Työpöydän vaihto hiirellä"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Vaihda vedettäessä objekteja näytön reunalle"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Kierrätä työpöytiä vaihdettaessa"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Työpöydät"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Pois"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Vieritys sivuilta"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Vieritys kulmista"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Taustan panorointi"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animaatiot"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sekuntia"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f X-akselin kerroin"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f Y-akselin kerroin"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Vaihdon animaatio"
 
@@ -4028,7 +4090,7 @@ msgid "Desktop Wallpaper"
 msgstr "Työpöydän taustakuva"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Aseta"
 
@@ -4039,12 +4101,12 @@ msgstr "Aseta taustakuva..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Oma"
 
@@ -4052,160 +4114,174 @@ msgstr "Oma"
 msgid "Screen Lock Settings"
 msgstr "Näytön lukituksen asetukset"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Valmiustila"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Valmiustila"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Mukautettu ruudun lukitus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Lukitse"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Näytä kaikilla näytön alueilla"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Näytä nykyisen näytön alueella"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Näytä näytön alueella #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Sisäänkirjautumisikkunan asetukset"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Lukitse X-näytönsäästäjän aktivoituessa"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekuntia"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Lukitse joutoajan ylittyessä"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minuuttia"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Ajastukset"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Jos lukitus ollut päällä korkeintaan"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Esitystilaan siirtyminen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Teemassa määritetty"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Teeman taustakuva"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Työpöydän taustakuva"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Taustakuva"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Näytönsäästäjän asetukset"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Ota käyttöön X-näytönsäästäjä"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Valmiustila levylle"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Näytönsäästäjä"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Alkutila"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Ruudunpimennys"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Mielellään"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Ei mielellään"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Grafiikanpaljastukset"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Salli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Älä salli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4213,39 +4289,53 @@ msgstr "Älä salli"
 msgid "Miscellaneous"
 msgstr "Sekalaiset valinnat"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Näytä virranhallinnan signalointi"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Nykyinen näyttöpalvelin ei ole<br>DPMS-valmis"
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Nykyisellä näyttöpalvelimella ei ole<br>DPMS-laajennusta."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Näytä virranhallinnan asetukset"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ota käyttöön näytön virranhallinta"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Valmiustilan viive"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Lepotilan viive"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Sammutuksen viive"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Takaisin"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtuaalityöpöydät"
@@ -4293,74 +4383,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Reunatoimintojen asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Lisää toiminto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Poista toiminto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Muokkaa toimintoa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Poista kaikki"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Palauta oletusnäppäimet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Toiminto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Toiminnon parametrit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Yleiset asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Salli toimintojen aktivointi kokoruudun ikkunoille"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Reunatoiminnon sekvenssi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Napsautettava reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Reunatoimintovirhe"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4369,28 +4459,28 @@ msgstr ""
 "Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4539,34 +4629,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr "Enlightenment ei voinut tuoda asetuksia kopiointivirheen<br>vuoksi."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Kieliasetukset"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Kielen valinta"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Järjestelmän oletus"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Valittu lokaali"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Lokaali"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Kieli"
 
@@ -4657,17 +4760,17 @@ msgid "Manager"
 msgstr "Hallinta"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ei mikään"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Hiiritoiminnon sekvenssi"
 
@@ -4691,13 +4794,11 @@ msgid "Menu Settings"
 msgstr "Valikon asetukset"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Oma"
@@ -4708,7 +4809,7 @@ msgid "Main Menu"
 msgstr "Näytä päävalikko"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Suosikit"
 
@@ -4728,7 +4829,7 @@ msgid "Comments"
 msgstr "Kommentti"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4740,7 +4841,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Näytä valikoissa"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Valikot"
 
@@ -4811,19 +4912,19 @@ msgid "Images"
 msgstr "Kuvat"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Fontit"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Teemat"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Kuvakkeet"
 
@@ -4976,18 +5077,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Taustakuvan asetukset"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Käytä teeman taustakuvaa"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Kuva..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Hae verkosta..."
 
@@ -5007,42 +5108,47 @@ msgstr "Tälle työpöydälle"
 msgid "This Screen"
 msgstr "Tälle näytölle"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Taustakuvan asetukset..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Vierekkäin"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Vieritys sivuilta"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Valitse kuva..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Kuvan tuontivirhe"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment ei voinut tuoda kuvaa<br>muunnosvirheen vuoksi."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Taustakuvan tuontivirhe"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment ei voinut tuoda taustakuvaa<br>kopiointivirheen vuoksi."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5080,7 +5186,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Kehysten oletustyyli"
 
@@ -5088,7 +5194,7 @@ msgstr "Kehysten oletustyyli"
 msgid "Window Border Selection"
 msgstr "Ikkunankehyksen valinta"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Muista tämä kehys tälle ikkunalle, kun ikkuna seuraavan kerran avautuu"
 
@@ -5121,7 +5227,7 @@ msgid "Menu Background Base"
 msgstr "Taustakuvat"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Valikon otsikko"
 
@@ -5130,7 +5236,7 @@ msgid "Menu Title Active"
 msgstr "Aktiivisen valikon otsikko"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Valikon teksti"
 
@@ -5144,12 +5250,12 @@ msgid "Menu Item Disabled"
 msgstr "Aktiivisen valikon teksti"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Ikkunan siirtoteksti"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Ikkunan koon muutosteksti"
 
@@ -5167,7 +5273,7 @@ msgid "Winlist Label"
 msgstr "Ikkunalistan nimike"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Ikkunalistan otsikko"
 
@@ -5187,389 +5293,399 @@ msgid "File Manager Background Base"
 msgstr "Tiedostonhallinta"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Aktivointi"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Painikkeen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Passiivisen painikkeen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Asetusnapin teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Passiivisen asetusnapin teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Tekstikentän teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Passiivisen painikkeen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Nimikkeen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Listan kohdan teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Listan kohdan teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Listan kohdan teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Listan otsikko"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Listan otsikko"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Valintanapin teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Passiivisen valintanapin teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Liukusäätimen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Passiivisen liukusäätimen teksti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Taustakuvat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Moduulin nimike"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Värit"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Väriluokat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Aseta väriluokat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Aseta väriluokat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Aseta väriluokat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Oma väri"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Poista"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Offline-tila"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Varjon väri"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Ikkunanhallinta"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Vimpaimet"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Muut"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Ikkunan otsakerivi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Tekstilohko normaali"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Tekstilohko kevyt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Tekstilohko suuri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Asetusten otsake"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Tietoa-ikkunan otsake"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Tietoa-ikkunan versioteksti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Tietoa-ikkunan teksti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Työpöytälukituksen otsikko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Työpöytälukituksen salasana"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Virheikkuna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Suorita komento -teksti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Käynnistysruudun otsikko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Käynnistysruudun teksti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Käynnistysruudun versioteksti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Tekstikenttä"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Kehys"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Nimike"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Liukusäädin"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Valintanapit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Asetusnapit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Tekstilistan kohta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Listan kohta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Listan otsikko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Tiedostonhallinta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Kirjoituspuskuri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Työpöydän kuvake"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Pieni"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Suuri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Pieni tyylitelty"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normaali tyylitelty"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Suuri tyylitelty"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Fonttien asetukset"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Suuri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Todella suuri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Valtava"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pikseliä"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ota käyttöön mukautetut fonttiluokat"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Esikatseluteksti: abc ABC 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Fonttiluokat"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Ota käyttöön fonttiluokat"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Fontti"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Laajempi esikatseluteksti.. abcåäö ABCÅÄÖ 123"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Vihjeistys"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Tavukoodi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Varafontit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Varafontin nimi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Käytä varafontteja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Vihjeistys / varafontit"
 
@@ -5577,12 +5693,17 @@ msgstr "Vihjeistys / varafontit"
 msgid "Icon Theme Settings"
 msgstr "Kuvaketeeman asetukset"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Ota komposiitti käyttöön"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Valitse sovellukset"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Kuvaketeema korvaa perusteeman"
@@ -5649,11 +5770,9 @@ msgid "Custom scaling factor"
 msgstr "Mukautettu skaalauskerroin"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f kertaa"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5664,6 +5783,12 @@ msgstr "Käytäntö"
 msgid "Minimum"
 msgstr "Vähintään"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f kertaa"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Enintään"
@@ -5684,25 +5809,25 @@ msgstr "Näytä käynnistysruutu sisäänkirjauduttaessa"
 msgid "Transition Settings"
 msgstr "Vaihtuman asetukset"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Työpöydän vaihto"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Taustakuvan vaihto"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Vaihtumat"
 
@@ -5718,15 +5843,15 @@ msgstr " Tuo..."
 msgid " Online..."
 msgstr " Hae verkosta..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Teeman osa-alueet"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Ota käyttöön"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Poista kaikki käytöstä"
 
@@ -5755,19 +5880,19 @@ msgstr "Enlightenment ei voinut tuoda teemaa<br>kopiointivirheen vuoksi."
 msgid "Exchange themes"
 msgstr "Vaihda teemoja"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Kehykset"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Kuvaketeema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Hiiren kursori"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skaalaus"
 
@@ -5898,6 +6023,11 @@ msgstr "Käytä sovelluksen tarjoamaa kuvaketta "
 msgid "Border Icon"
 msgstr "Kehys"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Älykäs sijoittaminen"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Älykäs sijoittaminen"
@@ -5929,24 +6059,47 @@ msgstr "Ikkunoiden alla"
 msgid "Animate"
 msgstr "Animaatiot"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineaarinen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Kiihdytä ja jarrutus sulavasti"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Kiihdytä"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Jarruta"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Hiiren kiihdytys"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Jarruta"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Kiihdytä ja jarrutus sulavasti"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Skaalaus"
@@ -5968,6 +6121,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Viimeisin hiiren kohdalla ollut ikkuna"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Kello"
@@ -6006,11 +6160,6 @@ msgstr "Valintaikkunat"
 msgid "Only dialogs with focused parent"
 msgstr "Vain uudet valintaikkunat aktivoituvat"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Aktivointi"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Muut asetukset"
@@ -6121,13 +6270,13 @@ msgid "Fill available space"
 msgstr "Täytä käytettävissä oleva tila"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Leveyssuuntaan"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Korkeussuuntaan"
@@ -6188,7 +6337,7 @@ msgid "Raise when clicking to focus"
 msgstr "Nosta napsautettaessa aktivoitavaksi"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Ikkunan aktivointi"
 
@@ -6446,33 +6595,33 @@ msgstr "Hyvin vaalea"
 msgid "Dropshadow"
 msgstr "Ikkunavarjo"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Kaikki"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Kaikki"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Sivuttajan asetukset"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Kaiken alla"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Kaikki"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Kaikki"
@@ -6482,165 +6631,165 @@ msgstr "Kaikki"
 msgid "Everything Settings"
 msgstr "Päätteen asetukset"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Käytettävissä olevat profiilit"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Siirrä"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Siirrä"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Muokkaa hyllyjä"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Näytä valikoissa"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Näytä valikoissa"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Oletusmoottori"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Tiedot"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Oletusmoottori"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animoitu vaihto"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Piiloutumisen viive"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Oletusmoottori"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Animoitu vaihto"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Aloitetaan"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Aloitetaan"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Viimeiseksi käytetty"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Viimeksi muokattu:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Toiminnon parametrit"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Objektin väri"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Paljas"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Ponnahdus"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Ponnahdusnopeus"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Oikealle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Ponnahdusikkunan asetukset"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6649,39 +6798,30 @@ msgstr "Ponnahdusikkunan asetukset"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Ponnahdus"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Ikkunageometria"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Toiminto"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Kohteet"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6703,167 +6843,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Kirjoituspuskuri"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Avaa sovelluksella..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Avaa sovelluksella..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Lisää sovellus"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Uusi sovellus"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Avaa sovelluksella..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Aja päätteessä"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Suoritettava ohjelma"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Komento"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Määritetty komento"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Kaikki"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Lisää..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Lajittele nyt"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Uudelleennimeä tiedosto"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Kaikki"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Näytä piilotiedostot"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Etsi hakemistoista"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Hakupolkujen asetukset"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Käyttäjän määrittämät hakemistot"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Poista käytöstä"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Valintaikkunat"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Koko näyttö"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Lähetä työpöydälle"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Tiedostokuvakkeet"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tiedostotyypit"
 
@@ -6910,19 +6952,19 @@ msgid "Select an image"
 msgstr "Valitse kuva"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Tiedostonhallinta"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Koti"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6941,7 +6983,7 @@ msgstr ""
 "asettaa asetukset uudelleen<br>mieleiseksesi. Anteeksi asetuksiesi "
 "sorkkiminen.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6957,7 +6999,7 @@ msgstr ""
 "ja<br> varotoimena asetuksesi on palautettu oletus arvoihin.<br>Pahoittelut "
 "aiheutetusta vaivasta.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Filemanin asetukset päivitetty"
 
@@ -7037,95 +7079,99 @@ msgstr "Avaa tiedostonhallinta liitettäessä"
 msgid "Device"
 msgstr "Esikatselu"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Mene isäntähakemistoon"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Muu sovellus..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Avaa"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Avaa sovelluksella..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Tunnetut sovellukset"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Määritetyt sovellukset"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Kaikki sovellukset"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Mukautettu komento"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiointi keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Siirto keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Poisto keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Aliprosessin tuntematon toiminto keskeytettiin"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopioitiin %s"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopioidaan %s (kesto: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Siirrettiin %s"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Siirretään %s (kesto: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Poisto suoritettu"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Poistetaan tiedostot..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7160,7 +7206,7 @@ msgstr "Suoritetaan %d toiminto(a)"
 msgid "Filemanager is idle"
 msgstr "Tiedostonhallinta on toimetonna"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM-toimintotiedot"
 
@@ -7172,37 +7218,42 @@ msgstr "Vempainten hallinta"
 msgid "Available Gadgets"
 msgstr "Käytettävissä olevat vempaimet"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Tilat"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Oma kuvatiedosto"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Oma väri"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Läpikuultava"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animaatiot"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Tausta"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Taustan panorointi"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Vempain: siirrä/muuta kokoa"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Vapaa"
@@ -7451,16 +7502,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Haluatko varmasti poistaa palkin lähteen?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Luo uusi kuvake"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Ominaisuudet"
 
@@ -7504,7 +7555,7 @@ msgstr "Näytä kaikkien työpöytien ikkunat"
 msgid "Show windows from active desktop"
 msgstr "Näytä aktiivisen työpöydän ikkunat"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7633,32 +7684,32 @@ msgstr ""
 "jo koodattu<br>kontekstivalikkojen käyttöön.<br>Tämä painike toimii vain "
 "ponnahduksessa"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Näytä sivuttajan ponnahdusikkuna"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Oikealle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Vasemmalle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Ylemmälle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Alemmalle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Vasemmalle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Vasemmalle työpöydälle ponnahdusikkunasta"
@@ -7679,133 +7730,93 @@ msgstr "Järjestelmän hallinta"
 msgid "Temperature Settings"
 msgstr "Lämpötila-asetukset"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensorit"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Näytä yksiköt"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Tarkistusaikaväli"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Korkea lämpötila"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Matala lämpötila"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Lämpötila"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Tervetuloa Enlightenmentiin"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Valitse jokin"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profiili"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Järjestelmästäsi ei<br>löytynyt valikkotiedostoja.<br> Katso sivuston<br> "
-"www.enlightenment.org<br> dokumenteista<br> tarkempia tietoja<br> kuinka "
-"saat<br> sovellusvalikot<br> toimimaan."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Valitse sovellusvalikko"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Käynnistinpalkki"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Valitse sovellukset"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Työpöytätiedostot"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Ei kuvakkeita työpöydällä"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Ota työpöytäkuvakkeet käyttöön"
 
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Aktivointitapa"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Ikkunat aktivoidaan napsauttamalla"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Ikkunat aktivoituvat kun hiiri on niiden päällä"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Valitse lisättävät kuvakkeet"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Valitse profiili"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Pikakäynnistys"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Valitse sovellukset"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Viimeiseksi käytetty"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7847,7 +7858,7 @@ msgstr "Vasen:"
 msgid "Right:"
 msgstr "Oikea:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Vaimenna"
 
@@ -7871,40 +7882,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Äänikortit"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Mikserin asetukset"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mikseri perustoiminnoille:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Avaa mikseri..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Mikserimoduulin asetukset"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Tarkkuuden vaihto"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Mikseriasetukset päivitetty"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Mikserimoduulin asetustiedot ovat muuttuneet.<br>Aiemmat asetukset on "
-"korvattu uusilla oletusarvoilla.<br>Pahoittelut aiheutuneesta haitasta."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Mikserimoduulin asetukset"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7931,138 +7956,361 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Offline-tila"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Säätimet"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Verkkoyhteyden asetukset"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Suojattu"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Tuntematon tilavuus"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Liitosvirhe"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Vierekkäin"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Vaihtumat"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Asetukset"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Paljas"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Moottori"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Muokkaa"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Käytössä"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Täytä käytettävissä oleva tila"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Suojattu"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Offline-tila"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Yksi ilmoitusalue on jo olemassa"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Käytössä voi olla vain yksi ilmoitusalue ja sellainen on jo olemassa."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Ilmoitusalue"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Ilmoitusalue"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ei voi käynnistää teemajärjestelmäänsä."
+#~ msgid "Acpi"
+#~ msgstr "Toiminto"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Tälle näytölle"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Tälle näytölle"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Muuta kokoa"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Vempain: lopeta siirtäminen/koon muuttaminen"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää Ecorea!\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää tiedostojärjestelmää.\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää X-yhteyttään.\n"
+#~ "Oletko asettanut DISPLAY-muuttujan?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää yhteysjärjestelmäänsä.\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää IPC-järjestelmäänsä.\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ei voi asettaa xineraman käärimistä.\n"
+#~ "Tätä ei pitäisi tapahtua."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ei voi asettaa xineraman käärimistä.\n"
+#~ "Tätä ei pitäisi tapahtua."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää Evas-järjestelmää.\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ei voi käynnistää aloitusruutua.\n"
+#~ "Ehkäpä muisti on lopussa?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Aseta tiedostonhallinta"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ei voi asettaa hyllyjärjestelmäänsä."
+
+#~ msgid "New Application"
+#~ msgstr "Uusi sovellus"
+
+#~ msgid "Background panning"
+#~ msgstr "Taustan panorointi"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f X-akselin kerroin"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f Y-akselin kerroin"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Näytä virranhallinnan signalointi"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Nykyinen näyttöpalvelin ei ole<br>DPMS-valmis"
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Nykyisellä näyttöpalvelimella ei ole<br>DPMS-laajennusta."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Oletusmoottori"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Toiminto"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Kirjoituspuskuri"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Avaa sovelluksella..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Avaa sovelluksella..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Lisää sovellus"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Uusi sovellus"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Aja päätteessä"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Suoritettava ohjelma"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Lisää..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Lajittele nyt"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Uudelleennimeä tiedosto"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Valintaikkunat"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Koko näyttö"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Lähetä työpöydälle"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Järjestelmästäsi ei<br>löytynyt valikkotiedostoja.<br> Katso sivuston<br> "
+#~ "www.enlightenment.org<br> dokumenteista<br> tarkempia tietoja<br> kuinka "
+#~ "saat<br> sovellusvalikot<br> toimimaan."
+
+#~ msgid "Select application menu"
+#~ msgstr "Valitse sovellusvalikko"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Käynnistinpalkki"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Ei kuvakkeita työpöydällä"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Ota työpöytäkuvakkeet käyttöön"
+
+#~ msgid "Focus mode"
+#~ msgstr "Aktivointitapa"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Ikkunat aktivoidaan napsauttamalla"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Ikkunat aktivoituvat kun hiiri on niiden päällä"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Valitse lisättävät kuvakkeet"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Pikakäynnistys"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Mikserimoduulin asetustiedot ovat muuttuneet.<br>Aiemmat asetukset on "
+#~ "korvattu uusilla oletusarvoilla.<br>Pahoittelut aiheutuneesta haitasta."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -8685,12 +8933,6 @@ msgstr "Ilmoitusalue"
 #~ msgid "Exit Immediately"
 #~ msgstr "Poistu välittömästi"
 
-#~ msgid "Shut Down"
-#~ msgstr "Sammuta"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Valmiustila levylle"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Työpöydän lukitus"
 
@@ -8782,9 +9024,6 @@ msgstr "Ilmoitusalue"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Lämpötilan asetukset"
 
-#~ msgid "Back"
-#~ msgstr "Takaisin"
-
 #~ msgid "Choose Language"
 #~ msgstr "Valitse kieli"
 
index bc83480..9119641 100755 (executable)
--- a/po/fo.po
+++ b/po/fo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-10-21 20:00+0000\n"
 "Last-Translator: Gunleif Joensen <Unknown>\n"
 "Language-Team: Faroese <fo@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Um Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Lat aftur"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Liðið</title>"
 
 #: src/bin/e_actions.c:365
@@ -69,620 +69,644 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nei"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Er tú vissur í at fara út?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Tú hevur biðið um at fara úr Enlightenment.<br><br>Er tú vissur í at fara úr?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Vil tú útritast?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Tú er um at útrita.<br><br>Er tú viss í at útrita?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Er tú vissir í at sløkkja?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Tú hevur biðið um at sløkkja telduna.<br><br>Er tú viss í at sløkkja?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Er tú viss í at endurbyrja?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Tú hevur biðið um at endurbyrja telduna.<br><br>Er tú viss í at endurbyrja?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Eru tygum viss í at fara í dvala?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Flyt"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Endurstødda"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Valmynd"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Glugga valmund"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Lyfta"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Lægri"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Gluggi : Standur"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Mesta"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Mesta loddrætt"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Mesta vannrætt"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Mesta fullskýggja"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Mesta standur \"smart\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Mesta standur \"fyll\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Vel ein/eitt"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Skriviborð"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Flippa skriviborðið til vinstru"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Flippa skriviborðið til vinstru"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Flippa skriviborðið upp"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Flippa skriviborðið Niður"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Vippa skriviborðið um..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Vís skriviborðið"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Vís hyllina"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Flippa skriviborðið til..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Vippa skriviborðið linjurætt..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Skift til skriviborð 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Skift til skriviborð 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Skift til skriviborð 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Skift til skriviborð 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Skift til skriviborð 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Skift til skriviborð 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Skift til skriviborð 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Skift til skriviborð 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Skift til skriviborð 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Skift til skriviborð 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Skift til skriviborð 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Skift til skriviborð 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Skift til skriviborð..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Flippa skriviborðið til vinstru (allir skíggjar)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Flippa skriviboðið til høgru (allir skíggjar)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Flippa skriviboðið upp (allir skíggjar)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Flippa skriviborðið niður (allir skíggjar)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Flippa skriviboðið um... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Flippa skriviboðið til... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vippa skriviborðið linjurætt... (Allir skíggjar)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Flippa skriviboðið í eina kós..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Skift til skriviborð 0 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Skift til skriviborð 1 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Skift til skriviborð 2 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Skift til skriviborð 4 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Skift til skriviborð 4 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Skift til skriviborð 5 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Skift til skriviborð 6 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Skift til skriviborð 7 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Skift til skriviborð 8 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Skift til skriviborð 9 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Skift til skriviborð 10 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Skift til skriviborð 11 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Skift til skriviborð... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Skíggji"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Send mús til skíggja 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Send mús til skíggja 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Send mús til skíggja..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Send mús fram til 1 skíggja"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Send mús aftur til 1 skíggja"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Send mús framm/aftur skíggjar.."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Flyt"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Flyt"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Flyt"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Endurstødda"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Flippa skriviboðið í eina kós..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Gluggi : Flyti"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Til næsta skriviborð"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Til fyrra skriviborð"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Av skriviborði #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Til skriviborð..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Vís høvuðs valmynd"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Vís yndis valmynd"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Vís allar nýtsluskipanar valmyndir"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Vís viðskifta valmynd"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Vís valmynd..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Koyr"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Boð"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Nýtsluskipan"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Endurbyrja"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Enda"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Enda nú"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Standur"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Kervi"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Rita út"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Sløkk nú"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Sløkk"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Endurbyrja"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Hvílustøða"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Hvílustøða"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Dvali"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Læs"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Rudda upp í gluggum"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Skíggji"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Skíggji"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Set sum bakgrund"
 
@@ -690,18 +714,16 @@ msgstr "Set sum bakgrund"
 msgid "Color Selector"
 msgstr "Lita veljari"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -709,20 +731,20 @@ msgstr "Lita veljari"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Ógilda"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -733,7 +755,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -742,11 +764,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Skrivi trupuleikar við at goyma Enlightenment setingarnar"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -754,93 +776,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Setingar dagførdar"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "Rudda upp í gluggum"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Vælkomin til Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -848,69 +870,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Framkomið"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Grundleggjandi"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Set í verk"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr ""
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Mótular"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -918,22 +944,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -954,106 +980,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr ""
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr ""
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1089,314 +1114,314 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Nýtsluskipan"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1428,12 +1453,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1441,7 +1466,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr ""
 
@@ -1457,7 +1482,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1477,17 +1502,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1496,7 +1521,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1512,52 +1537,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Flyt"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Endurstødda"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1603,14 +1618,14 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr ""
@@ -1662,156 +1677,163 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Glugga valmund"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Vís yndis valmynd"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Skíggji"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1832,7 +1854,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1991,7 +2013,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2068,15 +2089,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Koyr"
@@ -2091,20 +2110,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Mótular"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2142,7 +2147,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2150,11 +2155,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2167,7 +2172,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2175,76 +2180,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2279,7 +2282,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2309,7 +2312,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2326,7 +2329,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2337,7 +2340,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2346,427 +2349,479 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Skrivi trupuleikar við at goyma Enlightenment setingarnar"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
+#: src/bin/e_main.c:803
+msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
+#: src/bin/e_main.c:814
+msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
+#: src/bin/e_main.c:818
+msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
+#: src/bin/e_main.c:824
+msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1008
-msgid "Setup Wallpaper"
+#: src/bin/e_main.c:828
+msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1013
-msgid "Enlightenment cannot set up its desktop background system."
+#: src/bin/e_main.c:835
+msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1018
-msgid "Setup Mouse"
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1023
-msgid "Enlightenment cannot configure the mouse settings."
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1028
-msgid "Setup Bindings"
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1033
-msgid "Enlightenment cannot set up its bindings system."
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1038
-msgid "Setup Shelves"
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
+#: src/bin/e_main.c:908
+msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
+#: src/bin/e_main.c:949
+msgid "Almost Done"
 msgstr ""
 
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2774,7 +2829,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2782,7 +2837,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2790,42 +2845,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2833,16 +2880,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2853,26 +2900,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Boð"
@@ -2881,16 +2928,16 @@ msgstr "Boð"
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2898,113 +2945,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3012,156 +3059,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3172,12 +3219,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3205,140 +3252,146 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Vel ein/eitt"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Dvali"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3346,32 +3399,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr ""
 
@@ -3423,17 +3477,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3446,10 +3500,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Koyr"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Nýtsluskipan"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Skriviborð"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3462,7 +3531,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3500,9 +3569,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3544,7 +3613,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3552,7 +3621,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3560,7 +3629,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3568,7 +3637,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3576,47 +3645,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3625,11 +3694,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3638,90 +3707,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Skriviborð"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3738,7 +3790,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3749,12 +3801,12 @@ msgstr "Set sum bakgrund"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3762,186 +3814,213 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Hvílustøða"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Hvílustøða"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Læs"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Hvílustøða"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Skíggji"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3987,102 +4066,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4228,34 +4307,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4336,17 +4428,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4369,13 +4461,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4385,7 +4475,7 @@ msgid "Main Menu"
 msgstr "Vís høvuðs valmynd"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4404,7 +4494,7 @@ msgid "Comments"
 msgstr "Boð"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4415,7 +4505,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4483,19 +4573,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4639,18 +4729,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4670,42 +4760,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4740,7 +4834,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4748,7 +4842,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4778,7 +4872,7 @@ msgid "Menu Background Base"
 msgstr "Set sum bakgrund"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4787,7 +4881,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4800,12 +4894,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4822,7 +4916,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4840,378 +4934,388 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Set sum bakgrund"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5219,11 +5323,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5288,10 +5396,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5303,6 +5409,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5323,25 +5435,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5357,15 +5469,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5392,19 +5504,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5526,6 +5638,10 @@ msgstr "Nýtsluskipan"
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5556,23 +5672,43 @@ msgstr "Rudda upp í gluggum"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr ""
 
@@ -5593,6 +5729,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5627,11 +5764,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5732,13 +5864,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5796,7 +5928,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6046,28 +6178,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6075,146 +6207,146 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Flyt"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Flyt"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr ""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6223,37 +6355,28 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Nýtsluskipan"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Nýtsluskipan"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6275,152 +6398,63 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Nýtsluskipan"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nýtsluskipan"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Nýtsluskipan"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Boð"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Boð"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Nýtsluskipan"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Mesta fullskýggja"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6467,19 +6501,19 @@ msgid "Select an image"
 msgstr "Vel ein/eitt"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6490,7 +6524,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6500,7 +6534,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6577,95 +6611,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6700,7 +6738,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6712,36 +6750,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Flyt"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6968,15 +7010,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 #, fuzzy
 msgid "Properties"
 msgstr "Nýtsluskipan"
@@ -7021,7 +7063,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7140,31 +7182,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7184,129 +7226,92 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Høgt hitastig"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Lágt hitastig"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Hitastig"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Hitastig"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Næst"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Vælkomin til Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Vel ein/eitt"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Vel ein/eitt"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Flyt"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7348,7 +7353,7 @@ msgstr "Vinstru:"
 msgid "Right:"
 msgstr "Høgru:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Doyv"
 
@@ -7372,38 +7377,53 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Ljóð kort"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Mótular"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7430,121 +7450,157 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Stýritól"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Skíggji"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Skíggji"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Endurstødda"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Nýtsluskipan"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Nýtsluskipan"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nýtsluskipan"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Mesta fullskýggja"
+
+#, fuzzy
 #~ msgid "Show home directory"
 #~ msgstr "Vís skriviborðið"
 
index c8432d6..c088002 100755 (executable)
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,15 +2,16 @@
 # This file is put in the public domain.
 # 'Caro' <EMAIL@ADDRESS>,2005.
 # batden <batden@orange.fr>, 2009, 2010, 2011.
+# dazibao <dazibao@sfr.fr>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-06-09 09:43+0400\n"
-"Last-Translator: batden <batden@orange.fr>\n"
-"Language-Team: Enlightenment French Team <pourunmondesansgourou@gmail.com>\n"
+"POT-Creation-Date: 2011-12-01 06:34+0100\n"
+"PO-Revision-Date: 2011-12-01 12:18+0100\n"
+"Last-Translator: dazibao <dazibao@sfr.fr>\n"
+"Language-Team: Enlightenment French Team <sansgourou@gmail.com>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,20 +25,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos de Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
-#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/bin/e_about.c:17
+#: src/bin/e_actions.c:2728
+#: src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974
+#: src/bin/e_int_border_menu.c:151
+#: src/bin/e_int_border_prop.c:81
+#: src/bin/e_theme_about.c:17
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023
+#: src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18
+#: src/bin/e_actions.c:3060
+#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068
+#: src/bin/e_int_menus.c:182
+#: src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,661 +54,754 @@ msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
-msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
-"warranty. This software is governed by licensing conditions, so please see "
-"the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
-msgstr ""
-"Copyright &copy; 1999-2011, par l'Équipe de Développement de Enlightenment."
-"<br><br>Nous espérons que vous prendrez autant de plaisir à utiliser ce "
-"programme que nous en prenons à le développer.<br><br>Ce programme est "
-"fourni « EN L'ÉTAT » sans garantie d'aucune sorte, qu'elle soit exprimée ou "
-"implicite. Ce programme est régi par des conditions de licence, veuillez "
-"consulter les fichiers de licence COPYING et COPYING-PLAIN installés sur "
-"votre système.<br><br>Enlightenment est en cours de <hilight>DÉVELOPPEMENT "
-"INTENSIF</hilight> et n'est donc pas stable. Beaucoup de fonctionnalités "
-"sont encore incomplètes ou non encore implémentées et peuvent contenir de "
-"nombreux bogues. Vous êtes <hilight>PRÉVENU !</hilight>"
-
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>Notre Équipe</title>"
+msgid "<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</><br><br>We hope you enjoy using this software as much as we enjoyed writing it.<br><br>This software is provided as-is with no explicit or implied warranty. This software is governed by licensing conditions, so please see the COPYING and COPYING-PLAIN licence files installed on your system.<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not stable. Many features are incomplete or even non-existent yet and may have many bugs. You have been <hilight>WARNED!</>"
+msgstr "<title>Copyright &copy; 1999-2011, par l'Équipe de Développement de Enlightenment.<br><br>Nous espérons que vous prendrez autant de plaisir à utiliser ce programme que nous en prenons à le développer.<br><br>Ce programme est fourni « EN L'ÉTAT » sans garantie d'aucune sorte, qu'elle soit exprimée ou implicite. Ce programme est régi par des conditions de licence, veuillez consulter les fichiers de licence COPYING et COPYING-PLAIN installés sur votre système.<br><br>Enlightenment est en cours de <hilight>DÉVELOPPEMENT INTENSIF</hilight> et n'est donc pas stable. Beaucoup de fonctionnalités sont encore incomplètes ou non encore implémentées et peuvent contenir de nombreux bogues. Vous êtes <hilight>PRÉVENU !</hilight>"
+
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>Notre Équipe</><br><br>"
 
 #: src/bin/e_actions.c:365
 #, c-format
-msgid ""
-"You are about to kill %s.<br><br>Please keep in mind that all data from this "
-"window<br>which has not yet been saved will be lost!<br><br>Are you sure you "
-"want to kill this window?"
-msgstr ""
-"Vous êtes sur le point de tuer %s.<br><br>Tous les éléments rattachés à "
-"cette fenêtre<br>qui n'ont pas été enregistrés seront perdus !<br><br>Voulez-"
-"vous vraiment tuer cette fenêtre ?"
+msgid "You are about to kill %s.<br><br>Please keep in mind that all data from this window<br>which has not yet been saved will be lost!<br><br>Are you sure you want to kill this window?"
+msgstr "Vous êtes sur le point de tuer %s.<br><br>Tous les éléments rattachés à cette fenêtre<br>qui n'ont pas été enregistrés seront perdus !<br><br>Voulez-vous vraiment tuer cette fenêtre ?"
 
 #: src/bin/e_actions.c:377
 msgid "Are you sure you want to kill this window?"
 msgstr "Voulez-vous vraiment tuer cette fenêtre ?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380
+#: src/bin/e_actions.c:1917
+#: src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077
+#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271
+#: src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050
+#: src/bin/e_fm.c:9205
+#: src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518
+#: src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382
+#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273
+#: src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052
+#: src/bin/e_fm.c:9203
+#: src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519
+#: src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Voulez-vous vraiment quitter ?"
 
-#: src/bin/e_actions.c:1914
-msgid ""
-"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
-msgstr ""
-"Vous avez demandé à quitter Enlightenment.<br><br>Voulez-vous vraiment le "
-"faire ?"
+#: src/bin/e_actions.c:1913
+msgid "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr "Vous avez demandé à quitter Enlightenment.<br><br>Voulez-vous vraiment le faire ?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Voulez-vous vraiment fermer votre session ?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr ""
-"Vous êtes sur le point de fermer votre session.<br><br>Voulez-vous vraiment "
-"le faire ?"
+msgstr "Vous êtes sur le point de fermer votre session.<br><br>Voulez-vous vraiment le faire ?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071
+#: src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Voulez-vous vraiment éteindre ?"
 
-#: src/bin/e_actions.c:2074
-msgid ""
-"You requested to turn off your Computer.<br><br>Are you sure you want to "
-"shut down?"
-msgstr ""
-"Vous avez demandé à éteindre votre ordinateur.<br><br>Voulez-vous vraiment "
-"le faire ?"
+#: src/bin/e_actions.c:2073
+msgid "You requested to turn off your Computer.<br><br>Are you sure you want to shut down?"
+msgstr "Vous avez demandé à éteindre votre ordinateur.<br><br>Voulez-vous vraiment le faire ?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Voulez-vous vraiment redémarrer ?"
 
-#: src/bin/e_actions.c:2137
-msgid ""
-"You requested to reboot your Computer.<br><br>Are you sure you want to "
-"restart it?"
-msgstr ""
-"Vous avez demandé à relancer votre ordinateur.<br><br>Voulez-vous vraiment "
-"redémarrer ?"
+#: src/bin/e_actions.c:2136
+msgid "You requested to reboot your Computer.<br><br>Are you sure you want to restart it?"
+msgstr "Vous avez demandé à relancer votre ordinateur.<br><br>Voulez-vous vraiment redémarrer ?"
 
-#: src/bin/e_actions.c:2205
-msgid ""
-"You requested to suspend your Computer.<br><br>Are you sure you want to "
-"suspend?"
-msgstr ""
-"Vous avez demandé à mettre votre ordinateur en veille.<br><br>Voulez-vous "
-"vraiment le faire ?"
+#: src/bin/e_actions.c:2204
+msgid "You requested to suspend your Computer.<br><br>Are you sure you want to suspend?"
+msgstr "Vous avez demandé à mettre votre ordinateur en veille.<br><br>Voulez-vous vraiment le faire ?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
-msgstr "Voulez-vous vraiment mettre votre ordinateur en sommeil (STD) ?"
+msgstr "Mettre en sommeil (STD), vraiment ?"
 
-#: src/bin/e_actions.c:2268
-msgid ""
-"You requested to hibernate your Computer.<br><br>Are you sure you want to "
-"suspend to disk?"
-msgstr ""
-"Vous avez demandé à mettre votre ordinateur en sommeil (STD).<br><br>Voulez-"
-"vous vraiment le mettre dans un état d'hibernation ?"
+#: src/bin/e_actions.c:2267
+msgid "You requested to hibernate your Computer.<br><br>Are you sure you want to suspend to disk?"
+msgstr "Vous avez demandé à mettre votre ordinateur en sommeil (STD).<br><br>Voulez-vous vraiment le mettre dans un état d'hibernation ?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688
+#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723
+#: src/bin/e_actions.c:2728
+#: src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003
+#: src/bin/e_actions.c:3009
+#: src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688
+#: src/bin/e_fm.c:6168
+#: src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699
+#: src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710
+#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3042
+#: src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718
+#: src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Placer dessus"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723
+#: src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Placer dessous"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733
+#: src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767
+#: src/bin/e_actions.c:2769
+#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2780
+#: src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784
+#: src/bin/e_actions.c:2786
+#: src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795
+#: src/bin/e_actions.c:2800
+#: src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Activer/Désactiver l'ancrage"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Activer/Désactiver l'iconique"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Activer/Désactiver le mode plein écran"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759
+#: src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximisation plein écran"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximisation en mode « intelligent »"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximisation en mode « expansion »"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximisation en mode « remplissage »"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le haut"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le bas"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la gauche"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la droite"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Activer/Désactiver l'enroulement"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Activer/Désactiver le mode sans bordure"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Définir la bordure"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Circuler parmi les bordures"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Activer/Désactiver l'épinglage"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
-#: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
-#: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
+#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2819
+#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823
+#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2842
+#: src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854
+#: src/bin/e_actions.c:2856
+#: src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860
+#: src/bin/e_actions.c:2862
+#: src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866
+#: src/bin/e_actions.c:2868
+#: src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872
+#: src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878
+#: src/bin/e_actions.c:2884
+#: src/bin/e_actions.c:2886
+#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915
+#: src/bin/e_actions.c:2917
+#: src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921
+#: src/bin/e_actions.c:2923
+#: src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927
+#: src/bin/e_actions.c:2929
+#: src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933
+#: src/bin/e_actions.c:2935
+#: src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939
+#: src/bin/e_actions.c:3114
+#: src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267
+#: src/bin/e_fm.c:3273
+#: src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334
+#: src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637
+#: src/bin/e_fm_device.c:664
+#: src/bin/e_int_menus.c:144
+#: src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358
+#: src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Basculer vers le bureau gauche"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Basculer vers le bureau droit"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Basculer vers le bureau du dessus"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Basculer vers le bureau du dessous"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de … bureaux"
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Afficher le rack"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Aller au bureau …"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de … bureaux"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Passer au bureau 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Passer au bureau 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Passer au bureau 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Passer au bureau 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Passer au bureau 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Passer au bureau 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Passer au bureau 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Passer au bureau 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Passer au bureau 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Passer au bureau 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Passer au bureau 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Passer au bureau 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Passer au bureau …"
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Basculer vers le bureau gauche (tous les écrans)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Basculer vers le bureau droit (tous les écrans)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Basculer vers le bureau du dessus (tous les écrans)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Basculer vers le bureau du dessous (tous les écrans)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de … bureaux (tous les écrans)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Aller au bureau … (tous les écrans)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de … bureaux (tous les écrans)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Basculer le bureau en direction de ..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passer au bureau 0 (tous les écrans)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passer au bureau 1 (tous les écrans)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passer au bureau 2 (tous les écrans)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passer au bureau 3 (tous les écrans)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passer au bureau 4 (tous les écrans)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passer au bureau 5 (tous les écrans)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passer au bureau 6 (tous les écrans)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passer au bureau 7 (tous les écrans)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passer au bureau 8 (tous les écrans)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passer au bureau 9 (tous les écrans)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passer au bureau 10 (tous les écrans)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passer au bureau 11 (tous les écrans)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passer au bureau … (tous les écrans)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945
+#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955
+#: src/bin/e_actions.c:2957
+#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964
+#: src/bin/e_actions.c:2967
+#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979
+#: src/bin/e_actions.c:2981
+#: src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer le curseur à l'écran 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer le curseur à l'écran 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer le curseur à l'écran …"
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer le curseur à l'écran suivant"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer le curseur à l'écran précédent"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envoyer le curseur … écrans plus loin"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "Assombrir"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "Éclaircir"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "Rétroéclairage réglé"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "Rétroéclairage minimum"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "Rétroéclairage moyen"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "Rétroéclairage maximum"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "Ajuster le rétroéclairage"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "Augmenter le rétroéclairage"
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr "Baisser le rétroéclairage"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "Déplacer au centre"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Déplacer vers …"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr "Déplacer de …"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Redimensionner de …"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "En direction de …"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Glisser l'icone …"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020
+#: src/bin/e_actions.c:3022
+#: src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Vers le bureau suivant"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Vers le bureau précédent"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Déplacer de … bureaux"
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Vers le bureau …"
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des favoris"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Afficher la liste des fenêtres"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Afficher le menu …"
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
-#: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/bin/e_actions.c:3051
+#: src/bin/e_actions.c:3056
+#: src/modules/conf/e_mod_main.c:264
+#: src/modules/conf/e_mod_main.c:367
+#: src/modules/fileman/e_mod_main.c:72
+#: src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lancer"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051
+#: src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056
+#: src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060
+#: src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064
+#: src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Quitter à l'instant"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072
+#: src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : mode"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Activer/Désactiver le mode présentation"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Activer/Désactiver le mode hors ligne"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082
+#: src/bin/e_actions.c:3086
+#: src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094
+#: src/bin/e_actions.c:3098
+#: src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106
+#: src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
-#: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182
+#: src/modules/syscon/e_mod_main.c:31
+#: src/modules/syscon/e_mod_main.c:35
+#: src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Sortie"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Arrêt immédiat"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Arrêt"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Relance"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "Directement en veille"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Veille"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Sommeil"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Verrou"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119
+#: src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Réorganiser les fenêtres"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Générique : actions"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Action reportée"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Assombrir l'écran"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Éclaicir l'écran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Utiliser comme fond d'écran"
 
@@ -707,284 +809,248 @@ msgstr "Utiliser comme fond d'écran"
 msgid "Color Selector"
 msgstr "Sélecteur de couleur"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
-#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_color_dialog.c:46
+#: src/bin/e_config.c:1611
+#: src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262
+#: src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918
+#: src/bin/e_entry_dialog.c:62
+#: src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717
+#: src/bin/e_fm.c:9361
+#: src/bin/e_fm_prop.c:507
+#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_module.c:415
+#: src/bin/e_sys.c:487
+#: src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707
+#: src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
-#: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
+#: src/modules/cpufreq/e_mod_main.c:415
+#: src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
 #: src/modules/fileman/e_int_config_mime_edit.c:303
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47
+#: src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920
+#: src/bin/e_entry_dialog.c:63
+#: src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508
+#: src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120
+#: src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
-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 "
-"development, so don't report a<br>bug. This simply means Enlightenment needs "
-"new settings<br>data by default for usable functionality that your "
-"old<br>settings simply lack. This new set of defaults will fix<br>that by "
-"adding it in. You can re-configure things now to your<br>liking. Sorry for "
-"the hiccup in your settings.<br>"
-msgstr ""
-"Les données de configuration ont dû être mises à jour. Votre "
-"ancienne<br>configuration a été supprimée et de nouveaux paramètres "
-"par<br>défaut sont en place. Cela risque d'arriver en phase "
-"de<br>développement, aussi est-il inutile de faire un rapport de bogue."
-"<br>Cela signifie simplement que Enlightenment a besoin<br>de cette mise à "
-"niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout "
-"reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
-
-#: src/bin/e_config.c:980
-msgid ""
-"Your settings are NEWER than Enlightenment. This is very<br>strange. This "
-"should not happen unless you downgraded<br>Enlightenment or copied the "
-"settings from a place where<br>a newer version of Enlightenment was running. "
-"This is bad and<br>as a precaution your settings have been now restored "
-"to<br>defaults. Sorry for the inconvenience.<br>"
-msgstr ""
-"Votre configuration est PLUS RÉCENTE que Enlightenment.<br>C'est vraiment "
-"étonnant. Cela ne devrait pas se produire<br>à moins que vous n'ayez "
-"installé une version antérieure<br>ou copié la configuration depuis une "
-"machine sur laquelle<br>une version plus récente était en cours. Ce n'est "
-"pas bon<br>et, par mesure de précaution, les valeurs par défaut de<br>votre "
-"configuration ont été restaurées.<br>Désolé pour le désagrément.<br>"
-
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:972
+#: src/bin/e_config.c:1005
+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 development, so don't report a<br>bug. This simply means Enlightenment needs new settings<br>data by default for usable functionality that your old<br>settings simply lack. This new set of defaults will fix<br>that by adding it in. You can re-configure things now to your<br>liking. Sorry for the hiccup in your settings.<br>"
+msgstr "Les données de configuration ont dû être mises à jour. Votre ancienne<br>configuration a été supprimée et de nouveaux paramètres par<br>défaut sont en place. Cela risque d'arriver en phase de<br>développement, aussi est-il inutile de faire un rapport de bogue.<br>Cela signifie simplement que Enlightenment a besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
+
+#: src/bin/e_config.c:989
+msgid "Your settings are NEWER than Enlightenment. This is very<br>strange. This should not happen unless you downgraded<br>Enlightenment or copied the settings from a place where<br>a newer version of Enlightenment was running. This is bad and<br>as a precaution your settings have been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr "Votre configuration est PLUS RÉCENTE que la version actuelle de E.<br>C'est vraiment étonnant. Cela ne devrait pas se produire<br>à moins que vous n'ayez installé une version antérieure<br>ou copié la configuration depuis une machine sur laquelle<br>une version plus récente de E était en cours. Ce n'est pas bon<br>et, par mesure de précaution, les valeurs par défaut de<br>votre configuration ont été restaurées.<br>Désolé pour le désagrément.<br>"
+
+#: src/bin/e_config.c:1598
+#: src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration de Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
-msgid ""
-"Enlightenment has an error while moving config files<br>from:<br>"
-"%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety."
-"<br>"
-msgstr ""
-"Enlightenment a rencontré une erreur pendant<br>le déplacement de données de "
-"configuration<br>de :<br>%s<br><br>vers :<br>%s<br><br>L'écriture a été "
-"abandonnée par sécurité.<br>"
+msgid "Enlightenment has an error while moving config files<br>from:<br>%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety.<br>"
+msgstr "Enlightenment a rencontré une erreur pendant<br>le déplacement de données de configuration<br>de :<br>%s<br><br>vers :<br>%s<br><br>L'écriture a été abandonnée par sécurité.<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Configuration mise à niveau"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "Traitement du fichier EET incorrect."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Aucune donnée dans le fichier."
 
-#: src/bin/e_config.c:2117
-msgid ""
-"The file is not writable. Perhaps the disk is read-only<br>or you lost "
-"permissions to your files."
-msgstr ""
-"Le fichier n'est pas éditable. Le disque est peut-être monté<br>en lecture "
-"seule ou les permissions ont été modifiées."
+#: src/bin/e_config.c:2149
+msgid "The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files."
+msgstr "Le fichier n'est pas éditable. Le disque est peut-être monté<br>en lecture seule ou les permissions ont été modifiées."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
-msgstr ""
-"Mémoire insuffisante pour l'écriture.<br>Veuillez libérer de la mémoire."
+msgstr "Mémoire insuffisante pour l'écriture.<br>Veuillez libérer de la mémoire."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Erreur générique."
 
-#: src/bin/e_config.c:2125
-msgid ""
-"The settings file is too large.<br>It should be very small (a few hundred KB "
-"at most)."
-msgstr ""
-"Le fichier de configuration est trop gros.<br>Il ne devrait pas dépasser "
-"quelques centaines de Ko."
+#: src/bin/e_config.c:2158
+msgid "The settings file is too large.<br>It should be very small (a few hundred KB at most)."
+msgstr "Le fichier de configuration est trop gros.<br>Il ne devrait pas dépasser quelques centaines de Ko."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
-msgstr "Erreurs d'E/S sur le disque.<br>Peut-être devriez-vous le remplacer ?"
+msgstr "Erreurs d' E/S sur le disque.<br>Peut-être devriez-vous le remplacer ?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "Plus assez d'espace disponible pour l'écriture."
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "Le fichier s'est fermé pendant l'écriture."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Échec du mappage du fichier en mémoire (mmap)."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "Échec de l'encodage X509."
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Échec de la signature."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "Signature invalide."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Non signé."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Pas encore implémenté."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "Impossible de générer un germe PRNG."
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "Échec du cryptage."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr "Échec du décryptage."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "Enlightenment ne reconnaît pas cette erreur."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
-msgid ""
-"Enlightenment has an error while writing<br>its config file.<br>"
-"%s<br><br>The file where the error occurred was:<br>%s<br><br>This file has "
-"been deleted to avoid corrupt data.<br>"
-msgstr ""
-"Une erreur s'est produite au niveau du fichier<br>de configuration dans "
-"lequel Enlightenment<br>était en train d'écrire.<br>%s<br><br> Le fichier "
-"incriminé était :<br>%s<br><br>Ce fichier a été supprimé pour éviter la "
-"corruption des données.<br>"
+msgid "Enlightenment has an error while writing<br>its config file.<br>%s<br><br>The file where the error occurred was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
+msgstr "Une erreur s'est produite au niveau du fichier<br>de configuration dans lequel Enlightenment<br>était en train d'écrire.<br>%s<br><br>Le fichier incriminé était :<br>%s<br><br>Ce fichier a été supprimé pour éviter la corruption des données.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
-#: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
+#: src/bin/e_config_dialog.c:210
+#: src/modules/battery/e_mod_main.c:721
+#: src/modules/conf/e_mod_main.c:275
+#: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239
+#: src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Basique"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/bin/e_configure.c:28
+#: src/modules/conf_shelves/e_mod_main.c:21
+#: src/modules/gadman/e_mod_main.c:25
+#: src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
+#: src/bin/e_configure.c:29
+#: src/bin/e_configure.c:32
+#: src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Modules"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "Préférences"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Erreur : aucun support de PAM"
 
-#: src/bin/e_desklock.c:171
-msgid ""
-"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
-msgstr ""
-"Enlightenment a été compilé sans le support de PAM,<br>le verrouillage "
-"d'écran a été désactivé."
+#: src/bin/e_desklock.c:172
+msgid "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr "Enlightenment a été compilé sans le support de PAM,<br>le verrouillage d'écran a été désactivé."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:236
-msgid ""
-"Locking the desktop failed because some application<br>has grabbed either "
-"the keyboard or the mouse or both<br>and their grab is unable to be broken."
-msgstr ""
-"Le verrouillage de l'écran a échoué car une application<br>s'est accaparée "
-"le clavier ou la souris, voire les deux,<br>et il n'est pas possible "
-"d'outrepasser cette action."
+#: src/bin/e_desklock.c:237
+msgid "Locking the desktop failed because some application<br>has grabbed either the keyboard or the mouse or both<br>and their grab is unable to be broken."
+msgstr "Le verrouillage de l'écran a échoué car une application<br>s'est accaparée le clavier ou la souris, voire les deux,<br>et il n'est pas possible d'outrepasser cette action."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Veuillez saisir le mot de passe de déverrouillage"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Erreur du système d'authentification"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
-msgid ""
-"Authentication via PAM had errors setting up the<br>authentication session. "
-"The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
-"happening. Please report this bug."
-msgstr ""
-"L'authentification via PAM a rencontré une erreur lors de<br>la session "
-"d'authentification. Le code de l'erreur est <hilight>%i</hilight>.<br>Cette "
-"erreur ne devrait pas se produire.<br>Merci de faire un rapport de bogue."
+msgid "Authentication via PAM had errors setting up the<br>authentication session. The error code was <hilight>%i</hilight>.<br>This is bad and should not be happening. Please report this bug."
+msgstr "L'authentification via PAM a rencontré une erreur lors de<br>la session d'authentification. Le code de l'erreur est <hilight>%i</hilight>.<br>Cette erreur ne devrait pas se produire.<br>Merci de faire un rapport de bogue."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041
+#: src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Activer le mode présentation ?"
 
-#: src/bin/e_desklock.c:992
-msgid ""
-"You unlocked desktop too fast.<br><br>Would you like to enable "
-"<b>presentation</b> mode and temporarily disable screen saver, lock and "
-"power saving?"
-msgstr ""
-"Vous avez déverrouillé l'écran trop vite...<br><br>Voulez-vous activer le "
-"mode  <b>présentation</b> et désactiver temporairement l'écran de veille, le "
-"verrouillage et la gestion de l'énergie ?"
+#: src/bin/e_desklock.c:1044
+msgid "You unlocked desktop too fast.<br><br>Would you like to enable <b>presentation</b> mode and temporarily disable screen saver, lock and power saving?"
+msgstr "Vous avez déverrouillé l'écran trop vite...<br><br>Voulez-vous activer le mode  <b>présentation</b> et désactiver temporairement l'écran de veille, le verrouillage et la gestion de l'énergie ?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054
+#: src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Non, mais augmenter le délai"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056
+#: src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Non, et ne plus demander"
 
@@ -993,123 +1059,128 @@ msgid "Incomplete Window Properties"
 msgstr "Propriétés de la fenêtre incomplètes"
 
 #: src/bin/e_eap_editor.c:175
-msgid ""
-"The window you are creating an icon for<br>does not contain window name and "
-"class<br>properties, so the needed properties for<br>the icon so that it "
-"will be used for this<br>window cannot be guessed. You will need to<br>use "
-"the window title instead. This will only<br>work if the window title is the "
-"same at<br>the time the window starts up, and does not<br>change."
-msgstr ""
-"La fenêtre pour laquelle vous voulez créer un icone<br>n'a pas de nom, ni de "
-"classe, aussi les<br>propriétés nécessaires pour cet icone ne peuvent-"
-"elles<br>être allouées. Vous devriez utiliser le titre de<br>la fenêtre à la "
-"place. Cela fonctionnera<br>seulement si le nom de la fenêtre est "
-"identique<br>à celui du démarrage, et ne change pas ensuite."
+msgid "The window you are creating an icon for<br>does not contain window name and class<br>properties, so the needed properties for<br>the icon so that it will be used for this<br>window cannot be guessed. You will need to<br>use the window title instead. This will only<br>work if the window title is the same at<br>the time the window starts up, and does not<br>change."
+msgstr "La fenêtre pour laquelle vous voulez créer un icone<br>n'a pas de nom, ni de classe, aussi les<br>propriétés nécessaires pour cet icone ne peuvent-elles<br>être allouées. Vous devriez utiliser le titre de<br>la fenêtre à la place. Cela fonctionnera<br>seulement si le nom de la fenêtre est identique<br>à celui du démarrage, et ne change pas ensuite."
 
 #: src/bin/e_eap_editor.c:230
 msgid "Desktop Entry Editor"
 msgstr "Éditeur de fichier desktop"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671
+#: src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726
+#: src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394
+#: src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icone"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nom générique"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751
+#: src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Types MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Fichier desktop"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
-#: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1476
+#: src/modules/pager/e_mod_config.c:126
+#: src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Général"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notification de démarrage"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Exécuter dans un terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Afficher dans les menus"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786
+#: src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Options"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Sélectionner un icone"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Sélectionner un exécutable"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496
+#: src/bin/e_fm.c:8208
+#: src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506
+#: src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514
+#: src/bin/e_fm.c:6163
+#: src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522
+#: src/bin/e_fm.c:7954
+#: src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Coller"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:217
+#: src/bin/e_exec.c:224
+#: src/bin/e_exec.c:236
+#: src/bin/e_exec.c:260
+#: src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1122,15 +1193,12 @@ msgstr "Enlightenment n'est pas en mesure de déterminer le répertoire courant"
 #: src/bin/e_exec.c:225
 #, c-format
 msgid "Enlightenment was unable to change to directory:<br><br>%s"
-msgstr ""
-"Enlightenment n'est pas en mesure de changer de répertoire vers :<br><br>%s"
+msgstr "Enlightenment n'est pas en mesure de changer de répertoire vers :<br><br>%s"
 
 #: src/bin/e_exec.c:237
 #, c-format
 msgid "Enlightenment was unable to restore to directory:<br><br>%s"
-msgstr ""
-"Enlightenment n'est pas en mesure d'effectuer la restauration vers :<br><br>"
-"%s"
+msgstr "Enlightenment n'est pas en mesure d'effectuer la restauration vers :<br><br>%s"
 
 #: src/bin/e_exec.c:261
 #, c-format
@@ -1143,329 +1211,345 @@ msgstr "Erreur d'exécution de l'application"
 
 #: src/bin/e_exec.c:391
 #, c-format
-msgid ""
-"Enlightenment was unable to run the application:<br><br>%s<br><br>The "
-"application failed to start."
-msgstr ""
-"Enlightenment n'a pu démarrer l'application :<br><br>%s<br><br>L'application "
-"n'a pas réussi à se lancer."
+msgid "Enlightenment was unable to run the application:<br><br>%s<br><br>The application failed to start."
+msgstr "Enlightenment ne peut exécuter l'application :<br><br>%s<br><br>Son lancement a échoué."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s s'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s a retourné le code de sortie %1$i."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s a été interrompu par un signal d'interruption."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s a été interrompu par un signal de sortie."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s a été interrompu par un signal d'arrêt."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s a été interrompu par une erreur de virgule flottante."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu par un signal de mort prioritaire."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s a été interrompu par une erreur de segmentation."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s a été interrompu par un tube cassé."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s a été interrompu par un signal de terminaison."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s a été interrompu par une erreur de bus."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s a été interrompu par le signal numéro %i."
 
-#: src/bin/e_exec.c:609
-msgid ""
-"***The remaining output has been truncated. Save the output to view.***\n"
-msgstr ""
-"***Le reste de la sortie a été tronqué. Enregistrez la sortie pour tout voir."
-"***\n"
+#: src/bin/e_exec.c:605
+msgid "***The remaining output has been truncated. Save the output to view.***\n"
+msgstr "***Le reste de la sortie a été tronqué. Enregistrez la sortie pour tout voir.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667
+#: src/bin/e_exec.c:741
+#: src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Journaux des erreurs"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673
+#: src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677
+#: src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Enregistrer ce message"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681
+#: src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Ce journal d'erreur va être enregistré dans %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Information sur l'erreur"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725
+#: src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Chemin inexistant"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s n'existe pas."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Erreur au montage"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Impossible de monter le périphérique"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Erreur lors du démontage"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Impossible de démonter le périphérique"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Erreur pendant l'éjection"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Impossible d'éjecter le périphérique"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Fichiers"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176
+#: src/bin/e_fm.c:7962
+#: src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Lien "
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184
+#: src/bin/e_fm.c:9143
+#: src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Annuler"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881
+#: src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Hériter des options du parent"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890
+#: src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Mode d'affichage"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897
+#: src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Rafraîchir"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905
+#: src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917
+#: src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Mémoriser l'ordre"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926
+#: src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938
+#: src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Démonter"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Monter"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Éjecter"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Propriétés de l'application"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263
+#: src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propriétés du fichier"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500
+#: src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Valeur par défaut"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526
+#: src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Icones alignés"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534
+#: src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Icones personnalisés"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542
+#: src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icone (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614
+#: src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Définir le fond d'écran…"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619
+#: src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Définir l'incrustation…"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718
+#: src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142
+#: src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Réessayer"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Non pour tout"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Oui pour tout"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Le fichier existe déjà, écraser<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorer"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Tout ignorer"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Une erreur s'est produite lors d'une opération.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Voulez-vous vraiment supprimer<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
-msgid ""
-"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
-"hilight> ?"
-msgstr ""
-"Voulez-vous vraiment supprimer<br>les %d fichiers sélectionnés dans :"
-"<br><hilight>%s</hilight> ?"
+msgid "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</hilight> ?"
+msgstr "Voulez-vous vraiment supprimer<br>les %d fichiers sélectionnés dans :<br><hilight>%s</hilight> ?"
 
 #: src/bin/e_fm_device.c:33
 #, c-format
@@ -1492,12 +1576,12 @@ msgstr "%llu Kio"
 msgid "%llu B"
 msgstr "%llu o"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume inconnu"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
@@ -1505,7 +1589,8 @@ msgstr "Périphérique amovible"
 msgid "File:"
 msgstr "Fichier :"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339
+#: src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Taille :"
 
@@ -1521,7 +1606,8 @@ msgstr "Type de fichier :"
 msgid "Permissions"
 msgstr "Permissions :"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361
+#: src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Propriétaire :"
 
@@ -1541,17 +1627,18 @@ msgstr "Le propriétaire peut lire"
 msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379
+#: src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Aperçu"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Par défaut"
 
@@ -1560,7 +1647,7 @@ msgid "Thumbnail"
 msgstr "Vignette"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -1576,50 +1663,47 @@ msgstr "Information sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378
+#: src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Déplacer vers"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Déplacer/Redimensionner"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Redimensionnable"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
-msgstr "Défilement automatique du contenu"
+msgstr "Défilement automatique"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "En plein"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "En creux"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452
+#: src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Aspect"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463
+#: src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Finir de déplacer/redimensionner"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr "Insérer"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1644,10 +1728,8 @@ msgid "Protect this window from me accidentally changing it"
 msgstr "Protéger la fenêtre pour que je ne la modifie pas accidentellement"
 
 #: src/bin/e_int_border_locks.c:287
-msgid ""
-"Protect this window from being accidentally closed because it is important"
-msgstr ""
-"Protéger la fenêtre d'une fermeture accidentelle car elle est importante"
+msgid "Protect this window from being accidentally closed because it is important"
+msgstr "Protéger la fenêtre d'une fermeture accidentelle car elle est importante"
 
 #: src/bin/e_int_border_locks.c:289
 msgid "Do not allow the border to change on this window"
@@ -1661,44 +1743,56 @@ msgstr "Mémoriser ces verrous pour la prochaine apparition de cette fenêtre"
 msgid "Lock program changing:"
 msgstr "Empêcher le programme de changer :"
 
-#: src/bin/e_int_border_locks.c:306 src/bin/e_int_border_locks.c:325
-#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:174
+#: src/bin/e_int_border_locks.c:306
+#: src/bin/e_int_border_locks.c:325
+#: src/bin/e_int_border_remember.c:705
+#: src/bin/e_int_shelf_config.c:174
 msgid "Position"
 msgstr "Position"
 
-#: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
-#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/bin/e_int_border_locks.c:308
+#: src/bin/e_int_border_locks.c:327
+#: src/bin/e_int_border_remember.c:708
+#: src/bin/e_int_shelf_config.c:185
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Taille"
 
-#: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
+#: src/bin/e_int_border_locks.c:310
+#: src/bin/e_int_border_locks.c:329
+#: src/bin/e_int_border_menu.c:87
+#: src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:711
+#: src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Empilement"
 
-#: src/bin/e_int_border_locks.c:312 src/bin/e_int_border_locks.c:331
+#: src/bin/e_int_border_locks.c:312
+#: src/bin/e_int_border_locks.c:331
 msgid "Iconified state"
 msgstr "État de minimisation"
 
-#: src/bin/e_int_border_locks.c:314 src/bin/e_int_border_locks.c:333
+#: src/bin/e_int_border_locks.c:314
+#: src/bin/e_int_border_locks.c:333
 #: src/bin/e_int_border_remember.c:723
 msgid "Stickiness"
 msgstr "État d'ancrage"
 
-#: src/bin/e_int_border_locks.c:316 src/bin/e_int_border_locks.c:335
+#: src/bin/e_int_border_locks.c:316
+#: src/bin/e_int_border_locks.c:335
 #: src/bin/e_int_border_remember.c:729
 msgid "Shaded state"
 msgstr "État d'enroulement"
 
-#: src/bin/e_int_border_locks.c:318 src/bin/e_int_border_locks.c:337
+#: src/bin/e_int_border_locks.c:318
+#: src/bin/e_int_border_locks.c:337
 msgid "Maximized state"
 msgstr "État de maximisation"
 
-#: src/bin/e_int_border_locks.c:320 src/bin/e_int_border_locks.c:339
+#: src/bin/e_int_border_locks.c:320
+#: src/bin/e_int_border_locks.c:339
 #: src/bin/e_int_border_remember.c:732
 msgid "Fullscreen state"
 msgstr "État de plein écran"
@@ -1707,7 +1801,8 @@ msgstr "État de plein écran"
 msgid "Lock me from changing:"
 msgstr "M'empêcher de changer :"
 
-#: src/bin/e_int_border_locks.c:341 src/bin/e_int_border_remember.c:717
+#: src/bin/e_int_border_locks.c:341
+#: src/bin/e_int_border_remember.c:717
 msgid "Border style"
 msgstr "Style de bordure"
 
@@ -1721,160 +1816,189 @@ msgstr "Fermer cette fenêtre"
 
 #: src/bin/e_int_border_locks.c:348
 msgid "Exiting my login with this window open"
-msgstr "Fermer ma session en conservant cette fenêtre ouverte"
+msgstr "Fermer ma session en laissant cette fenêtre ouverte"
 
 #: src/bin/e_int_border_locks.c:352
 msgid "Remember these Locks"
 msgstr "Mémoriser ces verrous"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Fenêtre"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "Toujours au-dessus"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Ancré(e)"
+#: src/bin/e_int_border_menu.c:138
+#: src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230
+#: src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183
+#: src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540
+#: src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134
+#: src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307
+#: src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299
+#: src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790
+#: src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789
+#: src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Configuration"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307
+#: src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Éditer l'icone"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Créer un icone"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Ajouter au menu des favoris"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
-msgstr "Ajouter à l'IBar"
+msgstr "Ajouter à l' IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr "Créer un raccourci clavier"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Positionnement"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Ignorer"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524
+#: src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Mémoriser"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567
+#: src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Ancrée"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Ignorer"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
-msgstr "Enroulé(e)"
+msgstr "Enroulée"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr "Écran %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Toujours au-dessus"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Toujours en dessous"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Épingler au bureau"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Désépingler du bureau"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Sélectionner un style de bordure"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Utiliser l'icone proposé par E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icone fourni par l'appli"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Utiliser l'icone défini par l'utilisateur"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113
+#: src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Offrir une résistance"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173
+#: src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183
+#: src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796
+#: src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810
+#: src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814
+#: src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818
+#: src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853
+#: src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Barre des tâches"
 
@@ -1894,8 +2018,10 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propriétés ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_int_border_prop.c:419
+#: src/bin/e_int_border_remember.c:665
+#: src/bin/e_utils.c:1187
+#: src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titre"
 
@@ -1903,7 +2029,8 @@ msgstr "Titre"
 msgid "Class"
 msgstr "Classe"
 
-#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+#: src/bin/e_int_border_prop.c:422
+#: src/bin/e_int_border_prop.c:468
 msgid "Icon Name"
 msgstr "Nom de l'icone"
 
@@ -1929,7 +2056,7 @@ msgstr "Taille de base"
 
 #: src/bin/e_int_border_prop.c:429
 msgid "Resize Steps"
-msgstr "Phases de redimensionnement"
+msgstr "Redimensionnement incrémentiel"
 
 #: src/bin/e_int_border_prop.c:431
 msgid "Aspect Ratio"
@@ -1953,11 +2080,11 @@ msgstr "Groupe de la fenêtre"
 
 #: src/bin/e_int_border_prop.c:436
 msgid "Transient For"
-msgstr "Transition pour"
+msgstr "Relation transitoire"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr "Fenêtre parente"
+msgstr "Fenêtre principale"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
@@ -1965,7 +2092,7 @@ msgstr "Gravité"
 
 #: src/bin/e_int_border_prop.c:441
 msgid "Take Focus"
-msgstr "Prend le focus"
+msgstr "Prise du focus"
 
 #: src/bin/e_int_border_prop.c:442
 msgid "Accepts Focus"
@@ -1989,23 +2116,25 @@ msgstr "Propriétés NetWM"
 
 #: src/bin/e_int_border_prop.c:471
 msgid "Modal"
-msgstr "Modal(e)"
+msgstr "Modale"
 
 #: src/bin/e_int_border_prop.c:473
 msgid "Shaded"
-msgstr "Enroulé(e)"
+msgstr "Enroulée"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:744
+#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_remember.c:744
 msgid "Skip Taskbar"
 msgstr "Ignorer la barre des tâches"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:741
+#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_remember.c:741
 msgid "Skip Pager"
 msgstr "Ignorer le Pager"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
-msgstr "Caché(e)"
+msgstr "Cachée"
 
 #: src/bin/e_int_border_remember.c:83
 msgid "Window Remember"
@@ -2016,45 +2145,16 @@ msgid "Window properties are not a unique match"
 msgstr "Les propriétés de la fenêtre sont partagées"
 
 #: src/bin/e_int_border_remember.c:310
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>This is just a warning in "
-"case you did not intend this to happen.<br>If you did, simply press "
-"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your "
-"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
-"sure and nothing will be affected."
-msgstr ""
-"Vous demandez à Enlightenment de mémoriser les<br>propriétés (telles que la "
-"taille, la position,<br>le type de bordure, etc.) d'une fenêtre "
-"sans<br><hilight>propriétés distinctives</hilight>.<br><br>Ce qui signifie "
-"qu'elle partage son nom et classe, sa fugacité,<br>son rôle, etc., avec au "
-"moins une autre fenêtre à l'écran et que la<br>mémorisation des propriétés "
-"pour cette fenêtre s'appliquera à<br>toutes les autres fenêtres qui "
-"partagent les mêmes propriétés.<br><br>Ceci n'est qu'un avertissement au cas "
-"où ce<br>n'était pas ce que vous recherchiez.<br>Cliquez sur "
-"<hilight>Appliquer</hilight> ou <hilight>OK</hilight> et<br>vos paramètres "
-"seront acceptés. Cliquez<br>sur <hilight>Annuler</hilight> si vous n'êtes "
-"pas sûr,<br>et rien ne sera modifié."
+msgid "You are trying to ask Enlightenment to remember to apply<br>properties (such as size, location, border style etc.) to<br>a window that <hilight>does not have unique properties</hilight>.<br><br>This means it shares Name/Class, Transience, Role etc. properties<br>with more than 1 other window on the screen and remembering<br>properties for this window will apply to all other windows<br>that match these properties.<br><br>This is just a warning in case you did not intend this to happen.<br>If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not sure and nothing will be affected."
+msgstr "Vous demandez à Enlightenment de mémoriser les<br>propriétés (telles que la taille, la position,<br>le style de bordure, etc.) d'une fenêtre sans<br><hilight>propriétés distinctives</hilight>.<br><br>Ce qui signifie qu'elle partage son nom et classe,<br>sa relation transitoire, son rôle, etc., avec au<br>moins une autre fenêtre à l'écran et que la<br>mémorisation des propriétés pour cette fenêtre<br>s'appliquera à toutes les autres fenêtres qui<br>partagent les mêmes propriétés.<br><br>Ceci n'est qu'un avertissement au cas où ce<br>n'était pas ce que vous recherchiez.<br>Cliquez sur <hilight>Appliquer</hilight> ou <hilight>OK</hilight> et<br>vos paramètres seront acceptés.<br>Cliquez sur <hilight>Fermer</hilight> si vous n'êtes pas sûr,<br>et rien ne sera modifié."
 
 #: src/bin/e_int_border_remember.c:516
 msgid "No match properties set"
 msgstr "Aucune propriété ne correspond"
 
 #: src/bin/e_int_border_remember.c:519
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window <hilight>without "
-"specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
-"way of remembering this window."
-msgstr ""
-"Vous demandez à Enlightenment de mémoriser des<br>propriétés (telles que la "
-"taille, la position, le style de bordure, etc.)<br>d'une fenêtre "
-"<hilight>sans spécifier comment le faire</hilight>.<br><br>Vous devez "
-"spécifier au moins une méthode pour<br>mémoriser cette fenêtre."
+msgid "You are trying to ask Enlightenment to remember to apply<br>properties (such as size, location, border style etc.) to<br>a window <hilight>without specifying how to remember it</hilight>.<br><br>You must specify at least 1 way of remembering this window."
+msgstr "Vous demandez à Enlightenment de mémoriser des<br>propriétés (telles que la taille, la position, le style de bordure, etc.)<br>d'une fenêtre <hilight>sans spécifier comment le faire</hilight>.<br><br>Vous devez spécifier au moins une méthode pour<br>mémoriser cette fenêtre."
 
 #: src/bin/e_int_border_remember.c:617
 msgid "Nothing"
@@ -2068,8 +2168,8 @@ msgstr "Taille et position"
 msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
-#: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
+#: src/bin/e_int_border_remember.c:625
+#: src/modules/conf/e_mod_main.c:245
 msgid "All"
 msgstr "Tout"
 
@@ -2099,7 +2199,7 @@ msgstr "Caractères jokers autorisés"
 
 #: src/bin/e_int_border_remember.c:699
 msgid "Transience"
-msgstr "Fugacité"
+msgstr "Caractère transitoire"
 
 #: src/bin/e_int_border_remember.c:704
 msgid "Properties to remember"
@@ -2146,15 +2246,15 @@ msgid "Utilities"
 msgstr "Utilitaires"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
-#: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/everything/evry_plug_files.c:1585
+#: src/modules/fileman/e_mod_main.c:56
+#: src/modules/fileman/e_mod_main.c:76
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Fichiers"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56
+#: src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Lanceur"
 
@@ -2167,20 +2267,6 @@ msgstr "Base"
 msgid "Mobile"
 msgstr "Mobile"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Configuration"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Paramétrage des modules"
@@ -2193,7 +2279,8 @@ msgstr "Activer"
 msgid "Unload"
 msgstr "Désactiver"
 
-#: src/bin/e_int_config_modules.c:307 src/bin/e_int_config_modules.c:591
+#: src/bin/e_int_config_modules.c:307
+#: src/bin/e_int_config_modules.c:591
 msgid "No modules selected."
 msgstr "Aucun module sélectionné."
 
@@ -2209,7 +2296,8 @@ msgstr "Contenu du rack"
 msgid "Toolbar Contents"
 msgstr "Contenu de la barre d'outils"
 
-#: src/bin/e_int_gadcon_config.c:155 src/modules/gadman/e_mod_config.c:118
+#: src/bin/e_int_gadcon_config.c:155
+#: src/modules/gadman/e_mod_config.c:118
 #: src/modules/gadman/e_mod_config.c:134
 msgid "Add Gadget"
 msgstr "Ajouter un gadget"
@@ -2218,7 +2306,8 @@ msgstr "Ajouter un gadget"
 msgid "Remove Gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30
+#: src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Paramétrage de la barre d'outils"
 
@@ -2226,19 +2315,13 @@ msgstr "Paramétrage de la barre d'outils"
 msgid "Layout"
 msgstr "Présentation"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Erreur du système de saisie"
 
-#: src/bin/e_intl.c:343
-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 ""
-"Erreur lors du démarrage du système de saisie.<br><br>Veuillez vérifier que "
-"la configuration du système<br>de saisie est correcte et que l'exécutable "
-"est<br>dans votre PATH.<br>"
+#: src/bin/e_intl.c:353
+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 "Erreur lors du démarrage du système de saisie.<br><br>Veuillez vérifier que la configuration du système<br>de saisie est correcte et que l'exécutable est<br>dans votre PATH.<br>"
 
 #: src/bin/e_int_menus.c:99
 msgid "Main"
@@ -2246,7 +2329,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Applications favorites"
 
@@ -2254,76 +2337,80 @@ msgstr "Applications favorites"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1354
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151
+#: src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161
+#: src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "À propos"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192
+#: src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Thème"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289
+#: src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Racks"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
-msgstr "Afficher/Masquer les fenêtres"
+msgstr "Voir/Cacher les fenêtres"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Aucune application)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Paramétrer les bureaux"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132
+#: src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226
+#: src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Pas de nom !"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Aucun rack)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Ajouter un rack"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Supprimer un rack"
 
@@ -2358,7 +2445,7 @@ msgid "Shrink to Content Width"
 msgstr "Redimensionner à la largeur du contenu"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Style"
 
@@ -2388,7 +2475,7 @@ msgid "Hide duration"
 msgstr "Vitesse du masquage"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f secondes"
@@ -2405,7 +2492,7 @@ msgstr "Afficher sur tous les bureaux"
 msgid "Show on specified Desktops"
 msgstr "Afficher sur les bureaux spécifiés"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2422,7 +2509,7 @@ msgstr ""
 "ne vous appartient pas. Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2435,79 +2522,19 @@ msgstr ""
 "Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Options :\n"
-"\t-display DISPLAY\n"
-"\t\tSe connecter à l'affichage nommé DISPLAY.\n"
-"\t\tExemple : -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAjouter un écran xinerama VIRTUEL (au lieu d'écrans réels)\n"
-"\t\ten précisant la géométrie. Vous pouvez en ajouter autant\n"
-"\t\tque vous le désirez. Ils remplaceront les écrans xinerama réels,\n"
-"\t\tle cas échéant. On peut se servir de ça pour simuler xinerama.\n"
-"\t\tExemple : -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile PROFIL_CONFIG\n"
-"\t\tUtiliser le profil de configuration PROFIL_CONFIG à la place du profil "
-"par défaut choisi par\n"
-"\t\tl'utilisateur ou du simple « default » (prédéfini).\n"
-"\t-good\n"
-"\t\tGentil.\n"
-"\t-evil\n"
-"\t\tMéchant.\n"
-"\t-psychotic\n"
-"\t\tPsychopathe.\n"
-"\t-locked\n"
-"\t\tDémarrer avec le verrouillage de l'écran activé, afin que le mot de "
-"passe soit demandé.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tSi vous avez besoin d'afficher l'aide, alors cette option n'est pas pour "
-"vous.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ne peut pas initialiser Eina !\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser Ecore !\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ne peut pas initialiser Eet !\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système de fichiers.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore !\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2515,7 +2542,7 @@ msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de signal de sortie.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2523,72 +2550,39 @@ msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de signal HUP.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment ne peut pas initialiser le gestionnaire de signal "
-"UTILISATEUR.\n"
+"Enlightenment ne peut pas initialiser le gestionnaire de signal UTILISATEUR.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne peut pas initialiser sa connexion à X.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_IMF !\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne peut pas initialiser son système d'alerte d'urgence.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_File!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le gestionnaire de connexions.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_Con !\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système IPC.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_Ipc !\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne peut pas initialiser l'adaptateur (wrapper) pour xinerama.\n"
-"Cela ne devrait pas se produire."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_X !\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne peut pas initialiser l'adaptateur (wrapper) pour randr.\n"
-"Cela ne devrait pas se produire."
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ne peut pas initialiser Ecore_Evas !\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système Evas.\n"
-"Peut-être êtes-vous à court de mémoire ?"
-
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2599,7 +2593,7 @@ msgstr ""
 "installations de Evas et Ecore, et que ces bibliothèques\n"
 "supportent le moteur de rendu logiciel X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2610,7 +2604,31 @@ msgstr ""
 "installations de Evas et Ecore et vous assurer qu'elles supportent le\n"
 "moteur de rendu logiciel en mémoire."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ne peut pas initialiser Edje !\n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ne peut pas initialiser E_Intl !\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne peut pas initialiser son système d'alerte d'urgence.\n"
+"Avez-vous défini la variable d'environnement DISPLAY ?"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ne peut pas initialiser E_Xinerama !\n"
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ne peut pas initialiser E_Randr !\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2619,24 +2637,27 @@ msgstr ""
 "Peut-être n'avez-vous pas de dossier personnel,\n"
 "ou que votre disque dur est plein ?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ne peut pas initialiser son registre de fichiers."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ne peut pas initialiser son système de configuration."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ne peut pas configurer son environnement."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
-msgstr ""
-"Enlightenment ne peut pas initialiser son système de redimensionnement."
+msgstr "Enlightenment ne peut pas initialiser son système de redimensionnement."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment ne peut pas initialiser son système de pointage."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment est incapable de configurer son système de pointage."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2644,95 +2665,41 @@ msgstr ""
 "Enlightenment ne peut pas configurer les chemins de recherche des fichiers.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de polices."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas configurer l'écran de démarrage.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment est incapable de configurer son écran de démarrage."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Démarrage du support multilingue"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
-msgstr ""
-"Enlightenment ne peut pas initialiser son système d'internationalisation."
+msgstr "Enlightenment ne peut pas initialiser son système d'internationalisation."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le système de menus FDO.\n"
-"Peut-être êtes-vous à court de mémoire ?"
-
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Test du support des formats"
+"Peut-être vous manque-t-il certaines permissions sur ~/.cache/efreet\n"
+"ou bien le système est-il à court de mémoire ou d'espace disque ?"
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment a détecté que Evas ne peut créer un canevas en mémoire.\n"
-"Vérifiez que Evas supporte le moteur de rendu logiciel en mémoire.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a détecté que Evas ne peut charger les fichiers PNG.\n"
-"Vérifiez que Evas contient le support des images PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a détecté que Evas ne peut charger les fichiers JPEG.\n"
-"Vérifiez que Evas contient le support des images JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a détecté que Evas ne peut pas charger les fichiers EET.\n"
-"Vérifiez que Evas contient le support de EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment a détecté que Evas ne peut charger la police « Sans ». "
-"Vérifiez que Evas \n"
-"contient le support de fontconfig et que le système prend en charge la "
-"police « Sans ».\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Vérification du support SVG"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Configuration des écrans"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2740,348 +2707,420 @@ msgstr ""
 "Enlightenment ne peut être initialisé en tant que gestionnaire de fenêtres\n"
 "Un autre gestionnaire de fenêtres est-il déjà lancé ?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Configuration de l' ACPI"
+
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "Configuration du rétroéclairage"
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ne peut pas configurer le rétroéclairage."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Configuration du DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne peut pas configurer le DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Configuration de l'écran de veille"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne peut pas configurer l'écran de veille de X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "Configuration des modes de gestion de l'énergie"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ne peut pas configurer la gestion de l'énergie."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Configuration du verrouillage d'écran"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr ""
-"Enlightenment ne peut pas configurer son système de verrouillage d'écran."
+msgstr "Enlightenment ne peut pas configurer son système de verrouillage d'écran."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Configuration des pop-up"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne peut pas configurer son système de pop-up."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr "Configuration du bus système de messagerie"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Configuration des chemins"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Configuration des contrôles du système"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr ""
-"Enlightenment ne peut pas initialiser son gestionnaire de commandes "
-"système.\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de commandes système.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Configuration des actions"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne peut pas configurer son système d'actions."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Configuration du système d'exécution"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne peut pas initialiser son système d'exécution."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr "Configuration du gestionnaire de fichiers"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Configuration du système de messages"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne peut pas configurer son système de messages."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Configuration du glisser-déposer"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne peut pas configurer son système de glisser-déposer."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Configuration des périphériques d'entrée"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
-msgstr ""
-"Enlightenment ne peut pas configurer son gestionnaire de réservation de "
-"périphériques d'entrée."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
+msgstr "Enlightenment ne peut pas configurer son gestionnaire de réservation de périphériques d'entrée."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Configuration des modules"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763
+#: src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne peut pas configurer son système de modules."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Configuration de la mémorisation"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ne peut pas initialiser son système de mémorisation."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Configuration des classes de couleurs"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
-msgstr ""
-"Enlightenment ne peut pas configurer son système de classes de couleurs."
+msgstr "Enlightenment ne peut pas configurer son système de classes de couleurs."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Configuration de Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
-msgstr ""
-"Enlightenment ne peut pas configurer son système de contrôle des gadgets."
-
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Configuration de l'ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Configuration du DPMS"
+msgstr "Enlightenment ne peut pas configurer son système de contrôle des gadgets."
 
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ne peut pas configurer le DPMS."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Configuration de la gestion de l'énergie"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ne peut pas configurer la gestion de l'énergie."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Configuration du fond d'écran"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr ""
-"Enlightenment ne peut pas configurer son gestionnaire de fonds d'écran."
+msgstr "Enlightenment ne peut pas configurer son gestionnaire de fonds d'écran."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Configuration de la souris"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment est incapable de configurer la souris."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Configuration des raccourcis"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne peut pas configurer son système de raccourcis."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Configuration des racks"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ne peut pas configurer son gestionnaire de racks."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Configuration des vignettes"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne peut pas initialiser son système de vignettes.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment ne peut pas initialiser le système de cache d'icones.\n"
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ne peut pas initialiser le système Xsettings.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "Configuration de l'environnement de bureau"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ne peut pas initialiser son environnement de bureau.\n"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Configuration du classement des fichiers"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne peut pas configurer sa gestion des fichiers."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Activer les modules"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configurer les racks"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Presque fini..."
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
-"Enlightenment crashed early on start and has<br>been restarted. There was an "
-"error loading<br>module named: %s. This module has been disabled<br>and will "
-"not be loaded."
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Enlightenment a planté au démarrage et a<br>été redémarré. L'erreur s'est "
-"produite lors du<br>chargement du module : %s.<br>Ce module est désactivé et "
-"ne sera pas chargé."
-
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
-msgid "Enlightenment crashed early on start and has been restarted"
-msgstr "Enlightenment a planté au démarrage et a été redémarré."
+"Options :\n"
+"\t-display DISPLAY\n"
+"\t\tSe connecter à l'affichage nommé DISPLAY.\n"
+"\t\tExemple : -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAjouter un écran xinerama VIRTUEL (au lieu d'écrans réels)\n"
+"\t\ten précisant la géométrie. Vous pouvez en ajouter autant\n"
+"\t\tque vous le désirez. Ils remplaceront les écrans xinerama réels,\n"
+"\t\tle cas échéant. On peut se servir de ça pour simuler xinerama.\n"
+"\t\tExemple : -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
+"\t-profile PROFIL_CONFIG\n"
+"\t\tUtiliser le profil de configuration PROFIL_CONFIG à la place du profil par défaut choisi par\n"
+"\t\tl'utilisateur ou du simple « default » (prédéfini).\n"
+"\t-good\n"
+"\t\tGentil.\n"
+"\t-evil\n"
+"\t\tMéchant.\n"
+"\t-psychotic\n"
+"\t\tPsychopathe.\n"
+"\t-locked\n"
+"\t\tDémarrer avec le verrouillage de l'écran activé, afin que le mot de passe soit demandé.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tSi vous avez besoin d'afficher l'aide, alors cette option n'est pas pour vous.\n"
 
-#: src/bin/e_main.c:1100
-#, c-format
+#: src/bin/e_main.c:1147
 msgid ""
-"Enlightenment crashed early on start and has been restarted.<br>There was an "
-"error loading module named: %s<br><br>This module has been disabled and will "
-"not be loaded."
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
 msgstr ""
-"Enlightenment a planté au démarrage et a été redémarré.<br>L'erreur s'est "
-"produite lors du chargement du module : %s.<br><br>Ce module est désactivé "
-"et ne sera pas chargé."
+"Vous tentez, à tort, d'exécuter Enlightenment directement.\n"
+"Veuillez ne pas utiliser l'exécutable « enlightenment » mais\n"
+"plutôt le lanceur « enlightenment_start ». Ce dernier se\n"
+"charge du paramétrage des variables d'environnement,\n"
+"des chemins et de la gestion de tout autre service\n"
+"nécessaire, avant même le démarrage de enlightenment.\n"
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Test du support des formats"
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1430
 msgid ""
-"Enlightenment crashed early on start and has<br>been restarted. All modules "
-"have been disabled<br>and will not be loaded to help remove any "
-"problem<br>modules from your configuration. The module<br>configuration "
-"dialog should let you select your<br>modules again."
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
 msgstr ""
-"Enlightenment a planté au démarrage et a<br>été redémarré. Tous les modules "
-"ont été désactivés<br>et ne seront pas chargés pour vous aider à "
-"supprimer<br>les modules problématiques de votre configuration.<br>Le "
-"dialogue de configuration des modules vous permettra<br>de recharger vos "
-"modules."
+"Enlightenment a détecté que Evas ne peut créer un canevas en mémoire.\n"
+"Vérifiez que Evas supporte le moteur de rendu logiciel en mémoire.\n"
+
+#: src/bin/e_main.c:1442
+msgid "Enlightenment found Evas can't load SVG files. Check Evas has SVG loader support.\n"
+msgstr "Enlightenment a détecté que Evas ne peut charger les fichiers SVG. Vérifiez le support de SVG dans Evas.\n"
+
+#: src/bin/e_main.c:1452
+msgid "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader support.\n"
+msgstr "Enlightenment a détecté que Evas ne peut charger les fichiers JPEG. Vérifiez le support de JPEG dans Evas.\n"
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1462
+msgid "Enlightenment found Evas can't load PNG files. Check Evas has PNG loader support.\n"
+msgstr "Enlightenment a détecté que Evas ne peut charger les fichiers PNG. Vérifiez le support de PNG dans Evas.\n"
+
+#: src/bin/e_main.c:1472
+msgid "Enlightenment found Evas can't load EET files. Check Evas has EET loader support.\n"
+msgstr "Enlightenment a détecté que Evas ne peut charger les fichiers EET. Vérifiez le support de EET dans Evas.\n"
+
+#: src/bin/e_main.c:1486
 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 "
-"modules from your configuration.<br><br>The module configuration dialog "
-"should let you select your<br>modules again."
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Enlightenment a planté au démarrage et a été redémarré.<br>Tous les modules "
-"ont été désactivés et ne seront pas chargés pour vous<br>aider à supprimer "
-"les modules problématiques de votre configuration.<br><br>Le dialogue de "
-"configuration des modules vous permettra<br>de recharger vos modules."
+"Enlightenment a détecté que Evas ne peut charger la police « Sans ». Vérifiez que Evas \n"
+"contient le support de fontconfig et que le système prend en charge la police « Sans ».\n"
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configurer les racks"
+#: src/bin/e_main.c:1677
+#, c-format
+msgid "Enlightenment crashed early on start and has<br>been restarted. There was an error loading<br>module named: %s. This module has been disabled<br>and will not be loaded."
+msgstr "Enlightenment a planté au démarrage et a<br>été redémarré. L'erreur s'est produite lors du<br>chargement du module : %s.<br>Ce module est désactivé et ne sera pas chargé."
 
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Presque fini..."
+#: src/bin/e_main.c:1682
+#: src/bin/e_main.c:1699
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr "Enlightenment a planté au démarrage et a été redémarré."
 
-#: src/bin/e_module.c:102
+#: src/bin/e_main.c:1683
+#, c-format
+msgid "Enlightenment crashed early on start and has been restarted.<br>There was an error loading module named: %s<br><br>This module has been disabled and will not be loaded."
+msgstr "Enlightenment a planté au démarrage et a été redémarré.<br>L'erreur s'est produite lors du chargement du module : %s.<br><br>Ce module est désactivé et ne sera pas chargé."
+
+#: src/bin/e_main.c:1692
+msgid "Enlightenment crashed early on start and has<br>been restarted. All modules have been disabled<br>and will not be loaded to help remove any problem<br>modules from your configuration. The module<br>configuration dialog should let you select your<br>modules again."
+msgstr "Enlightenment a planté au démarrage et a<br>été redémarré. Tous les modules ont été désactivés<br>et ne seront pas chargés pour vous aider à supprimer<br>les modules problématiques de votre configuration.<br>Le dialogue de configuration des modules vous permettra<br>de recharger vos modules."
+
+#: src/bin/e_main.c:1700
+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 modules from your configuration.<br><br>The module configuration dialog should let you select your<br>modules again."
+msgstr "Enlightenment a planté au démarrage et a été redémarré.<br>Tous les modules ont été désactivés et ne seront pas chargés pour vous<br>aider à supprimer les modules problématiques de votre configuration.<br><br>Le dialogue de configuration des modules vous permettra<br>de recharger vos modules."
+
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Chargement du module : %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
-msgid ""
-"There was an error loading module named: %s<br>No module named %s could be "
-"found in the<br>module search directories.<br>"
-msgstr ""
-"Une erreur est survenue lors du chargement du module nommé : %s<br>Aucun "
-"module nommé %s n'a été trouvé<br>dans les dossiers de recherche du module."
-"<br>"
+msgid "There was an error loading module named: %s<br>No module named %s could be found in the<br>module search directories.<br>"
+msgstr "Une erreur est survenue lors du chargement du module nommé : %s<br>Aucun module nommé %s n'a été trouvé<br>dans les dossiers de recherche du module.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137
+#: src/bin/e_module.c:150
+#: src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145
+#: src/bin/e_module.c:162
 #, c-format
-msgid ""
-"There was an error loading module named: %s<br>The full path to this module "
-"is:<br>%s<br>The error reported was:<br>%s<br>"
-msgstr ""
-"Erreur lors du chargement du module nommé : %s<br>Le chemin d'accès de ce "
-"module est :<br>%s<br>L'erreur retournée est :<br>%s<br>"
+msgid "There was an error loading module named: %s<br>The full path to this module is:<br>%s<br>The error reported was:<br>%s<br>"
+msgstr "Erreur lors du chargement du module nommé : %s<br>Le chemin d'accès de ce module est :<br>%s<br>L'erreur retournée est :<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
-msgid ""
-"Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
-"module API version of: %i.<br>The module API advertized by Enlightenment is: "
-"%i.<br>"
-msgstr ""
-"Erreur de l'API du module.<br>Erreur d'initialisation du module : %s<br>La "
-"version minimale de l'API du module requise est : %i.<br>La version de l'API "
-"retournée par Enlightenment est : %i.<br>"
+msgid "Module API Error<br>Error initializing Module: %s<br>It requires a minimum module API version of: %i.<br>The module API advertized by Enlightenment is: %i.<br>"
+msgstr "Erreur de l' API du module.<br>Erreur d'initialisation du module : %s<br>La version minimale de l'API du module requise est : %i.<br>La version de l'API retournée par Enlightenment est : %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s de Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous désactiver ce module ?<br>"
 
-#: src/bin/e_screensaver.c:135
-msgid ""
-"You disabled screensaver too fast.<br><br>Would you like to enable "
-"<b>presentation</b> mode and temporarily disable screen saver, lock and "
-"power saving?"
-msgstr ""
-"Vous avez désactivé l'écran de veille trop vite...<br><br>Voulez-vous "
-"activer le mode  <b>présentation</b> et désactiver temporairement l'écran de "
-"veille, le verrouillage et la gestion de l'énergie ?"
+#: src/bin/e_screensaver.c:139
+msgid "You disabled screensaver too fast.<br><br>Would you like to enable <b>presentation</b> mode and temporarily disable screen saver, lock and power saving?"
+msgstr "Vous avez désactivé l'écran de veille trop vite...<br><br>Voulez-vous activer le mode  <b>présentation</b> et désactiver temporairement l'écran de veille, le verrouillage et la gestion de l'énergie ?"
 
 #: src/bin/e_shelf.c:165
 msgid "Shelf #"
 msgstr "Rack …"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304
+#: src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer ce rack ?"
 
-#: src/bin/e_shelf.c:1299
-msgid ""
-"You requested to delete this shelf.<br><br>Are you sure you want to delete "
-"it?"
-msgstr ""
-"Vous avez demandé à supprimer ce rack.<br><br>Voulez-vous vraiment le faire ?"
+#: src/bin/e_shelf.c:1305
+msgid "You requested to delete this shelf.<br><br>Are you sure you want to delete it?"
+msgstr "Vous avez demandé à supprimer ce rack.<br><br>Voulez-vous vraiment le faire ?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Finir de déplacer/redimensionner des gadgets"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Déplacer/Redimensionner des gadgets"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690
+#: src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Contenu"
 
@@ -3089,145 +3128,121 @@ msgstr "Contenu"
 msgid "Starting"
 msgstr "Démarrage"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Vérification des permissions du système"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221
+#: src/bin/e_sys.c:232
+#: src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Vérification du système terminée"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
-msgid ""
-"Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
-"want to finish the logout<br>anyway without closing these<br>applications "
-"first?<br><br>Auto logout in %d seconds."
-msgstr ""
-"La fermeture de la session est trop longue.<br>Certaines applications "
-"refusent de se terminer.<br>Voulez-vous forcer la fin de cette "
-"session<br>sans attendre la fermeture des applications ?<br><br>Fermeture "
-"automatique dans %d secondes."
+msgid "Logout is taking too long.<br>Some applications refuse to close.<br>Do you want to finish the logout<br>anyway without closing these<br>applications first?<br><br>Auto logout in %d seconds."
+msgstr "La fermeture de la session est trop longue.<br>Certaines applications refusent de se terminer.<br>Voulez-vous forcer la fin de cette session<br>sans attendre la fermeture des applications ?<br><br>Fermeture automatique dans %d secondes."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problème de fermeture de session"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Fermer à l'instant la session"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Attendre plus longtemps"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Annuler la fermeture de session"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Fermeture de la session…"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr ""
-"Fermeture de session en cours.<br><hilight>Veuillez patienter.</hilight>"
+msgstr "Fermeture de session en cours.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453
+#: src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment est occupé à traiter une autre requête"
 
-#: src/bin/e_sys.c:444
-msgid ""
-"Logging out.<br>You cannot perform other system actions<br>once a logout has "
-"begun."
-msgstr ""
-"Fermeture de session en cours.<br>Vous ne pouvez pas effectuer d'autres "
-"actions système<br>une fois que la fermeture de session est amorcée."
+#: src/bin/e_sys.c:458
+msgid "Logging out.<br>You cannot perform other system actions<br>once a logout has begun."
+msgstr "Fermeture de session en cours.<br>Vous ne pouvez pas effectuer d'autres actions système<br>une fois que la fermeture de session est amorcée."
 
-#: src/bin/e_sys.c:452
-msgid ""
-"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
-"has been started."
-msgstr ""
-"Extinction du système en cours.<br>Vous ne pouvez pas effectuer d'autres "
-"actions système<br>pendant l'arrêt de votre ordinateur."
+#: src/bin/e_sys.c:464
+msgid "Powering off.<br>You cannot do any other system actions<br>once a shutdown has been started."
+msgstr "Extinction du système en cours.<br>Vous ne pouvez pas effectuer d'autres actions système<br>pendant l'arrêt de votre ordinateur."
 
-#: src/bin/e_sys.c:459
-msgid ""
-"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
-"begun."
-msgstr ""
-"Relance en cours.<br>Vous ne pouvez pas effectuer d'autres actions "
-"système<br>lorsqu'un redémarrage est amorcé."
+#: src/bin/e_sys.c:469
+msgid "Resetting.<br>You cannot do any other system actions<br>once a reboot has begun."
+msgstr "Relance en cours.<br>Vous ne pouvez pas effectuer d'autres actions système<br>lorsqu'un redémarrage est amorcé."
 
-#: src/bin/e_sys.c:466
-msgid ""
-"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
-"system actions."
-msgstr ""
-"Mise en veille en cours.<br>Vous ne pouvez pas effectuer d'autres actions "
-"système<br>pendant ce temps."
+#: src/bin/e_sys.c:474
+msgid "Suspending.<br>Until suspend is complete you cannot perform<br>any other system actions."
+msgstr "Mise en veille en cours.<br>Vous ne pouvez pas effectuer d'autres actions système<br>pendant ce temps."
 
-#: src/bin/e_sys.c:473
-msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
-"complete."
-msgstr ""
-"Mise en hibernation en cours.<br>Vous ne pouvez pas effectuer d'autres "
-"actions système<br>tant que ce n'est pas terminé."
+#: src/bin/e_sys.c:479
+msgid "Hibernating.<br>You cannot perform any other system actions<br>until this is complete."
+msgstr "Mise en hibernation.<br>Vous ne pouvez pas effectuer d'autres actions système<br>tant que ce n'est pas terminé."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484
+#: src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "ARGH ! ça ne devrait pas se produire…"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Échec de l'extinction."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Échec du redémarrage."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Échec de la mise en veille."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Échec de la mise en sommeil (STD)."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Extinction"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Extinction.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Redémarrage"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Redémarrage.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Mise en veille"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Mise en veille.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Mise en hibernation"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Mise en hibernation.<br><hilight>Veuillez patienter.</hilight>"
 
@@ -3235,196 +3250,168 @@ msgstr "Mise en hibernation.<br><hilight>Veuillez patienter.</hilight>"
 msgid "About Theme"
 msgstr "À propos de ce thème"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Utiliser ce thème"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Finir de déplacer/redimensionner des éléments"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Déplacer/Redimensionner des éléments"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Définir le contenu de la barre d'outils"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231
+#: src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment n'a pu cloner un processus fils :<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Impossible de quitter : fenêtres immortelles."
 
-#: src/bin/e_utils.c:281
-msgid ""
-"Some windows are left still around with the Lifespan lock enabled. This "
-"means<br>that Enlightenment will not allow itself to exit until these "
-"windows have<br>been closed or have the lifespan lock removed.<br>"
-msgstr ""
-"Des fenêtres sont toujours présentes car elles ont été verrouillées."
-"<br>Enlightenment n'autorisera pas la fin de session tant que "
-"ces<br>fenêtres n'auront pas été fermées, ou déverrouillées.<br>"
+#: src/bin/e_utils.c:276
+msgid "Some windows are left still around with the Lifespan lock enabled. This means<br>that Enlightenment will not allow itself to exit until these windows have<br>been closed or have the lifespan lock removed.<br>"
+msgstr "Des fenêtres sont toujours présentes car elles ont été verrouillées.<br>Enlightenment n'autorisera pas la fin de session tant que ces<br>fenêtres n'auront pas été fermées, ou déverrouillées.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f octets"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Ko"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mo"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Go"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "il y a %li semaine(s)"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "il y a %li jour(s)"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "il y a %li heure(s)"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924
+#: src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19
+#: src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Paramétrage de l'importation d'image"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importer"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Options de remplissage et d'étirage"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Étirer"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrer"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Contenir"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Remplir"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualité du fichier"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Utiliser le fichier original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
-msgid ""
-"Configuration data needed upgrading. Your old configuration<br> has been "
-"wiped and a new set of defaults initialized. This<br>will happen regularly "
-"during development, so don't report a<br>bug. This simply means the module "
-"needs new configuration<br>data by default for usable functionality that "
-"your old<br>configuration simply lacks. This new set of defaults will "
-"fix<br>that by adding it in. You can re-configure things now to "
-"your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-"La configuration a dû être mise à jour. Votre ancienne configuration<br>a "
-"été supprimée et de nouveaux paramètres par défaut sont en place.<br>Cela "
-"risque d'arriver en phase de développement, aussi est-il inutile<br>de faire "
-"un rapport de bogue. Cela signifie simplement que le module a besoin<br>de "
-"cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez "
-"maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne "
-"occasionnée.<br>"
+#: src/bin/e_utils.c:1529
+msgid "Configuration data needed upgrading. Your old configuration<br> has been wiped and a new set of defaults initialized. This<br>will happen regularly during development, so don't report a<br>bug. This simply means the module needs new configuration<br>data by default for usable functionality that your old<br>configuration simply lacks. This new set of defaults will fix<br>that by adding it in. You can re-configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr "La configuration a dû être mise à jour. Votre ancienne configuration<br>a été supprimée et de nouveaux paramètres par défaut sont en place.<br>Cela risque d'arriver en phase de développement, aussi est-il inutile<br>de faire un rapport de bogue. Cela signifie simplement que le module a besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542
+#: src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
-msgstr "Configuration de %s actualisée"
+msgstr "Configuration de %s à jour"
 
-#: src/bin/e_utils.c:1560
-msgid ""
-"Your module configuration is NEWER than the module version. This is "
-"very<br>strange. This should not happen unless you downgraded<br>the module "
-"or copied the configuration from a place where<br>a newer version of the "
-"module was running. This is bad and<br>as a precaution your configuration "
-"has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
-msgstr ""
-"Votre configuration du module est PLUS RÉCENTE que la version<br>actuelle du "
-"module. C'est vraiment étonnant. Cela ne devrait<br>pas se produire à moins "
-"que vous n'ayez installé une version<br>antérieure ou copié la configuration "
-"du module depuis une machine sur<br>laquelle une version plus récente était "
-"en cours. Ce n'est<br>pas bon et, par mesure de précaution, les valeurs "
-"par<br>défaut de votre configuration ont été restaurées.<br>Désolé pour le "
-"désagrément.<br>"
+#: src/bin/e_utils.c:1555
+msgid "Your module configuration is NEWER than the module version. This is very<br>strange. This should not happen unless you downgraded<br>the module or copied the configuration from a place where<br>a newer version of the module was running. This is bad and<br>as a precaution your configuration has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr "Votre configuration du module est PLUS RÉCENTE que la version<br>actuelle du module. C'est vraiment étonnant. Cela ne devrait<br>pas se produire à moins que vous n'ayez installé une version<br>antérieure ou copié la configuration du module depuis une machine sur<br>laquelle une version plus récente était en cours. Ce n'est<br>pas bon et, par mesure de précaution, les valeurs par<br>défaut de votre configuration ont été restaurées.<br>Désolé pour le désagrément.<br>"
 
 #: src/bin/e_widget_config_list.c:60
 #: src/modules/conf_applications/e_int_config_apps.c:235
@@ -3445,139 +3432,146 @@ msgstr "Monter"
 msgid "Down"
 msgstr "Descendre"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Remonter d'un niveau"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr "Résolution :"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permissions :"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Dernière modification :"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Vous"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protégé"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715
+#: src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Lecture seule"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722
+#: src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lecture-Écriture"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Paramétrage du moniteur de batterie"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Contrôler tous les :"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tics"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr "Mettre en sommeil en dessous de :"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Interrogation"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Afficher une alerte de batterie faible"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Alerte quand le niveau est à :"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Éliminer automatiquement dans…"
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f s"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Alerte"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Auto-détection"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interne"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Mode pondéré"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Interface"
 
@@ -3585,37 +3579,44 @@ msgstr "Interface"
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "La batterie est faible !"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Branchement sur le secteur recommandé."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612
+#: src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621
+#: src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Surveillance de la batterie"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652
+#: src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr "Afficher le calendrier"
 
-#: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:268
-#: src/modules/conf/e_mod_main.c:367 src/modules/conf/e_mod_main.c:474
+#: src/modules/conf/e_mod_main.c:264
+#: src/modules/conf/e_mod_main.c:268
+#: src/modules/conf/e_mod_main.c:367
+#: src/modules/conf/e_mod_main.c:474
 msgid "Settings Panel"
 msgstr "Panneau de contrôle"
 
@@ -3624,40 +3625,12 @@ msgid "Configuration Panel"
 msgstr "Panneau de configuration"
 
 #: src/modules/conf/e_mod_main.c:295
-msgid ""
-"Configuration Panel Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-"La configuration du module Panneau de contrôle a dû être mise à jour. "
-"<br>Votre ancienne configuration a été supprimée et de nouveaux "
-"paramètres<br>par défaut sont en place. Cela risque d'arriver en phase "
-"de<br>développement, aussi est-il inutile de faire un rapport de bogue."
-"<br>Cela signifie simplement que le module Panneau de contrôle a "
-"besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous "
-"pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne "
-"occasionnée.<br>"
+msgid "Configuration Panel Module Configuration data needed upgrading. Your old configuration<br> has been wiped and a new set of defaults initialized. This<br>will happen regularly during development, so don't report a<br>bug. This simply means the module needs new configuration<br>data by default for usable functionality that your old<br>configuration simply lacks. This new set of defaults will fix<br>that by adding it in. You can re-configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr "La configuration du module Panneau de contrôle a dû être mise à jour. <br>Votre ancienne configuration a été supprimée et de nouveaux paramètres<br>par défaut sont en place. Cela risque d'arriver en phase de<br>développement, aussi est-il inutile de faire un rapport de bogue.<br>Cela signifie simplement que le module a besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
 
 #: src/modules/conf/e_mod_main.c:312
-msgid ""
-"Your Configuration Panel Module configuration is NEWER than the module "
-"version. This is very<br>strange. This should not happen unless you "
-"downgraded<br>the module or copied the configuration from a place where<br>a "
-"newer version of the module was running. This is bad and<br>as a precaution "
-"your configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-"Votre configuration du module Panneau de contrôle est PLUS RÉCENTE que la "
-"version<br>actuelle du module. C'est vraiment étonnant. Cela ne devrait pas "
-"se produire, à moins<br>que vous n'ayez installé une version antérieure ou "
-"copié la configuration du module<br>depuis une machine sur laquelle une "
-"version plus récente était en cours. Ce n'est<br>pas bon et, par mesure de "
-"précaution, les valeurs par défaut de votre configuration<br>ont été "
-"restaurées.<br>Désolé pour le désagrément.<br>"
+msgid "Your Configuration Panel Module configuration is NEWER than the module version. This is very<br>strange. This should not happen unless you downgraded<br>the module or copied the configuration from a place where<br>a newer version of the module was running. This is bad and<br>as a precaution your configuration has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr "Votre configuration du module Panneau de contrôle est PLUS RÉCENTE que la version<br>actuelle du module. C'est vraiment étonnant. Cela ne devrait pas se produire, à moins<br>que vous n'ayez installé une version antérieure ou copié la configuration du module<br>depuis une machine sur laquelle une version plus récente était en cours. Ce n'est<br>pas bon et, par mesure de précaution, les valeurs par défaut de votre configuration<br>ont été restaurées.<br>Désolé pour le désagrément.<br>"
 
 #: src/modules/conf/e_mod_main.c:443
 msgid "Presentation"
@@ -3673,21 +3646,21 @@ msgstr "Modes"
 
 #: src/modules/conf/e_mod_main.c:510
 msgid "Configuration Panel Configuration Updated"
-msgstr "Configuration de Panneau de contrôle actualisée"
+msgstr "Configuration de Panneau de contrôle à jour"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
-msgstr "Applications dans l'IBar"
+msgstr "Applications dans l' IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Applications au démarrage"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Applications à redémarrer"
 
@@ -3700,10 +3673,22 @@ msgid "Apps"
 msgstr "Applis"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nouvelle application"
+msgid "Create Launcher"
+msgstr "Créer un lanceur"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "Supprimer lanceurs perso"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "Applications par défaut"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "Environnements de bureau"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar (autres)"
 
@@ -3716,7 +3701,7 @@ msgid "Available Profiles"
 msgstr "Profils disponibles"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Sélectionnez un profil"
 
@@ -3754,9 +3739,11 @@ msgstr "Paramétrage des boîtes de dialogue"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519
+#: src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191
+#: src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
@@ -3766,7 +3753,7 @@ msgstr "Désactiver les boîtes de dialogue de confirmation"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:113
 msgid "Normal Windows"
-msgstr "Fenêtres normales"
+msgstr "Comportement des fenêtres normales"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:120
 msgid "Default Settings Dialogs Mode"
@@ -3798,206 +3785,144 @@ msgstr "Boîtes de dialogue"
 msgid "Profiles"
 msgstr "Profils"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
-msgid ""
-"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
-"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
-"will be restored in %d seconds."
-msgstr ""
-"Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le "
-"cas, ou Restaurer sinon.<br>Si vous ne cliquez pas, la précédente résolution "
-"de<br>%dx%d à %d Hz sera restaurée dans %d secondes."
+msgid "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not.<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz will be restored in %d seconds."
+msgstr "Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le cas, ou Restaurer sinon.<br>Si vous ne cliquez pas, la précédente résolution de<br>%dx%d à %d Hz sera restaurée dans %d secondes."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
-msgid ""
-"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
-"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
-"restored in %d seconds."
-msgstr ""
-"Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le "
-"cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
-"résolution de<br>%dx%d sera restaurée dans %d secondes."
+msgid "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not.<br>If you do not press a button, the old resolution of<br>%dx%d will be restored in %d seconds."
+msgstr "Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente résolution de<br>%dx%d sera restaurée dans %d secondes."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
-msgid ""
-"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
-"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
-"will be restored <hilight>IMMEDIATELY</hilight>."
-msgstr ""
-"Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le "
-"cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
-"résolution de<br>%dx%d à %d Hz sera restaurée <hilight>IMMÉDIATEMENT</"
-"hilight>."
+msgid "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not.<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr "Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente résolution de<br>%dx%d à %d Hz sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
-msgid ""
-"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
-"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
-"restored <hilight>IMMEDIATELY</hilight>."
-msgstr ""
-"Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le "
-"cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
-"résolution de<br>%dx%d sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
+msgid "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not.<br>If you do not press a button, the old resolution of<br>%dx%d will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr "Cela vous convient ? Cliquez sur <hilight>Enregistrer</hilight> si c'est le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente résolution de<br>%dx%d sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Modification de la résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Restaurer"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Paramétrage de la résolution de l'écran"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaurer à l'ouverture de session"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Rafraîchissement"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Miroir"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Fonctionnalités manquantes"
 
-#: src/modules/conf_display/e_int_config_display.c:677
-msgid ""
-"Your X Display Server is missing support for<br>the <hilight>XRandR</"
-"hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
-"resolutions without<br>the support of this extension. It could also "
-"be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
-"XRandR support detected."
-msgstr ""
-"Votre serveur X ne supporte pas l'extension<br><hilight>XRandR</hilight> "
-"(redimensionnement et rotation).<br>Vous ne pouvez modifier la résolution de "
-"l'écran sans le<br>support de cette extension. Il se peut aussi qu'au moment "
-"de la compilation<br>de <hilight>ecore</hilight>, le support de XRandR n'ait "
-"pas été détecté."
+#: src/modules/conf_display/e_int_config_display.c:628
+msgid "Your X Display Server is missing support for<br>the <hilight>XRandR</hilight> (X Resize and Rotate) extension.<br>You cannot change screen resolutions without<br>the support of this extension. It could also be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no XRandR support detected."
+msgstr "Votre serveur X ne supporte pas l'extension<br><hilight>XRandR</hilight> (redimensionnement et rotation).<br>Vous ne pouvez modifier la résolution de l'écran sans le<br>support de cette extension. Il se peut aussi qu'au moment de la compilation<br>de <hilight>ecore</hilight>, le support de XRandR n'ait pas été détecté."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Aucun taux de rafraîchissement détecté"
 
-#: src/modules/conf_display/e_int_config_display.c:690
-msgid ""
-"No refresh rates were reported by your X Display Server.<br>If you are "
-"running a nested X Display Server, then<br>this is to be expected. However, "
-"if you are not, then<br>the current refresh rate will be used when "
-"setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
-"screen."
-msgstr ""
-"Aucun taux de rafraîchissement n'a été rapporté par votre serveur X.<br>Si "
-"vous utilisez un serveur X imbriqué (nested), alors cela est normal."
-"<br>Néanmoins, si ce n'est pas le cas, le taux de rafraîchissement "
-"actuel<br>sera utilisé lors de la sélection de la résolution, ce qui "
-"pourrait<br><hilight>endommager</hilight> votre écran."
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid "No refresh rates were reported by your X Display Server.<br>If you are running a nested X Display Server, then<br>this is to be expected. However, if you are not, then<br>the current refresh rate will be used when setting<br>the resolution, which may cause <hilight>damage</hilight> to your screen."
+msgstr "Aucun taux de rafraîchissement n'a été rapporté par votre serveur X.<br>Si vous utilisez un serveur X imbriqué, alors cela est normal.<br>Néanmoins, si ce n'est pas le cas, le taux de rafraîchissement actuel<br>sera utilisé lors de la sélection de la résolution, ce qui pourrait<br><hilight>endommager</hilight> votre écran."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Paramétrage des bureaux virtuels"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Nombre de bureaux"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Basculement des bureaux"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Basculer lors du glissement d'objets au bord de l'écran"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Mise en boucle des bureaux adjacents"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Bureaux"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Aucune"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Panneau"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Fond d'écran panoramique"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Vitesse de l'animation"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f s"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Facteur horizontal"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Facteur vertical"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animation du basculement"
 
@@ -4014,7 +3939,7 @@ msgid "Desktop Wallpaper"
 msgstr "Fond d'écran du bureau"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Définir"
 
@@ -4024,12 +3949,12 @@ msgstr "Choisir un fond d'écran…"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personnel"
 
@@ -4037,183 +3962,209 @@ msgstr "Personnel"
 msgid "Screen Lock Settings"
 msgstr "Paramétrage du verrouillage de l'écran"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Verrouiller au démarrage"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Verrouiller à la mise en veille"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Commande de verrouillage personnalisée"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Verrouillage"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Afficher sur tous les écrans"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Afficher sur l'écran actuel"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Afficher sur l'écran ..."
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Boîte de connexion"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Verrouiller au démarrage de l'écran de veille"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f secondes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Verrouiller quand le temps d'attente est dépassé"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Minuteurs"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "À suggérer si désactivé avant"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Mode présentation"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Défini par le thème"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Fond d'écran du thème"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Fond d'écran actuel"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Fond d'écran"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Paramétrage de l'économiseur d'écran"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Activer l'écran de veille de X"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr "En veille quand l'écran s'éteint"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "Même sur secteur"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "Délai avant mise en veille effective"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Écran de veille"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Délai initial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Délai d'alternance"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Extinction de l'écran"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Préféré"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Non préféré"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Événements d'exposition"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne pas autoriser"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Display Power Management Signaling"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "L'affichage actuel ne supporte<br>pas le DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "L'affichage actuel n'a pas le support<br>de l'extension DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Paramétrage de la gestion de l'énergie"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Activer la gestion de l'énergie"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
-msgstr "Délai avant la mise en veille"
+msgstr "Délai avant mise en attente"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Délai avant l'état suspendu"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
-msgstr "Délai avant la mise hors tension"
+msgstr "Délai avant mise hors tension"
+
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr "DPMS"
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "Rétroéclairage normal"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "Rétroéclairage diminué"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr "Durée du fondu"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "Rétroéclairage"
 
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
@@ -4248,118 +4199,107 @@ msgid "<None>"
 msgstr "<Aucun>"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-msgid ""
-"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>You can either specify a delay of this<br> action using the slider, "
-"or make it<br>respond to edge clicks:"
-msgstr ""
-"Veuillez choisir un bord,<br>ou cliquez sur <hilight>Fermer</hilight> pour "
-"annuler.<br><br>Vous avez le choix entre spécifier un délai<br>pour cette "
-"action en utilisant le slider,<br>ou l'activer par un clic :"
+msgid "Please select an edge,<br>or click <hilight>Close</hilight> to abort.<br><br>You can either specify a delay of this<br> action using the slider, or make it<br>respond to edge clicks:"
+msgstr "Veuillez choisir un bord,<br>ou cliquez sur <hilight>Fermer</hilight> pour annuler.<br><br>Vous avez le choix entre spécifier un délai<br>pour cette action en utilisant le slider,<br>ou l'activer par un clic :"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
 msgid "Edge Bindings Settings"
 msgstr "Paramétrage des raccourcis des bords de l'écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Raccourcis des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Ajouter un raccourci"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Supprimer le raccourci"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modifier le raccourci"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paramètres de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Options générales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Autoriser l'activation du raccourci avec des fenêtres plein écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Séquence du raccourci des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Bord cliquable"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
-msgstr "Erreur de raccourci des bords"
+msgstr "Raccourci des bords : erreur"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
-msgid ""
-"The binding key sequence, that you choose, is already used by <br><hilight>"
-"%s</hilight> action.<br>Please choose another binding edge sequence."
-msgstr ""
-"La séquence de raccourci que vous avez choisie est déjà utilisée<br>par "
-"l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence pour "
-"le raccourci des bords."
+msgid "The binding key sequence, that you choose, is already used by <br><hilight>%s</hilight> action.<br>Please choose another binding edge sequence."
+msgstr "La séquence de raccourci que vous avez choisie est déjà utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence pour le raccourci des bords."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "Majuscule"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4369,7 +4309,8 @@ msgstr "Logo"
 #: src/modules/conf_edgebindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
 #: src/modules/conf_keybindings/e_mod_main.c:17
-#: src/modules/mixer/app_mixer.c:277 src/modules/mixer/app_mixer.c:295
+#: src/modules/mixer/app_mixer.c:277
+#: src/modules/mixer/app_mixer.c:295
 msgid "Input"
 msgstr "Entrée"
 
@@ -4494,57 +4435,57 @@ msgid "Input Method Config Import Error"
 msgstr "Erreur d'importation de la méthode de saisie"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:284
-msgid ""
-"Enlightenment was unable to import the configuration.<br><br>Are you sure "
-"this is really a valid configuration?"
-msgstr ""
-"Enlightenment n'a pu importer la configuration.<br><br>Êtes-vous sûr que "
-"cette configuration est valide ?"
+msgid "Enlightenment was unable to import the configuration.<br><br>Are you sure this is really a valid configuration?"
+msgstr "Enlightenment n'a pu importer la configuration.<br><br>Êtes-vous sûr que cette configuration est valide ?"
 
 #: src/modules/conf_intl/e_int_config_imc_import.c:300
-msgid ""
-"Enlightenment was unable to import the configuration<br>due to a copy error."
-msgstr ""
-"Enlightenment n'a pas pu importer cette configuration,<br>à cause d'une "
-"erreur de copie."
+msgid "Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr "Enlightenment n'a pas pu importer cette configuration,<br>à cause d'une erreur de copie."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Paramétrage de la langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr "Les paramètres régionaux peuvent poser problème"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid "You have some extra locale environment<br>variables set that may interfere with<br>correct display of your chosen language.<br>If you don't want these affected, use the<br>Environment variable settings to unset them.<br>The variables that may affect you are<br>as follows:<br>%s"
+msgstr "Certaines variantes de localisation<br>sont susceptibles de perturber le<br>rendu de la langue sélectionnée.<br>Pour éviter cela, utilisez la<br>configuration des Variables<br>d'environnement pour les désactiver.<br>Les variantes problématiques sont :<br>%s"
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Sélecteur de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Système (par défaut)"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Paramètres régionaux"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Localisation"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17
+#: src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Langue"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:4
-msgid ""
-"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
-msgstr ""
-"Veuillez composer votre séquence au clavier,<br><br>ou  <hilight>Échap</"
-"hilight> pour annuler."
+msgid "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr "Veuillez composer votre séquence au clavier,<br><br>ou  <hilight>Échap</hilight> pour annuler."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:8
 msgid "Single key"
@@ -4568,23 +4509,12 @@ msgstr "Erreur de raccourci clavier"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1175
 #, 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 ""
-"La séquence de raccourci clavier que vous avez choisie est déjà "
-"utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
-"autre séquence de raccourci clavier."
+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 "La séquence de raccourci clavier que vous avez choisie est déjà utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence de raccourci clavier."
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
-msgid ""
-"Please hold any modifier you want<br>and press any button on your mouse,<br> "
-"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
-"highlight> to abort."
-msgstr ""
-"Veuillez appuyer sur le modificateur de votre choix et<br>sur un bouton de "
-"votre souris, ou tourner la molette,<br>afin d'assigner un raccourci souris."
-"<br>Appuyez sur  <hilight>Échap</hilight> pour annuler."
+msgid "Please hold any modifier you want<br>and press any button on your mouse,<br> or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</highlight> to abort."
+msgstr "Veuillez appuyer sur le modificateur de votre choix et<br>sur un bouton de votre souris, ou tourner la molette,<br>afin d'assigner un raccourci souris.<br>Appuyez sur  <hilight>Échap</hilight> pour annuler."
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:112
 msgid "Mouse Bindings Settings"
@@ -4607,7 +4537,8 @@ msgid "Win List"
 msgstr "Liste de fenêtres"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:333
-#: src/modules/pager/e_mod_config.c:135 src/modules/pager/e_mod_config.c:248
+#: src/modules/pager/e_mod_config.c:135
+#: src/modules/pager/e_mod_config.c:248
 msgid "Popup"
 msgstr "Pop-up"
 
@@ -4624,17 +4555,17 @@ msgid "Manager"
 msgstr "Gestionnaire"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Aucun(e)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Séquence du raccourci souris"
 
@@ -4656,12 +4587,10 @@ msgid "Menu Settings"
 msgstr "Paramétrage du menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 msgid "Enlightenment Default"
 msgstr "Enlightenment (par défaut)"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr "Personnel (par défaut)"
 
@@ -4670,7 +4599,7 @@ msgid "Main Menu"
 msgstr "Menu principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favoris"
 
@@ -4687,9 +4616,12 @@ msgid "Comments"
 msgstr "Commentaires"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
-#: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
-#: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
+#: src/modules/gadman/e_mod_config.c:162
+#: src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_main.c:77
+#: src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120
+#: src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
 msgstr "Gadgets"
 
@@ -4698,7 +4630,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Paramétrage visible au premier niveau"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menus"
 
@@ -4766,19 +4698,19 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Polices"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Thèmes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Icones"
 
@@ -4817,17 +4749,11 @@ msgstr "Paramétrage du moteur"
 #: src/modules/conf_performance/e_int_config_engine.c:96
 #: src/modules/conf_performance/e_int_config_engine.c:138
 msgid "Use ARGB instead of shaped windows"
-msgstr "Fenêtres ARVB à la place de celles non rectangulaires"
+msgstr "Mode ARVB pour les fenêtres"
 
 #: src/modules/conf_performance/e_int_config_engine.c:140
-msgid ""
-"You have chosen to enable ARGB composite support,<br>but your current screen "
-"does not support composite.<br><br>Are you sure you wish to enable ARGB "
-"support ?"
-msgstr ""
-"Vous avez choisi d'activer l'extension composite ARVB,<br>mais votre écran "
-"actuel ne semble pas la supporter.<br><br>Voulez-vous tout de même activer "
-"l'extension ARVB ?"
+msgid "You have chosen to enable ARGB composite support,<br>but your current screen does not support composite.<br><br>Are you sure you wish to enable ARGB support ?"
+msgstr "Vous avez choisi d'activer l'extension composite ARVB<br>mais votre écran actuel ne semble pas la supporter.<br><br>Tenez-vous vraiment à activer cette extension ?"
 
 #: src/modules/conf_performance/e_int_config_performance.c:35
 msgid "Performance Settings"
@@ -4913,29 +4839,25 @@ msgstr "Configurer"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:287
 #, c-format
-msgid ""
-"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
-"shelf?"
-msgstr ""
-"Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer "
-"ce rack ?"
+msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this shelf?"
+msgstr "Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer ce rack ?"
 
 #: src/modules/conf_theme/e_int_config_wallpaper.c:105
 msgid "Wallpaper Settings"
 msgstr "Paramétrage du fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Image…"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "En ligne…"
 
@@ -4955,51 +4877,46 @@ msgstr "Ce bureau"
 msgid "This Screen"
 msgstr "Cet écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Paramétrage du fond d'écran…"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Répéter"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr "Pano"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Choisir une image…"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Erreur lors de l'importation du fichier"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
-msgid ""
-"Enlightenment was unable to import the picture<br>due to conversion errors."
-msgstr ""
-"Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
+msgid "Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr "Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
-msgid ""
-"Enlightenment was unable to import the wallpaper<br>due to a copy error."
-msgstr ""
-"Enlightenment n'a pu importer le fond d'écran<br>à cause d'une erreur de "
-"copie."
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
+msgid "Enlightenment was unable to import the wallpaper<br>due to a copy error."
+msgstr "Enlightenment n'a pu importer le fond d'écran<br>à cause d'une erreur de copie."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
-msgid ""
-"Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
-"is a valid wallpaper?"
-msgstr ""
-"Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr qu'il "
-"s'agit d'un fond d'écran valide ?"
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
+msgid "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this is a valid wallpaper?"
+msgstr "Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr qu'il s'agit d'un fond d'écran valide ?"
 
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:162
 msgid "By"
@@ -5030,7 +4947,7 @@ msgid "Error: can't start the request."
 msgstr "Erreur : initialisation impossible."
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Style de bordure par défaut"
 
@@ -5038,7 +4955,7 @@ msgstr "Style de bordure par défaut"
 msgid "Window Border Selection"
 msgstr "Sélection de la bordure de fenêtre"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Mémoriser la bordure lors de la prochaine apparition de cette fenêtre"
 
@@ -5067,7 +4984,7 @@ msgid "Menu Background Base"
 msgstr "Fond de base du menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Titre du menu"
 
@@ -5076,7 +4993,7 @@ msgid "Menu Title Active"
 msgstr "Titre du menu actif"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Élément du menu"
 
@@ -5089,12 +5006,12 @@ msgid "Menu Item Disabled"
 msgstr "Élément inactif du menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Texte de déplacement"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Texte de redimensionnement"
 
@@ -5111,7 +5028,7 @@ msgid "Winlist Label"
 msgstr "Étiquette de la liste des fenêtres"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Titre de la liste des fenêtres"
 
@@ -5128,389 +5045,404 @@ msgid "File Manager Background Base"
 msgstr "Fond de base du gestionnaire de fichiers"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Focalisation"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Texte du bouton"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Texte du bouton désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Texte du bouton à cocher"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Texte du bouton à cocher désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Texte de l'entrée"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Texte de l'entrée désactivée"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Texte de l'étiquette"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Texte de l'élément de liste sélectionné"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Texte de l'élément de liste impair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Fond de base de l'élément de liste impair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Texte de l'élément de liste pair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Fond de base de l'élément de liste pair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Texte de l'en-tête de liste pair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Fond de base de l'en-tête de liste pair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Texte de l'en-tête de liste impair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Fond de base de l'en-tête de liste impair"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Texte de bouton radio"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Texte de bouton radio désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Texte du slider"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Texte du slider désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Fond de base du cadre"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Fond de base du cadre de défilement"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Étiquette du module"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Couleur de la perte de focus composite"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Classe de couleur : %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Sélection de %u classes de couleurs mixtes"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Sélection de %u classes de couleurs indéfinies"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Sélection de %u classes de couleurs uniformes"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Aucune classe de couleur sélectionnée"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Couleurs personnalisées"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Objet :"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Contour :"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Ombre :"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Rendu des couleurs sur le texte."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "Les possibilités offertes dépendent du thème."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Objets graphiques"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Autres"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Barre de titre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Bloc de texte simple"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Bloc de texte fin"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Bloc de texte gros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "En-tête de configuration"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Titre de l'à propos "
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Version de l'à propos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Texte de l'à propos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titre du verrouillage d'écran"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Mot de passe du verrouillage d'écran"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Boîte de dialogue d'erreur"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Commande Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Titre de l'écran de présentation"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Texte de l'écran de présentation"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Version de l'écran de présentation"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "Horloge numérique"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Entrée"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Cadre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Étiquette"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Boutons"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Slider"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Boutons radio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Boutons à cocher"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Texte de l'élément de liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Élément de liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "En-tête de liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Gestionnaire de fichiers"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Icone de bureau"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grand"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Style petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Style normal"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Style grand"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Paramétrage des polices"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Minuscule"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Gros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Très gros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Activer les polices personnalisées"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Aperçu basique du texte : 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Aperçu avancé du texte : 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Optimisation"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
-#: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
+#: src/modules/cpufreq/e_mod_main.c:227
+#: src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
-msgstr "Polices de secours"
+msgstr "Polices de repli"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
-msgstr "Nom de la police de secours"
+msgstr "Nom de la police de repli"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
-msgstr "Activer les polices de secours"
+msgstr "Activer les polices de repli"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
-msgstr "Optimisation/Polices de secours"
+msgstr "Optimisation/Polices de repli"
 
 #: src/modules/conf_theme/e_int_config_icon_themes.c:53
 msgid "Icon Theme Settings"
 msgstr "Paramétrage du thème d'icones"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Activer le thème d'icones"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr "Utilser le thème d'icones pour les applications"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "Remplacer le thème interne"
 
@@ -5575,11 +5507,9 @@ msgid "Custom scaling factor"
 msgstr "Facteur d'échelle personnalisé"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
-msgstr "%1.2f fois"
+msgid "%1.2f x"
+msgstr "%1.2f x"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5590,6 +5520,12 @@ msgstr "Politique"
 msgid "Minimum"
 msgstr "Minimum"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f fois"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximum"
@@ -5610,25 +5546,25 @@ msgstr "Afficher l'écran de démarrage à la connexion"
 msgid "Transition Settings"
 msgstr "Paramétrage de la transition"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Événements"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Démarrage"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Changement de bureau"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Changement de fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transitions"
 
@@ -5644,15 +5580,15 @@ msgstr " Importer…"
 msgid " Online..."
 msgstr " En ligne…"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Catégories du thème"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Assigner"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Tout effacer"
 
@@ -5666,35 +5602,30 @@ msgid "Theme Import Error"
 msgstr "Erreur lors de l'importation du thème"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:285
-msgid ""
-"Enlightenment was unable to import the theme.<br><br>Are you sure this is "
-"really a valid theme?"
-msgstr ""
-"Enlightenment n'a pu importer ce thème.<br><br>Êtes-vous sûr qu'il s'agit "
-"d'un thème valide ?"
+msgid "Enlightenment was unable to import the theme.<br><br>Are you sure this is really a valid theme?"
+msgstr "Enlightenment n'a pu importer ce thème.<br><br>Êtes-vous sûr qu'il s'agit d'un thème valide ?"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:294
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
-msgstr ""
-"Enlightenment n'a pu importer ce thème<br>à cause d'une erreur de copie."
+msgstr "Enlightenment n'a pu importer ce thème<br>à cause d'une erreur de copie."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:126
 msgid "Exchange themes"
 msgstr "Thèmes Exchange"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordures"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Thème d'icones"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Mise à l'échelle"
 
@@ -5809,12 +5740,16 @@ msgstr "Défini par l'utilisateur"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:154
 msgid "Application provided"
-msgstr "Icone fourni par l'application"
+msgstr "Fourni par l'application"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:156
 msgid "Border Icon"
 msgstr "Icone en bordure"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Positionnement"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Positionnement intelligent"
@@ -5843,23 +5778,43 @@ msgstr "Nouvelles fenêtres"
 msgid "Animate"
 msgstr "Animation"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linéaire"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Accélérer, puis décélérer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Accélérer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Décélérer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+msgid "Pronounced Accelerate"
+msgstr "Accélération franche"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+msgid "Pronounced Decelerate"
+msgstr "Décélération franche"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Accélération franche, puis décélération"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr "Rebond"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr "Plus de rebond"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Enroulement"
 
@@ -5880,6 +5835,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Fenêtre la plus récente sous le curseur"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Clic"
 
@@ -5911,11 +5867,6 @@ msgstr "Uniquement les boîtes de dialogue"
 msgid "Only dialogs with focused parent"
 msgstr "Uniquement les boîtes de dialogue dont le parent est focalisé"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Focalisation"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Autres paramètres"
@@ -6013,13 +5964,13 @@ msgid "Fill available space"
 msgstr "Remplir l'espace disponible"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal(e)"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical(e)"
@@ -6076,7 +6027,7 @@ msgid "Raise when clicking to focus"
 msgstr "Élever lors du clic de focalisation"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Focalisation des fenêtres"
 
@@ -6108,7 +6059,7 @@ msgstr "Détails"
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:141
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:306
 msgid "<No Name>"
-msgstr "<Sans Nom>"
+msgstr "<sans nom>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:144
 msgid "Class:"
@@ -6117,7 +6068,7 @@ msgstr "Classe :"
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:148
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:308
 msgid "<No Class>"
-msgstr "<Sans Classe>"
+msgstr "<sans classe>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:151
 msgid "Title:"
@@ -6126,7 +6077,7 @@ msgstr "Titre :"
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:310
 msgid "<No Title>"
-msgstr "<Sans Titre>"
+msgstr "<sans titre>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:158
 msgid "Role:"
@@ -6135,7 +6086,7 @@ msgstr "Rôle :"
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:162
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:312
 msgid "<No Role>"
-msgstr "<Sans Rôle>"
+msgstr "<sans rôle>"
 
 #: src/modules/cpufreq/e_mod_main.c:132
 msgid "Cpufreq"
@@ -6165,15 +6116,18 @@ msgstr "Très lente (256 tics)"
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:261
+#: src/modules/cpufreq/e_mod_main.c:229
+#: src/modules/cpufreq/e_mod_main.c:261
 msgid "Lower Power Automatic"
 msgstr "Basse consommation automatique"
 
-#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:263
+#: src/modules/cpufreq/e_mod_main.c:231
+#: src/modules/cpufreq/e_mod_main.c:263
 msgid "Minimum Speed"
 msgstr "Vitesse minimale"
 
-#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:265
+#: src/modules/cpufreq/e_mod_main.c:233
+#: src/modules/cpufreq/e_mod_main.c:265
 msgid "Maximum Speed"
 msgstr "Vitesse maximale"
 
@@ -6212,30 +6166,16 @@ msgid "Powersaving behavior"
 msgstr "Comportement de la gestion de l'énergie"
 
 #: src/modules/cpufreq/e_mod_main.c:412
-msgid ""
-"There was an error trying to set the<br>cpu frequency governor via the "
-"module's<br>setfreq utility."
-msgstr ""
-"Une erreur s'est produite lors de la tentative<br>de changement de fréquence "
-"du CPU<br>via l'utilitaire setfreq du module."
+msgid "There was an error trying to set the<br>cpu frequency governor via the module's<br>setfreq utility."
+msgstr "Une erreur s'est produite lors de la tentative<br>de changement de fréquence du CPU<br>via l'utilitaire setfreq du module."
 
 #: src/modules/cpufreq/e_mod_main.c:440
-msgid ""
-"Your kernel does not support setting the<br>CPU frequency at all. You may be "
-"missing<br>Kernel modules or features, or your CPU<br>simply does not "
-"support this feature."
-msgstr ""
-"Votre noyau ne supporte pas le changement<br>de fréquence. Vous l'avez peut-"
-"être compilé sans cette option,<br>ou votre CPU ne supporte pas cette "
-"fonctionnalité ?"
+msgid "Your kernel does not support setting the<br>CPU frequency at all. You may be missing<br>Kernel modules or features, or your CPU<br>simply does not support this feature."
+msgstr "Votre noyau ne supporte pas le changement<br>de fréquence. Vous l'avez peut-être compilé sans cette option,<br>ou votre CPU ne supporte pas cette fonctionnalité ?"
 
 #: src/modules/cpufreq/e_mod_main.c:466
-msgid ""
-"There was an error trying to set the<br>cpu frequency setting via the "
-"module's<br>setfreq utility."
-msgstr ""
-"Une erreur s'est produite lors de la tentative<br>de changement de fréquence "
-"du CPU<br>via l'utilitaire setfreq du module."
+msgid "There was an error trying to set the<br>cpu frequency setting via the module's<br>setfreq utility."
+msgstr "Une erreur s'est produite lors de la tentative<br>de changement de fréquence du CPU<br>via l'utilitaire setfreq du module."
 
 #: src/modules/dropshadow/e_mod_config.c:39
 msgid "Dropshadow Settings"
@@ -6333,173 +6273,173 @@ msgstr "Très claire"
 msgid "Dropshadow"
 msgstr "Ombre portée"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Lanceur Omni"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Afficher Omni"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Configuration d'Omni"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Afficher la boîte de dialogue d'Omni"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:420
 msgid "Everything Module"
 msgstr "Module Omni"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:609
 msgid "Run Everything"
 msgstr "Omni"
 
-#: src/modules/everything/evry_config.c:79
+#: src/modules/everything/evry_config.c:78
 msgid "Everything Settings"
 msgstr "Paramétrage d'Omni"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Greffons disponibles"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Configurer"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Afficher dans « Tout »"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Afficher au premier niveau"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Nombre minimal de caractères pour la recherche"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Déclencheur"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Correspond au nom du greffon par défaut"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Rechercher uniquement si assigné"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Affichage du greffon"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "détaillé"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Affichage par défaut"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Défilement animé"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Flèche haut/bas va à l'élément suivant dans la vue en icones"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Masquer l'entrée quand inactif"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Masquer la liste"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Navigation rapide"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Style Emacs (Alt + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Style Vi (Alt + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Affichage par défaut"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Défilement animé"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Flèche haut/bas va à l'élément suivant dans la vue en icones"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Tri"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr "Pas de tri"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "Selon l'utilisation"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Le plus utilisé"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Dernier utilisé"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Sujet"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Action"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Objet"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:737
 msgid "Plugins"
 msgstr "Greffons"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Taille du pop-up"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Largeur du pop-up"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Hauteur du pop-up"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Alignement du pop-up"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6508,214 +6448,84 @@ msgstr "Alignement du pop-up"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Taille du bord du pop-up"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Géométrie"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:632
 msgid "Everything Collection"
 msgstr "Collection Omni "
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Actions"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Éléments"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:328
 msgid "No plugins loaded"
 msgstr "Aucun greffon activé"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Copier dans le presse-papiers "
-
 #: src/modules/everything/evry_view_help.c:67
-msgid ""
-"  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
-"Just type a few letters of the thing you are looking for. <br>  Use cursor "
-"<hilight>&lt;up/down&gt;</hilight> to choose from the list of things.<br>  "
-"Press  <hilight>&lt;tab&gt;</hilight> to select an action, then press  "
-"<hilight>&lt;return&gt;</hilight>.<br> This page will not show up next time "
-"you run <hilight>everything</hilight>.<br>    <hilight>&lt;Esc&gt;</hilight> "
-"close this Dialog<br>    <hilight>&lt;?&gt;</hilight> show this page<br>    "
-"<hilight>&lt;return&gt;</hilight> run action<br>    <hilight>&lt;ctrl"
-"+return&gt;</hilight> run action and continue<br>    <hilight>&lt;tab&gt;</"
-"hilight> toggle between selectors<br>    <hilight>&lt;ctrl+tab&gt;</hilight> "
-"complete input (depends on plugin)<br>    <hilight>&lt;ctrl+'x'&gt;</"
-"hilight> jump to plugin beginning with 'x'<br>    <hilight>&lt;ctrl+left/"
-"right&gt;</hilight> cycle through plugins<br>    <hilight>&lt;ctrl+up/"
-"down&gt;</hilight> go to first/last item<br>    <hilight>&lt;ctrl+1&gt;</"
-"hilight> toggle view modes (exit this page ;)<br>    <hilight>&lt;ctrl+2&gt;"
-"</hilight> toggle list view modes<br>    <hilight>&lt;ctrl+3&gt;</hilight> "
-"toggle thumb view modes"
-msgstr ""
-"  Voici des éclaircissements sur <hilight>Omni</hilight>...<br>  Tapez juste "
-"les premières lettres de ce que vous recherchez. <br>  Utilisez les touches "
-"<hilight>&lt;Flèche haut/bas&gt;</hilight> pour choisir dans la liste.<br>  "
-"Appuyez sur <hilight>&lt;Tabulation&gt;</hilight> pour sélectionner une "
-"action, puis sur  <hilight>&lt;Entrée&gt;</hilight>.<br>  Cette page ne "
-"s'affichera pas lors de la prochaine utilisation d' <hilight>Omni</hilight>."
-"<br>    <hilight>&lt;Échap&gt;</hilight> ferme cette boîte de "
-"dialogue<br>    <hilight>&lt;?&gt;</hilight> affiche cette page<br>    "
-"<hilight>&lt;Entrée&gt;</hilight> exécute une action<br>    <hilight>&lt;Ctrl"
-"+Entrée&gt;</hilight> exécute une action et continue<br>    <hilight>&lt;"
-"tab&gt;</hilight> passe d'un selecteur à l'autre<br>    <hilight>&lt;Ctrl"
-"+Tabulation&gt;</hilight> détail des entrées (ça dépend du greffon)<br>    "
-"<hilight>&lt;Ctrl+« x »&gt;</hilight> va au greffon commençant par la lettre "
-"« ... »<br>    <hilight>&lt;Ctrl+Flèche gauche/droite&gt;</hilight> circule "
-"parmi les greffons<br>    <hilight>&lt;ctrl+Flèche haut/bas&gt;</hilight> va "
-"au premier/dernier élément<br>    <hilight>&lt;Ctrl+1&gt;</hilight> commute "
-"le mode d'affichage (quitter cette page ;)<br>    <hilight>&lt;Ctrl+2&gt;</"
-"hilight> commute le mode d'affichage de la liste<br>    <hilight>&lt;Ctrl"
-"+3&gt;</hilight> commute le mode d'affichage des vignettes."
-
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Ouvrir avec…"
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Ouvrir le fichier…"
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Éditer le fichier d'application"
+msgid "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  Just type a few letters of the thing you are looking for. <br>  Use cursor <hilight>&lt;up/down&gt;</hilight> to choose from the list of things.<br>  Press  <hilight>&lt;tab&gt;</hilight> to select an action, then press  <hilight>&lt;return&gt;</hilight>.<br> This page will not show up next time you run <hilight>everything</hilight>.<br>    <hilight>&lt;Esc&gt;</hilight> close this Dialog<br>    <hilight>&lt;?&gt;</hilight> show this page<br>    <hilight>&lt;return&gt;</hilight> run action<br>    <hilight>&lt;ctrl+return&gt;</hilight> run action and continue<br>    <hilight>&lt;tab&gt;</hilight> toggle between selectors<br>    <hilight>&lt;ctrl+tab&gt;</hilight> complete input (depends on plugin)<br>    <hilight>&lt;ctrl+'x'&gt;</hilight> jump to plugin beginning with 'x'<br>    <hilight>&lt;ctrl+left/right&gt;</hilight> cycle through plugins<br>    <hilight>&lt;ctrl+up/down&gt;</hilight> go to first/last item<br>    <hilight>&lt;ctrl+1&gt;</hilight> toggle view modes (exit this page ;)<br>    <hilight>&lt;ctrl+2&gt;</hilight> toggle list view modes<br>    <hilight>&lt;ctrl+3&gt;</hilight> toggle thumb view modes"
+msgstr "  Voici des éclaircissements sur <hilight>Omni</hilight>...<br>  Tapez juste les premières lettres de ce que vous recherchez. <br>  Utilisez les touches <hilight>&lt;Flèche haut/bas&gt;</hilight> pour choisir dans la liste.<br>  Appuyez sur <hilight>&lt;Tabulation&gt;</hilight> pour sélectionner une action, puis sur  <hilight>&lt;Entrée&gt;</hilight>.<br>  Cette page ne s'affichera pas lors de la prochaine utilisation d' <hilight>Omni</hilight>.<br>    <hilight>&lt;Échap&gt;</hilight> ferme cette boîte de dialogue<br>    <hilight>&lt;?&gt;</hilight> affiche cette page<br>    <hilight>&lt;Entrée&gt;</hilight> exécute une action<br>    <hilight>&lt;Ctrl+Entrée&gt;</hilight> exécute une action et continue<br>    <hilight>&lt;tab&gt;</hilight> passe d'un selecteur à l'autre<br>    <hilight>&lt;Ctrl+Tabulation&gt;</hilight> détail des entrées (ça dépend du greffon)<br>    <hilight>&lt;Ctrl+« x »&gt;</hilight> va au greffon commençant par la lettre « ... »<br>    <hilight>&lt;Ctrl+Flèche gauche/droite&gt;</hilight> circule parmi les greffons<br>    <hilight>&lt;ctrl+Flèche haut/bas&gt;</hilight> va au premier/dernier élément<br>    <hilight>&lt;Ctrl+1&gt;</hilight> commute le mode d'affichage (quitter cette page ;)<br>    <hilight>&lt;Ctrl+2&gt;</hilight> commute le mode d'affichage de la liste<br>    <hilight>&lt;Ctrl+3&gt;</hilight> commute le mode d'affichage des vignettes."
 
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Nouveau fichier d'application"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Exécuter avec sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Ouvrir avec…"
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Ouvrir dans un terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Lancer l'exécutable"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1238
+#: src/modules/everything/evry_plug_apps.c:1373
 msgid "Everything Applications"
 msgstr "Omni applications"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1270
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1271
 msgid "Terminal Command"
 msgstr "Commande du terminal"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1276
 msgid "Sudo GUI"
 msgstr "Interface graphique sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1354
+#: src/modules/everything/evry_plug_files.c:1585
 msgid "Everything Plugin"
 msgstr "Greffon Omni "
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Calculatrice"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Copier dans..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Déplacer vers..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Mettre à la corbeille"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Ouvrir le dossier avec EFM"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Classer par date"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Classer par nom"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Documents récents"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1456
+#: src/modules/everything/evry_plug_files.c:1607
 msgid "Everything Files"
 msgstr "Omni fichiers"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1483
 msgid "Show recent files"
 msgstr "Afficher les documents récents"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1487
 msgid "Search recent files"
 msgstr "Rechercher dans les documents récents"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1491
 msgid "Search cached files"
 msgstr "Rechercher dans le cache des documents"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1495
 msgid "Cache visited directories"
 msgstr "Mettre en cache les dossiers visités"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1499
 msgid "Clear cache"
 msgstr "Vider le cache"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Afficher la boîte de dialogue"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Aller vers la fenêtre"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Activer/Désactiver le plein écran"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Envoyer sur le bureau"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Icones des fichiers"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Types de fichiers"
 
@@ -6759,56 +6569,29 @@ msgstr "Sélectionner un fichier edj"
 msgid "Select an image"
 msgstr "Sélectionner une image"
 
-#: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:58
+#: src/modules/fileman/e_mod_main.c:72
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Dossier personnel"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Racine"
 
-#: src/modules/fileman/e_mod_main.c:470
-msgid ""
-"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
-"been wiped and a new set of defaults initialized. This<br>will happen "
-"regularly during development, so don't report a<br>bug. This simply means "
-"Fileman module needs new configuration<br>data by default for usable "
-"functionality that your old<br>configuration simply lacks. This new set of "
-"defaults will fix<br>that by adding it in. You can re-configure things now "
-"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
-msgstr ""
-"La configuration du module Gestionnaire de fichiers a dû être mise à jour. "
-"<br>Votre ancienne configuration a été supprimée et de nouveaux "
-"paramètres<br>par défaut sont en place. Cela risque d'arriver en phase "
-"de<br>développement, aussi est-il inutile de faire un rapport de bogue."
-"<br>Cela signifie simplement que le module Gestionnaire de fichiers a "
-"besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous "
-"pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne "
-"occasionnée.<br>"
-
-#: src/modules/fileman/e_mod_main.c:483
-msgid ""
-"Your Fileman Module configuration is NEWER than Fileman Module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"Fileman Module or copied the configuration from a place where<br>a newer "
-"version of the Fileman Module was running. This is bad and<br>as a "
-"precaution your configuration has been now restored to<br>defaults. Sorry "
-"for the inconvenience.<br>"
-msgstr ""
-"Votre configuration du module Gestionnaire de fichiers est PLUS RÉCENTE que "
-"la version<br>actuelle du module. C'est vraiment étonnant. Cela ne devrait "
-"pas se produire, à moins<br>que vous n'ayez installé une version antérieure "
-"ou copié la configuration du module<br>depuis une machine sur laquelle une "
-"version plus récente était en cours. Ce n'est<br>pas bon et, par mesure de "
-"précaution, les valeurs par défaut de votre configuration<br>ont été "
-"restaurées. Désolé pour le désagrément.<br>"
-
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:474
+msgid "Fileman Module Settings data needed upgrading. Your old configuration<br>has been wiped and a new set of defaults initialized. This<br>will happen regularly during development, so don't report a<br>bug. This simply means Fileman module needs new configuration<br>data by default for usable functionality that your old<br>configuration simply lacks. This new set of defaults will fix<br>that by adding it in. You can re-configure things now to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+msgstr "La configuration du module Gestionnaire de fichiers a dû être mise à jour. <br>Votre ancienne configuration a été supprimée et de nouveaux paramètres<br>par défaut sont en place. Cela risque d'arriver en phase de<br>développement, aussi est-il inutile de faire un rapport de bogue.<br>Cela signifie simplement que le module Gestionnaire de fichiers a besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
+
+#: src/modules/fileman/e_mod_main.c:487
+msgid "Your Fileman Module configuration is NEWER than Fileman Module version. This is very<br>strange. This should not happen unless you downgraded<br>the Fileman Module or copied the configuration from a place where<br>a newer version of the Fileman Module was running. This is bad and<br>as a precaution your configuration has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr "Votre configuration du module Gestionnaire de fichiers est PLUS RÉCENTE que la version<br>actuelle du module. C'est vraiment étonnant. Cela ne devrait pas se produire, à moins<br>que vous n'ayez installé une version antérieure ou copié la configuration du module<br>depuis une machine sur laquelle une version plus récente était en cours. Ce n'est<br>pas bon et, par mesure de précaution, les valeurs par défaut de votre configuration<br>ont été restaurées. Désolé pour le désagrément.<br>"
+
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Configuration de EFM à jour"
 
@@ -6885,95 +6668,101 @@ msgstr "Ouvrir le gestionnaire de fichiers au montage"
 msgid "Device"
 msgstr "Périphérique"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Autre application…"
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690
+#: src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695
+#: src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Ouvrir avec…"
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Applications disponibles"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Toutes les applications"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Commande personnalisée"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Copie annulée"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Déplacement annulé"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Suppression annulée"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "L'opération a échoué"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Copie de %s accomplie"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Copie de %s (reste %d s)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Déplacement de %s accompli"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Déplacement de %s (reste %d s)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Suppression accomplie"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Suppression des fichiers…"
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7008,7 +6797,7 @@ msgstr "Traitement de %d opération(s)"
 msgid "Filemanager is idle"
 msgstr "Gestionnaire de fichiers inactif"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Informations EFM"
 
@@ -7020,35 +6809,41 @@ msgstr "Gestionnaire de gadgets"
 msgid "Available Gadgets"
 msgstr "Gadgets disponibles"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Mode"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143
+#: src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Image personnalisée"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147
+#: src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Couleur personnalisée"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparent"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animations"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Fond d'écran"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Options du fond d'écran"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Déplacer/Redimensionner"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Libre"
@@ -7069,9 +6864,10 @@ msgstr "Au-dessus en appuyant sur"
 msgid "Add other gadgets"
 msgstr "Ajouter un autre gadget"
 
-#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+#: src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120
 msgid "Show/hide gadgets"
-msgstr "Afficher/Masquer les gadgets"
+msgstr "Voir/Cacher les gadgets"
 
 #: src/modules/winlist/e_int_config_winlist.c:58
 msgid "Window List Settings"
@@ -7165,31 +6961,44 @@ msgstr "Alignement vertical"
 msgid "Alignment"
 msgstr "Alignement :"
 
-#: src/modules/winlist/e_mod_main.c:35 src/modules/winlist/e_mod_main.c:37
-#: src/modules/winlist/e_mod_main.c:39 src/modules/winlist/e_mod_main.c:42
-#: 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:53
-#: src/modules/winlist/e_mod_main.c:55 src/modules/winlist/e_mod_main.c:57
-#: src/modules/winlist/e_mod_main.c:72 src/modules/winlist/e_mod_main.c:73
-#: src/modules/winlist/e_mod_main.c:74 src/modules/winlist/e_mod_main.c:76
-#: src/modules/winlist/e_mod_main.c:78 src/modules/winlist/e_mod_main.c:79
-#: src/modules/winlist/e_mod_main.c:80 src/modules/winlist/e_mod_main.c:81
+#: src/modules/winlist/e_mod_main.c:35
+#: src/modules/winlist/e_mod_main.c:37
+#: src/modules/winlist/e_mod_main.c:39
+#: src/modules/winlist/e_mod_main.c:42
+#: 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:53
+#: src/modules/winlist/e_mod_main.c:55
+#: src/modules/winlist/e_mod_main.c:57
+#: src/modules/winlist/e_mod_main.c:72
+#: src/modules/winlist/e_mod_main.c:73
+#: src/modules/winlist/e_mod_main.c:74
+#: src/modules/winlist/e_mod_main.c:76
+#: src/modules/winlist/e_mod_main.c:78
+#: src/modules/winlist/e_mod_main.c:79
+#: src/modules/winlist/e_mod_main.c:80
+#: src/modules/winlist/e_mod_main.c:81
 msgid "Window : List"
 msgstr "Fenêtre : liste"
 
-#: src/modules/winlist/e_mod_main.c:35 src/modules/winlist/e_mod_main.c:73
+#: src/modules/winlist/e_mod_main.c:35
+#: src/modules/winlist/e_mod_main.c:73
 msgid "Next Window"
 msgstr "Fenêtre suivante"
 
-#: src/modules/winlist/e_mod_main.c:37 src/modules/winlist/e_mod_main.c:72
+#: src/modules/winlist/e_mod_main.c:37
+#: src/modules/winlist/e_mod_main.c:72
 msgid "Previous Window"
 msgstr "Fenêtre précédente"
 
-#: src/modules/winlist/e_mod_main.c:40 src/modules/winlist/e_mod_main.c:77
+#: src/modules/winlist/e_mod_main.c:40
+#: src/modules/winlist/e_mod_main.c:77
 msgid "Next window of same class"
 msgstr "Fenêtre suivante de même classe"
 
-#: src/modules/winlist/e_mod_main.c:43 src/modules/winlist/e_mod_main.c:75
+#: src/modules/winlist/e_mod_main.c:43
+#: src/modules/winlist/e_mod_main.c:75
 msgid "Previous window of same class"
 msgstr "Fenêtre précédente de même classe"
 
@@ -7201,19 +7010,23 @@ msgstr "Classe de fenêtre suivante"
 msgid "Previous window class"
 msgstr "Classe de fenêtre précédente"
 
-#: src/modules/winlist/e_mod_main.c:51 src/modules/winlist/e_mod_main.c:78
+#: src/modules/winlist/e_mod_main.c:51
+#: src/modules/winlist/e_mod_main.c:78
 msgid "Window on the Left"
 msgstr "Fenêtre à gauche"
 
-#: src/modules/winlist/e_mod_main.c:53 src/modules/winlist/e_mod_main.c:79
+#: src/modules/winlist/e_mod_main.c:53
+#: src/modules/winlist/e_mod_main.c:79
 msgid "Window Down"
 msgstr "Fenêtre en bas"
 
-#: src/modules/winlist/e_mod_main.c:55 src/modules/winlist/e_mod_main.c:80
+#: src/modules/winlist/e_mod_main.c:55
+#: src/modules/winlist/e_mod_main.c:80
 msgid "Window Up"
 msgstr "Fenêtre en haut"
 
-#: src/modules/winlist/e_mod_main.c:57 src/modules/winlist/e_mod_main.c:81
+#: src/modules/winlist/e_mod_main.c:57
+#: src/modules/winlist/e_mod_main.c:81
 msgid "Window on the Right"
 msgstr "Fenêtre à droite"
 
@@ -7223,7 +7036,7 @@ msgstr "Sélectionner une fenêtre"
 
 #: src/modules/ibar/e_mod_config.c:52
 msgid "IBar Settings"
-msgstr "Paramétrage de l'IBar"
+msgstr "Paramétrage de l' IBar"
 
 #: src/modules/ibar/e_mod_config.c:98
 msgid "Selected Bar Source"
@@ -7233,7 +7046,8 @@ msgstr "Sélection de la source"
 msgid "Icon Labels"
 msgstr "Description de l'icone"
 
-#: src/modules/ibar/e_mod_config.c:120 src/modules/ibox/e_mod_config.c:97
+#: src/modules/ibar/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:97
 msgid "Show Icon Label"
 msgstr "Afficher l'étiquette de l'icone"
 
@@ -7259,32 +7073,28 @@ msgstr "Saisir un nom pour cette nouvelle source :"
 
 #: src/modules/ibar/e_mod_config.c:179
 #, c-format
-msgid ""
-"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
-"bar source?"
-msgstr ""
-"Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer "
-"cette source ?"
+msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this bar source?"
+msgstr "Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer cette source ?"
 
 #: src/modules/ibar/e_mod_config.c:183
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Voulez-vous vraiment supprimer cette source ?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Créer un nouvel icone"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propriétés"
 
 #: src/modules/ibox/e_mod_config.c:48
 msgid "IBox Settings"
-msgstr "Paramétrage de l'Ibox"
+msgstr "Paramétrage de l' Ibox"
 
 #: src/modules/ibox/e_mod_config.c:101
 msgid "Display Name"
@@ -7322,7 +7132,7 @@ msgstr "Afficher les fenêtres de tous les bureaux"
 msgid "Show windows from active desktop"
 msgstr "Afficher les fenêtres du bureau actif"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7330,15 +7140,18 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Paramétrage du Pager"
 
-#: src/modules/pager/e_mod_config.c:127 src/modules/pager/e_mod_config.c:179
+#: src/modules/pager/e_mod_config.c:127
+#: src/modules/pager/e_mod_config.c:179
 msgid "Flip desktop on mouse wheel"
 msgstr "Changer de bureau avec la molette de la souris"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:130
+#: src/modules/pager/e_mod_config.c:182
 msgid "Show desktop names"
 msgstr "Afficher le nom des bureaux"
 
-#: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:218
+#: src/modules/pager/e_mod_config.c:136
+#: src/modules/pager/e_mod_config.c:218
 msgid "Show popup on desktop change"
 msgstr "Afficher un pop-up lors du changement de bureau"
 
@@ -7350,7 +7163,8 @@ msgstr "Afficher un pop-up pour les fenêtres urgentes"
 msgid "Resistance to dragging"
 msgstr "Résistance au glissement"
 
-#: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:226
+#: src/modules/pager/e_mod_config.c:187
+#: src/modules/pager/e_mod_config.c:226
 #: src/modules/pager/e_mod_config.c:245
 #, c-format
 msgid "%.0f px"
@@ -7360,9 +7174,12 @@ msgstr "%.0f px"
 msgid "Select and Slide button"
 msgstr "Bouton de sélectionner-glisser"
 
-#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:202
-#: src/modules/pager/e_mod_config.c:208 src/modules/pager/e_mod_config.c:338
-#: src/modules/pager/e_mod_config.c:343 src/modules/pager/e_mod_config.c:347
+#: src/modules/pager/e_mod_config.c:194
+#: src/modules/pager/e_mod_config.c:202
+#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:338
+#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:347
 #, c-format
 msgid "Click to set"
 msgstr "Cliquer pour configurer"
@@ -7383,7 +7200,8 @@ msgstr "Hauteur du pop-up du Pager"
 msgid "Popup speed"
 msgstr "Vitesse du pop-up"
 
-#: src/modules/pager/e_mod_config.c:236 src/modules/pager/e_mod_config.c:273
+#: src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:273
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondes"
@@ -7412,7 +7230,8 @@ msgstr "Vitesse du pop-up urgent"
 msgid "Urgent Windows"
 msgstr "Fenêtres urgentes"
 
-#: src/modules/pager/e_mod_config.c:340 src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:340
+#: src/modules/pager/e_mod_config.c:345
 #: src/modules/pager/e_mod_config.c:349
 #, c-format
 msgid "Button %i"
@@ -7423,53 +7242,48 @@ msgid "Pager Button Grab"
 msgstr "Bouton de capture du Pager"
 
 #: src/modules/pager/e_mod_config.c:374
-msgid ""
-"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
-"<br>Or <hilight>Del</hilight> to reset the button."
-msgstr ""
-"Veuillez cliquer sur un bouton de la souris.<br>Pressez  <hilight>Échap</"
-"hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight> pour réinitialiser "
-"le bouton."
+msgid "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort.<br>Or <hilight>Del</hilight> to reset the button."
+msgstr "Veuillez cliquer sur un bouton de la souris.<br>Pressez  <hilight>Échap</hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight> pour réinitialiser le bouton."
 
 #: src/modules/pager/e_mod_config.c:429
 msgid "Attention"
 msgstr "Attention"
 
 #: src/modules/pager/e_mod_config.c:430
-msgid ""
-"You cannot use the right mouse button in the<br>shelf for this as it is "
-"already taken by internal<br>code for context menus.<br>This button only "
-"works in the popup."
-msgstr ""
-"Vous ne pouvez pas utiliser le bouton droit de la souris<br>dans le rack "
-"pour cette action car il est déjà utilisé<br>par le code interne, pour les "
-"menus contextuels.<br>Ce bouton fonctionne uniquement dans le pop-up."
+msgid "You cannot use the right mouse button in the<br>shelf for this as it is already taken by internal<br>code for context menus.<br>This button only works in the popup."
+msgstr "Vous ne pouvez pas utiliser le bouton droit de la souris<br>dans le rack pour cette action car il est déjà utilisé<br>par le code interne, pour les menus contextuels.<br>Ce bouton fonctionne uniquement dans le pop-up."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Afficher le pop-up du Pager"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810
+#: src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Pop-up du bureau à droite"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Pop-up du bureau à gauche"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814
+#: src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Pop-up du bureau au-dessus"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Pop-up du bureau en dessous"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818
+#: src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Pop-up du bureau suivant"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Pop-up du bureau précédent"
 
@@ -7489,131 +7303,90 @@ msgstr "Contrôles du système"
 msgid "Temperature Settings"
 msgstr "Paramétrage de Température"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Affichage des unités"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Intervalle des vérifications"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Température élevée"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Température basse"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Températures"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Température"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Suivant"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenue dans Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147
+#: src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Choisissez"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-"Aucun fichier de menus<br>n'a été détecté.<br>Veuillez consulter "
-"la<br>documentation disponible<br>sur wiki.enlightenment.org<br>pour savoir "
-"comment<br>générer les menus<br>d'applications."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Sélectionnez l'agencement du menu"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Barre de lancement"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Sélectionnez les applications"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Fichiers desktop"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Pas d'icones sur le bureau"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Afficher les icones du bureau"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Type de focus"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
+msgstr "Proportions"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Cliquer pour focaliser les fenêtres"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "Choix des proportions"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Focalisation des fenêtres au passage de la souris "
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr "Obtention du focus…"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Sélectionnez les icones à ajouter"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Lanceur"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Sélectionnez les applications dans la barre"
+#: src/modules/wizard/page_060.c:37
+msgid "Mouse Over"
+msgstr "Au survol"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7631,7 +7404,8 @@ msgstr "Sortie"
 msgid "Cards"
 msgstr "Cartes"
 
-#: src/modules/mixer/app_mixer.c:369 src/modules/mixer/conf_gadget.c:278
+#: src/modules/mixer/app_mixer.c:369
+#: src/modules/mixer/conf_gadget.c:278
 msgid "Channels"
 msgstr "Canaux"
 
@@ -7655,11 +7429,13 @@ msgstr "Gauche :"
 msgid "Right:"
 msgstr "Droit :"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401
+#: src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Sourdine"
 
-#: src/modules/mixer/app_mixer.c:404 src/modules/mixer/conf_gadget.c:194
+#: src/modules/mixer/app_mixer.c:404
+#: src/modules/mixer/conf_gadget.c:194
 msgid "Lock Sliders"
 msgstr "Verrouiller les sliders"
 
@@ -7679,41 +7455,55 @@ msgstr "Pop-up si modification du volume via raccourci clavier"
 msgid "Sound Cards"
 msgstr "Cartes son"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Paramétrage du mélangeur"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mélangeur général :"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr "Notifier les modifications du volume sur le bureau"
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Lancer le mélangeur…"
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Paramétrage du module de mixage"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "Nouveau volume"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "Mélangeur"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "Volume modifié"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Configuration du mélangeur à jour"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Les données de configuration du mélangeur ont été modifiées.<br>De nouveaux "
-"paramètres par défaut remplacent votre ancienne configuration.<br>Désolé "
-"pour le désagrément."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
+msgstr "Module de mixage"
 
-#: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:85
+#: src/modules/connman/e_mod_main.c:112
+#: src/modules/connman/e_mod_main.c:1057
+#: src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Impossible d'accéder au mode hors ligne."
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96
+#: src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "Le démon ConnMan n'est pas en cours d'exécution."
 
@@ -7727,12 +7517,8 @@ msgstr "ConnMan requiert un mot de passe"
 
 #: src/modules/connman/e_mod_main.c:258
 #, c-format
-msgid ""
-"Connection Manager needs your passphrase for <br>the service <hilight>%s</"
-"hilight>"
-msgstr ""
-"Le gestionnaire de connexion requiert un mot de passe pour<br>le service "
-"<hilight>%s</hilight>"
+msgid "Connection Manager needs your passphrase for <br>the service <hilight>%s</hilight>"
+msgstr "Le gestionnaire de connexion requiert un mot de passe pour<br>le service <hilight>%s</hilight>"
 
 #: src/modules/connman/e_mod_main.c:282
 msgid "Show passphrase as clear text"
@@ -7742,124 +7528,362 @@ msgstr "Afficher le mot de passe en clair"
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576
+#: src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Déconnexion du service réseau."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634
+#: src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Le service n'existe plus"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642
+#: src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Connexion au service réseau."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Impossible de définir le mot de passe du service"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Mode hors ligne"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Contrôleurs"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "ConnMan introuvable"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Serveur ConnMan introuvable."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Mode hors ligne : les fonctions réseau sont désactivées"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Pas de connexion"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Non connecté"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472
+#: src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Nom inconnu"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Aucune erreur"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "inactif"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "association"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "configuration"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "prêt"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "login"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "en ligne"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "échec"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "activé"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "disponible"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "connecté"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "hors ligne"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Il y a déjà une zone de notification"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
-msgstr ""
-"Il y a déjà une zone de notification active et seule une instance de ce "
-"gadget est autorisée."
+msgstr "Il y a déjà une zone de notification active et seule une instance de ce gadget est autorisée."
+
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr "Zone de notification : erreur"
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr "La zone de notification ne fonctionne pas dans un rack paramétré sur « en dessous de tout »."
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Zone de notification"
 
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ne peut pas configurer son environnement."
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Finir de déplacer/redimensionner"
+
+#~ msgid "Resizeable"
+#~ msgstr "Redimensionnable"
+
+#~ msgid "Background panning"
+#~ msgstr "Fond d'écran panoramique"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Facteur horizontal"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Facteur vertical"
+
+#~ msgid "Default is plugin name"
+#~ msgstr "Correspond au nom du greffon par défaut"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Les données de configuration du mélangeur ont été modifiées.<br>De "
+#~ "nouveaux paramètres par défaut remplacent votre ancienne configuration."
+#~ "<br>Désolé pour le désagrément."
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser Ecore !\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système de fichiers.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser sa connexion à X.\n"
+#~ "Avez-vous défini la variable d'environnement DISPLAY ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le gestionnaire de connexions.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système IPC.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser l'adaptateur (wrapper) pour "
+#~ "xinerama.\n"
+#~ "Cela ne devrait pas se produire."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser l'adaptateur (wrapper) pour randr.\n"
+#~ "Cela ne devrait pas se produire."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système Evas.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas configurer l'écran de démarrage.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Vérification du support SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Configuration du gestionnaire de fichiers"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ne peut pas configurer son gestionnaire de racks."
+
+#~ msgid "New Application"
+#~ msgstr "Nouvelle application"
+
+#~ msgid "Actions"
+#~ msgstr "Actions"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Copier dans le presse-papiers "
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "Ouvrir avec…"
+
+#~ msgid "Open File..."
+#~ msgstr "Ouvrir le fichier…"
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Éditer le fichier d'application"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Nouveau fichier d'application"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Exécuter avec sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Ouvrir dans un terminal"
+
+#~ msgid "Run Executable"
+#~ msgstr "Lancer l'exécutable"
+
+#~ msgid "Calculator"
+#~ msgstr "Calculatrice"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Copier dans..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Déplacer vers..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Mettre à la corbeille"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Ouvrir le dossier avec EFM"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Classer par date"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Classer par nom"
+
+#~ msgid "Recent Files"
+#~ msgstr "Documents récents"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Afficher la boîte de dialogue"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Aller vers la fenêtre"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Activer/Désactiver le plein écran"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Envoyer sur le bureau"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Aucun fichier de menus<br>n'a été détecté.<br>Veuillez consulter "
+#~ "la<br>documentation disponible<br>sur wiki.enlightenment.org<br>pour "
+#~ "savoir comment<br>générer les menus<br>d'applications."
+
+#~ msgid "Select application menu"
+#~ msgstr "Sélectionnez l'agencement du menu"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Barre de lancement"
+
+#~ msgid "Desktop Files"
+#~ msgstr "Fichiers desktop"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Pas d'icones sur le bureau"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Afficher les icones du bureau"
+
+#~ msgid "Focus mode"
+#~ msgstr "Type de focus"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Cliquer pour focaliser les fenêtres"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Focalisation des fenêtres au passage de la souris "
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Sélectionnez les icones à ajouter"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Lanceur"
+
+#~ msgid "Select Applications"
+#~ msgstr "Sélectionnez les applications dans la barre"
+
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Assombrir l'écran"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Éclaicir l'écran"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Display Power Management Signaling"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "L'affichage actuel ne supporte<br>pas le DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "L'affichage actuel n'a pas le support<br>de l'extension DPMS."
 
 #~ msgid "Interaction"
 #~ msgstr "Interaction"
@@ -8289,9 +8313,6 @@ msgstr "Zone de notification"
 #~ msgid "Scroll Speed"
 #~ msgstr "Vitesse du défilement"
 
-#~ msgid "Size Settings"
-#~ msgstr "Paramétrage des dimensions"
-
 #~ msgid "Position Settings"
 #~ msgstr "Paramétrage de la position"
 
@@ -8688,12 +8709,6 @@ msgstr "Zone de notification"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Éteindre immédiatement"
 
-#~ msgid "Shut Down"
-#~ msgstr "Éteindre"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Hiberner"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Verrouillage du bureau"
 
@@ -8751,9 +8766,6 @@ msgstr "Zone de notification"
 #~ msgid "Mixer Module Configuration"
 #~ msgstr "Configuration du module de mixage"
 
-#~ msgid "Back"
-#~ msgstr "Précédent"
-
 #~ msgid "Choose Language"
 #~ msgstr "Choisir la langue"
 
index 981ea4f..3f38bb8 100755 (executable)
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2007-06-04 11:27+0100\n"
 "Last-Translator: Antoine Giniès <aginies.cooker@gmail.com>\n"
 "Language-Team: Enlightenment i18n French <enlightenment-intl@lists."
@@ -43,20 +43,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos d'Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -66,14 +65,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2007, par l'Équipe de Développement d'Enlightenment."
 "<br><br>Nous espérons que vous prendrez autant de plaisir à utiliser ce "
@@ -86,8 +85,9 @@ msgstr ""
 "incomplètes ou même inexistantes et peuvent contenir beaucoup de bogues. "
 "Vous avez été <hilight>PREVENUS !</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>L'Équipe</title>"
 
 #: src/bin/e_actions.c:365
@@ -105,48 +105,48 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Êtes-vous sûr de vouloir quitter ?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vous avez demandé à quitter Enlightenment.<br><br>Êtes-vous sûr de vouloir "
 "quitter ?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous sur de vouloir fermer votre session ?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Vous avez demandé à fermer votre session.<br><br>Êtes-vous sûr de vouloir le "
 "faire ?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Êtes-vous sur de vouloir éteindre ?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -154,11 +154,11 @@ msgstr ""
 "Vous avez demandé à éteindre votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir l'éteindre ?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Êtes-vous sûr de vouloir redémarrer ?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -166,18 +166,18 @@ msgstr ""
 "Vous avez demandé à redémarrer votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir le redémarrer ?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Vous avez demandé à votre ordinateur de roupiller<br><br>Êtes-vous sûr?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Êtes-vous sur de vouloir hiberner ?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -185,580 +185,604 @@ msgstr ""
 "Vous avez demandé à hiberner votre ordinateur.<br><br>Êtes-vous sur de "
 "vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Changer la taille (resize)"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Monter"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Descendre"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Iconifier (on/off)"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximiser en mode \"plein écran\""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximiser en mode \"intelligent\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximiser en mode \"expansion\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximiser en mode \"remplissage\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Ombre vers le haut (on/off)"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Ombre vers le bas (on/off)"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Ombre vers la gauche (on/off)"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Ombre vers la droite (on/off)"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Sans bordure (on/off)"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Bordure"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envoyer la souris ... écrans plus loin"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Éteindre"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Texte de déplacement"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Importer..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Importer..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Changer la taille (resize)"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Créer une icône"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Déplacer vers le bureau suivant"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Déplacer vers le bureau précédent"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Déplacer vers de ... bureaux"
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Déplacer vers le bureau..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des applications favorites"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Exécuter"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 #, fuzzy
 msgid "Exit Now"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Fermer la session"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Roupiller"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Roupiller"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 #, fuzzy
 msgid "Lock"
 msgstr "Verrous"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Ré-arranger les fenêtres"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Actions de module"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Action"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Cet écran"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Cet écran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Fonds d'écran"
@@ -768,18 +792,16 @@ msgstr "Fonds d'écran"
 msgid "Color Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -787,20 +809,20 @@ msgstr "Sélectionneur de thème"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -821,7 +843,7 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désagrément "
 "occasionné.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -837,12 +859,12 @@ msgstr ""
 "sain et par précaution votre<br>configuration a été remise à zéro. Désolé "
 "pour les désagréments.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -850,97 +872,97 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paramètre du bureau"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "L'hibernation de votre système a échoué."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Délai avant hibernation"
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Délai avant hibernation"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Bienvenue à Enlightenment 東京"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -951,57 +973,62 @@ msgstr ""
 "n'est pas courant.<br><br>Le fichier sur lequel l'erreur est apparu est:<br>"
 "%s<br><br>Ce fichier a été effacé pour éviter des erreurs de corruption.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Benêt"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Appliquer"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensions"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Modules"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Non préféré"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Erreur - pas de support PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment n'a pas été compilé avec le support<br>PAM, le verrouillage "
 "d'écran a été désactivé."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -1010,15 +1037,15 @@ msgstr ""
 "le clavier, la souris, ou les deux<br>et cette réservation n'a pu être "
 "annulée."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Veuillez entrer votre mot de passe pour dévérouiller"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Erreur du gestionnaire d'authentification"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -1030,22 +1057,22 @@ msgstr ""
 "erreur ne devrait pas se produire. Merci de redzipéter sur http://bugs."
 "enlightenment.org/"
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -1071,109 +1098,108 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editer un élément du bureau"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icône"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nom générique"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 #, fuzzy
 msgid "Mime Types"
 msgstr "Types Mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Fichier du bureau"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Général"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notification de démarrage"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Exécuter dans un terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Montrer dans les Menus"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 #, fuzzy
 msgid "Options"
 msgstr "Options de remplissage"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Sélectionner une icône"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 #, fuzzy
 msgid "Select an Executable"
 msgstr "Sélectionner un programme"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Coller"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Tout selectionner"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1213,333 +1239,333 @@ msgstr ""
 "Enlightenment n'a pu démarrer l'application :<br><br>%s<br><br>L'application "
 "n'a pas réussi à se lancer."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s c'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s a retourné le code de sortie %1$i."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s a été interrompu avec SIGINT"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s a été interrompu avec SIGQUIT."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s a été interrompu avec SIGABRT."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s a été interrompu par une erreur de virgule flottante."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu avec SIGKILL."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s a été interrompu par une erreur de segmentation."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s a été interrompu par un tube cassé (broken pipe)."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s a été interrompu avec SIGTERM."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s a été interrompu par une erreur de bus."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s a été interrompu avec le signal numéro %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "*** Le reste de la sortie a été tronqué. Sauvegardez la sortie pour la "
 "visionner. ***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Historique des erreurs"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Sauver ce message"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Cette erreur va être sauvé dans %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informations sur l'erreur"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 #, fuzzy
 msgid "Mount Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 #, fuzzy
 msgid "Eject Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i fichiers"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 #, fuzzy
 msgid "Link"
 msgstr "Linéaire"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 #, fuzzy
 msgid "Abort"
 msgstr "À propos"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paramètres de sélection"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode de vue"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Rafraîchir la vue"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Se souvenir de l'ordre"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 #, fuzzy
 msgid "Mount"
 msgstr "Élément de menu"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Éditeur d'application"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propriétés du fichier"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 #, fuzzy
 msgid "Use default"
 msgstr "Utiliser Valeurs par défaut"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Grille d'icônes"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Personnalisé"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 #, fuzzy
 msgid "List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icône"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 #, fuzzy
 msgid "Set background..."
 msgstr "Fonds d'écran"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Contenu du tablar"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 #, fuzzy
 msgid "Clear"
 msgstr "Supprimer"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 #, fuzzy
 msgid "Retry"
 msgstr "Redémarrer"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 #, fuzzy
 msgid "Warning"
 msgstr "Démarrage de %s"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Impossible de supprimer <br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Êtes-vous sûr de vouloir supprimer<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1573,12 +1599,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "volume inconnu"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
@@ -1586,7 +1612,7 @@ msgstr "Périphérique amovible"
 msgid "File:"
 msgstr "Fichier:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Taille :"
 
@@ -1602,7 +1628,7 @@ msgstr "Type de fichier:"
 msgid "Permissions"
 msgstr "Permissions :"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Propriétaire :"
 
@@ -1622,17 +1648,17 @@ msgstr "Le propriétaire peut lire"
 msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Pré-visualisation"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Défaut"
 
@@ -1641,7 +1667,7 @@ msgid "Thumbnail"
 msgstr "Miniature"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -1657,54 +1683,44 @@ msgstr "Informations sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Texte de déplacement"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Déplacer / redimensionner ce gadget"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Changer la taille (resize)"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Tel quel"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Encart"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 #, fuzzy
 msgid "Look"
 msgstr "Verrous"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Arrêter de Déplacer/redimensionner ce gadget"
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "Arrêter l'édition"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1752,14 +1768,14 @@ msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Taille"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Empilement"
@@ -1811,164 +1827,171 @@ msgstr "Fermer ma session en conservant cette fenêtre ouverte"
 msgid "Remember these Locks"
 msgstr "Se rappeler ces verrous"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Fenêtre"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
 #, fuzzy
-msgid "Always on Top"
-msgstr "Toujours au-dessus"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Sur tous les bureaux"
+msgid "Settings"
+msgstr "Paramètre du bureau"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Editer l'icône"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Créer une icône"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Ajouter au menu favoris"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Ajouter à IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Ajouter un raccourci clavier"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Positionnement intelligent"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Echapper"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Rappels"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Sur tous les bureaux"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Echapper"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Enroulé"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Écran"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Toujours au-dessus"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Toujours en-dessous"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Accroché au bureau"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Décroché du bureau"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Style de bordure par défaut"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Utiliser les préférences d'icônes E17 par défaut"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icône fournie par l'application"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Choix manuel de l'icône"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Résistance"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 #, fuzzy
 msgid "Taskbar"
 msgstr "Ne pas afficher dans la barre des tâches"
@@ -1990,7 +2013,7 @@ msgid "ICCCM Properties"
 msgstr "Propriétés ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titre"
 
@@ -2165,7 +2188,6 @@ msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Autoriser"
@@ -2248,15 +2270,13 @@ msgid "Utilities"
 msgstr "Utilitaires"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Fichiers"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Exécuter"
@@ -2272,21 +2292,6 @@ msgstr "Noyau (core)"
 msgid "Mobile"
 msgstr "Mozambique"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-#, fuzzy
-msgid "Settings"
-msgstr "Paramètre du bureau"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Paramètres du module"
@@ -2328,7 +2333,7 @@ msgstr "Ajouter un gadget"
 msgid "Remove Gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Paramètres d'apparition"
@@ -2337,11 +2342,11 @@ msgstr "Paramètres d'apparition"
 msgid "Layout"
 msgstr "Positionnement"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Erreur de la méthode de saisie"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2357,7 +2362,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Applications favorites"
 
@@ -2365,77 +2370,75 @@ msgstr "Applications favorites"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "À propos"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Thème"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Tablars"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Afficher/cacher toutes les fenêtres"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Aucune application)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 #, fuzzy
 msgid "Set Virtual Desktops"
 msgstr "Bureaux virtuels"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Aucun Nom !"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Aucun tablar)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Ajouter tablar"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Supprimer un tablar"
 
@@ -2471,7 +2474,7 @@ msgid "Shrink to Content Width"
 msgstr "Redimensionner à la taille du contenu"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 #, fuzzy
 msgid "Style"
 msgstr "Styles"
@@ -2503,7 +2506,7 @@ msgid "Hide duration"
 msgstr "Caché durant.."
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f secondes"
@@ -2523,7 +2526,7 @@ msgstr "Sur tous les bureaux"
 msgid "Show on specified Desktops"
 msgstr "Afficher le bureau spécifiés"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2539,7 +2542,7 @@ msgstr ""
 "ou ne vous appartient pas. Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2552,73 +2555,22 @@ msgstr ""
 "Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, fuzzy, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Options :\n"
-"\t-display AFFICHAGE\n"
-"\t\tSe connecter à l'affichage nommé AFFICHAGE\n"
-"\t\tExemple : -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAjouter un écran xinerama VIRTUEL (au lieu d'un réel)\n"
-"\t\tétant donné sa géométrie. Vous pouvez en ajouter autant\n"
-"\t\tque vous le désirez. Ils remplaceront les écrans réels\n"
-"\t\tle cas échéant. Ceci peut être utilisé pour simuler\n"
-"\t\txinerama.\n"
-"\t\tExemple : -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile PROFIL_CONF\n"
-"\t\tUtiliser le profil de configuration PROFIL_CONF en place du profil par "
-"défaut de l'utilisateur ou juste \"default\" pour le profil par défaut.\n"
-"\t-good\n"
-"\t\tÊtre gentil.\n"
-"\t-evil\n"
-"\t\tÊtre endiablé.\n"
-"\t-psychotic\n"
-"\t\tÊtre psychopathe.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser Ecore!\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système de fichiers.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2626,7 +2578,7 @@ msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de signal de sortie.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2634,7 +2586,7 @@ msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de SIGHUP.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2643,66 +2595,37 @@ msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de SIGHUP.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne peut pas initialiser sa connexion à X.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne peut pas initialiser son gestionnaire d'alerte d'urgence.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le gestionnaire de connexions.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système IPC.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne peut initialiser l'affichage xinerama.\n"
-"Ceci ne devrait pas se produire. Merci de chercher à reproduire\n"
-"l'erreur et redzipéter sur http://bugs.enlightenment.org/"
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne peut initialiser l'affichage xinerama.\n"
-"Ceci ne devrait pas se produire. Merci de chercher à reproduire\n"
-"l'erreur et redzipéter sur http://bugs.enlightenment.org/"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne peut pas initialiser le système Evas.\n"
-"Peut-être êtes-vous à court de mémoire ?"
-
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2713,7 +2636,7 @@ msgstr ""
 "installations d'Evas et d'Ecore et vérifier qu'ils supportent le\n"
 "moteur de rendu logiciel X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2724,7 +2647,35 @@ msgstr ""
 "installations d'Evas et d'Ecore et vérifier qu'ils supportent le\n"
 "le moteur de rendu logiciel en mémoire."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne peut pas initialiser son gestionnaire d'alerte d'urgence.\n"
+"Avez-vous défini la variable d'environnement DISPLAY ?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2734,28 +2685,33 @@ msgstr ""
 "quotas, que votre dossier personnel existe et que ses permissions sont\n"
 "correctes."
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ne peut pas initialiser son registre de fichiers."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de configuration."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
+
+#: src/bin/e_main.c:458
 #, fuzzy
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de tablars."
 
-#: src/bin/e_main.c:615
+#: src/bin/e_main.c:467
 #, fuzzy
-msgid "Enlightenment cannot set up the pointer system."
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de pointeurs (cannot "
 "set up pointer system)."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2764,96 +2720,47 @@ msgstr ""
 "fichiers.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de polices."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
-"Enlightenment ne peut pas initialiser l'écran de démarrage.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Enlightenment ne peut pas initialiser son gestionnaire "
+"d'internationalisation."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Démarrage de l'internationalisation"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire "
 "d'internationalisation."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de bureau FDO.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr ""
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment a remarqué qu'Evas ne pouvais créer un canvas en mémoire.\n"
-"Veuillez vérifier qu'Evas support le moteur de rendu logiciel en mémoire.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
-"Veuillez vérifier qu'Evas contient le support des images PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers JPEG.\n"
-"Veuillez vérifier qu'Evas contient le support des images JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers EET.\n"
-"Veuillez vérifier qu'Evas contient le support des images EET.\n"
-
-#: src/bin/e_main.c:754
-#, fuzzy
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
-"Veuillez vérifier qu'Evas contient le support des images PNG.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 #, fuzzy
 msgid "Setup Screens"
 msgstr "Ecran courant"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2862,230 +2769,392 @@ msgstr ""
 "pour tous les écrans de votre système.\n"
 "Un autre gestionnaire de fenêtres est-il déjà lancé ?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Paramètres des chemins (paths)"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Raccourcis-clavier"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ne peut pas configurer le DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne peut pas configurer le DPMS."
+
+#: src/bin/e_main.c:618
 #, fuzzy
 msgid "Setup Screensaver"
 msgstr "Ecran de veille"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne peut pas configurer l'écran de veille."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Définir la politique CPU"
+
+#: src/bin/e_main.c:633
+#, fuzzy
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ne peut pas configurer les popups"
+
+#: src/bin/e_main.c:640
 #, fuzzy
 msgid "Setup Desklock"
 msgstr "Verrouillage de d'écran"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de verrouillage "
 "d'écran."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Configurer les popups"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne peut pas configurer les popups"
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Système de messages"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Paramètres des chemins (paths)"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 #, fuzzy
 msgid "Setup System Controls"
 msgstr "Fixer le controleur"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de commandes "
 "systèmes.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 #, fuzzy
 msgid "Setup Actions"
 msgstr "Applications à démarrer (setup actions)"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire d'actions."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Système d'exécution (exec system)"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne peut pas initialiser son système d'exécution."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Gestionnaire de fichiers"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Nom du fichier"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Système de messages"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de messages."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Glisser-déposer (drag'n drop)"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de glisser-déposer."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "Réservation de périphériques d'entrée (grab input handling)"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de réservation de "
 "périphériques d'entrée (input grab handling)"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 #, fuzzy
 msgid "Setup Modules"
 msgstr "Modules"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de modules."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 #, fuzzy
 msgid "Setup Remembers"
 msgstr "Rappels"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de rappels."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 #, fuzzy
 msgid "Setup Color Classes"
 msgstr "Classes de couleurs"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de classes de couleur."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 #, fuzzy
 msgid "Setup Gadcon"
 msgstr "Gadcon (gadget control system)"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de contrôle de "
 "gadgets."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Paramètres des chemins (paths)"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ne peut pas configurer le DPMS."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Définir la politique CPU"
-
-#: src/bin/e_main.c:1003
-#, fuzzy
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ne peut pas configurer les popups"
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 #, fuzzy
 msgid "Setup Wallpaper"
 msgstr "Fond d'écran du bureau"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de fonds d'écran."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 #, fuzzy
 msgid "Setup Mouse"
 msgstr "Supprimer"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne peut pas configurer le DPMS."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 #, fuzzy
 msgid "Setup Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de raccourcis."
 "(bindings system)"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 #, fuzzy
 msgid "Setup Shelves"
 msgstr "Tablars"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ne peut pas initialiser son gestionnaire de tablars."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 #, fuzzy
 msgid "Setup Thumbnailer"
 msgstr "Paramètres des miniatures"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de miniatures.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+"Enlightenment ne peut pas initialiser son gestionnaire de commandes "
+"systèmes.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr ""
+"Enlightenment ne peut pas initialiser son gestionnaire de miniatures.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Tri des fichiers"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne peut pas paramétrer sa gestion des fichiers."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 #, fuzzy
 msgid "Load Modules"
 msgstr "Module"
 
+#: src/bin/e_main.c:938
+#, fuzzy
+msgid "Configure Shelves"
+msgstr "Configurer les tablars"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Presque reglé"
+
 #: src/bin/e_main.c:1094
+#, fuzzy, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Options :\n"
+"\t-display AFFICHAGE\n"
+"\t\tSe connecter à l'affichage nommé AFFICHAGE\n"
+"\t\tExemple : -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAjouter un écran xinerama VIRTUEL (au lieu d'un réel)\n"
+"\t\tétant donné sa géométrie. Vous pouvez en ajouter autant\n"
+"\t\tque vous le désirez. Ils remplaceront les écrans réels\n"
+"\t\tle cas échéant. Ceci peut être utilisé pour simuler\n"
+"\t\txinerama.\n"
+"\t\tExemple : -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile PROFIL_CONF\n"
+"\t\tUtiliser le profil de configuration PROFIL_CONF en place du profil par "
+"défaut de l'utilisateur ou juste \"default\" pour le profil par défaut.\n"
+"\t-good\n"
+"\t\tÊtre gentil.\n"
+"\t-evil\n"
+"\t\tÊtre endiablé.\n"
+"\t-psychotic\n"
+"\t\tÊtre psychopathe.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvais créer un canvas en mémoire.\n"
+"Veuillez vérifier qu'Evas support le moteur de rendu logiciel en mémoire.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
+"Veuillez vérifier qu'Evas contient le support des images PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers JPEG.\n"
+"Veuillez vérifier qu'Evas contient le support des images JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
+"Veuillez vérifier qu'Evas contient le support des images PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers EET.\n"
+"Veuillez vérifier qu'Evas contient le support des images EET.\n"
+
+#: src/bin/e_main.c:1486
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
+"Veuillez vérifier qu'Evas contient le support des images PNG.\n"
+
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -3093,11 +3162,11 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment a planté au démarrage et a été redémarré "
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -3105,7 +3174,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -3118,7 +3187,7 @@ msgstr ""
 "dialogue de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -3131,21 +3200,12 @@ msgstr ""
 "fenêtre de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1146
-#, fuzzy
-msgid "Configure Shelves"
-msgstr "Configurer les tablars"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Presque reglé"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Module"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3154,11 +3214,11 @@ msgstr ""
 "Une erreur est apparue lors du chargement du module nommé : %s<br>Aucun "
 "module nommé %s n'a pu être trouvé dans les<br>dossiers de modules.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3167,11 +3227,11 @@ msgstr ""
 "Erreur lors du chargement du module nommé : %s<br>Le chemin d'accès de ce "
 "module est :<br>%s<br>L'erreur retournée est :<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3182,16 +3242,16 @@ msgstr ""
 "requiert une version minimale de l'API du module de : %i.<br>La version de "
 "l'API retournée par Enlightenment est de: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous décharger ce module ?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3202,11 +3262,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Tablar #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce tablar ?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3214,18 +3274,18 @@ msgstr ""
 "Vous avez demandé à supprimer ce tablar.<br><br>Êtes-vous sur de vouloir la "
 "supprimer ?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Arrêter de déplacer/redimensionner des éléments"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Démarrer le déplacement/redimensionnement des éléments"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Commentaire"
@@ -3235,16 +3295,16 @@ msgstr "Commentaire"
 msgid "Starting"
 msgstr "Démarrage de %s"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Vérification des permissions système"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Vérification du système terminée"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3255,38 +3315,38 @@ msgstr ""
 "de se fermer.<br>Voulez-vous fermer votre session sans attendre <br>la "
 "fermeture de ces applications ?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problème de fermeture de session"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Fermer immédiatement votre session"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Attendez plus longtemps"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Annuler la fermeture de votre session"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Fermeture de votre session en cours"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Fermeture de votre session en cours.<br><hilight>Veuillez patienter.</"
 "hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment est occupé à traîter une autre requête"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -3296,7 +3356,7 @@ msgstr ""
 "effectuer d'autres actions système<br>lorsqu'une fermeture de session a "
 "commencé."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -3305,7 +3365,7 @@ msgstr ""
 "Enlightenment est train d'éteindre votre système.<br>Vous ne pouvez "
 "effectuer d'autres actions système<br>pendant l'arrêt de votre ordinateur."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -3314,7 +3374,7 @@ msgstr ""
 "Enlightenment est en train de redémarrer votre système.<br>Vous ne pouvez "
 "effectuer d'autres actions systèmes<br>lorsque qu'un redémarrage a commencé."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -3324,74 +3384,74 @@ msgstr ""
 "pouvez effectuer d'autres actions système<br>tant que le roupillonn'est pas "
 "terminée."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 #, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Enlightenment est en train de mettre votre système en hibernation.<br>Vous "
 "ne pouvez effectuer d'autres actions systèmes<br>tant que ce n'est pas "
 "terminée."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Saperlipopette, ça devrait pas arriver"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 #, fuzzy
 msgid "Reset failed."
 msgstr "Fichier du bureau"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 #, fuzzy
 msgid "Suspend failed."
 msgstr "Délai avant hibernation"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "L'hibernation de votre système a échoué."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Redémarrage de votre ordinateur.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 #, fuzzy
 msgid "Resetting"
 msgstr "Paramètre du bureau"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Redémarrage de votre ordinateur.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Roupillon"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Roupillon...<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Mise en hibernation"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
@@ -3403,35 +3463,35 @@ msgstr ""
 msgid "About Theme"
 msgstr "À propos de ce thème"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 #, fuzzy
 msgid "Set As Theme"
 msgstr "Sélectionner un thème..."
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Arrêter de déplacer/redimensionner des éléments"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Démarrer le déplacement/redimensionnement des éléments"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Configurer le contenu du tablar"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment n'a pu cloner un processus fils :<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Impossible de quitter : fenêtres increvables!"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3441,125 +3501,125 @@ msgstr ""
 "Cela<br>signifie qu'Enlightenment n'autorisera pas une fin de session "
 "jusqu'à ce<br>que ces fenêtres ai été fermé, ou déverrouillé."
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "il y a %li semaines"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "il y a %li jours"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "il y a %li heures"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Paramètres du Pager"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importer..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Options de remplissage et d'étirage"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Étirer"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrer"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Contenir"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Remplir"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualité du fichier"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Utiliser le fichier original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3580,12 +3640,12 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désordre "
 "occasionné.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Configuration du gestionnaire de fichiers mise à jour"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3621,150 +3681,156 @@ msgstr ""
 msgid "Down"
 msgstr "Éteindre"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Dossier parent"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Résolution"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permissions :"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Dernière modification :"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Vous"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protégé"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Lecture seule"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lecture-écriture"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 #, fuzzy
 msgid "Battery Monitor Settings"
 msgstr "Configuration du moniteur de batterie"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 #, fuzzy
 msgid "Check every:"
 msgstr "Controller la batterie tous les:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fichiers"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hiberner"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, fuzzy, c-format
+msgid "%1.0f %%"
+msgstr "%3.0f%%"
+
+#: src/modules/battery/e_mod_config.c:223
 #, fuzzy
 msgid "Polling"
 msgstr "Tel quel"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 #, fuzzy
 msgid "Alert when at:"
 msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minutes"
 
-#: src/modules/battery/e_mod_config.c:229
-#, fuzzy, c-format
-msgid "%1.0f %%"
-msgstr "%3.0f%%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f s"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 #, fuzzy
 msgid "Alert"
 msgstr "Accélérer"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 #, fuzzy
 msgid "Auto Detect"
 msgstr "Caché automatiquement"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 #, fuzzy
 msgid "Internal"
 msgstr "Interne"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Brouillé"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3772,34 +3838,35 @@ msgstr ""
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Couleur de l'ombre"
@@ -3874,17 +3941,17 @@ msgstr "Configuration du gestionnaire de fichiers mise à jour"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Applications Ibar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Applications à démarrer au login"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Applications à démarrer après restart d'E"
 
@@ -3900,10 +3967,24 @@ msgstr "Appliquer"
 
 #: src/modules/conf_applications/e_mod_main.c:21
 #, fuzzy
-msgid "New Application"
-msgstr "Application"
+msgid "Create Launcher"
+msgstr "Exécuter"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Applications spécifiques"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Fichier du bureau"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar (autres)"
 
@@ -3918,7 +3999,7 @@ msgid "Available Profiles"
 msgstr "Profils disponibles"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "Sélectionner un fichier Edje"
@@ -3962,9 +4043,9 @@ msgstr "Paramètres des fenêtres de configuration"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
@@ -4011,7 +4092,7 @@ msgstr "Fenêtre d'erreur"
 msgid "Profiles"
 msgstr "Profils"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -4022,7 +4103,7 @@ msgstr ""
 "sinon.<br>Si vous ne cliquez nulle part, la précédente résolution de<br>%dx"
 "%d à %d Hz sera restaurée dans %d secondes."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -4033,7 +4114,7 @@ msgstr ""
 "sinon.<br>Si vous ne cliquez nulle part, la précédente résolution de<br>%dx"
 "%d sera restaurée dans %d secondes."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -4044,7 +4125,7 @@ msgstr ""
 "sinon.<br>Si vous ne cliquez nulle part, la précédente résolution de<br>%dx"
 "%d à %d Hz sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -4055,49 +4136,49 @@ msgstr ""
 "sur Non sinon.<br>Si vous ne cliquez nulle part, la précédente résolution "
 "de<br>%dx%d sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Changement de résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 #, fuzzy
 msgid "Save"
 msgstr "État"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 #, fuzzy
 msgid "Restore"
 msgstr "Redémarrer"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Paramètre de résolution de l'écran"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaurer à l'ouverture de session"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Miroir"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Fonctionnalités manquantes"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -4112,11 +4193,11 @@ msgstr ""
 "moment de la compilation<br>d'<hilight>ecore</hilight>, le support de XRandr "
 "n'ait pas été détecté."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Aucun taux de rafraîchissement trouvé"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4130,92 +4211,74 @@ msgstr ""
 "lors de la sélection de la résolution, ce qui "
 "pourrait<br><hilight>endommager</hilight> votre écran."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Configuration des Bureaux virtuels"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Nombre de bureaux"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Feuilletage de bureaux"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Feuilleter lors de déplacements d'objets au bord de l'écran"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Tourner en boucle lors du feuilletage"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 #, fuzzy
 msgid "Desktops"
 msgstr "Bureau"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Aucune"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Vitre"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-#, fuzzy
-msgid "Background panning"
-msgstr "Changement de fond d'écran"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animation du feuilletage"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f s"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animation du feuilletage"
 
@@ -4232,7 +4295,7 @@ msgid "Desktop Wallpaper"
 msgstr "Fond d'écran du bureau"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 #, fuzzy
 msgid "Set"
 msgstr "Tout selectionner"
@@ -4244,12 +4307,12 @@ msgstr "Fonds d'écran"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personnel"
 
@@ -4257,199 +4320,228 @@ msgstr "Personnel"
 msgid "Screen Lock Settings"
 msgstr "Paramètres de verrouillage d'écran"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Roupiller"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Roupiller"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Verrouillage d'écran personnel"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Verrous"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Afficher sur toutes les zones d'écran"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Afficher sur la zone d'écran courante"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Afficher sur la zone d'écran :"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Paramètres de la box de Login"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Verrouiller lors du démarrage de l'écran de veille"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f secondes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Verrouillé quand le temps d'attente est dépassé"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutes"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 #, fuzzy
 msgid "Timers"
 msgstr "Compte à rebours"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Plein écran (on/off)"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Défini par le thème"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Fond d'écran du thème"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Fond d'écran du bureau"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Fond d'écran"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Paramètres de l'écran de veille"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Activer l'écran de veille"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Hiberner"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Ecran de veille"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "État initial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Eteindre (blanking)"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Préféré"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Non préféré"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Evenement d'exposition"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne pas autoriser"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Autres"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Afficher les informations sur la gestion d'énergie"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "L'affichage courant ne supporte<br>pas le DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "L'affichage courant n'a pas le support<br>DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Afficher la gestion d'énergie"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Activé l'affiche de la gestion d'énergie"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Délai avant roupillon"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Délai avant hibernation"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Délai avant d'éteindre"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "Par Date"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Retour"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Bureaux virtuels"
@@ -4495,79 +4587,79 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Paramètres de raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Ajouter raccourci"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Effacer raccourci"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modifier raccourcis"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis-clavier par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paramètres de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 #, fuzzy
 msgid "General Options"
 msgstr "Paramètres généraux"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Séquence de raccourci-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "Erreur de raccourci-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4577,28 +4669,28 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci-clavier."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "MAJ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4755,35 +4847,48 @@ msgstr ""
 "Enlightenment n'a pu importer cette configuration<br>dû à une erreur de "
 "copie."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Paramètres de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Sélectionneur de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 #, fuzzy
 msgid "System Default"
 msgstr "Utiliser Valeurs par défaut"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Locale sélectionnée"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Locale"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Langue"
 
@@ -4875,17 +4980,17 @@ msgid "Manager"
 msgstr "Manager"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Aucun"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Séquence de raccourci-souris"
 
@@ -4909,13 +5014,11 @@ msgid "Menu Settings"
 msgstr "Paramètres du menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Personnel"
@@ -4926,7 +5029,7 @@ msgid "Main Menu"
 msgstr "Afficher le menu principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favoris"
 
@@ -4946,7 +5049,7 @@ msgid "Comments"
 msgstr "Commentaire"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 #, fuzzy
@@ -4959,7 +5062,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Montrer dans les Menus"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menus"
 
@@ -5031,19 +5134,19 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Polices"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Thèmes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Icônes"
 
@@ -5197,18 +5300,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Paramètres de fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Image..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -5228,46 +5331,51 @@ msgstr "Ce bureau"
 msgid "This Screen"
 msgstr "Cet écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 #, fuzzy
 msgid "Wallpaper settings..."
 msgstr "Paramètres de fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Répéter"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Vitre"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Choisir une image..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Erreur lors de l'importation du fichier"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment n'a pu importer le fond d'écran<br>à cause d'une erreur de "
 "copie."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5307,7 +5415,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Bordure par défaut"
 
@@ -5315,7 +5423,7 @@ msgstr "Bordure par défaut"
 msgid "Window Border Selection"
 msgstr "Choix de la bordure de fenêtre"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 "Se rappeler cette bordure lors de la prochaine apparition de cette fenêtre"
@@ -5349,7 +5457,7 @@ msgid "Menu Background Base"
 msgstr "Fonds d'écran"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Titre de menu"
 
@@ -5358,7 +5466,7 @@ msgid "Menu Title Active"
 msgstr "Titre de menu actif"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Élément de menu"
 
@@ -5372,12 +5480,12 @@ msgid "Menu Item Disabled"
 msgstr "Élément de menu actif"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Texte de déplacement"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Texte de redimensionnement"
 
@@ -5395,7 +5503,7 @@ msgid "Winlist Label"
 msgstr "Label de la liste des fenêtres"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Titre de la liste des fenêtres"
 
@@ -5415,392 +5523,403 @@ msgid "File Manager Background Base"
 msgstr "Nom du fichier"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Focalisation"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Texte de bouton"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Texte de bouton désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Texte de checkbox"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Texte de checkbox désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Texte de l'entrée"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Texte de bouton désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Texte du label"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Elément de liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Elément de liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Elément de liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "En-tête de liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "En-tête de liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Texte de bouton radio"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Texte de bouton radio désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Texte du slider"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Texte du slider désactivé"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Fonds d'écran"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Nom du module"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Classes de couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Classes de couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Classes de couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Classes de couleurs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Exécuter une commande"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Couleur de l'objet"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Délai avant d'éteindre"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Couleur de l'ombre"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgets"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "IBar (autres)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Barre de titre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Bloc de texte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Bloc de texte (petiot)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Bloc de texte (gros)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "Paramètre du bureau"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Titre 'à propos'"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Version 'à propos'"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Texte 'à propos'"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titre du verrouillage de bureau"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Mot de Passe de l'écran de verouillage"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Fenêtre d'erreur"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Commande Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Titre du Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Texte du Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Version du Splash"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+#, fuzzy
+msgid "Digital Clock"
+msgstr "Affichage Numérique"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Entrée"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Cadre"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Label"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Boutons"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Slider"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Boutons radio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Checkbox"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Texte de la liste des éléments"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Élément de la liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "En-tête de liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 #, fuzzy
 msgid "Filemanager"
 msgstr "Nom du fichier"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 #, fuzzy
 msgid "Desktop Icon"
 msgstr "Afficher les icônes sur le bureau"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grand"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Style petit"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Style normal"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Style gras"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Paramètres de police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Miquelet"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Gros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Enorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Activer les police personnelles"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualisation basique du texte: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Police"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pré-visualisation avancée de texte...我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Astuces"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Fonte de remplacement"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nom de la fonte de remplacement"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Activer les fontes de remplacement"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 #, fuzzy
 msgid "Hinting / Fallbacks"
 msgstr "Fonte de remplacement"
@@ -5809,12 +5928,17 @@ msgstr "Fonte de remplacement"
 msgid "Icon Theme Settings"
 msgstr "Paramètres de thème d'icônes"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Utiliser le thème d'icône"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Applications spécifiques"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5883,11 +6007,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, fuzzy, c-format
-msgid "%1.2f times"
-msgstr "%1.0f fichiers"
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5900,6 +6022,12 @@ msgstr "Polonais"
 msgid "Minimum"
 msgstr "Taille minimale"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, fuzzy, c-format
+msgid "%1.2f times"
+msgstr "%1.0f fichiers"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 #, fuzzy
 msgid "Maximum"
@@ -5922,25 +6050,25 @@ msgstr "Afficher l'écran de démarrage à la connexion"
 msgid "Transition Settings"
 msgstr "Paramètres de transition"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Événements"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Démarrage"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Changement de bureau"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Changement de fond d'écran"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transitions"
 
@@ -5957,17 +6085,17 @@ msgstr "Importer..."
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Catégories"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 #, fuzzy
 msgid "Assign"
 msgstr "Atitrer"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 #, fuzzy
 msgid "Clear All"
 msgstr "Tout supprimer"
@@ -5998,19 +6126,19 @@ msgstr "Enlightenment n'a pu importer le thème<br>dû à une erreur de copie."
 msgid "Exchange themes"
 msgstr "Thèmes d'icônes"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordures"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Thèmes d'icônes"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 #, fuzzy
 msgid "Scaling"
 msgstr "Empilement"
@@ -6142,6 +6270,11 @@ msgstr "Utiliser l'icône fournie par l'application"
 msgid "Border Icon"
 msgstr "Bordure"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Positionnement intelligent"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Positionnement intelligent"
@@ -6173,24 +6306,47 @@ msgstr "Sous les fenêtres"
 msgid "Animate"
 msgstr "Animation du feuilletage"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linéaire"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Accélération et décélération douces"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Accélérer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Décélérer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Accélération de la souris"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Décélérer"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Accélération et décélération douces"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Empilement"
@@ -6212,6 +6368,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Fenêtre la plus récente sous la souris"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Horloge"
@@ -6250,11 +6407,6 @@ msgstr "Fenêtre d'erreur"
 msgid "Only dialogs with focused parent"
 msgstr "Seules les nouvelles boîtes de dialogue sont focalisées"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Focalisation"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Autres paramètres"
@@ -6368,13 +6520,13 @@ msgid "Fill available space"
 msgstr "Remplir l'espace disponible"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical"
@@ -6436,7 +6588,7 @@ msgid "Raise when clicking to focus"
 msgstr "Montrer lors d'un clic de focalisation"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Focalisation des fenêtres"
 
@@ -6712,33 +6864,33 @@ msgstr "Très clair"
 msgid "Dropshadow"
 msgstr "Ombre portée"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Tout"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Tout"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Configuration du Pager"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "En-dessous de tout"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Tout"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Tout"
@@ -6748,163 +6900,163 @@ msgstr "Tout"
 msgid "Everything Settings"
 msgstr "Paramètres de terminal"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Profils disponibles"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Configurer les tablars"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Montrer dans les Menus"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Montrer dans les Menus"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Moteur par défaut"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Valeurs par défaut"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Moteur par défaut"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Feuilletage animé"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Délai pour cacher"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Moteur par défaut"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Feuilletage animé"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
 msgid "Sorting"
 msgstr "Démarrage de %s"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Démarrage de %s"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Le plus récemment utilisé"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Dernière modification:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Paramètres de l'action"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Couleur de l'objet"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Tel quel"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Vitesse du popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Vers le bureau à droite"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6913,39 +7065,30 @@ msgstr "Paramètres de popup du Pager"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Taille de la fenêtre de déplacement"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Applications à démarrer après restart d'E"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Action"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6967,166 +7110,68 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Ouvrir avec..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Ouvrir avec..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Éditer l'applications"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Application"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Ouvrir avec..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Exécuter dans un terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Exécutable"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Applications à démarrer après restart d'E"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Commande"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Commande de terminal"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Tout"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Importer..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Classer maintenant"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Renommer le fichier"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Tout"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Dossier de recherche"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Paramètres de démarrage"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Dossiers définis par l'utilisateur"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Supprimer"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Fenêtre d'erreur"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Plein écran"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Envoyer vers le bureau"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Icônes de fichiers"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Types Mime"
 
@@ -7173,21 +7218,21 @@ msgid "Select an image"
 msgstr "Sélectionner une image"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 #, fuzzy
 msgid "File Manager"
 msgstr "Nom du fichier"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 #, fuzzy
 msgid "Root"
 msgstr "Redémarrer"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -7208,7 +7253,7 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désordre "
 "occasionné.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -7225,7 +7270,7 @@ msgstr ""
 "sain et par précaution votre<br>configuration a été remise à zéro. Désolé "
 "pour les désagréments.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Paramètres du gestionnaire de fichiers"
@@ -7312,98 +7357,102 @@ msgstr ""
 msgid "Device"
 msgstr "Pré-visualisation"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 #, fuzzy
 msgid "Other application..."
 msgstr "Ajouter une application..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Ouvrir avec..."
+
+#: src/modules/fileman/e_fwin.c:2039
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applications"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Toutes les applications"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 #, fuzzy
 msgid "Custom Command"
 msgstr "Exécuter une commande"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Supprimer"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Fichier du bureau"
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7440,7 +7489,7 @@ msgstr "Caché durant.."
 msgid "Filemanager is idle"
 msgstr "Nom du fichier"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7453,42 +7502,47 @@ msgstr "Nom du fichier"
 msgid "Available Gadgets"
 msgstr "Gadgets disponibles"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Modules"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 #, fuzzy
 msgid "Custom Image"
 msgstr "Exécuter une commande"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 #, fuzzy
 msgid "Custom Color"
 msgstr "Exécuter une commande"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 #, fuzzy
 msgid "Transparent"
 msgstr "Transition pour"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 #, fuzzy
 msgid "Animations"
 msgstr "Animation du feuilletage"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 #, fuzzy
 msgid "Background"
 msgstr "Fonds d'écran"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Changement de fond d'écran"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Déplacer / redimensionner ce gadget"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 #, fuzzy
 msgid "Free"
@@ -7742,16 +7796,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette source de barre ?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Créer une icône"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propriétés"
 
@@ -7797,7 +7851,7 @@ msgstr "Afficher les fenêtres de tous les bureaux"
 msgid "Show windows from active desktop"
 msgstr "Afficher les fenêtres du bureau actif"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7933,37 +7987,37 @@ msgstr ""
 "Vous ne pouvez pas utiliser le bouton droit de la souris<br>pour cette "
 "action car il est déja utilisé pour les menus contextuels."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vers le bureau à droite"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Vers le bureau à gauche"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Vers le bureau à gauche"
@@ -7987,145 +8041,97 @@ msgstr "Fixer le controleur"
 msgid "Temperature Settings"
 msgstr "Paramètres généraux"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Afficher les unités"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Fréquence des vérifications"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Température élevée"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Température basse"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Température"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Température"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 #, fuzzy
 msgid "Next"
 msgstr "NetWM"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 #, fuzzy
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenue à Enlightenment 東京"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Select one"
 msgstr "Sélectionner une icône"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 #, fuzzy
 msgid "Profile"
 msgstr "Profils"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:107
-#, fuzzy
-msgid "Select application menu"
-msgstr "Applications spécifiques"
-
-#: src/modules/wizard/page_040.c:22
-#, fuzzy
-msgid "Launcher Bar"
-msgstr "Ajouter l'application au lanceur"
-
-#: src/modules/wizard/page_040.c:24
-#, fuzzy
-msgid "Select applications"
-msgstr "Applications spécifiques"
-
-#: src/modules/wizard/page_050.c:25
-#, fuzzy
-msgid "Desktop Files"
-msgstr "Fichier du bureau"
-
-#: src/modules/wizard/page_050.c:29
-#, fuzzy
-msgid "No icons on desktop"
-msgstr "Sur tous les bureaux"
-
-#: src/modules/wizard/page_050.c:32
-#, fuzzy
-msgid "Enable desktop icons"
-msgstr "Afficher les icônes sur le bureau"
-
-#: src/modules/wizard/page_060.c:25
+#: src/modules/wizard/page_050.c:130
 #, fuzzy
-msgid "Focus mode"
-msgstr "Focalisation"
-
-#: src/modules/wizard/page_060.c:29
-#, fuzzy
-msgid "Click to focus windows"
-msgstr "Cliquer pour focaliser"
+msgid "Select preferred size"
+msgstr "Sélectionner un fichier Edje"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-#, fuzzy
-msgid "Select Icons to Add"
-msgstr "Sélectionner une icône"
-
-#: src/modules/wizard/page_080.c:59
+#: src/modules/wizard/page_060.c:37
 #, fuzzy
-msgid "Quick Launch"
-msgstr "Exécuter"
-
-#: src/modules/wizard/page_080.c:61
-#, fuzzy
-msgid "Select Applications"
-msgstr "Applications spécifiques"
+msgid "Mouse Over"
+msgstr "Le plus récemment utilisé"
 
 #: src/modules/mixer/app_mixer.c:161
 #, fuzzy
@@ -8175,7 +8181,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Clair"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 #, fuzzy
 msgid "Mute"
 msgstr "Élément de menu"
@@ -8202,42 +8208,58 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 #, fuzzy
 msgid "Mixer Settings"
 msgstr "Paramètres Mime"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 #, fuzzy
 msgid "Launch mixer..."
 msgstr "Ajouter l'application au lanceur"
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 #, fuzzy
 msgid "Mixer Module Settings"
 msgstr "Paramètres du module"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Changement de résolution"
+
+#: src/modules/mixer/e_mod_main.c:187
 #, fuzzy
 msgid "Mixer Settings Updated"
 msgstr "Configuration du gestionnaire de fichiers mise à jour"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Paramètres du module"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -8264,141 +8286,349 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Délai avant d'éteindre"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 #, fuzzy
 msgid "Controls"
 msgstr "Fixer le controleur"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Paramètres de sélection"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Protégé"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "volume inconnu"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Erreur d'exécution"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Répéter"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Transitions"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Configuration"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 #, fuzzy
 msgid "ready"
 msgstr "Grenade"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Blin"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Moteur"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Configurer"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Activé"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Remplir l'espace disponible"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Protégé"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Délai avant d'éteindre"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Système"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 #, fuzzy
 msgid "Systray"
 msgstr "Système"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
+#~ msgid "Acpi"
+#~ msgstr "Action"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Cet écran"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Cet écran"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Changer la taille (resize)"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Arrêter de Déplacer/redimensionner ce gadget"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser Ecore!\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système de fichiers.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser sa connexion à X.\n"
+#~ "Avez-vous défini la variable d'environnement DISPLAY ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le gestionnaire de connexions.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système IPC.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne peut initialiser l'affichage xinerama.\n"
+#~ "Ceci ne devrait pas se produire. Merci de chercher à reproduire\n"
+#~ "l'erreur et redzipéter sur http://bugs.enlightenment.org/"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne peut initialiser l'affichage xinerama.\n"
+#~ "Ceci ne devrait pas se produire. Merci de chercher à reproduire\n"
+#~ "l'erreur et redzipéter sur http://bugs.enlightenment.org/"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser le système Evas.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne peut pas initialiser l'écran de démarrage.\n"
+#~ "Peut-être êtes-vous à court de mémoire ?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Gestionnaire de fichiers"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ne peut pas initialiser son gestionnaire de tablars."
+
+#, fuzzy
+#~ msgid "New Application"
+#~ msgstr "Application"
+
+#, fuzzy
+#~ msgid "Background panning"
+#~ msgstr "Changement de fond d'écran"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Afficher les informations sur la gestion d'énergie"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "L'affichage courant ne supporte<br>pas le DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "L'affichage courant n'a pas le support<br>DPMS."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Moteur par défaut"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Action"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Ouvrir avec..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Ouvrir avec..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Éditer l'applications"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Application"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Exécuter dans un terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Exécutable"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Importer..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Classer maintenant"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Renommer le fichier"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Fenêtre d'erreur"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Plein écran"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Envoyer vers le bureau"
+
+#, fuzzy
+#~ msgid "Select application menu"
+#~ msgstr "Applications spécifiques"
+
+#, fuzzy
+#~ msgid "Launcher Bar"
+#~ msgstr "Ajouter l'application au lanceur"
+
+#, fuzzy
+#~ msgid "No icons on desktop"
+#~ msgstr "Sur tous les bureaux"
+
+#, fuzzy
+#~ msgid "Enable desktop icons"
+#~ msgstr "Afficher les icônes sur le bureau"
+
+#, fuzzy
+#~ msgid "Focus mode"
+#~ msgstr "Focalisation"
+
+#, fuzzy
+#~ msgid "Click to focus windows"
+#~ msgstr "Cliquer pour focaliser"
+
+#, fuzzy
+#~ msgid "Select Icons to Add"
+#~ msgstr "Sélectionner une icône"
+
+#, fuzzy
+#~ msgid "Quick Launch"
+#~ msgstr "Exécuter"
 
 #, fuzzy
 #~ msgid ""
@@ -9075,12 +9305,6 @@ msgstr "Système"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Quitter immédiatement"
 
-#~ msgid "Shut Down"
-#~ msgstr "Éteindre"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Hiberner"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Verrouillage du bureau"
 
@@ -9188,10 +9412,6 @@ msgstr "Système"
 #~ msgstr "Configuration du tablar"
 
 #, fuzzy
-#~ msgid "Back"
-#~ msgstr "Retour"
-
-#, fuzzy
 #~ msgid "Choose Language"
 #~ msgstr "Choix de la langue"
 
@@ -10853,9 +11073,6 @@ msgstr "Système"
 #~ msgid "Desktop Settings"
 #~ msgstr "Paramètres de bureaux"
 
-#~ msgid "Stop editing"
-#~ msgstr "Arrêter l'édition"
-
 #~ msgid "%i Queued"
 #~ msgstr "%i en attente"
 
@@ -11313,9 +11530,6 @@ msgstr "Système"
 #~ msgid "24 Hour"
 #~ msgstr "24 Heures"
 
-#~ msgid "Digital Display"
-#~ msgstr "Affichage Numérique"
-
 #~ msgid "Protect this file"
 #~ msgstr "Protéger ce fichier"
 
@@ -11333,6 +11547,3 @@ msgstr "Système"
 
 #~ msgid "My Group"
 #~ msgstr "Mon Groupe"
-
-#~ msgid "By Mod Time"
-#~ msgstr "Par Date"
index 65c80f1..8623097 100755 (executable)
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-09-11 09:15+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "אודות Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "סגור"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>הצוות</title>"
 
 #: src/bin/e_actions.c:365
@@ -71,70 +71,70 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "האם אתה בטוח שברצונך לחסל חלון זה?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "כן"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "לא"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "ביקשת לצאת מ־Enlightenment.<br><br>האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "אתה בטוח שברצונך להתנתק?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "אתה עומד להתנתק.<br><br>האם אתה בטוח שברצונך לעשות זאת?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "האם אתה בטוח שברצונך לכבות?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "ביקשת לכבות את המחשב שלך.<br><br>האם אתה בטוח שברצונך לכבות?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "האם אתה בטוח שברצונך לאתחל?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "ביקשת לאתחל את המחשב שלך.<br><br>האם אתה בטוח שברצונך לאתחל אותו?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "ביקשת להשהות את המחשב שלך.<br><br>האם אתה בטוח שברצונך להשהות?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "האם אתה בטוח שברצונך לעבור למצב המתנה?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -142,550 +142,575 @@ msgstr ""
 "ביקשת להעביר את המחשב למצב המתנה.<br><br>האם אתה בטוח שברצונך להשהות אל "
 "הכונן?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "חלון : פעולות"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "העבר"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "שנה גודל"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "תפריט"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "תפריט החלון"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "הגבה"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "הנמך"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "חסל"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "חלון : מצב"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "החלפת מצב הדבקה"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "החלפת מצב ממוזער"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "החלפת מצב מסך מלא"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "הגדל"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "הגדל אנכית"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "הגדל אופקית"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "הגדל למסך מלא"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "מצב הגדלה \"חכם\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "מצב הגדלה \"הרחבה\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "מצב הגדלה \"מילוי\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "החלפת מצב הצללה"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "החלפת מצב הצללה תחתית"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "החלפת מצב הצללה שמאלית"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "החלפת מצב הצללה ימנית"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "החלפת מצב ההצללה"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "החלפת מצב המסגרת"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "מסגרת"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "החלפת מצב הנעיצה"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "שולחן העבודה"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "הפוך את שולחן העבודה שמאלה"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "הפוך את שולחן העבודה ימינה"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "הפוך את שולחן העבודה למעלה"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "הפוך את שולחן העבודה למטה"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "הפוך את שולחן העבודה ב־..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "הצג את שולחן העבודה"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "הצג את המדף"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "הפוך את שולחן העבודה אל..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "הפוך את שולחן העבודה קווית..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "החלף לשולחן העבודה 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "החלף לשולחן העבודה 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "החלף לשולחן העבודה 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "החלף לשולחן העבודה 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "החלף לשולחן העבודה 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "החלף לשולחן העבודה 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "החלף לשולחן העבודה 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "החלף לשולחן העבודה 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "החלף לשולחן העבודה 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "החלף לשולחן העבודה 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "החלף לשולחן העבודה 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "החלף לשולחן העבודה 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "החלף לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "הפוך את שולחן העבודה שמאלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "הפוך את שולחן העבודה ימינה (כל המסכים)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "הפוך את שולחן העבודה למעלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "הפוך את שולחן העבודה למטה (כל המסכים)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "הפוך את שולחן העבודה ב־... (כל המסכים)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "הפוך את שולחן העבודה אל... (כל המסכים)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "הפוך את שולחן העבודה קווית... (כל המסכים)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "הפוך את כיוון שולחן העבודה..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "החלף לשולחן העבודה 0 (כל המסכים)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "החלף לשולחן העבודה 1 (כל המסכים)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "החלף לשולחן העבודה 2 (כל המסכים)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "החלף לשולחן העבודה 3 (כל המסכים)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "החלף לשולחן העבודה 4 (כל המסכים)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "החלף לשולחן העבודה 5 (כל המסכים)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "החלף לשולחן העבודה 6 (כל המסכים)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "החלף לשולחן העבודה 7 (כל המסכים)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "החלף לשולחן העבודה 8 (כל המסכים)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "החלף לשולחן העבודה 9 (כל המסכים)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "החלף לשולחן העבודה 10 (כל המסכים)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "החלף לשולחן העבודה 11 (כל המסכים)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "החלף לשולחן העבודה... (כל המסכים)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "מסך"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "שלח את העכבר למסך 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "שלח את העכבר למסך 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "שלח את העכבר למסך..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "שלח את העכבר מסך 1 קדימה"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "שלח את העכבר מסך 1 אחורה"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "שלח את העכבר קדימה/אחורה בין המסכים..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "כיבוי"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "העברת טקסט"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "עוד...‏"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "עוד...‏"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "שנה גודל"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "הפוך את כיוון שולחן העבודה..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "צור סמל"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "חלון : בתנועה"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "לשולחן העבודה הבא"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "לשולחן העבודה הקודם"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "לפי מס' שולחן העבודה..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "הצג תפריט ראשי"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "הצג תפריט מועדפים"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "הצג תפריט כל היישומים"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "הצג תפריט לקוחות"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "הצג תפריט..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "הפעל"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "פקודה"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "יישום"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "הפעל מחדש"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "צא עכשיו"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : מצב"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "החלפת מצב הצגה"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "החלפת מצב בלתי מקוון"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "מערכת"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "התנתק"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "כבה עכשיו"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "כבה"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "הפעלה מחדש"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "השהיה"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "השהיה"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "עבור למצב שינה"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "נעל"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "ניקוי החלונות"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "כללי : פעולות"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "פעולה מעוכבת"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "מסך"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "מסך"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "הגדרה כרקע"
 
@@ -693,18 +718,16 @@ msgstr "הגדרה כרקע"
 msgid "Color Selector"
 msgstr "בוחר צבע"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -712,20 +735,20 @@ msgstr "בוחר צבע"
 msgid "OK"
 msgstr "אישור"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -736,7 +759,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -745,11 +768,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "בעיות בכתיבה להגדרות Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -757,93 +780,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "ההגדרות שודרגו"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(אין חלונות)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "תיאור: לא זמין"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -854,56 +877,61 @@ msgstr ""
 "את<br>מקור השגיאה.<br><br>הקובץ בו ארעה השגיאה הינו:<br>%s<br><br>קובץ זה "
 "נמחק מחשש לנתונים פגומים.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "בסיסי"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "החל"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "הרחבות"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "מודולים"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "מאפייני הסמל"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "מיכל %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "שגיאה - אין תמיכה ב־PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "לא הוטמעה תמיכת PAM ב־Enlightenment, לכן<br>נעילת שולחן העבודה אינה פעילה."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "הנעילה נכשלה"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -911,15 +939,15 @@ msgstr ""
 "נעילת שולחן העבודה נכשלה כיוון שאחד היישומים<br>לכד את המקלדת או העכבר או את "
 "שניהם<br>ולא ניתן לשחרר את לכידתם."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "נא הזינו את סיסמת השיחרור"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "שגיאה במערכת האימות"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -930,22 +958,22 @@ msgstr ""
 "<hilight>%i</hilight>.<br>מצב זה הינו בעייתי ולא אמור לקרות. אנא דווחו על "
 "תקלה זו."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "הפעל מצב מצגת?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -966,106 +994,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "עורך רשומות שולחן העבודה"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "שם"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "הערה"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "סמל"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "שם כללי"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "מחלקת החלון"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "קטגוריות"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "טיפוסי MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "קובץ שולחן העבודה"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "כללי"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "התרעות בהפעלה"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "הפעלה במסוף"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "הצגה בתפריטים"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "אפשרויות"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "בחר סמל"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "בחר קובץהפעלה"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "מחק"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "גזור"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "העתק"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "הדבק"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "בחר הכול"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1104,314 +1131,314 @@ msgstr ""
 "Enlightenment לא הצליחה להפעיל את היישום:<br><br>%s<br><br>הפעלת היישום "
 "נכשלה."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "שגיאה בהפעלת היישום"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "פעולת %s נעצרה באופן בלתי צפוי."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "נתקבל קוד היציאה %i מ־%s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות הפרעה."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות יציאה."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות ביטול."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת נקודת ציפה."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול ללא־פסק."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "התרחשה הפרעה ליישום %s על ידי כשל קיטוע."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "התרחשה הפרעה ליישום %s על ידי מחרוזת קטועה."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת אפיק."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות מספר %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***שאר הפלט נקטע. שמור את הפלט כדי להציג את השאר.****\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "יומני שגיאות"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "אין הודעת שגיאה"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "שמור הודעה זו"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "יומן שגיאות זה יישמר כ־%s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "נתוני השגיאה"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "נתוני אות השגיאה"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "נתוני הפלט"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "אין פלט."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "נתיב לא קיים"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s לא קיים."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i קבצים"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "בטל"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "מצב תצוגה"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "רענן תצוגה"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "הצג קבצים מוסתרים"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "זכור את הסדר"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "סדר כעת"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "תיקייה חדשה"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "השתמש בסמל שסופק על ידי היישום "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "מאפייני הקובץ"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "השתמש בברירת המחדל"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "רשת סמלים"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "סמלים מותאמים אישית"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "רשימה"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "גודל הסמל (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "יצירת תיקייה חדשה"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "שם התיקייה החדשה:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "שנה את שמה של %s ל־:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "שנה את שם הקובץ"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "נסה שוב"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "לא להכול"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "כן להכול"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "התעלם מזה"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "התעלם מהכול"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "ארעה שגיאה בעת ביצוע פעולה.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "אישור מחיקה"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "האם אתה בטוח שברצונך למחוק את<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1445,12 +1472,12 @@ msgstr "%llu ק\"ב"
 msgid "%llu B"
 msgstr "%llu ב'"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "נפח לא ידוע"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "התקן נתיק"
 
@@ -1458,7 +1485,7 @@ msgstr "התקן נתיק"
 msgid "File:"
 msgstr "קובץ:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "גודל:"
 
@@ -1474,7 +1501,7 @@ msgstr "סוג הקובץ:"
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "בעלים:"
 
@@ -1494,17 +1521,17 @@ msgstr "הבעלים יכולים לקרוא"
 msgid "Owner can write"
 msgstr "הבעלים יכולים לכתוב"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "ברירת מחדל"
 
@@ -1513,7 +1540,7 @@ msgid "Thumbnail"
 msgstr "תמונה ממוזערת"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "מותאם אישית"
 
@@ -1529,53 +1556,42 @@ msgstr "נתוני הקישור"
 msgid "Select an Image"
 msgstr "בחר תמונה"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "העברת טקסט"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "התחל בהזזת/שינוי הגודל של חפיץ זה"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "שנה גודל"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "גלול את התוכן אוטומטית"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "פשוט"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "צמצום"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "מראה"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "הסר"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "הפסקת הזזת/שינוי הגודל של חפיץ זה"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1623,14 +1639,14 @@ msgstr "מיקום"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "גודל"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "איסוף בערימה"
@@ -1682,161 +1698,168 @@ msgstr "לצאת מהמשתמש שלי כשחלון זה פתוח"
 msgid "Remember these Locks"
 msgstr "זכור נעילות אלו"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "חלונות"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "תמיד עליון"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "דביק"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "הגדרות"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "מסך מלא"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "הגדל למירביות האנכית"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "הגדל למירביות האופקית"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "ביטול ההגדלה"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "עריכת הסמל"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "צור סמל"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "הוסף למועדפים"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "הוסף למועדפים"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "קיצורי מקשים"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "דלג"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "מסגרת"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "נעילות"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "שמור"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "דביק"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "דלג"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "מזער לסמל"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "מוצלל"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "מסך"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "תמיד עליון"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "רגיל"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "תמיד מעבר"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "הצמד לשולחן העבודה"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "הסר משולחן העבודה"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "בחר בסגנון המסגרת"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "השתמש בהעדפת הסמל כברירת המחדל של E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "השתמש בסמל שסופק על ידי היישום "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "השתמש בסמל שהוגדר על ידי המשתמש"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "רשימת חלונות"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "מחליף סביבות עבודה"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "שורת המשימות"
 
@@ -1857,7 +1880,7 @@ msgid "ICCCM Properties"
 msgstr "מאפייני ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "כותרת"
 
@@ -2016,7 +2039,6 @@ msgid "Size, Position and Locks"
 msgstr "גודל, מיקומים ונעילות"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2093,15 +2115,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "הפעל"
@@ -2116,20 +2136,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "מודולים"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "הגדרות"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "הגדרות המודול"
@@ -2168,7 +2174,7 @@ msgstr "הוסף יישומון"
 msgid "Remove Gadget"
 msgstr "הסרת יישומון"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "הגדרות סרגלי הכלים"
 
@@ -2176,11 +2182,11 @@ msgstr "הגדרות סרגלי הכלים"
 msgid "Layout"
 msgstr "פריסה"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "שגיאה בשיטת הקלט"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2193,7 +2199,7 @@ msgstr "ראשי"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "יישומים מועדפים"
 
@@ -2201,76 +2207,74 @@ msgstr "יישומים מועדפים"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "יישומים"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "חלונות"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "חלונות שאבדו"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "אודות"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "ערכת נושא"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "וירטואלי"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "מדפים"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "הצגת/הסתרת כל החלונות"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(אין יישומים)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(אין חלונות)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "אין שם!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(אין מדפים)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "הוסף מדף"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "מחק מדף"
 
@@ -2306,7 +2310,7 @@ msgid "Shrink to Content Width"
 msgstr "צמצמם לגודל התוכן"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2336,7 +2340,7 @@ msgid "Hide duration"
 msgstr "מסך ההסתרה"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2353,7 +2357,7 @@ msgstr "הצג על כל שולחנות העבודה"
 msgid "Show on specified Desktops"
 msgstr "הצג בשולחנות עבודה מסויימים"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2364,7 +2368,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2373,52 +2377,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להפעיל את Ecore!\n"
-"יתכן כי אזל לך הזכרון?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להפעיל את מערכת הקבצים.\n"
-"יתכן כי אזל לך הזכרון?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2426,7 +2400,7 @@ msgstr ""
 "Enlightenment לא הצליחה להגדיר יישום לטיפול באות יציאה.\n"
 "יתכן כי אזל לך הזכרון?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2434,7 +2408,7 @@ msgstr ""
 "Enlightenment לא הצליחה להגדיר יישום לטיפול באות HUP.\n"
 "יתכן כי אזל לך הזכרון?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2443,64 +2417,37 @@ msgstr ""
 "Enlightenment לא הצליחה להגדיר יישום לטיפול באות HUP.\n"
 "יתכן כי אזל לך הזכרון?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment לא הצליחה להתחיל את החיבור שלה ל־X.\n"
-"האם הגדרת את משתנה ה־DISPLAY כראוי?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment לא הצליחה להתחיל את מערכת התראות החירום.\n"
-"האם הגדרת את משתנה ה־DISPLAY כראוי?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להתחיל את מערכת החיבורים.\n"
-"יתכן כי אזל לך הזכרון?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להתחיל את מערכת ה־IPC.\n"
-"יתכן כי אזל לך הזכרון?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment לא יכולה להגדיר את מעטפת xinerama.\n"
-"זה לא אמור לקרות."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment לא יכולה להגדיר את מעטפת xinerama.\n"
-"זה לא אמור לקרות."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להתחיל את מערכת ה־Evas.\n"
-"יתכן כי אזל לך הזכרון?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2510,7 +2457,7 @@ msgstr ""
 "התוכנתי של X11 תחת Evas. אנא בדוק את התקנות ה־Evas\n"
 "וה־Ecore שלך ובדוק שהן תומכות במנוע העיבוד התוכנתי של X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2520,7 +2467,35 @@ msgstr ""
 "חוצץ תוכנתי תחת Evas. אנא בדוק את התקנות ה־Evas\n"
 "וה־Ecore שלך ובדוק שהם תומכים במנוע עיבוד החוצץ התוכנתי."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment לא הצליחה להתחיל את מערכת התראות החירום.\n"
+"האם הגדרת את משתנה ה־DISPLAY כראוי?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2528,23 +2503,29 @@ msgstr ""
 "Enlightenment לא הצליחה ליצור תיקיות בתיקיית הבית שלך.\n"
 "יתכן שאין לך תיקיית בית או שהכונן מלא?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת רישום הקבצים שלה."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת התצורה שלה."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment לא הצליחה להגדיר את מערכת ערכות הנושא שלה."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת המידה שלה."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ההצבעה שלה."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2552,92 +2533,42 @@ msgstr ""
 "Enlightenment לא הצליחה להגדיר את הנתיבים לחיפוש קבצים.\n"
 "יתכן שהזכרון אזל?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הגופנים שלה."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ערכות הנושא שלה."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment לא הצליחה להגדיר את מסך הפתיחה שלה.\n"
-"יתכן שהזכרון אזל?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment לא הצליחה להגדיר את מערכת הבינאום שלה."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "הפעלת התמיכה בבינאום"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הבינאום שלה."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment לא הצליחה להפעיל את מערכת שולחן העבודה FDO.\n"
 "יתכן שאזל לך הזכרון?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "בדיקת התמיכה בעיצוב."
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment מצאה כי Evas לא מצליח ליצור משטח עבודה לחוצץ. אנא בדוק\n"
-"את התמיכה של Evas במנוע חוצץ תוכנתי.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי PNG. בדוק כי ל־Evas\n"
-"ישנה תמיכה בטעינת קבצי PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי JPEG. בדוק כי ל־Evas\n"
-"ישנה תמיכה בטעינת קבצי JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי EET. בדוק כי ל־Evas\n"
-"ישנה תמיכה בטעינת קבצי EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment מצאה כי Evas לא מצליח לטעון הגופן 'Sans'. בדוק כי ל־Evas\n"
-"ישנה תמיכה ב־fontconfig ושמערכת ה־fontconfig מגדירה את הגופן 'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "הגדרת מסכים"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2645,199 +2576,335 @@ msgstr ""
 "הנסיון של Enlightenment להגדיר את ניהול החלונות עבור כל המסכים שבמערכת שלך\n"
 "נכשל. יתכן שישנו מנהל חלונות אחר פעיל?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "הגדרת DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "הגדרת איגודים"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment לא הצליחה להגדיר את תצורת ה־DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "הגדרת DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment לא הצליחה להגדיר את תצורת ה־DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "הגדרת שומר המסך"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment לא הצליחה להגדיר את שומר המסך של X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "הגדרת מצבי חסכון בחשמל"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment לא הצליחה להגדיר את מצבי החסכון בחשמל שלה."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "הגדרת נעילת המסך"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת נעילת המסך שלה."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "הגדרת חלוניות התרעה"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת חלוניות ההתרעה שלה."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "הגדרת מערכת ההודעות"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "הגדרת נתיבים"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "הגדרת פקדי מערכת"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת פיקוד המערכת.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "הגדרת פעולות"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הפעולות שלה."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "הגדרת מערכת הרצת הקבצים"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ה־exec שלה."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "הגדרת מנהל הקבצים"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "מנהל הקבצים"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "הגדרת מערכת ההודעות"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment לא הצליחה לטעון את מערכת ההודעות שלה."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "הגדרת DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ה־dnd שלה."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת הטיפול בקלט הגרירה."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "הגדרת מודולים"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת המודולים שלה."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "הגדרת זכרונות"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment לא הצליחה להגדיר את הגדרות הזכרון."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת מחלקות הצבע שלה."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "הגדרת בקרת היישומונים"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת בקרת היישומונים שלה."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "הגדרת DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "הגדרת DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment לא הצליחה להגדיר את תצורת ה־DPMS."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "הגדרת מצבי חסכון בחשמל"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment לא הצליחה להגדיר את מצבי החסכון בחשמל שלה."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "הגדרת רקע שולחן העבודה"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הרקע לשולחן העבודה שלה."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "הגדרת העכבר"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment לא הצליחה להגדיר את תצורת העכבר."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "הגדרת איגודים"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת האיגודים שלה."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "הגדרת מדפים"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment לא הצליחה להגדיר את מערכת המדפים שלה."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "הגדרת ממזער התמונות"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת מיזעור התמונות.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מערכת פיקוד המערכת.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment לא הצליחה להפעיל את מערכת מיזעור התמונות.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment לא הצליחה להגדיר את מערכת ערכות הנושא שלה."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "הגדרת סידור הקבצים"
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
-msgstr "Enlightenment לא הצליחה להגדיר את מערכת סידור הקבצים שלה."
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
+msgstr "Enlightenment לא הצליחה להגדיר את מערכת סידור הקבצים שלה."
+
+#: src/bin/e_main.c:908
+msgid "Load Modules"
+msgstr "טעינת מודולים"
+
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "הגדרת מדפים"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "כמעט בוצע"
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "בדיקת התמיכה בעיצוב."
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח ליצור משטח עבודה לחוצץ. אנא בדוק\n"
+"את התמיכה של Evas במנוע חוצץ תוכנתי.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי PNG. בדוק כי ל־Evas\n"
+"ישנה תמיכה בטעינת קבצי PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי JPEG. בדוק כי ל־Evas\n"
+"ישנה תמיכה בטעינת קבצי JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי PNG. בדוק כי ל־Evas\n"
+"ישנה תמיכה בטעינת קבצי PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח לטעון קבצי EET. בדוק כי ל־Evas\n"
+"ישנה תמיכה בטעינת קבצי EET.\n"
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
-msgstr "טעינת מודולים"
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment מצאה כי Evas לא מצליח לטעון הגופן 'Sans'. בדוק כי ל־Evas\n"
+"ישנה תמיכה ב־fontconfig ושמערכת ה־fontconfig מגדירה את הגופן 'Sans'.\n"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2845,11 +2912,11 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment קרסה מוקדם עם ההפעלה והופעלה מחדש"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2857,7 +2924,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2868,7 +2935,7 @@ msgstr ""
 "בוטלו<br>והם לא יטענו כדי לסייע בהסרת מודולים בעיתיים<br>כלשהם מהתצורה שלך. "
 "חלונית<br>תצורת המודולים אמורה לאפשר לך לבחור<br>במודולים שלך שוב."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2879,20 +2946,12 @@ msgstr ""
 "יטענו כדי<br>לסייע בהסרת מודולים בעיתיים כלשהם מהתצורה שלך.<br><br>חלונית "
 "תצורת המודולים אמורה לאפשר לך לבחור<br>במודולים שלך שוב."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "הגדרת מדפים"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "כמעט בוצע"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "טעינת מודולים"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2901,11 +2960,11 @@ msgstr ""
 "ארעה שגיאה בטעינת המודול בשם: %s<br>לא נמצא מודל בשם %s<br>בתיקיות חיפוש "
 "המודולים.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "שגיאה בטעינת מודול"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2914,11 +2973,11 @@ msgstr ""
 "ארעה שגיאה בטעינת מודול בשם: %s<br>הנתיב המלא למודול זה הינו:<br>"
 "%s<br>השגיאה שדווחה הינה:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "המודול אינו מכיל את כל הפונקציות הנחוצות"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2929,16 +2988,16 @@ msgstr ""
 "צריכה להיות לפחות: %i.<br>מודול ה־API המפורסם על ידי Enlightenment הינו: %i."
 "<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "מודול ה־%s של Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "האם ברצונך לפרוק מודול זה?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2949,28 +3008,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "מדף מס'"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "האם אתה בטוח שברצונך למחוק מדף זה?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "הפסקת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "התחלת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "הערה"
@@ -2979,16 +3038,16 @@ msgstr "הערה"
 msgid "Starting"
 msgstr "מתחיל"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "בדיקת הרשאות המערכת"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "בדיקת המערכת הושלמה"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2998,113 +3057,113 @@ msgstr ""
 "הניתוק אורך זמן רב מדי. כמה<br>מהיישומים מסרבים להסגר.<br>האם ברצונך לסיים "
 "את תהליך הניתוק<br>בכל זאת מבלי לסגור<br>יישומים אלו תחילה?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "בעיות ניתוק"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "התנתק כעת"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "המשך בהמתנה"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "ביטול הניתוק"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "הניתוק מתבצע כעת"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment עסוקה בטיפול בבקשה אחרת."
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "לעזאזל! זה לא אמור לקרות"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "לקראת השהייה"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "לקראת תרדמת"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3112,33 +3171,33 @@ msgstr ""
 msgid "About Theme"
 msgstr "אודות ערכות הנושא"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "הגדרה כערכת נושא"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "הפסקת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "התחלת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment לא הצליחה להתפצל לתהליך צאצא:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "לא ניתן לצאת - חלונות חסיני חיסול."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3147,124 +3206,124 @@ msgstr ""
 "לכמה מהחלונות נותרה נעילת משך החיים. כלומר<br>ש־Enlightenment לא תרשה לעצמה "
 "לצאת עד שחלונות אלו<br>יסגרו או שתוסר נעילת משך החיים.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f בתים"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f ק\"ב"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f מ\"ב"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ג\"ב"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "בעתיד"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "בדקה האחרונה"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "לפני %li שנים"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "לפני %li חודשים"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "לפני %li שבועות"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "לפני %li ימים"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "לפני %li שעות"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "לפני %li דקות"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "הגדרות מעקב הסוללה"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3275,12 +3334,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "מסך ההסתרה"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3308,141 +3367,147 @@ msgstr "למעלה"
 msgid "Down"
 msgstr "למטה"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "הוסף למועדפים"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "עלה לתיקיית המבוא"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "פעולה מעוכבת"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "הרשאות:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "שונה:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "אתה"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "מוגן"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "לקריאה בלבד"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "אסור"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "קריאה־כתיבה"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "הגדרות מעקב הסוללה"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "הצג התרעה כאשר הסוללה חלשה"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "עבור למצב שינה"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "הצג התרעה כאשר הסוללה חלשה"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "פנימי"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3450,32 +3515,33 @@ msgstr ""
 msgid "Battery"
 msgstr "סוללה"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "הסוללה שלך חלשה!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "מומלץ לחבר לרשת החשמל."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "לא זמין"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "שגיאה"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "מד הסוללה"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "שעון"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "קובץ הפעלה"
@@ -3529,17 +3595,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3553,10 +3619,25 @@ msgid "Apps"
 msgstr "יישומים"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "יישום חדש"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "הפעל"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "היישומים הנבחרים"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "קובץ שולחן העבודה"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3569,7 +3650,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3607,9 +3688,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3651,7 +3732,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3659,7 +3740,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3667,7 +3748,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3675,7 +3756,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3683,47 +3764,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3732,11 +3813,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3745,90 +3826,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "קובץ שולחן העבודה"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3845,7 +3909,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3856,12 +3920,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3869,193 +3933,220 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "השהיה"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "השהיה"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "נעל"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "הצג על כל שולחנות העבודה"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "המסך הנוכחי"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "הצג עם כניסת העכבר"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f שניות"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f דקות"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "החלפת מצב הצגה"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "הגדרת רקע שולחן העבודה"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "הגדרת שומר המסך"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "השהיה לכונן"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "הגדרת שומר המסך"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "מצב התחלתי"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -4102,102 +4193,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "הגדרות רשימת הלקוח"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4344,34 +4435,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4454,17 +4558,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "ללא"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4487,13 +4591,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "ברירת מחדל"
@@ -4504,7 +4606,7 @@ msgid "Main Menu"
 msgstr "הצג תפריט ראשי"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4524,7 +4626,7 @@ msgid "Comments"
 msgstr "הערה"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4536,7 +4638,7 @@ msgid "Show gadget settings in top-level"
 msgstr "הצגה בתפריטים"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "תפריטים"
 
@@ -4605,19 +4707,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "סמלים"
 
@@ -4761,18 +4863,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4792,42 +4894,47 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "פשוט"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4863,7 +4970,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "סגנון המסגרת כברירת המחדל"
 
@@ -4871,7 +4978,7 @@ msgstr "סגנון המסגרת כברירת המחדל"
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4904,7 +5011,7 @@ msgid "Menu Background Base"
 msgstr "הגדרה כרקע"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "כותרת התפריט"
 
@@ -4913,7 +5020,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "פריט בתפריט"
 
@@ -4927,12 +5034,12 @@ msgid "Menu Item Disabled"
 msgstr "פריט בתפריט"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "העברת טקסט"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "שינוי גודל הטקסט"
 
@@ -4949,7 +5056,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4968,384 +5075,394 @@ msgid "File Manager Background Base"
 msgstr "מנהל הקבצים"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "טקסט הלחצן"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "טקסט בדיקה"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "טקסט הבדיקה מבוטל"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "טקסט הבדיקה מבוטל"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "כותרת הרשימה"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "כותרת הרשימה"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "הגדרה כרקע"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "סמלים מותאמים אישית"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "מוצלל"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "מנהל החלונות"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "וידג'טים"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "אחר"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "כותרת הרשימה"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "קטן"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "גדול"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "זעיר"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "ענק"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5353,11 +5470,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "היישומים הנבחרים"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5423,11 +5545,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%.1f שניות"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5438,6 +5558,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5458,25 +5584,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5492,15 +5618,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5527,19 +5653,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "מסגרות"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5670,6 +5796,10 @@ msgstr "השתמש בסמל שסופק על ידי היישום "
 msgid "Border Icon"
 msgstr "מסגרת"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5700,23 +5830,43 @@ msgstr "מתחת לחלונות"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "איסוף בערימה"
@@ -5738,6 +5888,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "שעון"
@@ -5774,11 +5925,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5885,13 +6031,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5949,7 +6095,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6199,33 +6345,33 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "הכל"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "הכל"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "מסך ההסתרה"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "מתחת להכל"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "הכל"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "הכל"
@@ -6235,157 +6381,158 @@ msgstr "הכל"
 msgid "Everything Settings"
 msgstr "הכל"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "מודולים זמינים"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "העבר"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "העבר"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "הגדרת מדפים"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "פעיל"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "הצגה בתפריטים"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "הצגה בתפריטים"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "קובץ שולחן העבודה"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "ברירת מחדל"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "משך הזמן עד להסתרה"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "ברירת מחדל"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "מתחיל"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "מתחיל"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "השמישים ביותר"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "שונה לאחרונה:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "פשוט"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6394,38 +6541,29 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "נסה שוב"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "יישומים מועדפים"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "יישומים"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6447,160 +6585,65 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "שנה את שם הקובץ"
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "יישום"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "יישום חדש"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "הפעלה במסוף"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "קובץ הפעלה"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "יישומים מועדפים"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "פקודה"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "פקודה מוגדרת"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "הכל"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "עוד...‏"
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "סדר כעת"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "שנה את שם הקובץ"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "הכל"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "הצג קבצים מוסתרים"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "מסך מלא"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "שלח אל שולחן העבודה"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6647,19 +6690,19 @@ msgid "Select an image"
 msgstr "בחר תמונה"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "מנהל הקבצים"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6670,7 +6713,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6680,7 +6723,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6760,95 +6803,99 @@ msgstr ""
 msgid "Device"
 msgstr "תצוגה מקדימה"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "כל היישומים"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6883,7 +6930,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6895,36 +6942,41 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr "יישומונים זמינים"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "העבר"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "התחל בהזזת/שינוי הגודל של חפיץ זה"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7164,16 +7216,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "צור סמל"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "מאפיינים"
 
@@ -7217,7 +7269,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7337,31 +7389,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7381,128 +7433,91 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "יישומונים נבחרים"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "השמישים ביותר"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7544,7 +7559,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7568,38 +7583,53 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "מצב תצוגה"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7626,136 +7656,271 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "החלפת מצב בלתי מקוון"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "מוגן"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "נפח לא ידוע"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "שגיאה"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "קובץ:"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "מיקום"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "מסך ההסתרה"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "פשוט"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "תפקיד"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "פעיל"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "מודולים זמינים"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "מוגן"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "תפקיד"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment לא הצליחה להגדיר את מערכת ערכות הנושא שלה."
+#~ msgid "Dim Screen"
+#~ msgstr "מסך"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "מסך"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "שנה גודל"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "הפסקת הזזת/שינוי הגודל של חפיץ זה"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להפעיל את Ecore!\n"
+#~ "יתכן כי אזל לך הזכרון?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להפעיל את מערכת הקבצים.\n"
+#~ "יתכן כי אזל לך הזכרון?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להתחיל את החיבור שלה ל־X.\n"
+#~ "האם הגדרת את משתנה ה־DISPLAY כראוי?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להתחיל את מערכת החיבורים.\n"
+#~ "יתכן כי אזל לך הזכרון?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להתחיל את מערכת ה־IPC.\n"
+#~ "יתכן כי אזל לך הזכרון?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment לא יכולה להגדיר את מעטפת xinerama.\n"
+#~ "זה לא אמור לקרות."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment לא יכולה להגדיר את מעטפת xinerama.\n"
+#~ "זה לא אמור לקרות."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להתחיל את מערכת ה־Evas.\n"
+#~ "יתכן כי אזל לך הזכרון?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment לא הצליחה להגדיר את מסך הפתיחה שלה.\n"
+#~ "יתכן שהזכרון אזל?"
+
+#~ msgid "Setup FM"
+#~ msgstr "הגדרת מנהל הקבצים"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment לא הצליחה להגדיר את מערכת המדפים שלה."
+
+#~ msgid "New Application"
+#~ msgstr "יישום חדש"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "יישומים"
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "שנה את שם הקובץ"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "יישום"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "יישום חדש"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "הפעלה במסוף"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "קובץ הפעלה"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "עוד...‏"
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "סדר כעת"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "שנה את שם הקובץ"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "מסך מלא"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "שלח אל שולחן העבודה"
 
 #~ msgid "Add Application..."
 #~ msgstr "הוסף יישום..."
@@ -7846,9 +8011,6 @@ msgstr ""
 #~ msgid "Favorites Menu"
 #~ msgstr "תפריט המועדפים"
 
-#~ msgid "Selected Applications"
-#~ msgstr "היישומים הנבחרים"
-
 #~ msgid "About Dialog Title"
 #~ msgstr "כותרת תיבת האודות"
 
@@ -7879,12 +8041,6 @@ msgstr ""
 #~ msgid "Shut Down Immediately"
 #~ msgstr "כיבוי המחשב מיידית"
 
-#~ msgid "Shut Down"
-#~ msgstr "כיבוי"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "השהיה לכונן"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "נעילת שולחן העבודה"
 
index 16909a7..e8e94ea 100755 (executable)
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-11-09 18:07+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,14 +43,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Sva prava pridržana; 1999-2009, Enlightenment Razvojni Tim.<br><br>Nadamo se "
 "da uživate koristeći ovaj program isto toliko koliko smo mi uživali praveći "
@@ -62,8 +61,9 @@ msgstr ""
 "stabilan. Mnoge značajke su nekompletne ili čak nedostaju i mogu kriti puno "
 "problema. Vi ste <hilight>UPOZORENI!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Tim</title>"
 
 #: src/bin/e_actions.c:365
@@ -81,46 +81,46 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Jeste li sigurni da želite zatvoriti ovaj prozor?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Jeste li sigurni da želite izaći?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Tražili ste da napustite Enlightenment.<br><br>Jeste li sigurni da želite "
 "izaći?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Jeste li sigurni da se želite odjaviti?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Vi se odjavljujete.<br><br>Jeste li sigurni da hoćete da se odjavite?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Jeste li sigurni da želite ugasiti?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -128,11 +128,11 @@ msgstr ""
 "Tražili ste da ugasite vaše Računalo.<br><br>Jeste li sigurni da želite "
 "ugasiti?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Jeste l isigurni da hoćete da ponovno podignete sustav?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -140,7 +140,7 @@ msgstr ""
 "Zahtijevate da ponovno podignete vaše Računalo.<br><br>Jeste li sigurni da "
 "hoćete da restartujete?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -148,11 +148,11 @@ msgstr ""
 "Zatražili ste da suspendirate svoje Računalo.<br><br>Jeste li sigurni da "
 "želite suspendirati?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Jeste li sigurni da želite hibernirati?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -160,551 +160,574 @@ msgstr ""
 "Zatražili ste da hibernirate svoje Računalo.<br><br>Jeste li sigurni da "
 "želite hibernirati?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Prozor: Akcije"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Premjesti"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Promijeni veličinu"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Izbornik"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Prozorni Izbornik"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Uzdigni"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Spusti"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Zatvori"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Prozor: Stanje"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Preklopnik Ljepljivog Moda"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Preklopnik Ikoniziranog Moda"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Preklopnik Moda Cijelog Zaslona"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimiziraj"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimiziraj Vertikalno"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimiziraj horizontalno"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maksimiziraj Cijeli Ekran"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimiziraj \"Pametan\" Mod"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimiziraj Mod \"Proširiti\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimiziraj Mod \"Popuni\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Preklopnik Moda Gornje Sjenke"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Preklopnik Moda Donje Sjenke"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Preklopnik Moda Lijeve Sjenke"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Preklopnik Moda Desne Sjenke"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Preklopnik Moda Sjenke"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Preklopnik Bezrubnog Stanja"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Bordura"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Preklopnik Pribodenog Stanja"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Radna površina"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Okreni Radnu Površinu Lijevo"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Okreni Radnu Površinu Desno"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Okreni Radnu Površinu Gore"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Okreni Radnu Površinu Dolje"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Okreni Radnu Površinu Za..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Prikaži Radnu Površinu"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Prikaži Policu"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Okreni Radnu Površinu Na..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Okreni Radnu Površinu Linearno"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Prebaci na Radnu Površinu 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Prebaci na Radnu Površinu 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Prebaci na Radnu Površinu 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Prebaci na Radnu Površinu 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Prebaci na Radnu Površinu 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Prebaci na Radnu Površinu 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Prebaci na Radnu Površinu 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Prebaci na Radnu Površinu 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Prebaci na Radnu Površinu 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Prebaci na Radnu Površinu 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Prebaci na Radnu Površinu 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Prebaci na Radnu Površinu 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Prebaci na Radnu Površinu..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Okreni Radnu Površinu Lijevo (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Okreni Radnu Površinu Desno (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Okreni Radnu Površinu Gore (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Okreni Radnu Površinu Dolje (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Okreni Radnu Površinu Za... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Okreni Radnu Površinu Na... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Okreni Radnu Površinu Linearno... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Preokreni Radnu Površinu U Smjeru..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 0 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 1 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 2 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 3 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 4 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 5 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 6 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 7 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 8 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 9 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 10 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 11 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Prebaci Na Radnu Površinu... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Zaslon"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Pošalji Miša Na Zaslon 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Pošalji Miša Na Zaslon 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Pošalji Miša Na Zaslon..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Pošalji Miša Naprijed 1 Zaslon"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Pošalji Miša Nazad 1 Zaslon"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Pošalji Miša Napred/Natrag na Ekrane..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Premjesti Tekst"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Više..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Više..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Promijeni veličinu za:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Preokreni Radnu Površinu U Smjeru..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Kreiraj Ikonu"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Prozor: Pomjeranje"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Na Slijedeću Radnu Površinu"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Na Prethodnu Radnu Površinu"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Po Radnoj Površini #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Na Radnu Površinu..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Prikaži Glavni Izbornik"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Prikaži Omiljeni Izbornik"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Prikaži Izbornik Svih Aplikacija"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Prikaži Izbornik Klijenata"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Prikaži Izbornik..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Pokreni"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Naredba"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplikacija"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Ponovo pokreni"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Izađi Odmah"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Mod"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Mijenjaj Način Prezentacije"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Mijenjaj Način Isključenja"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sustav"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Odjava"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Ugasi Odmah"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Ugasi"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Ponovno podigni sustav"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Suspendiraj"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspendiraj"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernirati"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Zaključaj"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Očisti Prozore"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Uopćeno : Akcije"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Odgođena Akcija"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Akcija"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Ovaj Ekran"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Ovaj Ekran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Postavi Kao Pozadinu"
 
@@ -712,18 +735,16 @@ msgstr "Postavi Kao Pozadinu"
 msgid "Color Selector"
 msgstr "Odabirač Boja"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -731,20 +752,20 @@ msgstr "Odabirač Boja"
 msgid "OK"
 msgstr "U redu"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Poništi"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -763,7 +784,7 @@ msgstr ""
 "rekonfigurirati  stvari<br>po vašoj želji. Izvinjavamo se zbog problema sa "
 "vašim postavkama.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -777,11 +798,11 @@ msgstr ""
 "i radi predostrožnosti vaše postavke su vraćene u<br>originalno stanje. "
 "Izvinjavamo se zbog neugodnosti.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemi Pisanja Enlightenment Postavki"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -789,96 +810,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Postavke Unaprijeđene"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Hiberniranje nije uspjelo"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Nema Prozora)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Suspendiranje nije uspjelo"
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Suspendiranje nije uspjelo"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Dobrodošli u Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -890,57 +911,62 @@ msgstr ""
 "otkrivena:<br>%s<br><br>je uklonjena da bi se izbjegla korupcija podataka."
 "<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Osnovno"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Primijeni"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Nastavci"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduli"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Postavke ikone"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Kontejner %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Greška - bez PAM podrške"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Podrška za PAM nije ugrađena u Enlightenment, što je onemogućilo "
 "zaključavanje radne površine."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Neuspjelo Zaključavanje"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -948,15 +974,15 @@ msgstr ""
 "Zaključavanje radne površine je neuspjelo jer je neka aplikacija<br>zgrabila "
 "ili tipkovnicu ili miša ili oboje i ovoga se nije moguće riješiti."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Molimo unesite vašu lozinku za otključavanje"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Greška Sistema Autorizacije"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -967,11 +993,11 @@ msgstr ""
 "greške je<hilight>%i</hilight>.<br>Ovo je loše i se nije smjelo dogoditi. "
 "Molimo prijavite ovaj problem."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktiviraj Način Prezentiranja"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -981,11 +1007,11 @@ msgstr ""
 "</b>prezentiranja</b> i privremeno onesposobiti zaštitnika zaslona, bravu  i "
 "uštedu energije?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, ali povećaj vrijeme neaktivnosti"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne, i prestani pitati"
 
@@ -1011,106 +1037,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Urednik Unosa u Radnu Površinu"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Ime"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komentar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Općenito Ime"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Klasa Prozora"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorije"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime tipovi"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Datoteka Radne Površine"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Općenito"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Početna Obavijest"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Izvodi u Terminalu"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Prikaži u Izbornicima"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opcije"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Odaberi Ikonu"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Odaberi Izvršni"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Zalijepi"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Odaberi sve"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1149,314 +1174,314 @@ msgstr ""
 "Enlightenment nije u mogućnosti da izvede aplikaciju:<br><br>"
 "%s<br><br>Neuspješan start aplikacije."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Greška Izvršenja Aplikacije"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s je neočekivano zaustavio izvođenje"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Izlazni kod %i je vraćen iz %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je prekinut Interrupt Signalom"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je prekinut Quit Signalom"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je prekinut Abort Signalom"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s je prekinut Floating Point Greškom"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s je prekinut Uninterruptable Kill Signalom"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s je prekinut Segmentation Greškom"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s je prekinut od Slomljene Cijevi"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je prekinut Termination Signalom"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s je prekinut Bus Greškom"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s je prekinut signalom broj %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Preostali izlaz je okrnjen. Pohrani izlaz u pogled.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Pogrešni Logovi"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Nema poruke o grešci."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Pohrani Ovu Poruku"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Zapis ove greške će biti pohranjen kao %s/%s. zapis"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informacije o Grešci"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informacije o Signalu Greške"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Izlazni Podaci"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Nije bilo izlaza."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Nepostojeći put"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s ne postoji."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Greška kod montiranja"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Nemoguće montirati uređaj"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Greška kod demontiranja"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Nemoguće demontirati uređaj"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Greška kod izbacivanja"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Nemoguće izbaciti uređaj"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Datoteke"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Odustani"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Preuzmi izvorne postavke"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Pregled"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Osvježi Pogled"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Prikaži Skrivene Datoteke"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Zapamti Redoslijed"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sortiraj Sada"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Novi Direktorij"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Demontiraj"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Monitraj"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Izbaci"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Upotrijebi Ikonu Snabdjevenu Aplikacijom "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Svojstva datoteke"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Upotrijebi zadane vrijednosti"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Mrežne Ikone"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Posebne Ikone"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Veličinia Ikone (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Postavi pozadinu..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Postavi oblogu..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Kreiraj"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Naziv Novog Direktorija:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj %s na:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Preimenuj Datoteku"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Ponovi"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Greška"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ne za sve"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Da za sve"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Datoteka već postoji, prepiši preko?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignoriraj ovo"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignoriraj sve"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Pojavila se greška u izvođenju radnje<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Potvrda Brisanja"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Jeste li sigurni da želite obrisati<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1490,12 +1515,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nepoznata Jačina"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Odstranjiv Uređaj"
 
@@ -1503,7 +1528,7 @@ msgstr "Odstranjiv Uređaj"
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Veličina:"
 
@@ -1519,7 +1544,7 @@ msgstr "Vrsta Datoteke:"
 msgid "Permissions"
 msgstr "Dozvole"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Vlasnik:"
 
@@ -1539,17 +1564,17 @@ msgstr "Vlasnik može čitati"
 msgid "Owner can write"
 msgstr "Vlasnik može pisati"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Pregled"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Zadano"
 
@@ -1558,7 +1583,7 @@ msgid "Thumbnail"
 msgstr "Sličica"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Prilagođeni"
 
@@ -1574,53 +1599,42 @@ msgstr "Infomacije o linku"
 msgid "Select an Image"
 msgstr "Odaberi Sliku"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Premjesti Tekst"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Počni pomakni/promjeni veličinu ovog aparata"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Promijeni veličinu"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Automatski listaj sadržaj"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Običan"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Umetak"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Pogledaj"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Ukloni"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Zaustavi pomjeranje/promjenu veličine ovog aparata"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1666,14 +1680,14 @@ msgstr "Pozicija"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Veličina"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Slaganje"
@@ -1725,163 +1739,169 @@ msgstr "Napuštam moj login sa ovim prozorom otvorenim"
 msgid "Remember these Locks"
 msgstr "Zapamti ove Brave"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Prozori"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Uvijek na vrhu"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Ljepljivo"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Postavke"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Cijeli ekran"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maksimiziraj vertikalno"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maksimiziraj horizontalno"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Odmaksimiziraj"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Uredi Ikonu"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Kreiraj Ikonu"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Dodaj u Omiljene"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Dodaj u Omiljene"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Tipkovnička Prečica"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Inteligentno Polaganje"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Preskoči"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Bordura"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Brave"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Zapamti"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Ljepljivo"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Preskoči"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Ikonizirati"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Sjenčeno"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Zaslon"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Uvijek na vrhu"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Uvijek Ispod"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Pribodi na Radnu Površinu"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Skini sa Radne Površine"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Odaberi Vrstu Bordure"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Upotrijebi E17 Standardne Postavke Ikone"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Upotrijebi Ikonu Snabdjevenu Aplikacijom "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Upotrijebi Ikonu Definiranu od Korisnika"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Otpor"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista Prozora"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Preglednik"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Taskbar"
 
@@ -1902,7 +1922,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM Svojstva"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Naslov"
 
@@ -2075,7 +2095,6 @@ msgid "Size, Position and Locks"
 msgstr "Veličina, Pozicija i Brave"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Dozvoli"
@@ -2153,15 +2172,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Datoteke"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Pokreni"
@@ -2176,20 +2193,6 @@ msgstr "Jezgra"
 msgid "Mobile"
 msgstr "Moduli"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Postavke"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Postavke Modula"
@@ -2230,7 +2233,7 @@ msgstr "Dodaj Aparat"
 msgid "Remove Gadget"
 msgstr "Ukloni Aparat"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Postavke Alatne Trake"
 
@@ -2238,11 +2241,11 @@ msgstr "Postavke Alatne Trake"
 msgid "Layout"
 msgstr "Raspored"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Greška u Metodu Unosa"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2258,7 +2261,7 @@ msgstr "Glavni"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Omiljene Aplikacije"
 
@@ -2266,76 +2269,74 @@ msgstr "Omiljene Aplikacije"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplikacije"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Prozori"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Izgubljeni Prozori"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "O"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtualno"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Police"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Prikaži/Sakrij Sve Prozore"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Nema Aplikacija)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Postavi Virtualne Radne Površine"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Nema Prozora)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Nema imena!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Nema Polica)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "dodaj Policu"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Ukloni Policu"
 
@@ -2371,7 +2372,7 @@ msgid "Shrink to Content Width"
 msgstr "Stisni do Veličine Sadržaja"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stil"
 
@@ -2401,7 +2402,7 @@ msgid "Hide duration"
 msgstr "Sakrij trajanje"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekunde"
@@ -2418,7 +2419,7 @@ msgstr "Prikaži na svim Radnim Površinama"
 msgid "Show on specified Desktops"
 msgstr "Prikaži na specificiranim Radnim Površinama"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2435,7 +2436,7 @@ msgstr ""
 "ili vi niste vlasnik. Molimo provjerite:\n"
 "%s/enlighenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2448,77 +2449,22 @@ msgstr ""
 "Molimo provjerite:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Options:\n"
-"\t-prikaz PRIKAZ\n"
-"\t\tPoveži na prikaz zvani PRIKAZ.\n"
-"\t\tEG: -prikaz :1.0\n"
-"\t-lažni-xinerama-zaslon WxH+X+Y\n"
-"\t\tDodaj LAŽNI xinerama zaslon (namjesto stvarnih)\n"
-"\t\timajući u vidu geometriju. Dodajte ih koliko hoćete. Ovi svi\n"
-"\t\tzamjenjuju stvarne xinerama zaslone. Ovo može\n"
-"\t\tbiti korišteno da simulira xinerama.\n"
-"\t\tEG: -lažni-xinerama-zaslon 800x600+0+0 -lažni-xinerama-zaslon "
-"800x600+800+0\n"
-"\t-profil CONF_PROFILE\n"
-"\t\tUpotrijebi konfiguracioni profil CONF_PROFILE namjesto korisnički "
-"odabranog standarda ili samo \"standardan\".\n"
-"\t-dobar\n"
-"\t\tBudi dobar.\n"
-"\t-zao\n"
-"\t\tBudi zao.\n"
-"\t-psihotičan\n"
-"\t\tBudi psihotičan.\n"
-"\t-zaključan\n"
-"\t\tPočni sa zaključanom radnom površinom, tako da lozinka mora biti "
-"zatražena.\n"
-"\t-ja-znam-što-radim-i-prihvaćam-svu-odgovornost-za-to-\n"
-"\t\tAko trebate ovu pomoć, onda ne trebate ovu opciju.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može inicijalizirati Ecore!\n"
-"Možda vam nedostaje memorije?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može inicijalizirati Sistem datoteka.\n"
-"Možda vam nedostaje memorije?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2526,7 +2472,7 @@ msgstr ""
 "Enlightenment ne može postaviti manipulator izlaznog signala.\n"
 "Možda vam nedostaje memorije?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2534,7 +2480,7 @@ msgstr ""
 "Enlightenment ne može postaviti manipulator HUP signala.\n"
 "Možda vam nedostaje memorije?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2543,64 +2489,37 @@ msgstr ""
 "Enlightenment ne može postaviti manipulator HUP signala.\n"
 "Možda vam nedostaje memorije?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne može inicijalizirati svoju X konekciju.\n"
-"Jeste li postavili vašu PRIKAZ varijablu?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne može inicijalizirati svoj sistem hitnog alarma.\n"
-"Jeste li postavili svoju PRIKAZ varijablu?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može inicijalizirati sistem povezanosti.\n"
-"Možda vam nedostaje memorije?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može inicijalizirati IPC sistem.\n"
-"Možda vam nedostaje memorije?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne može postaviti xinerama omot.\n"
-"Ovo se nije trebalo dogoditi."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne može postaviti xinerama omot.\n"
-"Ovo se nije trebalo dogoditi."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može inicijalizirati Evas sistem.\n"
-"Možda vam nedostaje memorije?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2610,7 +2529,7 @@ msgstr ""
 "prikaz u Evas. Molimo provjerite instalaciju Evas i\n"
 "Ecore i provjerite da podržava Software X11 prikaznu mašinu."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2620,7 +2539,35 @@ msgstr ""
 "koji prezentira u Evas. Molimo provjerite vašu instalaciju Evas i Ecore i \n"
 "provjerite da ovi podržavaju Softver Bufer prezentacionu mašinu."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne može inicijalizirati svoj sistem hitnog alarma.\n"
+"Jeste li postavili svoju PRIKAZ varijablu?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2628,23 +2575,29 @@ msgstr ""
 "Enlightenment ne može kreirati direktorije u vašem polaznom direktoriju.\n"
 "Možda nemate polazni direktorij ili je vašdisk pun?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ne može postaviti svoj sistem datotečnih registara."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ne može postaviti svoj Config sistem."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ne može postaviti svoj sistem tema."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment ne može postaviti svoj sustav promjene veličine."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment ne može postaviti svoj sustav pokazivača."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2652,94 +2605,42 @@ msgstr ""
 "Enlightenment ne može postaviti puteve za pronalaženje datoteka.\n"
 "Možda nemate dovoljno memorije?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ne može postaviti svoj sistem pisma."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ne može postaviti svoj sistem tema."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne može postaviti init ekran.\n"
-"Možda nemate dovoljno memorije?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment ne može postaviti svoj intl sistem."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Pokretanje Međunarodne Podrške"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne može postaviti svoj intl sistem."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ne može inicijalizirati sistem FDO radne površine,\n"
 "Možda vam nedostaje memorije?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testiranje Podrške Formata"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment je otkrio da Evas ne može kreirati bafer kanvas. Molimo "
-"provjerite\n"
-"da Evas ima podršku za Softver Bafer mašinu.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je otkrio da Evas ne može učitavati PNG datoteke. Provjeri \n"
-"da li Evas ima podršku učitavanja za PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je otkrio da Evas ne može učitavati JPEG datoteke. Provjeri \n"
-"da li Evas ima podršku učitavanja za JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je otkrio da Evas ne može učitavati EET datoteke. Provjeri \n"
-"da li Evas ima podršku učitavanja za EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment je otkrio da Evas ne može učitavati 'Sans' pismo. Provjeri \n"
-"da li Evas ima fontconfig podršku i da sustavni fontconfig definira 'Sans' "
-"pismo.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Postavi Ekrane"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2748,214 +2649,377 @@ msgstr ""
 "sustavu\n"
 "nije uspio. Možda je neki drugi upravitelj prozora aktivan?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Postavi DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Postavljanje Poveznika"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ne može konfigurirati DPMS postavke."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Postavi DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne može konfigurirati DPMS postavke."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Postavka Čuvara Zaslona"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne može konfigurirati X čuvar zaslona."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Postavi modove Štednje energije"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ne može postaviti svoje modove štednje energije."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Postavi Zaključavanje Radne Površine"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment ne može postaviti svoj sistem zaključavanja radne površine."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Postavi Pop-ups"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne može postaviti svoj pop-up sistem."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Postavi Sistem Poruka"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Postavke Puteva"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Postavljanje Kontrola Sustava"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne može inicijalizirati Sustavne Naredbe\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Postavi Akcije"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne može postaviti svoj sistem akcija."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Postavljanje Izvršnog Sistema"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne može postaviti svoj exec sistem."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Postavi FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Upravitelj datotekama"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Postavi Sistem Poruka"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne može postaviti svoj msg sistem."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Postavi DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne može postaviti svoj DND sistem."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Postavke Rukovanja Masovnog Unosa"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment ne može postaviti svoj sustav rrkovanja grabljenja unosa"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Postavi Module"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenmet ne može postaviti svoj sistem modula."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Postavi Podsjetnike"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ne može postaviti postavke podsjetnika."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Postavi Klase Boja"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne može postaviti svoj sistem klasiranja boja."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Postavi Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ne može postaviti svoj sistem kontrole aparata"
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Postavi DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Postavi DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ne može konfigurirati DPMS postavke."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Postavi modove Štednje energije"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ne može postaviti svoje modove štednje energije."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Postavi Tapetu"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne može postaviti svoj sistem pozadine radne površine"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Postavi Miša"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne može konfigurirati postavke miša."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Postavljanje Poveznika"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne može postaviti svoj sistem poveznika"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Postavi Police"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ne može postaviti svoj sistem polica."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Postavi Urednika Sličica"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne može inicijalizirati sustav Postavljanja Sličica.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment ne može inicijalizirati Sustavne Naredbe\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ne može inicijalizirati sustav Postavljanja Sličica.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ne može postaviti svoj sistem tema."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Postavi Raspored Datoteka"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne može postaviti svoj sistem rasporeda datoteka."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Unesi Module"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Konfiguriraj Police"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Skoro Gotovo"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Options:\n"
+"\t-prikaz PRIKAZ\n"
+"\t\tPoveži na prikaz zvani PRIKAZ.\n"
+"\t\tEG: -prikaz :1.0\n"
+"\t-lažni-xinerama-zaslon WxH+X+Y\n"
+"\t\tDodaj LAŽNI xinerama zaslon (namjesto stvarnih)\n"
+"\t\timajući u vidu geometriju. Dodajte ih koliko hoćete. Ovi svi\n"
+"\t\tzamjenjuju stvarne xinerama zaslone. Ovo može\n"
+"\t\tbiti korišteno da simulira xinerama.\n"
+"\t\tEG: -lažni-xinerama-zaslon 800x600+0+0 -lažni-xinerama-zaslon "
+"800x600+800+0\n"
+"\t-profil CONF_PROFILE\n"
+"\t\tUpotrijebi konfiguracioni profil CONF_PROFILE namjesto korisnički "
+"odabranog standarda ili samo \"standardan\".\n"
+"\t-dobar\n"
+"\t\tBudi dobar.\n"
+"\t-zao\n"
+"\t\tBudi zao.\n"
+"\t-psihotičan\n"
+"\t\tBudi psihotičan.\n"
+"\t-zaključan\n"
+"\t\tPočni sa zaključanom radnom površinom, tako da lozinka mora biti "
+"zatražena.\n"
+"\t-ja-znam-što-radim-i-prihvaćam-svu-odgovornost-za-to-\n"
+"\t\tAko trebate ovu pomoć, onda ne trebate ovu opciju.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testiranje Podrške Formata"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može kreirati bafer kanvas. Molimo "
+"provjerite\n"
+"da Evas ima podršku za Softver Bafer mašinu.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati PNG datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati JPEG datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati PNG datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati EET datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati 'Sans' pismo. Provjeri \n"
+"da li Evas ima fontconfig podršku i da sustavni fontconfig definira 'Sans' "
+"pismo.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 "Enlightenment je pao prilikom ranijeg starta i morao je biti ponovno "
 "podignut."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2963,7 +3027,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2975,7 +3039,7 @@ msgstr ""
 "problemni<br>moduliu vašoj konfiguraciji. Dijalog konfiguracije modula<br>će "
 "vam omogućiti ponovni odabir vaših modula."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2987,20 +3051,12 @@ msgstr ""
 "moduliu vašoj konfiguraciji.<br><br>Dijalog konfiguracije modula će vam "
 "omogućiti ponovni odabir<br>vaših modula."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Konfiguriraj Police"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Skoro Gotovo"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Unesi Module"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3009,11 +3065,11 @@ msgstr ""
 "Potkrala se greška učitavanja modula: %s.<br>Modul sa imenom %s nije "
 "pronađen u<br>direktorijima za pretragu modula.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Greška kod unošenja Modula"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3022,11 +3078,11 @@ msgstr ""
 "Potkrala se greška učitavanja modula: %s.<br>Kompletan put do ovog modula je:"
 "<br>%s<br>Prijavljena greška je:<br>%s.<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modul ne sadrži sve neophodne funkcije"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3037,16 +3093,16 @@ msgstr ""
 "zahtijeva najmanju inačicu API modula: %i.<br>API modul kojeg Enlightenment "
 "reklamira je: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Da li želite isprazniti ovaj modul?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3060,28 +3116,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Polica #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jeste li sigurni da hoćete ukloniti ovu policu?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Zatražili ste da uklonite ovu policu.<br>Jeste li sigurni?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Zaustavi Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Počni Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Komentar"
@@ -3090,16 +3146,16 @@ msgstr "Komentar"
 msgid "Starting"
 msgstr "Početak"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Provjeravanje Sustavnih Dozvola"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Provjera Sustava Završena"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3109,35 +3165,35 @@ msgstr ""
 "Odjava traje predugo. Neke aplikacije<br>nije moguće zatvoriti.<br>Da li "
 "hoćete završiti odjavljivanje<br>bez zatvaranja ovih aplikacija?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Odjavni Problemi"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Odjavi se odmah"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Čekaj još malo"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Odustani od Odjave"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Odjava u procesu"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Odjava u procesu.<br><hilight>Molimo sačekajte.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je trenutno zaposlen na drugom zahtjevu."
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3145,7 +3201,7 @@ msgstr ""
 "Odjavljivanje.<br>Ne možete izvoditi druge sustavne akcije<br>kad je proces "
 "odjave već pokrenut."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3153,7 +3209,7 @@ msgstr ""
 "Gašenje sustava.<br>Ne možete uraditi nijednu sustavnu funkciju<br>kad je "
 "gašenje već započeto."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3161,7 +3217,7 @@ msgstr ""
 "Ponovno postavljanje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>kad "
 "je ponovno postaljanje već započeto."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3169,63 +3225,64 @@ msgstr ""
 "Suspendiranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok "
 "suspendiranje nije završeno."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Hiberniranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok ovo nije "
 "završeno."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Ovo se nije trebalo dogoditi."
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Gašenje neuspjelo."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Ponovno postavljanje nije uspjelo"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Suspendiranje nije uspjelo"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hiberniranje nije uspjelo"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Gašenje"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Gašenje.<br><hilight>Molimo čekajte.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Ponovno postavljanje"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Ponovno postavljanje.<br><hilight>Molimo pričekajte.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Suspendiranje"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspendiranje.<br><hilight>Molimo pričekajte.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hiberniranje"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hiberniranje.<br><hilight>Molimo pričekajte.</hilight>"
 
@@ -3233,33 +3290,33 @@ msgstr "Hiberniranje.<br><hilight>Molimo pričekajte.</hilight>"
 msgid "About Theme"
 msgstr "O Temi"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Postavi Kao Temu"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Zaustavi Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Počni Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Postavi Sadržaj Alatne Trake"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nije mogao razdvojiti nemoćan proces:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Nije moguće izaći - neuništivi prozori"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3269,125 +3326,125 @@ msgstr ""
 "znači<br>da Enlightenment neće dozvoliti da se zatvori dok se ovi<br>prozori "
 "ne zatvore ili se ukloni Lifespan brava.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%' .0f Bajta"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%' .0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%' .0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'  .1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Ubuduće"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "U zadnjoj Minuti"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "prije %li godina"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "prije %li Mjeseci"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "prije %li Tjedana"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "prije %li Dana"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "prije %li Sati"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "prije %li Minuta"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nepoznat"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Postavke Preglednika"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Uvoz..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opcije Popune i Protezanja"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Rastegni"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centar"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Unutar"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Popuni"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Kvaliteta Datoteke"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Upotrijebi Originalnu Datoteku"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3407,12 +3464,12 @@ msgstr ""
 "riješiti dodavanjem. Sada možete rekonfigurirati stvari po vašoj volji."
 "<br>Ispričavamo se zbog problema sa vašom konfiguracijom."
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Konfiguriraj Zaglavlje"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3447,142 +3504,148 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dolje"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Dodaj u Omiljene"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Jedan Direktorij Više"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Razlučivost"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Dozvole:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificirano:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Vi"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Zaštićen"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Samo za Čitanje"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Zabranjen"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Čitaj-Piši"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Postavke Monitora Baterije"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Prikaži alarm kad je baterija niska"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Provjeri svaki:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f otkucaja"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernirati"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Prozivanje"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Prikaži alarm na niskoj bateriji"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Alarm kad je na:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatski odbaci u..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Alarm"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automatski Otkrij"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Nejasno"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardver"
 
@@ -3590,32 +3653,33 @@ msgstr "Hardver"
 msgid "Battery"
 msgstr "Baterija"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Baterija je niska"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC energija je preporučena"
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Nedostupno"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "GREŠKA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Baterijski Mjerač"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Sat"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Prikaži Alatnu Traku"
@@ -3685,17 +3749,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar Aplikacija"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplikacije za Podizanje Sustava"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Aplikacije kod Ponovnog Podizanja Sustava"
 
@@ -3709,10 +3773,25 @@ msgid "Apps"
 msgstr "Apps"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nove Aplikacije"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Pokreni"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Odaberi Aplikacije"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Datoteke Radne Površine"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar Ostalo"
 
@@ -3725,7 +3804,7 @@ msgid "Available Profiles"
 msgstr "Raspoloživi Profili"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Odaberi Profil"
 
@@ -3763,9 +3842,9 @@ msgstr "Postavke Dijaloga"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Opće Postavke"
 
@@ -3807,7 +3886,7 @@ msgstr "Dijalozi"
 msgid "Profiles"
 msgstr "Profili"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3818,7 +3897,7 @@ msgstr ""
 "ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d at %d Hz "
 "će biti obnovljena u %d sekundi."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3829,7 +3908,7 @@ msgstr ""
 "Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d će "
 "biti obnovljena u %d sekundi."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3840,7 +3919,7 @@ msgstr ""
 "Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d "
 "pri %d Hz će biti obnovljena <hilight>ODMAH</hilight>"
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3851,47 +3930,47 @@ msgstr ""
 "Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d će "
 "biti obnovljena <hilight>ODMAH</hilight>"
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Promjena razlučivosti"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Spremi"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Obnovi"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Postavke Razlučivosti Ekrana"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Razlučivost"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Obnovi kod prijavljivanja"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotacija"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Zrcaljenje"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Nedostaju Značajke"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3904,11 +3983,11 @@ msgstr ""
 "zaslona bez<br>podrške za ovaj nastavak. Moguće je da<br>u vrijeme kad "
 "je<hilight>ecore</hilight>urađen, nije<br>otkrivena podrška za XRandR"
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Brzine Osvježavanja Nisu Pronađene"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3922,93 +4001,74 @@ msgstr ""
 "postavljanja rezolucije, što može prouzrokovati<hilight>oštećenje</"
 "hilight>vašega zaslona."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Postavke Virtualne Radne Površine"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Broj Radnih Površina"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Okreni Radnu Površinu Mišom"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Okreni kod pomicanja objekata ka rubu zaslona"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Omotaj radne površine kod okretanja"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Radne Površine"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Isključen"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Panel"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zumiranje"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Paniranje Pozadine"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animacije"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f X-osovina pan faktor"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f Y-osovina pan faktor"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animacija Okretanja"
 
@@ -4025,7 +4085,7 @@ msgid "Desktop Wallpaper"
 msgstr "Tapeta Radne Površine"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Postavi"
 
@@ -4036,12 +4096,12 @@ msgstr "Postavi pozadinu..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Osobno"
 
@@ -4049,160 +4109,174 @@ msgstr "Osobno"
 msgid "Screen Lock Settings"
 msgstr "Postavke Zaključavanja Ekrana"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Suspendiraj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Suspendiraj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Posebna Brava Zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Zaključaj"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Prikaži na svim zonama zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Prikaži na aktivnoj zoni zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Prikaži na zoni zaslona #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Postavke Prijavne Kutije"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Zaključaj kad se X čuvar zaslona aktivira"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekundi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Zaključaj ako je prekoračeno vrijeme praznog hoda"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minuta"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Tajmeri"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Ako je deaktivirano prije"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Unesi Način Prezentacije"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Definirana Tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Tematska Tapeta"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Tapeta Radne Površine"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Tapeta"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Postavke Čuvara Zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Omogući X čuvar zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Suspendiraj"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Čuvar Zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Početno Stanje"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Zatamnjenje"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Prioritetan"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Neprioritetan"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Događaji Izlaganja"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne Dozvoli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4210,39 +4284,52 @@ msgstr "Ne Dozvoli"
 msgid "Miscellaneous"
 msgstr "Razne Opcije"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Prikaži Signalizaciju Upravljanja Energijom"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Trenutačni izložbeni poslužitelj nije<br>osposobljen za DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Trenutačni izložbeni poslužitelj nema<br>DPMS ekstenziju."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Prikaži Postavke Upravljanja Energijom"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Omogući Prikaz Upravljanja Energijom"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Pričuvno Vrijeme"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Vrijeme Suspendiranja"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Isključeno Vrijeme"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtualne Radne Površine"
@@ -4287,74 +4374,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Postavke Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Dodaj Poveznik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Ukloni Poveznik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modificiraj Poveznik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Obriši Sve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Obnovi Zadane Poveznike"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcija"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametri Akcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Generalne Opcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Dozvoli aktivaciju povezivanja sa cijelim zaslonom prozora"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Sekvenca Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Greška Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4364,28 +4451,28 @@ msgstr ""
 "<br><hilight>%s</hilight> akcije.<br>Molimo odaberite drugu sekvencu "
 "povezivanja ruba."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4535,34 +4622,47 @@ msgid ""
 msgstr ""
 "Enlightenment nije mogao da uveze konfiguraciju<br>zbog greške u kopiji."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Postavke Jezika"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Odabirač Jezika"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Zadane Vrijednosti Sustava"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Odabrani Prostor"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Prostor"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Jezik"
 
@@ -4654,17 +4754,17 @@ msgid "Manager"
 msgstr "Upravitelj"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nijedan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Redoslijed Poveznika Miš"
 
@@ -4688,13 +4788,11 @@ msgid "Menu Settings"
 msgstr "Postavke Izbornika"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Osobno"
@@ -4705,7 +4803,7 @@ msgid "Main Menu"
 msgstr "Prikaži Glavni Izbornik"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Omiljeni"
 
@@ -4725,7 +4823,7 @@ msgid "Comments"
 msgstr "Komentar"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4737,7 +4835,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Prikaži u Izbornicima"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Izbornici"
 
@@ -4808,19 +4906,19 @@ msgid "Images"
 msgstr "Slike"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Pisma"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Teme"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikone"
 
@@ -4974,18 +5072,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Postavke Tapete"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Upotrijebi Tematsku Tapetu"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Slika..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Povezan"
 
@@ -5005,42 +5103,47 @@ msgstr "Ova Radna Površina"
 msgid "This Screen"
 msgstr "Ovaj Ekran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Postavljanje tapete..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Pločica"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Panel"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Odaberi Sliku..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Greška Uvoza Slike"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "enlightenment nije mogao uvesti sliku<br>zbog grešaka u konverziji."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Greška Uvoza Tapete"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment nije mogao uvesti tapetu<br>zbog greške u kopiranju."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5078,7 +5181,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Zadani Stil Bordure"
 
@@ -5086,7 +5189,7 @@ msgstr "Zadani Stil Bordure"
 msgid "Window Border Selection"
 msgstr "Odabir Obruba Prozora"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamti ovu Borduru kad se ovaj prozor slijedeći put pojavi."
 
@@ -5119,7 +5222,7 @@ msgid "Menu Background Base"
 msgstr "Pozadine"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Naziv Izbornika"
 
@@ -5128,7 +5231,7 @@ msgid "Menu Title Active"
 msgstr "Naslov Izbornika Aktivan"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Element Izbornka"
 
@@ -5142,12 +5245,12 @@ msgid "Menu Item Disabled"
 msgstr "Aktivna Stavka Izbornika"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Premjesti Tekst"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Promijeni Veličinu Teksta"
 
@@ -5165,7 +5268,7 @@ msgid "Winlist Label"
 msgstr "Winlist Oznaka"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Winlist Naslov"
 
@@ -5185,389 +5288,399 @@ msgid "File Manager Background Base"
 msgstr "Upravitelj datoteka"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Tekst Gumba"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Tekst Gumba Onesposobljen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Provjeri Tekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Tekst Potvrdnog Okvira Onesposobljen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Tekst Unosa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Tekst Gumba Onesposobljen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Tekst Oznake"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Tekst Stavke sa Liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Tekst Stavke sa Liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Tekst Stavke sa Liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Zaglavlje Liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Zaglavlje Liste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Radio Tekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Radio Tekst Onemogućen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Tekst Klizača"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Tekst Klizača Onesposobljen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Pozadine"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Oznaka Modula"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Boje"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Klase Boja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Postavi Klase Boja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Postavi Klase Boja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Postavi Klase Boja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Posebna Boja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Izbaci"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Isključen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Boja Sjene"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Upravitelj Prozora"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Grafički Element"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Ostalo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Naslovna Traka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Normalan Blok Teksta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Lagani Blok Teksta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Veliki Blok Teksta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Zaglavlje Postavki"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "O Naslovu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "O Inačici"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "O Tekstu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Naslov Brave Radne Površine"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Lozinka Brave Radne Površine"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Greška Dijaloga"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "exebuf Naredba"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Naslov Prskanja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Tekst Prskanja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Inačica Prskanja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Unos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Okvir"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Oznaka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Gumbi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Klizač"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Radio Gumbi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Gumb Potvrdnog Okvira"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Stavka Tekstualne Liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Stavka Liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Zaglavlje Liste"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Upravitelj datotekama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Ikona Radne Površine"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Malo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Velik"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Mali Format"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normalan Format"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Veliki Format"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Postavke Pisma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Sićušno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Velik"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Vrlo Velik"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Ogroman"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d piksela"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Omogući Posebne Klase Pisama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Osnovni tekst pregleda : 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Klase Pisama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Osposobi Klasu Pisma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Napredni Tekst Pregleda.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Savjetovanje"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bajtkod"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Rezervne Varijante Pisma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Naziv Rezervne Varijante"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Osposobi Rezervne Varijante"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Aludiranje / Rezerve"
 
@@ -5575,12 +5688,17 @@ msgstr "Aludiranje / Rezerve"
 msgid "Icon Theme Settings"
 msgstr "Postavke Tema Sličica"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Omogući Sprezanje"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Odaberi Aplikacije"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Tema ikone nadvladava generalnu temu"
@@ -5647,11 +5765,9 @@ msgid "Custom scaling factor"
 msgstr "Posebni faktor skaliranja"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f puta"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5662,6 +5778,12 @@ msgstr "Pravila"
 msgid "Minimum"
 msgstr "Minimalno"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f puta"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maksimalno"
@@ -5682,25 +5804,25 @@ msgstr "Prikaži Prskani Zaslon kod Prijave"
 msgid "Transition Settings"
 msgstr "Postavke Promjene"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Događaji"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Pokretanje"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Promjena Radne Površine"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Promjena Pozadine"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Promjene"
 
@@ -5716,15 +5838,15 @@ msgstr " Uvoz..."
 msgid " Online..."
 msgstr " Povezan"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Kategorije Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Pripiši"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Očisti Sve"
 
@@ -5753,19 +5875,19 @@ msgstr "Enlightenment nije mogao uvesti temu<br>zbog greške u kopiranju."
 msgid "Exchange themes"
 msgstr "Razmijeni Teme"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordure"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema Sličica"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Pokazivač Miša"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skaliranje"
 
@@ -5896,6 +6018,11 @@ msgstr "Upotrijebi Ikonu Snabdjevenu Aplikacijom "
 msgid "Border Icon"
 msgstr "Bordura"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Inteligentno Polaganje"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Inteligentno Polaganje"
@@ -5927,24 +6054,47 @@ msgstr "Ispod Prozora"
 msgid "Animate"
 msgstr "Animacije"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linearno"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Blago ubrzavanje i usporavanje"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Ubrzaj"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Uspori"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Ubrzanje Miša"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Uspori"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Blago ubrzavanje i usporavanje"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Skaliranje"
@@ -5966,6 +6116,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Zadnji prozor ispod miša"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Sat"
@@ -6004,11 +6155,6 @@ msgstr "Dijalozi"
 msgid "Only dialogs with focused parent"
 msgstr "Samo novi dijalozi trebaju biti fokusirani"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Ostale Postavke"
@@ -6119,13 +6265,13 @@ msgid "Fill available space"
 msgstr "Popuni raspoloživi prostor"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Vodoravno"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Okomito"
@@ -6186,7 +6332,7 @@ msgid "Raise when clicking to focus"
 msgstr "Uzdigni kod klika za fokus"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fokus Prozora"
 
@@ -6444,33 +6590,33 @@ msgstr "Vrlo Svijetlo"
 msgid "Dropshadow"
 msgstr "Oborena Sjenka"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Sve"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Sve"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Konfiguriraj Zaglavlje"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Ispod Svega"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Sve"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Sve"
@@ -6480,165 +6626,165 @@ msgstr "Sve"
 msgid "Everything Settings"
 msgstr "Postavke Terminala"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Raspoloživi Profili"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Premjesti"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Premjesti"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Konfiguriraj Police"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Prikaži u Izbornicima"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Prikaži u Izbornicima"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
-msgid "Plugin Trigger"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Uobičajeni Stroj"
+#: src/modules/everything/evry_config.c:412
+msgid "Plugin Trigger"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Detalji"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Uobičajeni Stroj"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animirani okretaj"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Sakrij vrijeme neaktivnosti"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Uobičajeni Stroj"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Animirani okretaj"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Početak"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Početak"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Najskorije upotrijebljen"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Zadnja Promjena:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Parametri Akcije"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Boja Objekta"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Običan"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Pop-up"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Pop-up brzina"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Pop-up Radna Površina Desno"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Pop-up Postavke"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6647,39 +6793,30 @@ msgstr "Pop-up Postavke"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Pop-up"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Geometrija Prozora"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Aplikacije kod Ponovnog Podizanja Sustava"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Akcija"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6701,167 +6838,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Otvori s..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Otvori s..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Dodaj Aplikaciju"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nove Aplikacije"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Otvori s..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Izvodi u Terminalu"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Izvršna"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Aplikacije kod Ponovnog Podizanja Sustava"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Naredba"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Pokreni Naredbu"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Sve"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Više..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Sortiraj Sada"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Preimenuj Datoteku"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Sve"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Prikaži Skrivene Datoteke"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Pretraži Direktorije"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Pretraži Postavke Puta"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Upotrijebi Definirane Direktorije"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Očisti"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Dijalozi"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Cijeli ekran"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Pošalji na Radnu Površinu"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Sličice Datoteka"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipovi Datoteka"
 
@@ -6908,19 +6947,19 @@ msgid "Select an image"
 msgstr "Odaberi Sliku"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Upravitelj datoteka"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Početak"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Korijen"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6939,7 +6978,7 @@ msgstr ""
 "riješiti dodavanjem. Sada možete rekonfigurirati stvari po vašoj volji."
 "<br>Ispričavamo se zbog problema sa vašom konfiguracijom."
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6955,7 +6994,7 @@ msgstr ""
 "Ovo je loše i iz bezbjednosnih razloga je<br>vaša konfiguracija obnovljena "
 "na početne vrijednosti. Ispričavamo se zbog neugodnosti."
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Postavke Menadžera Datoteka Osvježene"
 
@@ -7035,95 +7074,99 @@ msgstr "Otvori upravitelja datoteka pri montiranju"
 msgid "Device"
 msgstr "Pregled"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Idi na Izvorni Direktorij"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Druga aplikacija..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Otvori"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Otvori s..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Poznate Aplikacije"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specifična Aplikacija"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Sve Aplikacije"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Posebne Naredbe"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiranje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Pomicanje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Brisanje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Nepoznata operacija pomoćnika je prekinuta"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopiranje %s je završeno"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopiranje %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Pomicanje %s je završeno"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Pomicanje %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Brisanje završeno"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Brisanje datoteka..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7158,7 +7201,7 @@ msgstr "Procesiranje %d operacija"
 msgid "Filemanager is idle"
 msgstr "Upravitelj datoteka je neaktivan"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM Operativne Informacije"
 
@@ -7170,37 +7213,42 @@ msgstr "Upravitelj Aparata"
 msgid "Available Gadgets"
 msgstr "Dostupni Aparati"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Načini"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Podešena Slika"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Posebna Boja"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Proziran"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animacije"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Pozadina"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Paniranje Pozadine"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Počni pomakni/promjeni veličinu ovog aparata"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Slobodno"
@@ -7449,16 +7497,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Jeste li sigurni da hoćete ukloniti ovaj izvor trake?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Napravi Novu Ikonu"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Svojstva"
 
@@ -7502,7 +7550,7 @@ msgstr "Prikaži prozore sa svih radnih površina"
 msgid "Show windows from active desktop"
 msgstr "Prikaži prozore sa aktivne radne površine"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7631,32 +7679,32 @@ msgstr ""
 "internom kodu<br>za kontekstualne izbornike. <br>Ovaj gumb radi samo u Pop-"
 "up."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Prikaži Preglednički Pop-up"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Pop-up Radna Površina Desno"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Pop-up Radna Površina Lijevo"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Pop-up Radna Površina Gore"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Pop-up Radna Površina Dolje"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Pop-up Radna Površina Lijevo"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Pop-up Radna Površina Lijevo"
@@ -7677,133 +7725,93 @@ msgstr "Kontrole Sustava"
 msgid "Temperature Settings"
 msgstr "Postavke Temperature"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Osjetila"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celzijus"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Jedinice Izložka"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Provjeri Interval"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Visoka Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Niska Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatura"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Dobrodošli u Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Odaberi Jedan"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Nijedna datoteka izbornika<br>nije pronadjena na sustavu.<br>Molimo "
-"pogledajte dokumentaciju<br>na www.enlightenment.org kako bi <br>saznali "
-"kako napraviti aplikacione izbornike<br>da funkcioniraju."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Odaberi Aplikacijski Izbornik"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Traka Pokretača"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Odaberi Aplikacije"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Datoteke Radne Površine"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Nema ikona na radnoj površini"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Osposobi ikone radne površine"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Foku mod"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Klikni da fokusiraš prozore"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Miš preko će fokusirati prozore"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Odaberi Ikone za Dodati"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Odaberi Profil"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Brzo Pokretanje"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Odaberi Aplikacije"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Najskorije upotrijebljen"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7845,7 +7853,7 @@ msgstr "Lijevo:"
 msgid "Right:"
 msgstr "Desno:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Bezvučan"
 
@@ -7869,40 +7877,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Zvučne Karte"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Postavke Miksera"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Upotrijebiti mikser za globalne akcije:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Pokreni mikser..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Postavke Mikser Modula"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Promjena razlučivosti"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Postavke Miksera Unaprijeđene"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Podaci o Postavkama Modula Miksera su promijenjeni.<br>Stara konfiguracija "
-"je zamijenjena sa standardnom.<br>Izvinite zbog neugodnosti."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Postavke Mikser Modula"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7929,138 +7951,361 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Isključen"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Kontrole"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Postavke Mrežne Veze"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Zaštićen"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Nepoznata Jačina"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Greška kod montiranja"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Pločica"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Promjene"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfiguriraj Zaglavlje"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Običan"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Stroj"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Konfiguriraj"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Omogućeno"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Popuni raspoloživi prostor"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Zaštićen"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Isključen"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Postoji drugi systray"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Može postojati samo jedan systray uređaj, i jedan već postoji."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Systray"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Systray"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ne može postaviti svoj sistem tema."
+#~ msgid "Acpi"
+#~ msgstr "Akcija"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Ovaj Ekran"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Ovaj Ekran"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Promijeni veličinu"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Zaustavi pomjeranje/promjenu veličine ovog aparata"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati Ecore!\n"
+#~ "Možda vam nedostaje memorije?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati Sistem datoteka.\n"
+#~ "Možda vam nedostaje memorije?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati svoju X konekciju.\n"
+#~ "Jeste li postavili vašu PRIKAZ varijablu?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati sistem povezanosti.\n"
+#~ "Možda vam nedostaje memorije?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati IPC sistem.\n"
+#~ "Možda vam nedostaje memorije?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne može postaviti xinerama omot.\n"
+#~ "Ovo se nije trebalo dogoditi."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne može postaviti xinerama omot.\n"
+#~ "Ovo se nije trebalo dogoditi."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može inicijalizirati Evas sistem.\n"
+#~ "Možda vam nedostaje memorije?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne može postaviti init ekran.\n"
+#~ "Možda nemate dovoljno memorije?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Postavi FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ne može postaviti svoj sistem polica."
+
+#~ msgid "New Application"
+#~ msgstr "Nove Aplikacije"
+
+#~ msgid "Background panning"
+#~ msgstr "Paniranje Pozadine"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f X-osovina pan faktor"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f Y-osovina pan faktor"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Prikaži Signalizaciju Upravljanja Energijom"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Trenutačni izložbeni poslužitelj nije<br>osposobljen za DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Trenutačni izložbeni poslužitelj nema<br>DPMS ekstenziju."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Uobičajeni Stroj"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Akcija"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Otvori s..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Otvori s..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Dodaj Aplikaciju"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nove Aplikacije"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Izvodi u Terminalu"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Izvršna"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Više..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Sortiraj Sada"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Preimenuj Datoteku"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Dijalozi"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Cijeli ekran"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Pošalji na Radnu Površinu"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Nijedna datoteka izbornika<br>nije pronadjena na sustavu.<br>Molimo "
+#~ "pogledajte dokumentaciju<br>na www.enlightenment.org kako bi <br>saznali "
+#~ "kako napraviti aplikacione izbornike<br>da funkcioniraju."
+
+#~ msgid "Select application menu"
+#~ msgstr "Odaberi Aplikacijski Izbornik"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Traka Pokretača"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Nema ikona na radnoj površini"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Osposobi ikone radne površine"
+
+#~ msgid "Focus mode"
+#~ msgstr "Foku mod"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Klikni da fokusiraš prozore"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Miš preko će fokusirati prozore"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Odaberi Ikone za Dodati"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Brzo Pokretanje"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Podaci o Postavkama Modula Miksera su promijenjeni.<br>Stara "
+#~ "konfiguracija je zamijenjena sa standardnom.<br>Izvinite zbog neugodnosti."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
index 923ec01..457a627 100755 (executable)
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-10-24 09:18+0000\n"
 "Last-Translator: lisovszki <lisovszki@gmail.com>\n"
 "Language-Team: Hungarian <pclinuxos-i18n@googlegroups.com>\n"
@@ -23,20 +23,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Az Enlightenmentrõl"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,14 +45,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2009, az Enlightenment fejlesztői csapat. Minden jog "
 "fenntartva.<br><br>Reméljük ugyanannyira élvezed a szoftver használatát, "
@@ -64,8 +63,9 @@ msgstr ""
 "stabil. Néhány képesség nem működik, vagy még be sem került, esetleg hibás. "
 "<hilight>FIGYELMEZTETVE LETTÉL!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>A csapat</title>"
 
 #: src/bin/e_actions.c:365
@@ -83,628 +83,652 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Tényleg be akarod zárni ezt az ablakot?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Igen"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nem"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
 "akarod?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
 "akarod?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Tényleg ki akarod kapcsolni a gépet?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "A számítógép kikapcsolását választottad.<br><br>Biztosan ki akarod kapcsolni?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Biztosan újra akarod indítani?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "A számítógép újraindítását választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Az számítógép felfüggesztését választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Tényleg hibernálni akarod a gépet?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "A számítógép hibernálását választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mozgatás"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Ablak menü"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Felemelés"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Alsó"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Kilövés"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Ablak : Állapot"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Ragadós módra vált"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Ikonizált módra vált"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Teljes képernyő módra vált"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximalizálás"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximalizálás függőlegesen"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximalizálás vízszintesen"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Teljes képernyő maximalizálás"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximalizálási mód \"Intelligens\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximalizálási mód \"Kitöltés\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximalizálási mód \"Bőséges\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Felgördítés fel módra vált"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Felgördítés le módra vált"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Felgördítés balra módra vált"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Felgördítés jobbra módra vált"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Felgördítés módra vált"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Szegély nélküli állapotra vált"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Szegély"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Rögzített állapotra vált"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Munkaasztal"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Asztal váltás fel"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Asztal váltás ezzel..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Munkaasztal megjelenítése"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mutasd a polcot"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Asztal váltása ide..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Vízszintes asztal váltás..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Váltás a 0-ás asztalra"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Váltás az 1-es asztalra"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Váltás a 2-es asztalra"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Váltás a 3-as asztalra"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Váltás a 4-es asztalra"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Váltás az 5-ös asztalra"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Váltás a 6-os asztalra"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Váltás a 7-es asztalra"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Váltás a 8-as asztalra"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Váltás a 9-es asztalra"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Váltás a 10-es asztalra"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Váltás a 11-es asztalra"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Asztal válát fel"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Asztalváltás ennyivel..."
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Lineáris asztalváltás"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Munkaasztal forgatása a megadott irányba..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Váltás a 0. asztalra"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Váltás a 1. asztalra"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Váltás a 2. asztalra"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Váltás a 3 asztalra"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Váltás a 4. asztalra"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Váltás a 5. asztalra"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Váltás a 6. asztalra"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Váltás a 7. asztalra"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Váltás a 8. asztalra"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Váltás a 9. asztalra"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Váltás a 10. asztalra"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Váltás a 11. asztalra"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Az egér küldése a 0-ás képernyőre"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Az egér küldése a 1-es képernyőre"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Egér küldése erre a képernyőre..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Egér küldése előre 1 képernyőt"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Egér vissza 1 képernyőt"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Egér küldése előre/Vissza képernyőket..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Leállítás"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Szöveg mozgatása"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Több..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Több..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Átméretezés:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Munkaasztal forgatása a megadott irányba..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Ikon készítése"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Ablak : Mozgatás"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "A következő asztalra"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Az előző asztalra"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "#... Asztal által..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Erre az asztalra..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Saját Menü mutatása"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Kedvencek menü megjelenítése"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Minden alkalmazás menü megjelenítése"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Ablakok menü megjelenítése"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Menü megjelenítése..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Indítás"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Parancs"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Kilépés most"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Mód"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Bemutató mód"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Offline mód"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Rendszer"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Kikapcsolás most"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Kikapcsolás"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernálás"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Lezárás"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Ablakok tisztogatása"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Késleltetett folyamat"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Művelet"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Ez a képernyő"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Ez a képernyő"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Beállítás háttérként"
 
@@ -712,18 +736,16 @@ msgstr "Beállítás háttérként"
 msgid "Color Selector"
 msgstr "Szín választó"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -731,20 +753,20 @@ msgstr "Szín választó"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -761,7 +783,7 @@ msgstr ""
 "és<br>ezek az elõzõ fájlokból hiányoztak. Mindent visszaállíthatsz,<br>ahogy "
 "neked tetszik. Az esetleges galibákért elnézést kérünk!<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -775,11 +797,11 @@ msgstr ""
 "Ez így nem túl jó, és figyelmez-<br>tetésként a beállítások visszaálltak az "
 "alapértelmezésre.<br>A galibákért elnézést kérünk!<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment konfiguráció írási problémák"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -787,96 +809,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Beállítások frissítve"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Hibernálás nem sikerült."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Nincsenek ablakok)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Felfüggesztés nem sikerült."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Felfüggesztés nem sikerült."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Üdvözlünk az Enlightenmentben"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -887,57 +909,62 @@ msgstr ""
 "megszakadt. Ez nagyon szokatlan.<br><br>A fájl, ahol a hiba keletkezett:<br>"
 "%s<br><br> A fájl törölve lett.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Speciális"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Alap"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Alkalmaz"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Modulok"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Ikon tulajdonságok"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "%d tároló"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Hiba - nincs PAM támogatás"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Nem lett PAM támogatás beleépítve az ENlightenmentbe, ezért az <br>asztal "
 "zárolás nem engedélyezett."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Zárolás nem sikerült!"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -945,15 +972,15 @@ msgstr ""
 "Nem tudtam az asztalt zárolni, mert egy alkalmazás<br>használja az egeret "
 "vagy billentyûzetet, vagy mindkettõt<br>és nem tudom tõle elszakítani õket."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Kérlek írd be a feloldási jelszavad"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Hiba az azonosítási rendszerben!"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -963,11 +990,11 @@ msgstr ""
 "A PAM azonosítás hibával járt.<br>A hibakód <highlight>%i</highlight>.<br>Ez "
 "így nem jó, és nem kellene megtörténnie. Kérlek jelentsd ezt a hibát!"
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktiválod a bemutató üzemmódot?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -977,11 +1004,11 @@ msgstr ""
 "ha az energiatakarékosság érdekében átváltanánk <b>bemutató</b> módra, és "
 "letiltanánk átmenetileg a képernyővédőt?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, de növelje a késleltetési időt"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne, és ne kérdezősködj"
 
@@ -1006,106 +1033,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Munkaasztal bejegyzés szerkesztő"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Név"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Általános név"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Ablak osztály"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime Típus"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Desktop fájl"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Általános"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Indulás"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Futtatás terminálban"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Megjelenítés a menükben"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Válassz egy ikont"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Egy futtatható kiválasztása"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Mindent kijelöl"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1146,316 +1172,316 @@ msgid ""
 "application failed to start."
 msgstr "Az E17 nem tudta elindítani a következõ programot:<br><br>%s<br><br>"
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Hiba az alkalmazás végrehajtásakor"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s váratlanul befejezte mûködését."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%i kilépési értékkel tért vissza a %s-től."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s futtatását megszakította egy megszakítót jel."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s futtatását megszakította egy kilépés jel."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s futtatását megszakította egy elvetõ jel."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s futtatását megszakította egy lebegõpont hiba"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s futtatását megszakította egy megszakíthatatlan gyilok szignál"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s futtatása megszakadt szegmens hiba miatt"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s futtatása megszakadt törött csõ miatt"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s futtatását megszakította egy vég szignál"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s futtatása megszakadt bus hiba miatt"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s futtatása megszakadt az %i számú szignál miatt"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***A megmaradt kimenet meg lett csonkítva. Mentsd el a kimenetet, hogy "
 "megnézhesd.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Hiba bejegyzések"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Nem volt hibaüzenet."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Mentsd el ezt az üzenetet"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "A hiba bejegyzés elmentbe ide: %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Hiba információ"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Hiba szignál információk"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Kimeneti adat"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Nem volt kimenet"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Nem létező útvonal"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nem létezik."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Csatolási hiba"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Nam lehet csatlakoztatni az eszközt"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Leválasztási hiba"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Nem lehet leválasztani az eszközt"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Kiadási hiba"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Nem lehet kiadni a lemezt"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i fájlok"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Megszakítás"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Szülő beállítások öröklése"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Nézetmód"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "A nézet frissítése"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Emlékezz az utasításokra"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Rendezés Most"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Új könyvtár"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Leválasztás"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Csatolás"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Lemez kiadása"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Az alkalmazás ikonjának használata "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Fájljellemzők"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Alapértelmezés használata"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Rács Ikonok"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Egyéni Ikonok"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonméret (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Háttér beállítása..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Overlay beállítása..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Törlés"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Új könyvtár létrehozása"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Új könyvtár neve:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s átnevezése erre:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Újra"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Hiba"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nem, ne mindet"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Igen, mindet"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "A fájl már létezik, felülírod?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Elveti ezt"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Mindent elvet"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Hiba történt egy folyamat végzése közben.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "A törlés megerősítése"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Biztosan törölni akarod a(z) <br><hilight>%s</hilight> nevû fájlt?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1489,12 +1515,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Ismeretlen érték"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Cserélhető adathordozójú eszköz"
 
@@ -1502,7 +1528,7 @@ msgstr "Cserélhető adathordozójú eszköz"
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Méret:"
 
@@ -1518,7 +1544,7 @@ msgstr "Fájl típus:"
 msgid "Permissions"
 msgstr "Jogosultságok"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Tulajdonos:"
 
@@ -1538,17 +1564,17 @@ msgstr "Tulajdonos olvashatja"
 msgid "Owner can write"
 msgstr "Tulajdonos írhatja"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Előnézet"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -1557,7 +1583,7 @@ msgid "Thumbnail"
 msgstr "Előnézeti kép"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Egyéni"
 
@@ -1573,53 +1599,42 @@ msgstr "Link információ"
 msgid "Select an Image"
 msgstr "Válassz egy képet"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Szöveg mozgatása"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Modul áthelyezésének/átméretezésének kezdése"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Átméretezés"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Tartalom automatikus görgetése"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Egyszerű"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Beágyazott"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Kinézet"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Modul áthelyezésének/átméretezésének leállítása"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1667,14 +1682,14 @@ msgstr "Pozíció"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Méret"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Halomba rakás"
@@ -1726,163 +1741,169 @@ msgstr "Kijelentkezni, ha ez az ablak nyitva van"
 msgid "Remember these Locks"
 msgstr "Emlékezzen a zárolásokra"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Ablakok"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Mindig legfelül"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Ragadós"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Beállítások"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Teljes méretû függõlegesen"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Teljes méretû vízszintesen"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Kicsinyítés"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Ikon szerkesztése"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Ikon készítése"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Gyorsbillentyű"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Intelligens elhelyezés"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Kihagyás"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Szegély"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Zárolások"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Megjegyez"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Ragadós"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Kihagyás"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Ikonméret"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Árnyékolt"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Képernyő"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Mindig legfelül"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normál"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Mindig alul"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Tüzd erre az asztalra"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Vedd el erről az asztalról"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Keret stílus kiválasztása"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "használd az alapértelmezett E17 ikon beállítást"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Az alkalmazás ikonjának használata "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Felhasználó által megadott ikon használata"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Ellenállás"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Ablaklista"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Lapozó"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Feladatlista"
 
@@ -1903,7 +1924,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM tulajdonságok"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Cím"
 
@@ -2074,7 +2095,6 @@ msgid "Size, Position and Locks"
 msgstr "Méret, hely és zárolások"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Engedélyezés"
@@ -2152,15 +2172,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Fájlok"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Indítás"
@@ -2175,20 +2193,6 @@ msgstr "Mag"
 msgid "Mobile"
 msgstr "Modulok"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Beállítások"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modul beállítások"
@@ -2229,7 +2233,7 @@ msgstr "Modul hozzáadása"
 msgid "Remove Gadget"
 msgstr "Modul eltávolítása"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Eszköztár beállítások"
 
@@ -2237,11 +2241,11 @@ msgstr "Eszköztár beállítások"
 msgid "Layout"
 msgstr "Elrendezés"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Beviteli mód hiba"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2257,7 +2261,7 @@ msgstr "Fő"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Kedvencek"
 
@@ -2265,76 +2269,74 @@ msgstr "Kedvencek"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Alkalmazások"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Ablakok"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Elveszett ablakok"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Névjegy"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Téma"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuális"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Polcok"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Összes ablak mutatása/elrejtése"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Nincs alkalmazás)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Virtuális asztalok beállítása"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Nincsenek ablakok)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Nincs név!!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Nincsenek polcok)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Polc hozzáadása"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Polc törlése"
 
@@ -2370,7 +2372,7 @@ msgid "Shrink to Content Width"
 msgstr "Tartalom méretének összehúzása"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stílus"
 
@@ -2400,7 +2402,7 @@ msgid "Hide duration"
 msgstr "Elrejtés időtartama"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f másodperc"
@@ -2417,7 +2419,7 @@ msgstr "Mutasd minden asztalon"
 msgid "Show on specified Desktops"
 msgstr "Mutrasd a kiválasztott asztalon"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2434,7 +2436,7 @@ msgstr ""
 "de nem te vagy a tulajdonos. Kérlek ellenőrizd:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2447,52 +2449,22 @@ msgstr ""
 "Kérlek ellenőrizd:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta elindítani az Ecore-t!\n"
-"Talán kevés a memória?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta betölteni a fájlrendszert.\n"
-"Talán kevés a memória?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2500,7 +2472,7 @@ msgstr ""
 "Az E17 nem tudta betölteni a kilépési signál kezelõt!\n"
 "Talán kevés a memória?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2508,7 +2480,7 @@ msgstr ""
 "Az E17 nem tudta betölteni a HUP szignál kezelõt!\n"
 "Talán kevés a memória?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2517,64 +2489,37 @@ msgstr ""
 "Az E17 nem tudta betölteni a HUP szignál kezelõt!\n"
 "Talán kevés a memória?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Az E17 nem tudott csatlakozni az X szerverhez.\n"
-"Be van állítva a DISPLAY változó?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Az E17 nem tudta elindítani a vészhelyzeti figyelmeztetõ rendszert!\n"
-"Be van állítva a DISPLAY változó?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta elindítani a kapcsolódási rendszert!\n"
-"Talán kevés a memória?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta elindítani az IPC rendszert!\n"
-"Talán kevés a memória?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Az E17 nem tudta beállítani a xinerama keretrendszert!\n"
-"Ennek nem kéne megtörténnie"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Az E17 nem tudta beállítani a xinerama keretrendszert!\n"
-"Ennek nem kéne megtörténnie"
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta elindítani az Evas-t!\n"
-"Talán kevés a memória?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2584,7 +2529,7 @@ msgstr ""
 "Kérlek, ellenõrizd az Ecore, és Evas telepítéseket, hogy\n"
 "támogatják-e a fenti funkciót!"
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2594,31 +2539,65 @@ msgstr ""
 "Kérlek, ellenõrizd az Ecore, és Evas telepítéseket, hogy\n"
 "támogatják-e a fenti funkciót!"
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
+
+#: src/bin/e_main.c:378
 msgid ""
-"Enlightenment cannot create directories in your home directory.\n"
-"Perhaps you have no home directory or the disk is full?"
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
 msgstr ""
-"Az E17 nem tudta létrehozni a könyvtárakat a könyvtáradban!\n"
-"Lehet, hogy nincs saját könyvtárad, vagy a lemez tele van?"
+"Az E17 nem tudta elindítani a vészhelyzeti figyelmeztetõ rendszert!\n"
+"Be van állítva a DISPLAY változó?"
 
-#: src/bin/e_main.c:582
-msgid "Enlightenment cannot set up its file registry system."
-msgstr "Az E17 nem tudta beállítani konfigurációs rendszert."
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
+
+#: src/bin/e_main.c:415
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+"Az E17 nem tudta létrehozni a könyvtárakat a könyvtáradban!\n"
+"Lehet, hogy nincs saját könyvtárad, vagy a lemez tele van?"
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:425
+msgid "Enlightenment cannot set up its file registry system."
+msgstr "Az E17 nem tudta beállítani konfigurációs rendszert."
+
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Az E17 nem tudta beállítani konfigurációs rendszert."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Az E17 nem tudta elindítani a témázó-rendszert."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Az E17 nem tudja elindítani a héj rendszert."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2626,93 +2605,42 @@ msgstr ""
 "Az E17 nem tudta felállítani a fájlok elérési útjait.\n"
 "Talán nincs elég memória?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Az E17 nem tudta elindítani a betütípus-rendszert."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Az E17 nem tudta elindítani a témázó-rendszert."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Az E17 nem tudta felállítani az induló képernyõt.\n"
-"Lehet, hogy kevés a memória?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Nemzetközi támogatás indítása"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Az E17 nem tudta betölteni a fájlrendszert!\n"
 "Talán kevés a memória?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Formátum támogatás tesztelése"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Az Evas nem tudja megcsinálni a puffer vásznat. Kérlek ellenõrizd\n"
-"hogy az Evas támogatja-e a Software Buffer engine-t\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Az Evas nem tudja betölteni a PNG fájlokat. Kérlek ellenõrizd,\n"
-"hogy az Evas támogatja-e a PNG töltõt.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Az Evas nem tudja betölteni a JPEG fájlokat. Kérlek ellenõrizd,\n"
-"hogy az Evas támogatja-e a JPEG töltõt.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Az Evas nem tudja betölteni a EET fájlokat. Kérlek ellenõrizd,\n"
-"hogy az Evas támogatja-e a EET töltõt.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Az Evas nem tudja betölteni a 'Sans' betűtípust. Kérlek ellenõrizd,\n"
-"hogy az Evas támogatja-e a betűtípusbeállítást, és hogy a rendszer "
-"betűtípusa a 'Sans'-e.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "képernyők beállítása"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2720,211 +2648,348 @@ msgstr ""
 "Az E17 nem tudta elindítani az ablakkezelőt. Lehet, hogy fut már egy másik\n"
 "ablakkezelõ?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "DPMS Beállítás"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Billentyûkombinációk"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMS Beállítás"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Képernyőkímélő beállítása"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Az E17 nem tudta elindítani az X képernyővédőt!"
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Energiatakarékosság beállítása"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Az e17 nem tudta felállítani az energiatakarékossági rendszert."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Asztal zárolás beállítása"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Az E17 nem tudta felállítani az asztalzár-rendszert."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "felugró ablakok beállítása"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Az E17 nem tudta beállítani a felugró-ablak rendszert."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Üzenet rendszer beállítása"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Útvonalak beállítása"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Rendszer felügyeletek beállítása"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Folyamatok beállítása"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Az E17 nem tudta elindítani az akció-rendszerét."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Végrehajtó rendszer beállítása"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Az E17 nem tudta elindítani a exec rendszert."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "FM beállítása"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Fájlkezelõ"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Üzenet rendszer beállítása"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Az E17 nem tudta felállítani az üzenet-rendszert."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "FÉV beállítása"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Az E17 nem tudta felállítani a fogd-és-vidd rendszert."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Grab Input kezelés beállítása"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Az E17 nem tudta elindítani a beviteli mozdulat-kezelõt."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Modulok beállítása"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Az E17 nem tudta elindítani a modul rendszert."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Emlékezések beállítása"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "szín osztályok beállítása"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Az E17 nem tudta elindítani a szín-osztály rendszert."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Modulkezelő beállítása"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Az E17 nem tudta elindítani a modul kezelõ rendszert."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "DPMS Beállítás"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMS Beállítás"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Energiatakarékosság beállítása"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Az e17 nem tudta felállítani az energiatakarékossági rendszert."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Háttérkép beállítása"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Az E17 nem tudta beállítani az asztal háttér-rendszert."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Egér beállítása"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Az Enlightenment nem tudja beállítani az egér opciókat."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Billentyûkombinációk"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Az e17 nem tudta felállítani a kombinációs rendszert."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Polcok beállítása"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Az E17 nem tudta elindítani a polc-rendszert."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Előkép beállítása"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Az E17 nem tudta elindítani a témázó-rendszert."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Fájl utasítás beállítása"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Az E17 nem tudta elindítani a fájl utasítás rendszert."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Modulok betöltése"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Polcok beállítása"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Madnem kész"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Formátum támogatás tesztelése"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Az Evas nem tudja megcsinálni a puffer vásznat. Kérlek ellenõrizd\n"
+"hogy az Evas támogatja-e a Software Buffer engine-t\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Az Evas nem tudja betölteni a PNG fájlokat. Kérlek ellenõrizd,\n"
+"hogy az Evas támogatja-e a PNG töltõt.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Az Evas nem tudja betölteni a JPEG fájlokat. Kérlek ellenõrizd,\n"
+"hogy az Evas támogatja-e a JPEG töltõt.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Az Evas nem tudja betölteni a PNG fájlokat. Kérlek ellenõrizd,\n"
+"hogy az Evas támogatja-e a PNG töltõt.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Az Evas nem tudja betölteni a EET fájlokat. Kérlek ellenõrizd,\n"
+"hogy az Evas támogatja-e a EET töltõt.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Az Evas nem tudja betölteni a 'Sans' betűtípust. Kérlek ellenõrizd,\n"
+"hogy az Evas támogatja-e a betűtípusbeállítást, és hogy a rendszer "
+"betűtípusa a 'Sans'-e.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Az E17 sérült már az indítás elején, ezért újra lett indítva."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2932,7 +2997,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2944,7 +3009,7 @@ msgstr ""
 "távolítod a hibákat<br>a beálításodból. a modul beállítások ablak<br>újra "
 "lehetővé teszi, hogy kiválaszd a <br>moduljaidat ismét."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2956,20 +3021,12 @@ msgstr ""
 "távolítod a hibákat<br>a beálításodból. a modul beállítások ablak<br>újra "
 "lehetővé teszi, hogy kiválaszd a <br>moduljaidat ismét."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Polcok beállítása"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Madnem kész"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Modulok betöltése"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2978,11 +3035,11 @@ msgstr ""
 "Hiba a %s modul betöltésekor<br>Nincs %s nevû modul a modul könyvtárakban."
 "<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Hiba a modul betöltésekor"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2991,11 +3048,11 @@ msgstr ""
 "Hiba a %s modul betöltésekor. A modul teljes elérési útja:<br>%s<br><br>A "
 "hiba:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "A modul nem tartalmazza az összes szükséges funkciót"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3005,16 +3062,16 @@ msgstr ""
 "Modul API hiba<br>Hiba a modul betöltésekor: %s<br> Ennek a modulnak "
 "legalább %i verziójú api kell<br>Az Enlightenment API verziója: %i<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Szeretnéd a modult kikapcsolni?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3028,28 +3085,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Polc #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Biztosan törölni akarod ezt a polcot?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "A polc törlését választottad.<br><br>Biztosan törölni akarod?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Elemek mozgatásának/átméretezésének leállítása"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Elemek mozgatása/átméretezése"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Megjegyzés"
@@ -3058,16 +3115,16 @@ msgstr "Megjegyzés"
 msgid "Starting"
 msgstr "Indulás folyamatban"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Rendszer jogosultságok ellenőrzése"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Rendszer ellenőrzés kész"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3077,35 +3134,35 @@ msgstr ""
 "A kijelentkezés túl sokáig tart. Néhány<br>alkalmazást nem lehet bezárni."
 "<br>Be akarod fejezni a kilépést<br>a programok bezárása nélkül?<br>"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Kijelentkezési problémák"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Kijelentkezés most"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Várakozás"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Mégsem lép ki"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Kijelentkezés folyamatban"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Kijelentkezés folyamatban.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Az E17 foglalt egy másik kérés által"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3113,7 +3170,7 @@ msgstr ""
 "Kijelentkezés.<br>Nem végezhetsz más rendszerműveleteket<br>, ha már a "
 "kijelentkezés elkezdődött."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3121,7 +3178,7 @@ msgstr ""
 "Leállítás.<br>Nem végezhetsz más rendszerműveleteket<br>, ha a leállítás már "
 "elkezdődött."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3129,7 +3186,7 @@ msgstr ""
 "Újraindítás.<br>Nem végezhetsz más rendszerműveletet<br>, ha az újraindítás "
 "már elkezdődött."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3137,63 +3194,64 @@ msgstr ""
 "Felfüggesztés.<br>A felfüggesztés alatt nem végezhetsz<br> semmilyen más "
 "rendszerműveletet."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Hibernálás.<br>Nem végezhetsz semmilyen egyéb rendszerműveletet<br> a "
 "hibernálás alatt."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Ez nem történhet meg"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "leállítás nem sikerült."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Újraindítás nem sikerült."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Felfüggesztés nem sikerült."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hibernálás nem sikerült."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Kikapcsolás"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kikapcsolás.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Újraindítás"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Újraindítás.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Felfüggesztés.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernálás"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernálás.<br><hilight>Kérlek várj.</hilight>"
 
@@ -3201,34 +3259,34 @@ msgstr "Hibernálás.<br><hilight>Kérlek várj.</hilight>"
 msgid "About Theme"
 msgstr "A témáról"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Beállítás témának"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Elemek mozgatásának/átméretezésének leállítása"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Elemek mozgatása/átméretezése"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Eszköztár tartalmának a beállítása"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Az Enlightenment képtelen volt új folyamatot elágaztatni:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Nem tudok kilépni - halhatatlan ablakok"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3238,125 +3296,125 @@ msgstr ""
 "Enlightenment nem tud addig kilépni, amíg ezek az ablakok nyitva "
 "vannak<br>vagy az Élettartam zár el nem lett távolítva<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bájt"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "A jövőben"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Az utolsó percben"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li éve"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li hónapja"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li hete"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li napja"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li órája"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li perce"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Lapozó beállításai"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importálás..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Kitöltés és nyújtás bállítások"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Nyújtás"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Középre"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Belül"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Kitöltés"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Fájl minőség"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Eredeti fájl használata"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3375,12 +3433,12 @@ msgstr ""
 "Ezek az új alapértelmezett beállítások helyjehozták a hibákat.<br>Most már "
 "testreszabhatod a modult.<br> Elnézésedet kérjük a kellemetlenségekért.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Címsor beállítása"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3415,142 +3473,148 @@ msgstr "Fel"
 msgid "Down"
 msgstr "Le"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Egy könyvtárt fel"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Felbontás"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Jogosultságok:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Módosítva:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Te"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Védett"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Csak olvasható"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Tiltott"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Olvasás-Írás"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Telep töltöttség mérõ beállítások"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Figyelmeztetés, ha a telep töltöttség alacsony"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Ellenőrzési időközök:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fájl"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernálás"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Szavazás"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Figyelmeztetés alacsony töltöttségi szintnél"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Figyelmeztetés ekkor:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f perc"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatikus mellőzés ekkor:"
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f másodperc"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Figyelmeztetés"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automatikus azonosítás"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Belső"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Életlen"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hárdver"
 
@@ -3558,32 +3622,33 @@ msgstr "Hárdver"
 msgid "Battery"
 msgstr "Akkumulátor"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Hamarosan le fog merülni az akku!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC áramforrás ajánlott."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "HIBA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Akkumulátor mérő"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Óra"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Az eszköztár megjelenítése"
@@ -3652,17 +3717,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Bar alkalmazások"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Automatikusan induló programok"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Alkalmazások újraindítása"
 
@@ -3676,10 +3741,25 @@ msgid "Apps"
 msgstr "Alkalmazások"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Új program"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Indítás"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Alkalmazások kiválasztása"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Munkaasztal fájlok"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar egyéb"
 
@@ -3692,7 +3772,7 @@ msgid "Available Profiles"
 msgstr "A rendelkezésre álló profilok"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Válassz egy profilt"
 
@@ -3730,9 +3810,9 @@ msgstr "Párbeszédablak beállításai"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Általános beállítások"
 
@@ -3774,7 +3854,7 @@ msgstr "Párbeszédablakok"
 msgid "Profiles"
 msgstr "Profilok"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3785,7 +3865,7 @@ msgstr ""
 "<br>vagy a Helyreállít gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot "
 "sem, az eredeti, %dx%d @ %d Hz felbontás visszaáll, %d mp múlva"
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3796,7 +3876,7 @@ msgstr ""
 "<br>vagy a Helyreállít gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot "
 "sem, az eredeti, %dx%d @ felbontás visszaáll, %d mp múlva"
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3808,7 +3888,7 @@ msgstr ""
 "sem, az eredeti, %dx%d @ %d Hz felbontás <hilight>AZONNAL</hilight> "
 "visszaáll."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3819,47 +3899,47 @@ msgstr ""
 "<br>vagy a Visszaállít gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot "
 "sem, az eredeti, %dx%d felbontás <hilight>AZONNAL</hilight> visszaáll."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Felbontás módosítása"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Mentés"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Visszaállít"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Képernyő felbontás beállítások"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Állítsd vissza bejelentkezéskor!"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Forgatás"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Tükrözés"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Hiányzó képességek"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3873,11 +3953,11 @@ msgstr ""
 "<br>Előfordulhat, hogy az <hilight>ecore</hilight>, a forgatásakor nem "
 "érzékelt<br> XRandR támogatást."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Nem találtam frissítési sebességeket"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3891,93 +3971,74 @@ msgstr ""
 "belbontást<br> állítasz, ami azt eredményezheti, hogy<hilight>sérül</"
 "hilight> a képernyőd."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Virtuális asztal beállítások"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Munkaasztalok száma"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Asztalváltás egérrel"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Válts asztalt, ha az egér a kép szélén van"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Forgasd körbe az asztalokat váltáskor"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Asztalok"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Ki"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Szelet"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Nagyítás"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Háttér úsztatás"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animációk"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f mp"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2fX-axis pan faktor"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f Y-axis pan faktor"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Váltás animáció"
 
@@ -3994,7 +4055,7 @@ msgid "Desktop Wallpaper"
 msgstr "Munkaasztal háttérképe"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Beállít"
 
@@ -4005,12 +4066,12 @@ msgstr "Háttér beállítása..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Személyes"
 
@@ -4018,160 +4079,174 @@ msgstr "Személyes"
 msgid "Screen Lock Settings"
 msgstr "Képernyő zárolási beállítások"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Felfüggesztés"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Felfüggesztés"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Egyéni zárolás"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Lezárás"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Megjelenítés minden képernyõn"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Megjelenítés a jelenlegi képernyõn"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Megjelenítés ezen a képernyõn #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Bejelentkező ablak beállításai"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Zárolás a képernyõvédõ indításakor"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f másodperc"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Zárolás ha meghaladja az inaktív időt"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f perc"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Időmérő(k)"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Ha deaktiválódna elötte"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Belépés a bemutató módba"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Téma megadva"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Téma háttérkép"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Munkaasztal háttérképe"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Háttérkép"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Képernyővédő beállítások"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "X képernyővédő engedélyezése"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Felfüggesztés lemezre"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Képernyővédő"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Kezdeti állapot"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Üresen hagy"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Javasolt"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Nem javasolt"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Exponálás események"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne engedélyezd"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4179,39 +4254,52 @@ msgstr "Ne engedélyezd"
 msgid "Miscellaneous"
 msgstr "Egyéb beállítások"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Energiakezelés jelzés megjelenítése"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "A jelenlegi megjelenítő szerver nem <br>DPMS képes."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "A jelenlegi megjelenítő szervernek nincs <br>DPMS kiterjesztése"
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Energiakezelés beállítások megjelenítése"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Energiakezelés megjelenítésének engedélyezése"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Készenléti idő"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Felfüggesztés ideje"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Kikapcsolási idő"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtuális asztalok"
@@ -4256,74 +4344,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Szegélykötés beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Művelet hozzáadása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Művelet törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Művelet módosítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Mind törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Alapértelmezettek visszaállítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Művelet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Művelet paraméterei"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Általános beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Kötés aktiválás jóváhagyása teljes képernyős ablakoknál"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Szegélykötés sorozat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Szegélykötés hiba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4332,28 +4420,28 @@ msgstr ""
 "Ez a kötés kulcssorozat, amit választottál, már <br>használatban van a "
 "következő folyamat által:<hilight>%s</hilight>.<br>Kérlek válassz másikat."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4502,34 +4590,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr "Az E17 nem tudja importálni a beállítást<br> egy másolási hiba miatt."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Nyelvi beállítások"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Nyelv választó"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Alapértelmezett"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Területi beállítás kiválasztva"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Területi beállítás"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Nyelv"
 
@@ -4620,17 +4721,17 @@ msgid "Manager"
 msgstr "Kezelő"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nincs"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Egér művelet sorozat"
 
@@ -4654,13 +4755,11 @@ msgid "Menu Settings"
 msgstr "Menü beállítások"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Személyes"
@@ -4671,7 +4770,7 @@ msgid "Main Menu"
 msgstr "Saját Menü mutatása"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Kedvencek"
 
@@ -4691,7 +4790,7 @@ msgid "Comments"
 msgstr "Megjegyzés"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4703,7 +4802,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Megjelenítés a menükben"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menük"
 
@@ -4774,19 +4873,19 @@ msgid "Images"
 msgstr "Képek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Betűkészletek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Témák"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikonok"
 
@@ -4938,18 +5037,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Háttérkép beállítások"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "A téma hátterének használata"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Kép..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Online..."
 
@@ -4969,45 +5068,50 @@ msgstr "Ez a munkaasztal"
 msgid "This Screen"
 msgstr "Ez a képernyő"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Háttérkép beállítások..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Csempe"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Szelet"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Válassz egy képet..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Kép importálás hiba"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Az Enlightenment nem képes importálni a képet, <br> átalakítási hibák miatt."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Háttérkép importálás hiba"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Az Enlightenment nem tudja a háttérképet importálni, <br>egy másolási hiba "
 "miatt."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5045,7 +5149,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Alapértelmezett keret stílus"
 
@@ -5053,7 +5157,7 @@ msgstr "Alapértelmezett keret stílus"
 msgid "Window Border Selection"
 msgstr "Ablakkeret választása"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Megjegyez Szegély for ablak következő idő"
 
@@ -5086,7 +5190,7 @@ msgid "Menu Background Base"
 msgstr "Hátterek"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Menü cím"
 
@@ -5095,7 +5199,7 @@ msgid "Menu Title Active"
 msgstr "Menü cím aktív"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menüelem"
 
@@ -5109,12 +5213,12 @@ msgid "Menu Item Disabled"
 msgstr "Menü elem aktív"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Szöveg mozgatása"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Szöveg átméretezése"
 
@@ -5132,7 +5236,7 @@ msgid "Winlist Label"
 msgstr "Ablaklista címke"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Ablaklista cím"
 
@@ -5152,389 +5256,399 @@ msgid "File Manager Background Base"
 msgstr "Fájlkezelő"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fókusz"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "nyomógombszöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Gomb szöveg tiltva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Szöveg ellenőrzése"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Szöveg ellenőrzés tiltva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Szöveg bevitel"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Gomb szöveg tiltva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Címke szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Lista elem szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Lista elem szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Lista elem szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Lista fejléc"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Lista fejléc"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Rádió szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Rádió szöveg tiltva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Csúszka szöveg"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Csúszka szöveg tiltva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Hátterek"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Modul címke"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Színek"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Ikon osztályok"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "szín osztályok beállítása"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "szín osztályok beállítása"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "szín osztályok beállítása"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Egyéni szín"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Lemez kiadása"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Offline"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Árnyék szín"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Ablakkezelő"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Felületi elemek"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Egyéb"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Címsor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Szövegmező"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Szövegmező fény"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Szövegmező nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Címsor beállítások"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "A címről"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "A verzióról"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "A szövegről"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Asztalzár cím"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Asztalzár jelszó"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Párbeszédablak hiba"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Parancs futtatása"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Splash cím"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Splash szöveg"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Splash verzió"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Belépés"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Keret"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Címke"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Gombok"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Csúszka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Rádió gombok"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Gombok ellenörzése"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Szöveg lista elem"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Lista elem"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Lista fejléc"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Fájlkezelõ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Típus:"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Munkaasztal ikon"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Kicsi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Általános"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Betűtípus-beállítások"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Apró"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Nagyon nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "nagyon nagy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Egyedi betûk engedélyezése"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Alap szöveg előnézet: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Betű osztályok"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Betű osztály engedélyezése"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Betűtípus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Speciális szöveg előnézet.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Megjelenítési információk (hinting)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bájtkód"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Háttér betûtípusok"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Betûtípus neve"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Háttér betûtípusok engedélyezése"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Útalás / Útmutatások"
 
@@ -5542,12 +5656,17 @@ msgstr "Útalás / Útmutatások"
 msgid "Icon Theme Settings"
 msgstr "Ikon téma beállítások"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Összetett engedélyezése"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Alkalmazások kiválasztása"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Az ikon téma felülírja az alapt émát"
@@ -5614,11 +5733,9 @@ msgid "Custom scaling factor"
 msgstr "Egyéni skálázási tényező"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f (szer)"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5629,6 +5746,12 @@ msgstr "Szabályzat"
 msgid "Minimum"
 msgstr "Minimum"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f (szer)"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximum"
@@ -5649,25 +5772,25 @@ msgstr "Splash képernyő megjelenítése a bejelentkezésnél"
 msgid "Transition Settings"
 msgstr "Átmenet beállítások"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Események"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Indítás"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Asztal módosítás"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Háttér módosítás"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Átmenetek"
 
@@ -5683,15 +5806,15 @@ msgstr " Importálás..."
 msgid " Online..."
 msgstr " Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Téma kategóriák"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Hozzárendelés"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Az összes törlése"
 
@@ -5721,19 +5844,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Témák váltása"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Szegélyek"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Ikon téma"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Egér Kurzor"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skálázás"
 
@@ -5864,6 +5987,11 @@ msgstr "Az alkalmazás ikonjának használata "
 msgid "Border Icon"
 msgstr "Szegély"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Intelligens elhelyezés"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Intelligens elhelyezés"
@@ -5895,24 +6023,47 @@ msgstr "Ablakok alatt"
 msgid "Animate"
 msgstr "Animációk"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineáris"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Sima gyorsítás és lassítás"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Gyorsítás"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Lassítás"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Egér gyorsítás"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Lassítás"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Sima gyorsítás és lassítás"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Skálázás"
@@ -5934,6 +6085,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Legújabb ablakok az egér alatt"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Óra"
@@ -5972,11 +6124,6 @@ msgstr "Párbeszédablakok"
 msgid "Only dialogs with focused parent"
 msgstr "Csak az új párbeszédablakoknak van fókusza"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fókusz"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Egyéb beállítások"
@@ -6087,13 +6234,13 @@ msgid "Fill available space"
 msgstr "Kitöltés az elérhető helyre"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Vízszintes"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Függőleges"
@@ -6154,7 +6301,7 @@ msgid "Raise when clicking to focus"
 msgstr "Előtérbe hozás amikor a fókuszra kattint"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Ablak fókusz"
 
@@ -6407,33 +6554,33 @@ msgstr "Nagyon világos"
 msgid "Dropshadow"
 msgstr "Árnyékdobás"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Minden"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Minden"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Címsor beállítása"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Minden alatt"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Minden"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Minden"
@@ -6443,165 +6590,165 @@ msgstr "Minden"
 msgid "Everything Settings"
 msgstr "Terminál beállítások"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "A rendelkezésre álló profilok"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Mozgatás"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Mozgatás"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Polcok beállítása"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Megjelenítés a menükben"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Megjelenítés a menükben"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Alapértelmezett motor"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
+#, fuzzy
+msgid "Detailed"
+msgstr "Részletek"
+
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Alapértelmezett motor"
+
+#: src/modules/everything/evry_config.c:467
 #, fuzzy
-msgid "Detailed"
-msgstr "Részletek"
+msgid "Animate scrolling"
+msgstr "Animált váltás"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Elrejtés ennyi idő után"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Alapértelmezett motor"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Animált váltás"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Indulás folyamatban"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Indulás folyamatban"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Legtöbbet használt"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Utoljára módosítva:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Művelet paraméterei"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Objektum szín"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Egyszerű"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Felbukkanó"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Felugró sebessége"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Felugró asztal jobbra"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Felugró ablakok beállításai"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6610,39 +6757,30 @@ msgstr "Felugró ablakok beállításai"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Felbukkanó"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Ablak geometria"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Alkalmazások újraindítása"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Művelet"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6664,167 +6802,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Típus:"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Megnyitás ezzel..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Megnyitás ezzel..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Alkalmazás hozzáadása"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Új program"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Megnyitás ezzel..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Futtatás terminálban"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Futtatható program"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Alkalmazások újraindítása"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Parancs"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Megadott parancs"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Minden"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Több..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Rendezés Most"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Fájl átnevezése"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Minden"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Könyvtárak keresése"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Keresési útvonal beállítások"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Felhasználó könyvtárak"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Törlés"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Párbeszédablakok"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Teljes képernyő"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Küldd erre az asztalra"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Fájlikonok"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Fájltípusok"
 
@@ -6871,19 +6911,19 @@ msgid "Select an image"
 msgstr "Válassz egy képet"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Fájlkezelő"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Saját könyvtár"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6901,7 +6941,7 @@ msgstr ""
 "Ezek az új alapértelmezett beállítások helyjehozták a hibákat.<br>Most már "
 "testreszabhatod a modult.<br> Elnézésedet kérjük a kellemetlenségekért.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6917,7 +6957,7 @@ msgstr ""
 "alapértelmezett beállítások vissza lettek állítva.<br> Elnézést a "
 "kellemetlenségekért.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Fájlkezelő beállítások frissítve"
 
@@ -6997,95 +7037,99 @@ msgstr "Fájlkezelő megnyitása felcsatoláskor"
 msgid "Device"
 msgstr "Előnézet"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Vissza az előző könyvtárba"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Más alkalmazás..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Megnyitás"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Megnyitás ezzel..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Ismert alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Megadott alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Egyéni parancs"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Másolás megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Mozgatás megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Törlés megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Ismeretlen másodlagos müvelet megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "A %s másolása kész"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "%s másolása (még: %d másodperc)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "%s áthelyezése befejezve"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "%s áthelyezése (még: %d másodperc)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Törlés végrehajtva"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Fájlok törlése..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7120,7 +7164,7 @@ msgstr "%d müvelet(ek) végrehajtása"
 msgid "Filemanager is idle"
 msgstr "A fájlkezelő elfoglalt"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM művelet info"
 
@@ -7132,37 +7176,42 @@ msgstr "Bígyó kezelő"
 msgid "Available Gadgets"
 msgstr "Elérhető modulok"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Módok"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Egyéni kép"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Egyéni szín"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Átlátszóság"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animációk"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Háttér"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Háttér úsztatás"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Modul áthelyezésének/átméretezésének kezdése"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Szabad"
@@ -7409,16 +7458,16 @@ msgstr "A \"%s\" törlését kérted.<br><br> Biztosan törölni szeretnéd?"
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Biztosan törölni szeretnéd?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Új ikon létrehozása"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Tulajdonságok"
 
@@ -7462,7 +7511,7 @@ msgstr "Minden asztal ablakainak megjelenítése"
 msgid "Show windows from active desktop"
 msgstr "Ablakok megjelenítése az aktív asztalról"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7591,32 +7640,32 @@ msgstr ""
 "Nem használhatod a jobb egér gombot a <br>polcban erre.<br> <br>Ez a gomb "
 "csak a felugróknál működik."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Lapozó felugró ablak megjelenítése"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Felugró asztal jobbra"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Felugró asztal balra"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Felugró asztal fel"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Felugró asztal le"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Felugró asztal balra"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Felugró asztal balra"
@@ -7637,133 +7686,93 @@ msgstr "Rendszer felügyelők"
 msgid "Temperature Settings"
 msgstr "Hőmérsékleti beállítások"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Érzékelők"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Mértékegységek megjelenítése"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Ellenőrzési időköz"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Magas hőmérséklet"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Alacsony hőmérséklet"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Hőmérséklet"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Hőmérséklet"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Következő"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Üdvözlünk az Enlightenmentben"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Válassz egy"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Nem találtam menü<br>fájlokat a rendszereden.<br>Bővebb információért "
-"olvasd<br>el a www.enlightenment.org<br> oldalon található,<br>hogyan "
-"bírhatom működésre<br>az alkalmazás menüt dokumentációt."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Alkalmazás menü választása"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Indító pult"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Alkalmazások kiválasztása"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Munkaasztal fájlok"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Ne legyenek ikonok az asztalon"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Munkaasztal ikonok megjelenítése"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Fókusz mód"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Kattints a fókuszáláshoz"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Csúsztasd a mutatót az újonnan megnyitot, fókuszált ablakra"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Hozzáadni kívánt ikonok kiválasztása"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Válassz egy profilt"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Gyorsindító"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Alkalmazások kiválasztása"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Legtöbbet használt"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7805,7 +7814,7 @@ msgstr "Bal:"
 msgid "Right:"
 msgstr "Jobb:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Némít"
 
@@ -7829,40 +7838,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Hangkártyák"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Keverő beállítások"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Keverő a globális folymatokhoz:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Keverő indítása..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Keverő modul beállításai"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Felbontás módosítása"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Keverő beállításai frissítve"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"A keverő modul beállításai meg lettek változtatva.<br> A régi beállításaid "
-"felül lettek írva az újakkal.<br> Elnézést a kellemetlenségekért."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Keverő modul beállításai"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7889,138 +7912,362 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Offline"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Vezérlők"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Hálózati kapcsolat beállításai"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Védett"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Ismeretlen érték"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Csatolási hiba"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Csempe"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Átmenetek"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Címsor beállítása"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Egyszerű"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Meghajtó"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Beállítás"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Engedélyezve"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Kitöltés az elérhető helyre"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Védett"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Offline"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Egy másik rendszertálca már létezik"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Itt csak egy rendszertálca modul lehet, de már egy létezik."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Rendszertálca"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Rendszertálca"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Az E17 nem tudta elindítani a témázó-rendszert."
+#~ msgid "Acpi"
+#~ msgstr "Művelet"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Ez a képernyő"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Ez a képernyő"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Átméretezés"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Modul áthelyezésének/átméretezésének leállítása"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta elindítani az Ecore-t!\n"
+#~ "Talán kevés a memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta betölteni a fájlrendszert.\n"
+#~ "Talán kevés a memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Az E17 nem tudott csatlakozni az X szerverhez.\n"
+#~ "Be van állítva a DISPLAY változó?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta elindítani a kapcsolódási rendszert!\n"
+#~ "Talán kevés a memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta elindítani az IPC rendszert!\n"
+#~ "Talán kevés a memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Az E17 nem tudta beállítani a xinerama keretrendszert!\n"
+#~ "Ennek nem kéne megtörténnie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Az E17 nem tudta beállítani a xinerama keretrendszert!\n"
+#~ "Ennek nem kéne megtörténnie"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta elindítani az Evas-t!\n"
+#~ "Talán kevés a memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Az E17 nem tudta felállítani az induló képernyõt.\n"
+#~ "Lehet, hogy kevés a memória?"
+
+#~ msgid "Setup FM"
+#~ msgstr "FM beállítása"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Az E17 nem tudta elindítani a polc-rendszert."
+
+#~ msgid "New Application"
+#~ msgstr "Új program"
+
+#~ msgid "Background panning"
+#~ msgstr "Háttér úsztatás"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2fX-axis pan faktor"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f Y-axis pan faktor"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Energiakezelés jelzés megjelenítése"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "A jelenlegi megjelenítő szerver nem <br>DPMS képes."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "A jelenlegi megjelenítő szervernek nincs <br>DPMS kiterjesztése"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Alapértelmezett motor"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Művelet"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Típus:"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Megnyitás ezzel..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Megnyitás ezzel..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Alkalmazás hozzáadása"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Új program"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Futtatás terminálban"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Futtatható program"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Több..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Rendezés Most"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Fájl átnevezése"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Párbeszédablakok"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Teljes képernyő"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Küldd erre az asztalra"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Nem találtam menü<br>fájlokat a rendszereden.<br>Bővebb információért "
+#~ "olvasd<br>el a www.enlightenment.org<br> oldalon található,<br>hogyan "
+#~ "bírhatom működésre<br>az alkalmazás menüt dokumentációt."
+
+#~ msgid "Select application menu"
+#~ msgstr "Alkalmazás menü választása"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Indító pult"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Ne legyenek ikonok az asztalon"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Munkaasztal ikonok megjelenítése"
+
+#~ msgid "Focus mode"
+#~ msgstr "Fókusz mód"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Kattints a fókuszáláshoz"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Csúsztasd a mutatót az újonnan megnyitot, fókuszált ablakra"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Hozzáadni kívánt ikonok kiválasztása"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Gyorsindító"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "A keverő modul beállításai meg lettek változtatva.<br> A régi "
+#~ "beállításaid felül lettek írva az újakkal.<br> Elnézést a "
+#~ "kellemetlenségekért."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -8659,12 +8906,6 @@ msgstr "Rendszertálca"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Leállítás azonnal"
 
-#~ msgid "Shut Down"
-#~ msgstr "Leállítás"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Felfüggesztés lemezre"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Asztal zárolása"
 
index 7ae7861..751a51d 100755 (executable)
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-06-08 18:05+0200\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-10-31 22:18+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
 "Language: \n"
@@ -19,20 +19,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Informazioni su Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -41,28 +40,28 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
-msgstr ""
-"Copyright &copy; 1999-2011, dell'Enlightenment Development Team.<br><br>Ci "
-"auguriamo che vi piacerà usare questo software tanto quanto a noi è piaciuto "
-"scriverlo.<br><br>Questo software viene fornito così-com'è senza alcuna "
-"garanzia esplicita o implicita. Questo software è regolato dalle condizioni "
-"di licenza, quindi si prega di leggere i file di licenza COPYING e COPYING-"
-"PLAIN installati sul sistema.<br><br>Enlightenment è sotto <hilight>PIENO "
-"SVILUPPO</hilight> e non è stabile. Molte funzionalità sono incomplete o "
-"ancora inesistenti e possono presentare molti difetti. Siete stati "
-"<hilight>AVVERTITI!</hilight>"
-
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>Il Team</title>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
+msgstr ""
+"<title>Copyright &copy; 1999-2011, dell'Enlightenment Development Team.</"
+"><br><br>Ci auguriamo che vi piacerà usare questo software tanto quanto a "
+"noi è piaciuto scriverlo.<br><br>Questo software viene fornito così-com'è "
+"senza alcuna garanzia esplicita o implicita. Questo software è regolato "
+"dalle condizioni di licenza, quindi si prega di leggere i file di licenza "
+"COPYING e COPYING-PLAIN installati sul sistema.<br><br>Enlightenment è sotto "
+"<hilight>PIENO SVILUPPO</> e non è stabile. Molte funzionalità sono "
+"incomplete o ancora inesistenti e possono presentare molti difetti. Siete "
+"stati <hilight>AVVERTITI!</>"
+
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>Il Team</><br><br>"
 
 #: src/bin/e_actions.c:365
 #, c-format
@@ -79,59 +78,59 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Siete sicuri di voler uccidere questa finestra?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Sì"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Siete sicuri di voler uscire?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Avete chiesto di uscire da Enlightenment.<br><br>Siete sicuri di voler "
 "uscire?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Siete sicuri di voler chiudere la sessione?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Avete richiesto la chiusura della sessione.<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Siete sicuri di voler arrestarre il sistema?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Avete richiesto di arrestare il sistema.<br><br>Siete sicuri di volerlo fare?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Siete sicuri di voler riavviare?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -139,7 +138,7 @@ msgstr ""
 "Avete richiesto di riavviare il sistema.<br><br>Siete sicuri di volerlo "
 "fare??"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -147,551 +146,577 @@ msgstr ""
 "Avete richiesto di sospendere il computer.<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Siete sicuri di voler ibernare?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Avete chiesto di ibernare il computer.<br><br>Siete sicuri di volerlo fare?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Finestre : Azioni"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Sposta"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menù"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menù finestra"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Eleva"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Abbassa"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Uccidi"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Finestre : Stato"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Commuta stato appiccicata"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Commuta stato iconificata"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Commuta stato a tutto schermo"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Massimizza a tutto schermo"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo massimizzazione intelligente"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo massimizzazione espansivo"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo massimizzazione riempitivo"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Commuta contrazione verso l'alto"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Commuta contrazione verso il basso"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Commuta contrazione verso sinistra"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Commuta contrazione verso destra"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Commuta contrazione"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Commuta stato senza bordo"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Imposta bordo"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Cicla tra i bordi"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Commuta stato attaccata"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Cambia desktop verso sinistra"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Cambia desktop verso destra"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Cambia desktop verso l'alto"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Cambia desktop verso il basso"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Cambia desktop di..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Mostra il desktop"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mostra la mensola"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Cambia desktop a..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Cambia desktop linearmente..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Passa al desktop 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Passa al desktop 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Passa al desktop 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Passa al desktop 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Passa al desktop 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Passa al desktop 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Passa al desktop 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Passa al desktop 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Passa al desktop 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Passa al desktop 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Passa al desktop 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Passa al desktop 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Passa al desktop..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Cambia desktop verso sinistra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Cambia desktop verso destra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Cambia desktop verso l'alto (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Cambia desktop verso il basso (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Cambia desktop di...  (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Cambia desktop a... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Cambia desktop linearmente... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Cambia desktop in direzione..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passa al desktop 0 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passa al desktop 1 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passa al desktop 2 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passa al desktop 3 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passa al desktop 4 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passa al desktop 5 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passa al desktop 6 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passa al desktop 7 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passa al desktop 8 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passa al desktop 9 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passa al desktop 10 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passa al desktop 11 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passa al desktop... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Invia mouse allo schermo 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Invia mouse allo schermo 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Invia mouse allo schermo..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Invia mouse avanti di 1 schermo"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Invia mouse indietro di 1 schermo"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Invia mouse avanti/indietro di schermi..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "Oscura schermo"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "Illumina schermo"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "Imposta retroilluminazione"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "Retroilluminazione minima"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "Retroilluminazione media"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "Retroilluminazione massima"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "Regolazione retroilluminazione"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "Aumenta retroilluminazione"
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr "Diminuisci retroilluminazione"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "Sposta al centro"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Sposta verso..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr "Sposta a..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Ridimensiona a..."
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "Muovi in direzione..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Trascina icona..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Finestre : Spostamento"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Al desktop successivo"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Al desktop precedente"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Di # desktop..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Al desktop..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Mostra menù principale"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Mostra menù preferiti"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Mostra menù applicazioni"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Mostra menù dei client"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Mostra menù..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lancia"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Applicazione"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Esci adesso"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modalità"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Commuta modalità presentazione"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Commuta modalità disconnessa"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Spegni adesso"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Spegni"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "Sospendi ora"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Iberna"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Blocca"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Ordina Finestre"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Generica : Azioni"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Azione ritardata"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Oscura schermo"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Illumina schermo"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Imposta come sfondo"
 
@@ -699,18 +724,16 @@ msgstr "Imposta come sfondo"
 msgid "Color Selector"
 msgstr "Selettore colore"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -718,20 +741,20 @@ msgstr "Selettore colore"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -751,7 +774,7 @@ msgstr ""
 "funzionalità.<br>Adesso è possibile riconfigurare le cose a proprio "
 "piacimento.<br>Ci scusiamo per il disagio.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -766,11 +789,11 @@ msgstr ""
 "male, quindi la vostra configurazione è<br>stata ripristinata a scopo "
 "precauzionale ai valori predefiniti. Ci<br>scusiamo per l'inconveniente.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemi scrittura configurazione di Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -781,19 +804,19 @@ msgstr ""
 "configurazione da:<br>%s<br><br>a:<br>%s<br><br>Il resto della scrittura è "
 "stato abortito per sicurezza.<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Impostazioni aggiornate"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "La gestione del file EET è errata."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Il file non contiene dati."
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -801,17 +824,17 @@ msgstr ""
 "Il file non è scrivibile. Forse il disco e' montato in sola<br>lettura o non "
 "si hanno più i propri permessi."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 "La memoria è andata esaurita mentre si preparava<br>la scrittura. Si prega "
 "di liberare memoria."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Questo è un errore generico."
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -819,60 +842,60 @@ msgstr ""
 "Il file di impostazioni è troppo grande.<br>Dovrebbe essere molto piccolo "
 "(al massimo qualche centinaio di KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 "Ci sono errori di I/O sul disco.<br>Forse ha bisogno di essere sostituito?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "Lo spazio è andato esaurito mentre si scriveva il file."
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "Il file è stato chiuso mentre lo si scriveva."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "La mappatura in memoria (mmap) del file è fallita."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "La codifica X509 è fallita."
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Firma fallita."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "La firma non era valida."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Non firmato."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Funzionalità non implementata."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "Non è stato fornito il seme al PRNG."
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "Crittazione fallita."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr "Decrittazione fallita."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "L'errore è sconosciuto a Enlightenment."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -884,57 +907,61 @@ msgstr ""
 "%s<br><br>Questo file è stato cancellato per evitare<br>corruzione di dati."
 "<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Basilari"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Applica"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Estensioni"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduli"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Contenitore %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Errore - supporto PAM mancante"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Il supporto per PAM non è stato compilato in Enlightenment,<br>quindi il "
 "blocco dello schermo viene disabilitato."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Blocco non riuscito"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -943,15 +970,15 @@ msgstr ""
 "impossessata della tastiera e/o del<br>mouse e Enlightenment non può "
 "riappropiarsene."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Inserire la password di sblocco"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Errore del sistema di autenticazione"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -962,11 +989,11 @@ msgstr ""
 "di autenticazione. Il codice d'errore è <hilight>%i</hilight>.<br>Questo è "
 "male e non dovrebbe succedere.<br>Si prega di riportare questo bug."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Attivare modalità presentazione?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -976,11 +1003,11 @@ msgstr ""
 "modalità <b>presentazione</b> e disabilitare temporaneamente lo screensaver, "
 "il bloccaschermo e la gestione energetica?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "No, ma aumenta la temporizzazione"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "No, e non chiedere più"
 
@@ -1007,106 +1034,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor file desktop"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Commento"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Icona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Descrizione"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorie"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Tipi Mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "File desktop"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Impostazioni generali"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notifica avvio"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Esegui in terminale"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Mostra in menù"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Seleziona un'icona"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Seleziona un'eseguibile"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copia"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Seleziona tutto"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1145,314 +1171,314 @@ msgstr ""
 "Enlightenment non ha potuto avviare l'applicazione:<br><br>"
 "%s<br><br>L'applicazione non è partita"
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "L'esecuzione di %s è terminata inaspettatamente"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s ha restituito il codice d'uscita %1$i."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s è stato fermato da un segnale d'interruzione"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s è stato fermato da un segnale di uscita"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s è stato fermato da un segnale di aborto"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s è stato fermato da un errore di virgola mobile"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s è stato fermato da un segnale di uccisione ininterrompibile"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s è stato fermato da un errore di segmentazione"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s è stato fermato da una pipe rotta"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s è stato fermato da un segnale di terminazione"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s è stato fermato da un errore del bus"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s è stato fermato dal segnale numero %i"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***L'output rimanente è stato troncato. Salvare l'output per vederlo.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Log di errore"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Non ci sono messaggi d'errore."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Salva questo messaggio"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Questo log di errore verrà salvato come %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informazioni sull'errore"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informazioni sui segnali d'errore"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Dati dell'output"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Non ci sono output."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Percorso inesistente"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s non esiste."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Errore di montaggio"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Impossibile montare il dispositivo"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Errore di smontaggio"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Impossibile smontare il dispositivo"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Errore di espulsione"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Impossibile espellere il dispositivo"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i File"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Collega"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Abortisci"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Eredita impostazioni genitore"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Modalità visualizzazione"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Aggiorna vista"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Ricorda ordinamento"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Ordina adesso"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nuova directory"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Smonta"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Monta"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Espelli"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Proprietà dell'applicazione"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Proprietà del file"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Usa predefinito"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Icone"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Icone personalizzabile"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Elenco"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Dimensione icona (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Imposta sfondo..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Imposta sfumatura..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Crea nuova directory"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nome directory:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Rinomina %s in:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Rinomina file"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Ritenta"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Errore"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "No a tutti"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Sì a tutti"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Il file esiste già, lo sovrascrivo?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignora questo"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignora tutto"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "C'è stato un errore nell'esecuzione di un'operazione.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Conferma eliminazione"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Siete sicuri di voler eliminare<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1486,12 +1512,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume sconosciuto"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispositivo rimovibile"
 
@@ -1499,7 +1525,7 @@ msgstr "Dispositivo rimovibile"
 msgid "File:"
 msgstr "File:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Dimensione:"
 
@@ -1515,7 +1541,7 @@ msgstr "Tipo di file"
 msgid "Permissions"
 msgstr "Permessi"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Proprietario:"
 
@@ -1535,17 +1561,17 @@ msgstr "Proprietario può leggere"
 msgid "Owner can write"
 msgstr "Proprietario può scrivere"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Anteprima"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Predefinito"
 
@@ -1554,7 +1580,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personalizzata"
 
@@ -1570,50 +1596,41 @@ msgstr "Informazioni collegamento"
 msgid "Select an Image"
 msgstr "Seleziona un'immagine"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Sposta in"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Inizio spostamento/ridimensionamento"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Ridimensionabile"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Scorri automaticamente contenuto"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Liscio"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Incassato"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Aspetto"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Elimina"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Fine spostamento/ridimensionamento di questo gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr "Ferma spostamento"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1661,14 +1678,14 @@ msgstr "Posizione"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Dimensione"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Livello"
@@ -1720,154 +1737,161 @@ msgstr "Uscire dalla sessione con questa finestra aperta"
 msgid "Remember these Locks"
 msgstr "Ricorda questi blocchi"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Finestra"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "Sempre sulle altre"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Appiccicata"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Impostazioni"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "A tutto schermo"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Dimensioni normali"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Modifica icona"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Crea icona"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Aggiungi al menù preferiti"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Aggiungi a IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr "Crea scorciatoia di tastiera"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Posizionamento"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Salta"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Bordo"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Blocchi"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Ricorda..."
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Appiccicata"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Salta"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr "Contrai"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr "Schermo %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Sempre sulle altre"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normale"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Sempre sotto le altre"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Attacca al desktop"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Stacca dal desktop"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Seleziona stile del bordo"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Usa preferenza predefinita per l'icona"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Usa icona fornita dall'applicazione"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Usa icona impostata dall'utente"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Offri resistenza"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista finestre"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Taskbar"
 
@@ -1888,7 +1912,7 @@ msgid "ICCCM Properties"
 msgstr "Proprietà ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titolo"
 
@@ -2062,7 +2086,6 @@ msgid "Size, Position and Locks"
 msgstr "Dimensione, posizione e blocchi"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Tutto"
 
@@ -2139,15 +2162,13 @@ msgid "Utilities"
 msgstr "Utilità"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "File"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Lanciatore"
 
@@ -2160,20 +2181,6 @@ msgstr "Nucleo"
 msgid "Mobile"
 msgstr "Mobile"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Impostazioni"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Gestione moduli"
@@ -2211,7 +2218,7 @@ msgstr "Aggiungi gadget"
 msgid "Remove Gadget"
 msgstr "Elimina gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Impostazioni barra strumenti"
 
@@ -2219,11 +2226,11 @@ msgstr "Impostazioni barra strumenti"
 msgid "Layout"
 msgstr "Posizione"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Errore del metodo di input"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2239,7 +2246,7 @@ msgstr "Principale"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Applicazioni preferite"
 
@@ -2247,76 +2254,74 @@ msgstr "Applicazioni preferite"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Finestre"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Finestre perse"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Informazioni su..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuali"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Mensole porta-gadget"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Mostra/nascondi tutte le finestre"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Nessuna Applicazione)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Imposta desktop virtuali"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Nessuna Finestra)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Nessun nome!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Nessuna mensola)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Aggiungi mensola"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Elimina mensola"
 
@@ -2351,7 +2356,7 @@ msgid "Shrink to Content Width"
 msgstr "Riduci alla larghezza del contenuto"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stile"
 
@@ -2381,7 +2386,7 @@ msgid "Hide duration"
 msgstr "Durata scomparsa"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f secondi"
@@ -2398,7 +2403,7 @@ msgstr "Mostra su tutti i desktop"
 msgid "Show on specified Desktops"
 msgstr "Mostra sui desktop specificati"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2415,7 +2420,7 @@ msgstr ""
 "non ne siete proprietari. Controllare:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2427,76 +2432,19 @@ msgstr ""
 "del socket IPC. Controllare:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Opzioni:\n"
-"\t-display DISPLAY\n"
-"\t\tConnette al display chiamato DISPLAY.\n"
-"\t\tES: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAggiunge uno schermo xinerama fittizio (invece di quello vero)\n"
-"\t\tdata la geometria. Aggiungetene quanti ne volete. Questi\n"
-"\t\tsostituiscono tutti i veri schermi xinerama, se ce ne sono.\n"
-"\t\tQuesto si può usare per simulare xinerama.\n"
-"\t\tEsempio:\n"
-"\t\t-fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUsa il profilo di configurazione CONF_PROFILE invece di quello\n"
-"\t\tpredefinito selezionato dall'utente o dal sistema.\n"
-"\t-good\n"
-"\t\tSii buono.\n"
-"\t-evil\n"
-"\t\tSii cattivo.\n"
-"\t-psychotic\n"
-"\t\tSii psicotico.\n"
-"\t-locked\n"
-"\t\tAvvia con desklock attivato, così verrà richiesta una password.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tSe hai bisogno di questo aiuto non hai bisogno di questa opzione.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment non riesce ad inizializzare Eina!\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare Ecore!\n"
-"Forse siete a corto di memoria?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment non riesce ad inizializzare Eet!\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il sistema File.\n"
-"Forse siete a corto di memoria?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore!\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2504,7 +2452,7 @@ msgstr ""
 "Enlightenment non riesce a configurare un gestore di segnali d'uscita.\n"
 "Forse siete a corto di memoria?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2512,7 +2460,7 @@ msgstr ""
 "Enlightenment non riesce a configurare un gestore di segnali HUP.\n"
 "Forse siete a corto di memoria?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2520,64 +2468,31 @@ msgstr ""
 "Enlightenment non riesce a configurare un gestore di segnali USER.\n"
 "Forse siete a corto di memoria?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare la connessione a X.\n"
-"Avete impostato la variabile DISPLAY?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_IMF!\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il suo sistema\n"
-"di allarme d'emergenza.\n"
-"Avete impostato la variabile DISPLAY?"
-
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il sistema di connessioni\n"
-"Forse siete a corto di memoria?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_File!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il sistema IPC.\n"
-"Forse siete a corto di memoria?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_Con!\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment non riesce a configurare xinerama.\n"
-"Questo non dovrebbe accadere."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_Ipc!\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment non riesce a configurare randr.\n"
-"Questo non dovrebbe accadere."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_X!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il sistema Evas.\n"
-"Forse siete a corto di memoria?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment non riesce ad inizializzare Ecore_Evas!\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2587,7 +2502,7 @@ msgstr ""
 "software X11 in Evas. Controllate le vostre installazioni di Evas e\n"
 "Ecore e il loro supporto per il motore di rendering software X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2597,7 +2512,32 @@ msgstr ""
 "software Buffer in Evas. Controllate le vostre installazioni di Evas e\n"
 "Ecore e il loro supporto per il motore di rendering software Buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment non riesce ad inizializzare Edje!\n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment non riesce ad inizializzare E_Intl!\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment non riesce ad inizializzare il suo sistema\n"
+"di allarme d'emergenza.\n"
+"Avete impostato la variabile DISPLAY?"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment non riesce ad inizializzare E_Xinerama!\n"
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment non riesce ad inizializzare E_Randr!\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2605,31 +2545,35 @@ msgstr ""
 "Enlightenment non riesce a creare directory nella vostra home.\n"
 "Forse non avete home directory, o il disco è pieno?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di file registry."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di configurazione."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment non riesce ad impostare il suo ambiente."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di scaling."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di puntatore."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2637,100 +2581,49 @@ msgstr ""
 "Enlightenment non riesce a configurare i percorsi per la\n"
 "ricerca dei file. Forse siete a corto di memoria?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di font."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di temi."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
-"Enlightenment non riesce a configurare la schermata d'avvio.\n"
-"Forse siete a corto di memoria?"
+"Enlightenment non riesce a configurare la sua\n"
+"schermata di iniziazione."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Avvio supporto internazionalizzazione"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di intl (internazionalizzazione)."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
-"Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment non riesce ad inizializzare il sistema desktop FDO.\n"
-"Forse siete a corto di memoria?"
-
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Test supporto formato"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment ha riscontrato che Evas non può creare una canvas di\n"
-"buffer. Controllare che Evas abbia il supporto per il motore di\n"
-"rendering software Buffer.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment ha riscontrato che Evas non può caricare file PNG.\n"
-"Controllare che Evas abbia il supporto per il loader PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment ha riscontrato che Evas non può caricare file JPEG.\n"
-"Controllare che Evas abbia il supporto per il loader JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment ha riscontrato che Evas non può caricare file EET.\n"
-"Controllare che Evas abbia il supporto per il loader EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment ha riscontrato che Evas non può caricare il font 'Sans'.\n"
-"Controllare che Evas abbia il supporto per fontconfig e che il\n"
-"fontconfig di sistema dfeinisca un font 'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Controlla supporto SVG"
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
+msgstr ""
+"Enlightenment non riesce ad inizializzare il sistema desktop FDO.\n"
+"Forse non avete permessi per accedere a ~/.cache/efreet o\n"
+"siete a corto di spazio su disco?"
 
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Impostazione schermi"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2739,239 +2632,398 @@ msgstr ""
 "da parte di Enlightenment è fallita. Forse c'è un altro window\n"
 "manager in esecuzione?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Impostazione ACPI"
+
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "Impostazione retroilluminazione"
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment non riesce a configurare la retroilluminazione"
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Impostazione DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+"Enlightenment non riesce a configurare le\n"
+"impostazioni DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Impostazione screensaver"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 "Enlightenment non riesce a configurare lo\n"
 "screensaver di X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "Modalità risparmio energetico"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+"Enlightenment non riesce a configurare il suo\n"
+"sistema di modi risparmio energetico."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Impostazione bloccashermo"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di blocco dello schermo."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Finestre popup"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di popup."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr "Bus dei messaggi"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Impostazione percorsi"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Controlli di sistema"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment non riesce a il sistema di comandi di sistema.\n"
 "\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Impostazione azioni"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di azioni."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Sistema di esecuzione"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema \"exec\"."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Impostazione file manager"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
+msgstr "File manager"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment non riesce ad inizializzare il File manager.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Sistema di messaggi"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di messaggi."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Impostazione drag and drop"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di 'drag & drop'."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Impostazioni gestione cattura dell'input"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
-"sistema di gestione dell'input catturato."
+"sistema di gestione della cattura dell'input."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Impostazione moduli"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di moduli."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Ripristino impostazioni da ricordare"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 "Enlightenment non riesce a configurare le\n"
 "impostazioni da ricordare."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Impostazione classi colore"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di classi colore."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Controllo dei gadget"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di controllo dei gadget."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Impostazione ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Impostazione DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-"Enlightenment non riesce a configurare le\n"
-"impostazioni DPMS."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Modi risparmio energetico"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-"Enlightenment non riesce a configurare il suo\n"
-"sistema di modi risparmio energetico."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Impostazione sfondo"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di sfondi del desktop."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Impostazione mouse"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 "Enlightenment non riesce a configurare le\n"
 "impostazion del mouse."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Combinazioni tastiera e mouse"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di binding (associazioni)."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Impostazione mensole porta-gadget"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
-"Enlightenment non riesce a configurare il suo\n"
-"sistema di mensole porta-gadget."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Generatore miniature"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di thumbnailing (anteprime).\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+"Enlightenment non riesce a inizializzare il suo sistema di\n"
+"cache delle icone.\n"
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment non riesce a inizializzare il sistema XSettings.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "Ambienti desktop"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr ""
+"Enlightenment non riesce a configurare il suo\n"
+"ambiente desktop.\n"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Ordinamento dei file"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di ordinamento file."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Carica moduli"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configura mensole porta-gadget"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Quasi fatto"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Opzioni:\n"
+"\t-display DISPLAY\n"
+"\t\tConnette al display chiamato DISPLAY.\n"
+"\t\tES: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAggiunge uno schermo xinerama fittizio (invece di quello vero)\n"
+"\t\tdata la geometria. Aggiungetene quanti ne volete. Questi\n"
+"\t\tsostituiscono tutti i veri schermi xinerama, se ce ne sono.\n"
+"\t\tQuesto si può usare per simulare xinerama.\n"
+"\t\tEsempio:\n"
+"\t\t-fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUsa il profilo di configurazione CONF_PROFILE invece di quello\n"
+"\t\tpredefinito selezionato dall'utente o dal sistema.\n"
+"\t-good\n"
+"\t\tSii buono.\n"
+"\t-evil\n"
+"\t\tSii cattivo.\n"
+"\t-psychotic\n"
+"\t\tSii psicotico.\n"
+"\t-locked\n"
+"\t\tAvvia con desklock attivato, così verrà richiesta una password.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tSe hai bisogno di questo aiuto non hai bisogno di questa opzione.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+"State eseguendo enlightenment direttamente, e questo\n"
+"è male. Non eseguite il binario \"enlightenment\", usate\n"
+"il lanciatore \"enlightenment_start\" perché questo\n"
+"gestirà l'impostazione di variabili d'ambiente,\n"
+"percorsi, avvierà ogni altro servizio richiesto e\n"
+"altre cose simili prima di cominciare l'esecuzione di\n"
+"enlightenment stesso.\n"
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Test supporto formato"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può creare una canvas di\n"
+"buffer. Controllare che Evas abbia il supporto per il motore di\n"
+"rendering software Buffer.\n"
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può caricare file SVG.\n"
+"Controllare che Evas abbia il supporto per il loader SVG.\n"
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può caricare file JPEG.\n"
+"Controllare che Evas abbia il supporto per il loader JPEG.\n"
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può caricare file PNG.\n"
+"Controllare che Evas abbia il supporto per il loader PNG.\n"
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può caricare file EET.\n"
+"Controllare che Evas abbia il supporto per il loader EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment ha riscontrato che Evas non può caricare il font 'Sans'.\n"
+"Controllare che Evas abbia il supporto per fontconfig e che il\n"
+"fontconfig di sistema dfeinisca un font 'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
@@ -2980,11 +3032,11 @@ msgstr ""
 "C'è stato un errore nel<br>caricamento del modulo: %s. Questo modulo è "
 "stato<br>disabilitato e non verrà caricato."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment è andato subito in crash ed è stato riavviato"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2995,7 +3047,7 @@ msgstr ""
 "<br>C'è stato un errore nel caricamento del modulo: %s.<br><br>Questo modulo "
 "è stato disabilitato e non verrà caricato."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -3008,7 +3060,7 @@ msgstr ""
 "finestra di configurazione<br>dei moduli dovrebbe permettervi di "
 "selezionare<br>nuovamente i vostri moduli."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -3021,20 +3073,12 @@ msgstr ""
 "finestra di configurazione<br>dei moduli dovrebbe permettervi di "
 "selezionare<br>nuovamente i vostri moduli."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configura mensole porta-gadget"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Quasi fatto"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Caricamento modulo: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3043,11 +3087,11 @@ msgstr ""
 "C'è stato un errore nel caricamento del modulo: %s<br>Non ho potuto trovare "
 "nessun modulo di nome %s nelle<br>directory di ricerca dei moduli.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Errore nel caricamento del modulo"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3056,11 +3100,11 @@ msgstr ""
 "C'è stato un errore nel caricamento del modulo: %s<br>Il percorso completo "
 "del modulo è:<br>%s<br>L'errore riportato è stato:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Il modulo non contiene tutte le funzioni necessarie"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3071,16 +3115,16 @@ msgstr ""
 "richiede una versione minima dell'API dei moduli di: %i.<br>L'API dei moduli "
 "dichiarata da Enlightenment è: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Modulo %s di Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Volete disattivare questo modulo?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3094,11 +3138,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Mensola #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Siete sicuri di voler eliminare questa mensola?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3106,16 +3150,16 @@ msgstr ""
 "Avete chiesto di eliminare questa mensola.<br><br>Siete sicuri di volerla "
 "eliminare?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Fine spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Inizio spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Contenuti"
 
@@ -3123,16 +3167,16 @@ msgstr "Contenuti"
 msgid "Starting"
 msgstr "Avvio"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Controllo permessi del sistema"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Controllo sistema eseguito"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3144,35 +3188,35 @@ msgstr ""
 "senza aspettare<br>prima la chiusura di queste applicazioni?<br><br>Chiusura "
 "automatica tra %d secondi."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problemi chiusura sessione"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Esci adesso"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Attendi ancora"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Annulla chiusura"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Chiusura in corso"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Chiusura in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment è occupato con un'altra richiesta"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3180,7 +3224,7 @@ msgstr ""
 "Chiusura un corso.<br>Non è possibile richiedere ulteriori azioni di "
 "sistema<br>una volta che è stata richiesta la chiusura di sessione."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3188,7 +3232,7 @@ msgstr ""
 "Spegnimento in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>una volta che è iniziato l'arresto del sistema."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3196,7 +3240,7 @@ msgstr ""
 "Riavvio in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>una volta che è iniziato il riavvio del sistema."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3204,63 +3248,63 @@ msgstr ""
 "Sospensione in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>finchè non è terminata la procedura di sospensione."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Ibernazione in corso.<br>Non è possibile eseguire ulteriori azioni di "
-"sistema<br>finchè non è terminata la procedura di ibernazione."
+"sistema<br>finchè non è terminata questa procedura."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Questo non dovrebbe succedere"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Spegnimento fallito."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Riavvio fallito."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Sospensione fallita."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Ibernazione fallita."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Spegnimento"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Spegnimento in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Riavvio"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Riavvio in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Sospensione"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Sospensione in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Ibernazione in corso"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Ibernazione in corso.<br><hilight>Attendere prego.</hilight>"
 
@@ -3268,34 +3312,34 @@ msgstr "Ibernazione in corso.<br><hilight>Attendere prego.</hilight>"
 msgid "About Theme"
 msgstr "Informazioni sul tema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Imposta come tema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Fine spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Inizio spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Imposta contenuti della barra strumenti"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment non ha potuto fare il fork di un processo figlio:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Impossibile uscire - finestre immortali."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3305,123 +3349,123 @@ msgstr ""
 "<br>Questo significa che Enlightenment non uscirà finchè queste "
 "finestre<br>non saranno chiuse o avranno il blocco Perpetua disabilitato.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "In futuro"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Nell'ultimo minuto"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anni fa"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li mesi fa"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li settimane fa"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li giorni fa"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li ore fa"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuti fa"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Impostazioni importazione immagini"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importa"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opzioni di riempimento e stiramento"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Stirata"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrata"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "All'interno"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Riempimento"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualità del file"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Usa file originale"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3441,12 +3485,12 @@ msgstr ""
 "nuove funzionalità. Adesso è<br>possibile riconfigurare le cose a proprio "
 "piacimento. Ci scusiamo per il disagio.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "Configurazione %s aggiornata"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3480,139 +3524,144 @@ msgstr "Su"
 msgid "Down"
 msgstr "Giù"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Directory superiore"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr "Risoluzione:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permessi:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificato:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Tu"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protetto"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Sola lettura"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Proibito"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lettura-scrittura"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Impostazioni di Battery"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Allarme se il livello batteria è basso"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Controlla ogni:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tick"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr "Iberna quando sotto:"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Campionamento"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Mostra allarme carica bassa"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Soglia allarme:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Distacco automatico in..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sec"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Allarme"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Rileva automaticamente"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
-msgstr "Interni"
+msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Modalità ponderata"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3620,32 +3669,33 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Battery"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Basso livello batteria!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Consigliata alimentazione AC."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Indicatore di carica"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Clock"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr "Mostra calendario"
 
@@ -3713,17 +3763,17 @@ msgstr "Impostazioni del pannello di configurazioni aggiornate"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Applicazioni di IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Applicazioni per l'avvio"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Applicazioni per il riavvio"
 
@@ -3736,10 +3786,22 @@ msgid "Apps"
 msgstr "Applicazioni"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nuova applicazione"
+msgid "Create Launcher"
+msgstr "Crea lanciatore"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "Elimina lanciatore personalizzato"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "Applicazioni predefinite"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "Ambienti desktop"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar, altri"
 
@@ -3752,7 +3814,7 @@ msgid "Available Profiles"
 msgstr "Profili disponibili"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Selezionare un profilo"
 
@@ -3792,9 +3854,9 @@ msgstr "Impostazioni finestre di dialogo"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Impostazioni generali"
 
@@ -3836,7 +3898,7 @@ msgstr "Finestre di dialogo"
 msgid "Profiles"
 msgstr "Profili"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3847,7 +3909,7 @@ msgstr ""
 "<br>Se non si preme alcun bottone verrà ripristinata la "
 "vecchia<br>risoluzione di %dx%d a %d Hz entro %d secondi."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3858,7 +3920,7 @@ msgstr ""
 "<br>Se non si preme alcun bottone verrà ripristinata la "
 "vecchia<br>risoluzione di %dx%d entro %d secondi."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3869,7 +3931,7 @@ msgstr ""
 "<br>Se non si preme alcun bottone verrà <hilight>IMMEDIATAMENTE</hilight> "
 "ripristinata<br>la vecchia risoluzione di %dx%d a %d Hz."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3881,47 +3943,47 @@ msgstr ""
 "<hilight>IMMEDIATAMENTE</hilight> ripristinata<br>la vecchia risoluzione di "
 "%dx%d."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Cambio risoluzione"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Salva"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Ripristina"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Risoluzione dello schermo"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Ripristina al login"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Aggiornamento"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotazione"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Specularità"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Funzionalità mancanti"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3935,11 +3997,11 @@ msgstr ""
 "dovuto al fatto che quando si<br>è compilato <hilight>ecore</hilight> non è "
 "stato rilevato<br>il supporto XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Frequenza di refresh non trovata"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3953,89 +4015,72 @@ msgstr ""
 "verrà usata all'impostazione della risoluzione, il che potrebbe<br>\n"
 "provocare <hilight>danni</hilight> al vostro schermo."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Desktop virtuali"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Numero di desktop"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Cambio desktop"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Cambia desktop al trascinamento di oggetti sul limite dello schermo"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Passa al desktop opposto quando oltrepassi gli estremi"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Desktop"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Disattivata"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Sovrapposizione"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Sfondo panoramico"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Velocità animazione"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Fattore panoramica asse X"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Fattore panoramica asse Y"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animazione cambio"
 
@@ -4052,7 +4097,7 @@ msgid "Desktop Wallpaper"
 msgstr "Sfondo desktop"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Imposta"
 
@@ -4062,12 +4107,12 @@ msgstr "Seleziona uno sfondo..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personali"
 
@@ -4075,184 +4120,210 @@ msgstr "Personali"
 msgid "Screen Lock Settings"
 msgstr "Impostazioni bloccaschermo"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Blocca all'avvio"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Blocca alla sospensione"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Comando bloccaschermo personalizzato"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Blocco schermo"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Mostra su tutti gli schermi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Mostra sullo schermo corrente"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Mostra sullo schermo #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Finestra di login"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Blocca dopo l'attivazione dello screensaver di X"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f secondi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Blocca al superamento del tempo massimo"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minuti"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Timer"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Suggerisci se disattivato prima di"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Modalità presentazione"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Definita dal tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Sfondo del tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Sfondo corrente"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Sfondo"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Impostazioni screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Abilita screensaver di X"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr "Sospendi all'oscuramento"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "Anche se alimentato da rete"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "Ritardo sospensione"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Temporizzazione iniziale"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Temporizzazione alternanza"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Oscuramento"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferito"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Non preferito"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Eventi di esposizione"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Consenti"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Non consentire"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Opzioni varie"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "DPMS (Display Power Management Signaling)"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "L'attuale server grafico non è<br>capace di gestire il DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "L'attuale server grafico non ha<br>le estensioni DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Impostazioni gestione energetica dello schermo"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Abilita gestione energetica dello schermo"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Standby"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Sospensione"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Spegnimento"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr "DPMS"
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "Retroilluminazione normale"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "Retroilluminazione bassa"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr "Tempo di dissolvenza"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "Retroilluminazione"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Desktop virtuali"
@@ -4300,74 +4371,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Configurazione azioni sui bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Aggiungi combinazione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Elimina combinazione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modifica combinazione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Cancella tutto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Ripristina associazioni predefinite"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametri azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Opzioni generali"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Consenti azioni con finestre a tutto schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Sequenza bordo dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Bordo cliccabile"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Errore azione sul bordo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4377,28 +4448,28 @@ msgstr ""
 "dall'azione <hilight>%s</hilight>.<br>Si prega di scegliere una sequenza "
 "diversa."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "Maiuscole"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4547,34 +4618,52 @@ msgstr ""
 "Enlightenment non ha potuto importare la configurazione<br>a causa di un "
 "errore di copia."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Localizzazione"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr "Possibili problemi di localizzazione"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+"Attualmente sono impostate alcune variabili<br>d'ambiente extra per la "
+"localizzazione che<br>potrebbero interferire con la "
+"corretta<br>visualizzazione della lingua scelta.<br>Se non volete che questo "
+"si verifichi<br>rimuovete le variabili tramite l'apposita<br>voce del "
+"pannello impostazioni.<br>Le variabili in questione sono le seguenti:<br>%s"
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Selettore lingua"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Predefinito dal sistema"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Localizzazione selezionata"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Localizzazione"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Lingua"
 
@@ -4662,17 +4751,17 @@ msgid "Manager"
 msgstr "Manager"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nessuno"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Sequenza associazione del mouse"
 
@@ -4694,12 +4783,10 @@ msgid "Menu Settings"
 msgstr "Impostazioni del menù"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 msgid "Enlightenment Default"
 msgstr "Predefinito di Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr "Predefinito dell'utente"
 
@@ -4708,7 +4795,7 @@ msgid "Main Menu"
 msgstr "Menù principale"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Preferiti"
 
@@ -4725,7 +4812,7 @@ msgid "Comments"
 msgstr "Commenti"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4736,7 +4823,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Mostra impostazioni gadget al livello più alto"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menù"
 
@@ -4804,19 +4891,19 @@ msgid "Images"
 msgstr "Immagini"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Font"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temi"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Icone"
 
@@ -4962,18 +5049,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Impostazioni sfondo"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Usa sfondo del tema"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Immagine..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Online..."
 
@@ -4993,46 +5080,50 @@ msgstr "Questo desktop"
 msgid "This Screen"
 msgstr "Questo schermo"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Impostazioni sfondo..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Affiancata"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr "Estesa"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Selezionare un'immmagine..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Errore importazione immagine"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment non ha potuto importare l'immagine<br>a causa di errori di "
 "conversione."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Errore importazione sfondo"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment non ha potuto importare lo sfondo<br>a causa di un errore di "
 "copia."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5069,7 +5160,7 @@ msgid "Error: can't start the request."
 msgstr "Errore: impossibile avviare la richiesta"
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Stile di bordo predefinito"
 
@@ -5077,7 +5168,7 @@ msgstr "Stile di bordo predefinito"
 msgid "Window Border Selection"
 msgstr "Selezione bordo della finestra"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Ricorda questo bordo alla prossima apertura della finestra"
 
@@ -5106,7 +5197,7 @@ msgid "Menu Background Base"
 msgstr "Sfondo base menù"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Titolo menù"
 
@@ -5115,7 +5206,7 @@ msgid "Menu Title Active"
 msgstr "Titolo menù attivo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Voce di menù"
 
@@ -5128,12 +5219,12 @@ msgid "Menu Item Disabled"
 msgstr "Voce menù disabilitata"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Testo spostamento"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Testo ridimensionamento"
 
@@ -5150,7 +5241,7 @@ msgid "Winlist Label"
 msgstr "Etichetta lista finestre"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Titolo lista finestre"
 
@@ -5167,377 +5258,387 @@ msgid "File Manager Background Base"
 msgstr "Sfondo base file manager"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Cambio del fuoco"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Testo bottone"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Testo bottone disabilitato"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Testo casella di spunta"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Testo casella di spunta disabilitata"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Testo voce"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Testo voce disabilitata"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Testo etichetta"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Testo voce lista selezionata"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Testo voce lista (pari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Sfondo base voce lista (pari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Testo voce lista (dispari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Sfondo base voce lista (dispari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Testo intestazione lista (pari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Sfondo base intestazione lista (pari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Testo intestazione lista (dispari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Sfondo base intestazione lista (dispari)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Testo casella di opzione"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Testo casella di opzione disabilitata"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Testo cursore"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Testo cursore disabilitato"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Sfondo base cornice"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Sfondo base cornice scorritore"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Etichetta del modulo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Fuori fuoco in Composite"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Colori"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Classe colore: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Selezionate %u classi colore miste"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Selezionate %u classi colore non impostate"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Selezionate %u classi colore uniformi"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Nessuna classe colore selezionata"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Colori personalizzato"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Oggetto:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Contorno:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Ombra:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Testo con colore applicato."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "I colori dipendono dalle funzionalità del tema."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Window manager"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widget"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Altri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Barra del titolo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Textblock"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Textblock leggero"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Textblock grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Intestazione impostazioni"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Titolo \"Informazioni su...\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Versione \"Informazioni su...\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Testo \"Informazioni su...\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titolo bloccaschermo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Password bloccaschermo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Finestra d'errore"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Lanciacomandi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Titolo splash screen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Testo splash screen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Versione splash screen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "Orologio digitale"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Voce"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Cornice"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etichetta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Bottone"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Cursore"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Casella di opzione"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Casella di spunta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Casella di testo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Voce casella combinata"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Intestazione casella combinata"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "File manager"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Casella immissione testo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Icona desktop"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Piccolo stilizzato"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normale stilizzato"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Grande stilizzato"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Impostazioni dei font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Piccolissima"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Molto grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Grandissima"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Abilita classi font personalizzate"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Testo anteprima di base: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Configurazione classi font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Abilita classe font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Testo anteprima avanzato.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Hinting (ottimizzazione)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Font alternativi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nome font alternativo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Abilita font alternativi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Hinting / alternative"
 
@@ -5545,11 +5646,15 @@ msgstr "Hinting / alternative"
 msgid "Icon Theme Settings"
 msgstr "Impostazioni tema delle icone"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Abilita tema icone"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr "Usa tema icone per le applicazioni"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "Le icone prevalgono sul tema generale"
 
@@ -5614,11 +5719,9 @@ msgid "Custom scaling factor"
 msgstr "Fattore di scala personalizzato"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
-msgstr "%1.2f volte"
+msgid "%1.2f x"
+msgstr "%1.2f x"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5629,6 +5732,12 @@ msgstr "Regole"
 msgid "Minimum"
 msgstr "Minimo"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f volte"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Massimo"
@@ -5649,25 +5758,25 @@ msgstr "Mostra splash screen al login"
 msgid "Transition Settings"
 msgstr "Impostazioni transizione"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Eventi"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Avvio"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Cambio desktop"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Cambio sfondo"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transizioni"
 
@@ -5683,15 +5792,15 @@ msgstr "Importa..."
 msgid " Online..."
 msgstr "Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Categorie dei temi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Assegna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Pulisci tutto"
 
@@ -5722,19 +5831,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Temi da Exchange"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordi"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema icone"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Puntatore del mouse"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Scalatura"
 
@@ -5855,6 +5964,10 @@ msgstr "Fornita dall'applicazione"
 msgid "Border Icon"
 msgstr "Icona del bordo"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Posizionamento"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Posizionamento intelligente"
@@ -5883,23 +5996,43 @@ msgstr "Nuove finestre"
 msgid "Animate"
 msgstr "Usa animazione"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Costante"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Accelera, poi decelera"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Accelera"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Decelera"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+msgid "Pronounced Accelerate"
+msgstr "Accelera molto"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+msgid "Pronounced Decelerate"
+msgstr "Decelera molto"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Accelera molto, poi decelera molto"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr "Rimbalza"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr "Rimbalza molto"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Contrazione"
 
@@ -5920,6 +6053,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Sulla finestra più recente sotto il mouse"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Segue clic"
 
@@ -5951,11 +6085,6 @@ msgstr "Solo finestre di dialogo"
 msgid "Only dialogs with focused parent"
 msgstr "Solo finestre di dialogo con genitore a fuoco"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Cambio del fuoco"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Altre impostazioni"
@@ -6053,13 +6182,13 @@ msgid "Fill available space"
 msgstr "Riempitiva"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Orizzontale"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Verticale"
@@ -6116,7 +6245,7 @@ msgid "Raise when clicking to focus"
 msgstr "Eleva quando la si clicca per il fuoco"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fuoco delle finestre"
 
@@ -6373,28 +6502,28 @@ msgstr "Molto chiara"
 msgid "Dropshadow"
 msgstr "Dropshadow"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Pannello di Everything"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Mostra lanciatore Everything"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Configurazione di Everything"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Mostra finestra di dialogo di Everything"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Modulo Everything"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Pannello di Everything"
 
@@ -6402,144 +6531,144 @@ msgstr "Pannello di Everything"
 msgid "Everything Settings"
 msgstr "Impostazioni di Everything"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Plugin disponibili"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Sposta su"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Sposta giù"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Configura"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Mostra in \"Tutti\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Mostra al livello più alto"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Caratteri minimi per la ricerca"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Richiamo per il plugin"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Il predefinito è il nome del plugin"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Cerca solo se richiamato"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Visualizzazione plugin"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Dettagliata"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Vista predefinita"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Scorrimento animato"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Su/Giù seleziona oggetto successivo in vista icone"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Nascondi input se inattivo"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Nascondi elenco"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Navigazione veloce"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Stile Emacs (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Stile Vi (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Vista predefinita"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Scorrimento animato"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Su/Giù seleziona oggetto successivo in vista icone"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Ordinamento"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr "Nessun ordinamento"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "In base all'uso"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Più usati"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Usati per ultimi"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Plugin soggetto"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Plugin azione"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Plugin oggetto"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Plugin"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Dimensione popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Larghezza popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Altezza popup"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Allineamento popup"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6548,35 +6677,27 @@ msgstr "Allineamento popup"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Dimensione popup bordo"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Geometria"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Raccolta di Everything"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Azioni"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Elementi"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Nessun plugin caricato"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Copia negli appunti"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6615,145 +6736,59 @@ msgstr ""
 "hilight> cambia visualizzazione a elenco<br>    <hilight>&lt;ctrl+3&gt;</"
 "hilight> cambia visualizzazione a miniature"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Riga di comando"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Apri con..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Apri file..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Modifica applicazione"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Nuova applicazione"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Esegui con Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Apri con..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Apri terminale qui"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Lancia eseguibile"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Modulo applicazioni di Everything"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Comandi"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Comando terminale"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Interfaccia sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr "Plugin di Everything"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Calcolatrice"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Copia in ..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Sposta in ..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Sposta nel cestino"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Apri cartella (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Ordina per data"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Ordina per nome"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "File recenti"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Modulo file di Everything"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Mostra file recenti"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Cerca file recenti"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Cerca file in cache"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Cache per directory visitate"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Svuota cache"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Mostra finestra di dialogo"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Vai alla finestra"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "A tutto schermo"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Invia al desktop"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Icone dei file"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipi di file"
 
@@ -6798,19 +6833,19 @@ msgid "Select an image"
 msgstr "Seleziona un'immagine"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "File manager"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Home"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Directory principale"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6830,7 +6865,7 @@ msgstr ""
 "nuove funzionalità.<br>Adesso è possibile riconfigurare le cose a proprio "
 "piacimento.<br>Ci scusiamo per il disagio.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6847,7 +6882,7 @@ msgstr ""
 "configurazione è<br>stata ripristinata a scopo precauzionale ai valori "
 "predefiniti. Ci<br>scusiamo per l'inconveniente.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Impostazioni di Fileman aggiornate"
 
@@ -6924,95 +6959,99 @@ msgstr "Apri filemanager al montaggio"
 msgid "Device"
 msgstr "Unità"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Directory superiore"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Altre applicazioni..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Apri"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Apri con..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Applicazioni conosciute"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Applicazioni specifiche"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Tutte le applicazioni"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Comando personalizzato"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Copiatura abortita"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Spostamento abortito"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Eliminazione abortita"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Operazione sconosciuta dallo slave abortita"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Copiatura di %s eseguita"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Copio %s (rimangono %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Spostamento di %s eseguito"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Sposto %s (rimangono %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Eliminazione eseguita"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Eliminazione file..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7047,7 +7086,7 @@ msgstr "Processo %d operazioni"
 msgid "Filemanager is idle"
 msgstr "Filemanager in attesa"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Info operazioni EFM"
 
@@ -7059,35 +7098,39 @@ msgstr "Gestore gadget"
 msgid "Available Gadgets"
 msgstr "Gadget disponibili"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Modalità"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Immagine personalizzata"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Colore personalizzato"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animazioni"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Opzioni dello sfondo"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Inizio spostamento/ridimensionamento"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Libero"
@@ -7309,15 +7352,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Siete sicuri di voler rimuovere questa sorgente per Ibar?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Crea nuova icona"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Proprietà"
 
@@ -7361,7 +7404,7 @@ msgstr "Mostra finestre di tutti i desktop"
 msgid "Show windows from active desktop"
 msgstr "Mostra finestre del desktop attivo"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7483,31 +7526,31 @@ msgstr ""
 "usato dal codice<br>interno per il menù contestuale.<br>Questo tasto "
 "funziona solo nel popup."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Mostra popup del pager"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Desktop a destra nel popup"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Desktop a sinistra nel popup"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Desktop sopra nel popup"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Desktop sotto nel popup"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Desktop successivo nel popup"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Desktop precedente nel popup"
 
@@ -7527,131 +7570,89 @@ msgstr "Controlli di sistema"
 msgid "Temperature Settings"
 msgstr "Impostazioni di Temperature"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensori"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Unità di misura"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Frequenza di campionamento"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Alta temperatura"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Bassa temperatura"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Temperature"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperature"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Avanti"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Benvenuti in Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Selezionare un'opzione"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profilo"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-"Non sono stati trovati<br>file di menù sul vostro<br>sistema.<br>Vedere la "
-"documentazione<br>su www.enlightenment.org<br>per ulteriori dettagli "
-"su<br>come far funzionare i<br>propri menù di applicazioni."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Selezionare menù applicazioni"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Barra lanciatori"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Selezionare applicazioni"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "File desktop"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Nessuna icona sul desktop"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
+msgstr "Dimensionamento"
 
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Abilita icone sul desktop"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "Selezionare la dimensione preferita"
 
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Modalità fuoco finestre"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr "Fuoco delle finestre:"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Cliccare per dare fuoco a finestre"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Passare mouse per dare fuoco a finestre"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Selezionare le icone da aggiungere"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Avvio veloce da barra"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Selezionare le applicazioni"
+#: src/modules/wizard/page_060.c:37
+msgid "Mouse Over"
+msgstr "Passaggio del mouse"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7693,7 +7694,7 @@ msgstr "Sinistro:"
 msgid "Right:"
 msgstr "Destro:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Muto"
 
@@ -7717,41 +7718,52 @@ msgstr "Mostra popup volume al cambio da tastiera"
 msgid "Sound Cards"
 msgstr "Schede audio"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Impostazioni di Mixer"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mixer da usare per le azioni globali:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr "Visualizza notifica al cambio di volume"
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Lancia mixer..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Impostazioni del modulo Mixer"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "Nuovo livello audio"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "Mixer"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "Il volume dell'audio è cambiato"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Impostazioni di Mixer aggiornate"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"La configurazione del modulo Mixer è cambiata.<br>La vostra vecchia "
-"configurazione è stata rimpiazzatata con<br>quella predefinita. Ci scusiamo "
-"per l'inconveniente."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
+msgstr "Modulo Mixer"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Impossibile commutare modalità disconnessa del sistema"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "Il demone Connman non è in esecuzione"
 
@@ -7780,121 +7792,128 @@ msgstr "Mostra passphrase come testo"
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Disconnetti dal servizio di rete"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Il servizio non esiste più"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Connetti al servizio di rete"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Impossibile impostare la passphrase per il servizio"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Modalità disconnessa"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Controlli"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Nessun Connman"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Non è stato trovato nessun server Connman"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Modalità disconnessa: le funzioni di rete sono disattivate"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Nessuna connessione"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Disconnesso"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "Disconnetti"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Nome sconosciuto"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Nessun errore"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "In attesa"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "Connessione"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "Configurazione"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "Pronto"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "Login"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "Connesso"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "Errore"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "Abilitato"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "Disponibile"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "Connesso"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "Disconnesso"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Esiste un'altra istanza di Systray"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Può esserci una sola istanza di Systray, e attualmente ne esiste già "
 "un'altra."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr "Errore di Systray"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+"Systray non può funzionare in una mensola impostata per stare sotto le "
+"finestre."
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Systray"
-
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment non riesce ad impostare il suo ambiente."
index e30a8c3..27d00a4 100755 (executable)
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2011-01-06 16:45+0900\n"
 "Last-Translator: Yasufumi Haga <yasufumi.haga@nifty.com>\n"
 "Language-Team: E17-jp <LL@li.org>\n"
@@ -20,20 +20,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment について"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "閉じる"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -42,18 +41,18 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
 msgstr ""
 
 #: src/bin/e_actions.c:365
@@ -71,625 +70,652 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "本当にこのウィンドウを強制終了しますか"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "はい"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "いいえ"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "本当に終了しますか"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Enlightenment を終了しようとしています.<br><br>本当に終了しますか."
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "本当にログアウトしますか"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "ログアウトしようとしています.<br><br>本当にログアウトしますか"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "本当にシャットダウンしますか"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "シャットダウンしようとしています.<br><br>本当にシャットダウンしますか"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "本当に再起動しますか"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "再起動しようとしています.<br><br>本当に再起動しますか"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "サスペンドしようとしています.<br><br>本当にサスペンドしますか"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "ハイバネートしようとしています.<br><br>本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "ウィンドウ: 動作"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "サイズ変更"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "メニュー"
 
 #
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "ウィンドウメニュー"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "上げる"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "下げる"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "強制終了"
 
 #
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "ウィンドウ: 状態"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "常時表示モード反転"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "アイコンモード反転"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "全画面モード反転"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "最大化"
 
 #
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "垂直に最大化"
 
 #
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "全面表示"
 
 #
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化モード \"賢く\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化モード \"拡大\""
 
 #
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化モード \"空きまで"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "上方シェード反転"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "下方シェード反転"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "左方シェード反転"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "右方シェード反転"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "シェード状態反転"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "ボーダー無し状態反転"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "ボーダー"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "位置固定状態反転"
 
 #
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "下のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "デスクトップを指定分移動する"
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "デスクトップ背景を出す"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "シェルフを出す"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "デスクトップを順に移動する..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "デスクトップ 0 に切り替える"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "デスクトップ 1 に切り替える"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "デスクトップ 2 に切り替える"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "デスクトップ 3 に切り替える"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "デスクトップ 4 に切り替える"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "デスクトップ 5 に切り替える"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "デスクトップ 6 に切り替える"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "デスクトップ 7 に切り替える"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "デスクトップ 8 に切り替える"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "デスクトップ 9 に切り替える"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "デスクトップ 10 に切り替える"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "デスクトップ 11 に切り替える"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "指定のデスクトップに切り替える"
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "左のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "右のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "上のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "下のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "デスクトップを指定分移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "指定のデスクトップへ移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "デスクトップを順に移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "指定の方向へデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "デスクトップ 0 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "デスクトップ 1 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "デスクトップ 2 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "デスクトップ 3 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "デスクトップ 4 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "デスクトップ 5 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "デスクトップ 6 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "デスクトップ 7 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "デスクトップ 8 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "デスクトップ 9 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "デスクトップ 10 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "デスクトップ 11 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "指定のデスクトップに切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "画面"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "マウスをスクリーン 0 へ移す"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "マウスをスクリーン 1 へ移す"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "マウスを指定のスクリーンへ移す..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "マウスを次のスクリーンへ移す"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "マウスを前のスクリーンへ戻す"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "マウスを指定のスクリーン分だけ前後に移す..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "シャットダウン"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "移動時"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "移動..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "移動..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "変更サイズ"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "指定の方向へデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "アイコン作成"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "ウィンドウ: 移動"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "次のデスクトップへ"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "前のデスクトップへ"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "指定分のデスクトップを移動"
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "指定のデスクトップへ..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "メインメニューを表示する"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "お気に入りメニューを表示する"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "全アプリケーションメニューを表示する"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "クライアントメニューを表示する"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "指定のメニューを表示する..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "コマンドの実行"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "コマンド"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "アプリケーション"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "終了"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "ただちに終了"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : モード"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "プレゼンテーションモード切換え"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "オフラインモード切換え"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "システム"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "ただちに電源を切る"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "電源を切る"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "サスペンド"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "ハイバネート"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "ロック"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "ウィンドウ整頓"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "一般: 動作"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "遅延動作"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "スクリーンを暗くする"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "スクリーンを明るくする"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "背景に設定する"
 
@@ -697,18 +723,16 @@ msgstr "背景に設定する"
 msgid "Color Selector"
 msgstr "色選択"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -716,20 +740,20 @@ msgstr "色選択"
 msgid "OK"
 msgstr "了解"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -746,7 +770,7 @@ msgstr ""
 "いデフォルト設定<br>を追加すれば更新されます. これで好きなように設定できます."
 "ちょっと面倒ですが, <br>よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -760,11 +784,11 @@ msgstr ""
 "<br>これではまずいので, 念のためデフォルトの設定に置き換えました.<br>ご不便を"
 "おかけしますが, よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment の設定書込時の問題"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -774,19 +798,19 @@ msgstr ""
 "%s から %s へ設定ファイルの移動中にエラーが起きました.<br>安全のため書き出し"
 "はここで強制終了しました."
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "設定が更新されました"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "EETファイルハンドルがおかしいです"
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "ファイルデータが空です"
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -794,74 +818,75 @@ msgstr ""
 "このファイルには書き込めません.<br>ディスクが読み出し専用になっているか書き込"
 "み権限がありません"
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr "書き出し準備中のメモリ不足になりました. メモリ解放してください."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 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:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr "ディスクの入出力エラーです. 交換した方がいいかも."
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "ファイル書き出し中にスペースが不足しました"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "書き出し中にファイルがクローズされました"
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "ファイルのメモリマップ (mmap) が失敗しました"
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "X509エンコーディングが失敗しました"
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "署名に失敗しました"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "署名が不正です"
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "署名がありません"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "機能が未実装です"
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "PRNGの種がありません"
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "暗号化が失敗しました"
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+#, fuzzy
+msgid "Decryption failed."
 msgstr "復号化が失敗しました"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "未知のエラーです"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -872,56 +897,61 @@ msgstr ""
 "%s<br><br>です. 壊れたデータが使われないように, このファイルは削除されました."
 "<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "基本設定"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "適用"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "拡張機能"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "モジュール"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "アイコン・プリファレンス"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "コンテナ %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "エラー - PAMがサポートされていません"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "EnlightenmentにPAMサポートが組み込まれていないため, デスクロックは無効です."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "ロックに失敗しました."
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -929,15 +959,15 @@ msgstr ""
 "キーボードかマウス, またはその両方を掴んで離さないアプリケーションがあるため,"
 "<br>デスクトップをロックできませんでした."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "ロック解除パスワードを入力して下さい"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "認証システムエラー"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -948,11 +978,11 @@ msgstr ""
 "コードは <hilight>%i</hilight> です.<br>これはまずいですね. 起きてはいけない"
 "ことです. ぜひバグ報告して下さい."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "プレゼンテーションモードを有効にしますか?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -961,11 +991,11 @@ msgstr ""
 "デスクトップのロック解除が早すぎます.<br><b>プレゼンテーションモード</b>を有"
 "効にして,<br>スクリーンセーバー, ロック, 省電力機能を一時的に無効にしますか?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "いいえ. しかしタイムアウトは増やす"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "いいえ. 以降は尋ねない"
 
@@ -991,108 +1021,107 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "デスクトップエントリエディタ"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "名前"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "注釈"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
 #
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "一般名称"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "ウィンドウクラス"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "MIME タイプ"
 
 #
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "desktop ファイル"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "一般"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "起動通知"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "端末内で実行"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "メニューに表示する"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "オプション"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "アイコンを選択する"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "プログラムの選択"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "削除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "カット"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "コピー"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "すべて選択"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1134,317 +1163,317 @@ msgstr ""
 "Enlightenment で以下のアプリケーションが実行できませんでした.<br><br>"
 "%s<br><br>このアプリケーションの起動に失敗しました."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s が突然停止しました"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s から終了コード %1$i が返りました"
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s に割り込みシグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s に Quit シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s に Abort シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s に浮動小数点エラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s に割り込み不能 kill シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s にセグメンテーションフォールトによる割り込みが入りました"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s に Broken Pipe による割り込みが入りました"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s に終了シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s にバスエラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s にシグナル番号 %i の割り込みが入りました"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***残りは切り捨てられました. 出力を保存してから参照してください.***\n"
 
 #
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "エラーログ"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "エラーメッセージはありませんでした"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "このメッセージを保存する"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "このエラーログは %s/%s.log に保存されます"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "エラー情報"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "エラーシグナル情報"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "出力データ"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "出力はありませんでした"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "存在しないパス"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s が存在しません"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "マウントエラー"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "デバイスをマウントできません"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "アンマウントエラー"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "デバイスをアンマウントできません"
 
 #
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "イジェクトエラー"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "デバイスをイジェクトできません"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "ファイル数 %i"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "リンク"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "中止"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "親の設定を継承する"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "表示モード"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "内容を更新する"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "隠しファイルを表示する"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "順序をを記憶する"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "ただちにソートする"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "新しいディレクトリ"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "名前変更"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "アンマウント"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "マウント"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "イジェクト"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "アプリケーションプロパティ"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "ファイルプロパティ"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "デフォルトを使う"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "グリッドアイコン"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "カスタムアイコン"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "リスト"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "アイコンサイズ (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "背景を設定する"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "オーバーレイを設定する"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "解除"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "ディレクトリを新規作成する"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "新しいディレクトリ名"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "名前を %s から変更:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "ファイル名を変更する"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "再実行"
 
 #
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "エラー"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "すべて拒否"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "すべて了承"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "警告"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "ファイルが存在します. 上書きしますか?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "これを無視"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "すべて無視"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "操作中にエラーが起きました.<br>%s"
 
 #
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "削除確認"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "以下を本当に削除しますか.<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1478,12 +1507,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知のボリュームです"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "着脱可能媒体"
 
@@ -1491,7 +1520,7 @@ msgstr "着脱可能媒体"
 msgid "File:"
 msgstr "ファイル:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "サイズ:"
 
@@ -1507,7 +1536,7 @@ msgstr "ファイルタイプ:"
 msgid "Permissions"
 msgstr "許可情報"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "所有者"
 
@@ -1527,17 +1556,17 @@ msgstr "所有者が読める"
 msgid "Owner can write"
 msgstr "所有者が書ける"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "プレビュー"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "デフォルト"
 
@@ -1546,7 +1575,7 @@ msgid "Thumbnail"
 msgstr "サムネイル"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "ユーザー指定"
 
@@ -1562,50 +1591,42 @@ msgstr "リンク情報"
 msgid "Select an Image"
 msgstr "画像を選択する"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "移動先"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "移動/大きさ変更を始める"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "サイズ変更可"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "自動的にスクロールする"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "普通"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "埋め込む"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "外見"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "削除"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "このガジェットの移動/大きさ変更を終了する"
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "編集を終了する"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1655,14 +1676,14 @@ msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "サイズ"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "積み重ね順"
@@ -1721,160 +1742,167 @@ msgstr "このウィンドウを開いたままログインを終了する"
 msgid "Remember these Locks"
 msgstr "以上のロックを記憶する"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "ウィンドウ"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "常に一番上に"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "常時表示"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "設定"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "全面表示"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "垂直に最大化"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "通常サイズ"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "アイコン編集"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "アイコン作成"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "お気に入りに追加する"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "IBar に追加する"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "キーボードショートカットに追加"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "配置"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "スキップ"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "ボーダー"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "ロック"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "記憶"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "常時表示"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "スキップ"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "アイコン化"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "シェード"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "画面"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "常に一番上に"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "普通"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "常に一番下に"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "デスクトップ内で位置を固定する"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "デスクトップ内で位置固定を解除にする"
 
 #
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "ボーダースタイルを選ぶ"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "E17デフォルトのアイコンプリファレンスを使う"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "アプリケーション付属のアイコンを使う"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "ユーザー定義アイコンを使う"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "エッジ抵抗"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "ウィンドウリスト"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "ページャ"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "タスクバー"
 
@@ -1895,7 +1923,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCMプロパティ"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "タイトル"
 
@@ -2068,7 +2096,6 @@ msgid "Size, Position and Locks"
 msgstr "サイズ, 位置, およびロック"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "すべて"
 
@@ -2145,15 +2172,13 @@ msgid "Utilities"
 msgstr "ユーティリティ"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "ファイル"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "ランチャー"
 
@@ -2166,20 +2191,6 @@ msgstr "コア"
 msgid "Mobile"
 msgstr "モバイル"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "設定"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "モジュールの設定"
@@ -2217,7 +2228,7 @@ msgstr "ガジェットを追加する"
 msgid "Remove Gadget"
 msgstr "ガジェットを削除する"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "ツールバーの設定"
 
@@ -2225,11 +2236,11 @@ msgstr "ツールバーの設定"
 msgid "Layout"
 msgstr "配置"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "インプットメソッドエラー"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2245,7 +2256,7 @@ msgstr "メイン"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "お気に入りのアプリケーション"
 
@@ -2253,76 +2264,74 @@ msgstr "お気に入りのアプリケーション"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "迷子なウィンドウ"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "情報"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "仮想デスクトップ"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "シェルフ"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "全ウィンドウを一度に隠す/表示する"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(アプリケーション無し)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "仮想デスクトップの設定"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(ウインドウ無し)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "名前無し"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(シェルフ無し)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "シェルフを追加する"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "シェルフを削除する"
 
@@ -2357,7 +2366,7 @@ msgid "Shrink to Content Width"
 msgstr "中身の幅まで縮小する"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "スタイル"
 
@@ -2387,7 +2396,7 @@ msgid "Hide duration"
 msgstr "隠蔽に要する時間"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 秒"
@@ -2404,7 +2413,7 @@ msgstr "全デスクトップに表示する"
 msgid "Show on specified Desktops"
 msgstr "指定のデスクトップに表示する"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2421,7 +2430,7 @@ msgstr ""
 "以下の結果を確認して下さい:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2433,71 +2442,25 @@ msgstr ""
 "以下の結果を確認して下さい:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, fuzzy, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"オプション:\n"
-"\t-display DISPLAY\n"
-"\t\tDISPLAY に指定されたディスプレイに接続する.\n"
-"\t\t例: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\t指定のジオメトリに(本物ではなく)疑似 xinerama スクリーンを追加し,\n"
-"\t\t本物の xinerama スクリーンを置き換える. 個数に制限は無い. \n"
-"\t\tこれを使えば xinerama がシミュレートできる.\n"
-"\t\t例: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tユーザーが決めたデフォルトの設定プロファイルの代わりに CONF_PROFILE を使"
-"う.さもなければ \"default\" が使われる.\n"
-"\t-good\n"
-"\t\t良くしてて\n"
-"\t-evil\n"
-"\t\t悪くしてて\n"
-"\t-psychotic\n"
-"\t\t精神病様にしてて\n"
+#
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment で Ecore が初期化できません.\n"
-"メモリー不足かもしれません."
+#
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment でファイルシステムが初期化できません.\n"
-"メモリー不足かもしれません."
+#
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2505,7 +2468,7 @@ msgstr ""
 "Enlightenment で終了シグナルハンドラーが準備できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2513,7 +2476,7 @@ msgstr ""
 "Enlightenment で HUP シグナルハンドラーが準備できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2521,63 +2484,43 @@ msgstr ""
 "Enlightenment で USER シグナルハンドラーが準備できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenmentで X との接続が初期化できません.\n"
-"環境変数 DISPLAY の定義を確認してください."
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenmentで緊急アラートシステムが初期化できません.\n"
-"環境変数 DISPLAY の定義を確認してください."
+#
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment で接続システムが初期化できません.\n"
-"メモリー不足かもしれません."
+#
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment で IPC システムが初期化できません.\n"
-"メモリー不足かも知れません."
+#
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment で xinerama のラッピングが準備できません.\n"
-"そんなばかな..."
+#
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment で randr のラッピングが準備できません.\n"
-"そんなばかな..."
+#
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment で Evas システムが初期化できません.\n"
-"メモリー不足かも知れません."
+#
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2588,7 +2531,7 @@ msgstr ""
 "ソフトウェア x11 レンダリングエンジンがサポートされていることも確認してくださ"
 "い."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2600,7 +2543,39 @@ msgstr ""
 "ソフトウェアバッファレンダリングエンジンがサポートされていることを確認してく"
 "ださい."
 
-#: src/bin/e_main.c:572
+#
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
+
+#
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenmentで緊急アラートシステムが初期化できません.\n"
+"環境変数 DISPLAY の定義を確認してください."
+
+#
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
+
+#
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2608,23 +2583,29 @@ msgstr ""
 "あなたのホームディレクトリにディレクトリが作成できません.\n"
 "ホームディレクトリはちゃんとありますか, ディスクが一杯になっていませんか."
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment でファイルレジストリシステムが初期化できません."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment で設定処理システムが初期化できません."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment でテーマシステムが準備できません."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment でスケールシステムが準備できません."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment でポインタシステムが準備できません."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2632,95 +2613,42 @@ msgstr ""
 "Enlightenment でファイル検索用のパスが設定できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment でフォントシステムが準備できません."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment でテーマシステムが準備できません."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment で初期スクリーンが準備できません.\n"
-"メモリー不足かもしれません."
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment で国際化システムが準備できません."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "国際化機能を起動中"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment で国際化システムが準備できません."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment で FDO デスクトップシステムが初期化できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "フォーマットのサポート状態を確認中"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Evas でバッファキャンバスが作成できません.\n"
-"Evas にソフトウェアバッファエンジンがサポートされていることを確認して下さ"
-"い.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Evas で PNG ファイルがロードできません.\n"
-"Evas で PNG ローダーがサポートされていることを確認して下さい.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Evas で JPEG ファイルがロードできません.\n"
-"Evas で JPEG ローダーがサポートされていることを確認して下さい.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Evas で EET ファイルがロードできません.\n"
-"Evas で EET ローダーがサポートされていることを確認して下さい.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Evas で 'Sans' フォントがロードできません.\n"
-"Evas で fontconfig がサポートされていること, \n"
-"およびシステムの fontconfig で 'Sans' フォントが\n"
-"定義されていることを確認して下さい.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "SVGサポートチェック"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "スクリーンを準備中"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2728,199 +2656,360 @@ msgstr ""
 "Enlightenment でこのシステムのすべての画面に対するウィンドウ管理が\n"
 "準備できませんでした. 別のウィンドウマネージャが動いているかもしれません.\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "ACPIを準備中"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "バインドを準備中"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment で DPMS が設定できません."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMSを準備中"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment で DPMS が設定できません."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "スクリーンセーバーを準備中"
 
 #
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment で X スクリーンセーバーが設定できません."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "省電力モードを設定中"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment で省電力モードが準備できません."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "デスクロックを準備中"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment で デスクロックシステムが準備できません."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "ポップアップを準備中"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment でポップアップシステムが準備できません."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "メッセージシステムを準備中"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "パスを設定中"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "システムコントロールを準備中"
 
 #
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment でシステムコマンドの処理システムが初期化できません.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "アクションを準備中"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment でアクションシステムが準備できません."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "実行システムを準備中"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment で exec システムが準備できません."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "ファイルマネージャを準備中"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "ファイルマネージャ"
 
 #
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "メッセージシステムを準備中"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment で メッセージシステムが準備できません."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "DNDシステムを準備中"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment で dnd システムが準備できません."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "入力グラブ処理システムを準備中"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment で入力グラブ処理システムが準備できません."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "モジュールを準備中"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment でモジュールシステムが準備できません."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "記憶機能を準備中"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment で記憶機能の設定が準備できません."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "色クラスを準備中"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment でカラークラスシステムが準備できません."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Gadconを準備中"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment でガジェット管理システムが準備できません."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "ACPIを準備中"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMSを準備中"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment で DPMS が設定できません."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "省電力モードを設定中"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment で省電力モードが準備できません."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "壁紙を準備中"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment でデスクトップ背景システムが準備できません."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "マウスを準備中"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment でマウスが設定できません."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "バインドを準備中"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment でバインディングシステムが準備できません."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "シェルフを準備中"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment でシェルフシステムが準備できません."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "サムネイル機能を準備中"
 
 #
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment でサムネイル処理システムが初期化できません.\n"
 
-#: src/bin/e_main.c:1058
+#
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment でシステムコマンドの処理システムが初期化できません.\n"
+
+#
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment でサムネイル処理システムが初期化できません.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment でテーマシステムが準備できません."
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "ファイルオーダリングを準備中"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment で order ファイルシステムが準備できません."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "モジュールをロード中"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "シェルフを設定中"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "ほぼ終了"
+
+#: src/bin/e_main.c:1094
+#, fuzzy, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"オプション:\n"
+"\t-display DISPLAY\n"
+"\t\tDISPLAY に指定されたディスプレイに接続する.\n"
+"\t\t例: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\t指定のジオメトリに(本物ではなく)疑似 xinerama スクリーンを追加し,\n"
+"\t\t本物の xinerama スクリーンを置き換える. 個数に制限は無い. \n"
+"\t\tこれを使えば xinerama がシミュレートできる.\n"
+"\t\t例: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tユーザーが決めたデフォルトの設定プロファイルの代わりに CONF_PROFILE を使"
+"う.さもなければ \"default\" が使われる.\n"
+"\t-good\n"
+"\t\t良くしてて\n"
+"\t-evil\n"
+"\t\t悪くしてて\n"
+"\t-psychotic\n"
+"\t\t精神病様にしてて\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "フォーマットのサポート状態を確認中"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Evas でバッファキャンバスが作成できません.\n"
+"Evas にソフトウェアバッファエンジンがサポートされていることを確認して下さ"
+"い.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Evas で PNG ファイルがロードできません.\n"
+"Evas で PNG ローダーがサポートされていることを確認して下さい.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Evas で JPEG ファイルがロードできません.\n"
+"Evas で JPEG ローダーがサポートされていることを確認して下さい.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Evas で PNG ファイルがロードできません.\n"
+"Evas で PNG ローダーがサポートされていることを確認して下さい.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Evas で EET ファイルがロードできません.\n"
+"Evas で EET ローダーがサポートされていることを確認して下さい.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Evas で 'Sans' フォントがロードできません.\n"
+"Evas で fontconfig がサポートされていること, \n"
+"およびシステムの fontconfig で 'Sans' フォントが\n"
+"定義されていることを確認して下さい.\n"
+
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2928,11 +3017,11 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2940,7 +3029,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2948,7 +3037,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2956,20 +3045,12 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "シェルフを設定中"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "ほぼ終了"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "モジュールをロード中: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2978,11 +3059,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>モジュール %s はモジュール"
 "の検索パスにありません.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "モジュールのロードエラー"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2991,11 +3072,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>このモジュールのフルパスは"
 "以下のとおりです.<br>%s<br>エラーの内容は以下のとおりです.<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "モジュールに不足している機能があります."
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3006,16 +3087,16 @@ msgstr ""
 "モジュール API が必要です.<br>Enlightenment で提供されているモジュール API の"
 "バージョンは %i です.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s モジュール"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "このモジュールをアンロードしますか?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3029,26 +3110,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr "シェルフ #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "このシェルフを本当に削除しますか."
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "ガジェットの位置と大きさの変更を終了する"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "ガジェットの位置と大きさの変更を始める"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "中身"
 
@@ -3056,16 +3137,16 @@ msgstr "中身"
 msgid "Starting"
 msgstr "起動中"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "システムパーミッションを確認中"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "システム確認終了"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3076,42 +3157,42 @@ msgstr ""
 "めです.<br>このアプリケーションを無視して、とにかくログアウトを完了させます"
 "か.<br><br>自動ログアウトまであと %d 秒."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "ログアウトに問題があります"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "ただちにログアウトする"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "待機する"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "ログアウトを取り消す"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "ログアウト中"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "ログアウト処理中です.<br><hilight>しばらくお待ち下さい</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment は現在他の処理で手一杯です."
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "ログアウト中です.<br>ログアウト処理が始まったら他のシステム処理はできません."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3119,77 +3200,78 @@ msgstr ""
 "シャットダウン中です.<br>シャットダウン処理が始まったら他のシステム処理はでき"
 "ません."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr "再起動中です.<br>再起動処理が始まったら他のシステム処理はできません."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 "サスペンド中です.<br>サスペンドが完了するまでは他のシステム処理はできません."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "ハイバネート中です.<br>ハイバネートが完了するまでは他のシステム処理はできませ"
 "ん."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "ありゃりゃ, これはまずいよ"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "電源断に失敗しました"
 
 #
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "リセットが失敗しました"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "サスペンドが失敗しました"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "ハイバネートに失敗しました"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "電源断"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "電源断処理中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "リセット中"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "リセット中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "サスペンド中"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "サスペンド中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "ハイバネート中"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "ハイバネート中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
@@ -3197,34 +3279,34 @@ msgstr "ハイバネート中です.<br><hilight>しばらくお待ち下さい.
 msgid "About Theme"
 msgstr "このテーマについて"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "テーマに設定する"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を終了する"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を始める"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "ツールバーの内容の設定"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment で以下の子プロセスが fork できませんでした.<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "終了できません. 不死身のウィンドウです."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3234,123 +3316,123 @@ msgstr ""
 "ンドウを閉じるか寿命のロックを解除するまで Enlightenment は<br>終了できませ"
 "ん.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f B"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "未来"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "直前"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li ヶ月前"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 週間前"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 日前"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 時間前"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分前"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "不明"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "画像インポート設定"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "インポート"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "画像の配置方法"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "変形"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "中央"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "等倍"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "全面"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "画質"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "元のファイルに合わせる"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3369,12 +3451,12 @@ msgstr ""
 "これで好きなように設定できます.<br>\n"
 "ちょっと面倒ですがよろしくお願いします.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s 設定を更新しました"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3408,140 +3490,146 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "お気に入りに追加する"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "解像度"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "許可情報"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "最終更新日"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "本人"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "保護"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "読込専用"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "読書両用"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "バッテリモニターの設定"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "バッテリ容量の低下時に警告を表示する"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "監視間隔"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "ハイバネート"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "ポーリング"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "容量低下時に警告を表示する"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "警告を出す残容量"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "指定時間後自動解除"
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f 秒"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "警告"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "内部"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "ファジーモード"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "ハードウェア"
 
@@ -3550,33 +3638,34 @@ msgstr "ハードウェア"
 msgid "Battery"
 msgstr "バッテリ"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "バッテリ容量低下!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC 電源を使ってください."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "不可"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "エラー"
 
 #
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "バッテリメーター"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "時計"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "ツールバーを表示する"
@@ -3643,17 +3732,17 @@ msgstr "設定パネルの設定を更新しました"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBarアプリケーション"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "スタートアップアプリケーション"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "再起動アプリケーション"
 
@@ -3666,10 +3755,26 @@ msgid "Apps"
 msgstr "アプリケーション"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "新しいアプリケーション"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "ランチャー"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "アプリケーションを選択する"
+
+#
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "デスクトップファイル"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar 他"
 
@@ -3682,7 +3787,7 @@ msgid "Available Profiles"
 msgstr "利用できるプロファイル"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "プロファイルを選択する"
 
@@ -3721,9 +3826,9 @@ msgstr "設定ダイアログの設定"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "一般設定"
 
@@ -3765,7 +3870,7 @@ msgstr "設定ダイアログ"
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3776,7 +3881,7 @@ msgstr ""
 "に戻す ボタンを押して下さい.<br>ボタンを押さない場合は, 元の解像度 %dx%d, リ"
 "フレッシュレート %d Hz にあと %d 秒で復帰します."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3787,7 +3892,7 @@ msgstr ""
 "に戻す ボタンを押して下さい.<br>ボタンを押さない場合は, 元の解像度 %dx%d にあ"
 "と %d 秒で復帰します."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3798,7 +3903,7 @@ msgstr ""
 "に戻す ボタンを押して下さい.<br>ボタンを押さない場合は, 元の解像度 %dx%d, と"
 "リフレッシュレート %d Hz に<hilight>ただちに</hilight> 復帰します."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3809,47 +3914,47 @@ msgstr ""
 "に戻す ボタンを押して下さい.<br>ボタンを押さない場合は, 元の解像度 %dx%d に"
 "<hilight>ただちに</hilight> 復帰します."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "解像度の変更"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "保存する"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "元に戻す"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "画面の解像度の設定"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "解像度"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "ログイン時に解像度復帰"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "更新"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "回転"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "反転"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "機能が不足しています"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3862,11 +3967,11 @@ msgstr ""
 "画面の解像度は変更できません.<br><hilight>ecore</hilight> の構築時に XRandR "
 "サポートが検出されなかった可能性もあります."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "リフレッシュレートが見つかりません"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3879,89 +3984,72 @@ msgstr ""
 "ば, 解像度の設定時に現在のリフレッシュレートが使われます.<br>ただし、こうする"
 "と画面に<hilight>損傷</hilight>を与える場合があります."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "仮想デスクトップの設定"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "デスクトップ数"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "デスクトップの切り替え"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "ウィンドウなどを画面の端までドラッグしたらデスクトップを切り替える"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "デスクトップの上下左右をつなげる"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "デスクトップ"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "無効"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "パン"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "ズーム"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "背景をパンさせる"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "アニメーション速度"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f 秒"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "X軸パンファクタ"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Y軸パンファクタ"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "切替アニメーション"
 
@@ -3979,7 +4067,7 @@ msgid "Desktop Wallpaper"
 msgstr "デスクトップの壁紙"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "設定"
 
@@ -3989,12 +4077,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "ユーザー"
 
@@ -4002,185 +4090,214 @@ msgstr "ユーザー"
 msgid "Screen Lock Settings"
 msgstr "スクリーンロックの設定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "開始時にロック"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "サスペンド時にロック"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "カスタムスクリーンロックコマンド"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "ロック中"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "全スクリーンに表示する"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "現在のスクリーンに表示する"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "次のスクリーンに表示する :"
 
 #
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "ログインボックス"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "X スクリーンセーバーが起動したらロックする"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f 秒"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "所定のアイドル時間が過ぎたらロックする"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f 分"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "タイマー"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "すでに無効になっているかどうか示す"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "プレゼンテーションモード"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "テーマ指定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "テーマの壁紙"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "現在の壁紙"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "壁紙"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "スクリーンセーバーの設定"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "X スクリーンセーバーを有効にする"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "ディスクへサスペンド"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "スクリーンセーバー"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "初期タイムアウト"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "変化後のタイムアウト"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "ブランキング"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "欲しい"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "要らない"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "エクスポージャイベント"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "許可する"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "許可しない"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "ディスプレイ電源管理シグナル"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "現在のディスプレイサーバーでは DPMS は使えません"
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "現在のディスプレイサーバーには DPMS 拡張機能がありません"
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "ディスプレイ電源管理の設定"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "ディスプレイ電源管理を有効にする"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "スタンバイ時間"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "サスペンド時間"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "オフ時間"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "更新日で"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "戻る"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "仮想デスクトップ"
@@ -4228,74 +4345,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "エッジバインディング設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "エッジバインディング"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "マウスバインド追加"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "マウスバインド削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "マウスバインド変更"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "すべて削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "デフォルトのキーバインドに戻す"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "アクション"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "アクションパラメータ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "一般オプション"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "全画面ウィンドウでバインディング動作を許可する"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "エッジバインドシーケンス"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "クリック可能エッジ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "エッジのバインドエラー"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4304,28 +4421,28 @@ msgstr ""
 "そのバインドキーシーケンスはすでに以下のアクションで使われています."
 "<br><hilight>%s</hilight><br>他のエッジバインドシーケンスを選んで下さい."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4475,34 +4592,47 @@ msgid ""
 msgstr ""
 "コピーでエラーが発生したため Enlightenment で設定情報が取り込めませんでした."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "言語の設定"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "使用する言語"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "システムデフォルト"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "選択されたロケール"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "ロケール"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "言語"
 
@@ -4590,17 +4720,17 @@ msgid "Manager"
 msgstr "マネージャ"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "無し"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "マウスバインドシーケンス"
 
@@ -4625,13 +4755,11 @@ msgid "Menu Settings"
 msgstr "メニューの設定"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "ユーザー"
@@ -4641,7 +4769,7 @@ msgid "Main Menu"
 msgstr "メインメニュー"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "お気に入り"
 
@@ -4660,7 +4788,7 @@ msgstr "注釈"
 
 #
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4672,7 +4800,7 @@ msgid "Show gadget settings in top-level"
 msgstr "トップレベルに表示する"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "メニュー"
 
@@ -4740,19 +4868,19 @@ msgid "Images"
 msgstr "画像"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "フォント"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "テーマ"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "アイコン"
 
@@ -4899,18 +5027,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "壁紙の設定"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "テーマの壁紙を使う"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "他の画像..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "ネットから..."
 
@@ -4930,42 +5058,47 @@ msgstr "このデスクトップ"
 msgid "This Screen"
 msgstr "このスクリーン"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "壁紙の設定..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "タイル"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "パン"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "画像の選択..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "画像のインポートエラー"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "画像の変換でエラーが発生したため画像が取り込めませんでした."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "画像のインポートエラー"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "画像のコピーでエラーが発生したため画像が取り込めませんでした."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5003,7 +5136,7 @@ msgstr "エラー: 要求を開始できません"
 
 #
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "デフォルトのボーダースタイル"
 
@@ -5011,7 +5144,7 @@ msgstr "デフォルトのボーダースタイル"
 msgid "Window Border Selection"
 msgstr "ウィンドウボーダーの選択"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "このボーダーを記憶して, 次回このウィンドウが現れた時に適用する"
 
@@ -5045,7 +5178,7 @@ msgid "Menu Background Base"
 msgstr "メニュー背景ベース"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "メニュータイトル"
 
@@ -5054,7 +5187,7 @@ msgid "Menu Title Active"
 msgstr "アクティブなメニューのタイトル"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "メニュー項目"
 
@@ -5067,12 +5200,12 @@ msgid "Menu Item Disabled"
 msgstr "無効なメニュー項目"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "移動時"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "サイズ変更時"
 
@@ -5089,7 +5222,7 @@ msgid "Winlist Label"
 msgstr "ウィンドウリストラベル"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "ウィンドウリストタイトル"
 
@@ -5106,377 +5239,388 @@ msgid "File Manager Background Base"
 msgstr "ファイルマネージャ背景ベース"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "フォーカス"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "ボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "無効ボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "チェックボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "無効チェックボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "テキストフィールド"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "無効なエントリテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "ラベルテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "選択されたリスト項目テキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "リスト項目テキスト(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "リスト項目背景ベース(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "リスト項目テキスト(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "リスト項目背景ベース(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "リストヘッダーテキスト(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "リストヘッダー背景ベース(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "リストヘッダーテキスト(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "リストヘッダー背景ベース(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "ラジオボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "無効ラジオボタンテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "スライダテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "無効スライダーテキスト"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "フレーム背景ベース"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "スクローラフレーム背景ベース"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "モジュールラベル"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "コンポジットフォーカスアウト色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "配色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "色クラス: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "%u 色の混合色クラスを選択"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "%u色 の未設定色クラスを選択"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "%u 色の統一色クラスを選択"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "色クラス未選択"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "カスタム色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "オブジェクト:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "アウトライン"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "影"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "適用された色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "使える色はテーマによって異なります"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "ウィンドウマネージャ"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "ウィジェット"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "その他"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "タイトルバー"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "テキストブロック(普通)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "テキストブロック(ライト)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "テキストブロック(ビッグ)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "設定ヘディング"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "「...について」のタイトル"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "「...について」のバージョン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "「...について」の内容"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "デスクロックのタイトル"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "ロック解除用パスワード"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "エラーダイアログ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "コマンド実行"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "スプラッシュのタイトル"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "スプラッシュのテキスト"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "スプラッシュのバージョン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+#, fuzzy
+msgid "Digital Clock"
+msgstr "デジタル表示"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "テキストフィールド"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "フレーム"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "ラベル"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "ボタン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "スライダ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "ラジオボタン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "チェックボタン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "リスト項目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "リストヘッダー"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "ファイルマネージャ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "デスクトップアイコン"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "小(体裁よい)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "普通(体裁よい)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "大(体裁よい)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "フォントの設定"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "とても小さい"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "大きい"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "とても大きい"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "極めて大きい"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d px"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "カスタムフォントクラスを有効にする"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "フォントクラス"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "フォントクラスを有効にする"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "フォント名"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "ヒンティング"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "バイトコード"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "代替フォント"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "代替フォント名"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "代替フォントを有効にする"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "ヒンティング / 代替フォント"
 
@@ -5484,12 +5628,17 @@ msgstr "ヒンティング / 代替フォント"
 msgid "Icon Theme Settings"
 msgstr "アイコンテーマの設定"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "アイコンテーマを使う"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "アプリケーションを選択する"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "全体テーマを無効にする"
@@ -5555,11 +5704,9 @@ msgid "Custom scaling factor"
 msgstr "スケーリング係数をカスタマイズする"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f 倍"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f ピクセル/秒"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5570,6 +5717,12 @@ msgstr "ポリシー"
 msgid "Minimum"
 msgstr "最小"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f 倍"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "最大"
@@ -5591,25 +5744,25 @@ msgstr "ログイン時にスプラッシュスクリーンを表示する"
 msgid "Transition Settings"
 msgstr "デスクトップの特殊効果設定"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "イベント"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "起動時"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "デスクトップの移動"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "背景の変更"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "デスクトップ特殊効果"
 
@@ -5625,15 +5778,15 @@ msgstr "インポート..."
 msgid " Online..."
 msgstr "ネットから..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "テーマのカテゴリ"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "設定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "全解除"
 
@@ -5663,19 +5816,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "テーマの交換"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "ボーダー"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "アイコンのテーマ"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "マウスカーソル"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "スケール調整"
 
@@ -5797,6 +5950,10 @@ msgstr "アプリケーション付属"
 msgid "Border Icon"
 msgstr "ボーダーアイコン"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "配置"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "賢く配置する"
@@ -5825,23 +5982,46 @@ msgstr "新しいウィンドウ"
 msgid "Animate"
 msgstr "アニメーション"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "定速で動かす"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "加速のち減速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "次第に加速する"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "次第に減速する"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "マウスアクセラレータ"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "次第に減速する"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "加速のち減速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "シェーディング"
 
@@ -5862,6 +6042,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "最後にマウスがあったウィンドウにフォーカスを残す"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "クリック"
 
@@ -5893,11 +6074,6 @@ msgstr "ダイアログのみ"
 msgid "Only dialogs with focused parent"
 msgstr "親にフォーカスがあるダイアログのみ"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "フォーカス"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "その他の設定"
@@ -5999,13 +6175,13 @@ msgid "Fill available space"
 msgstr "空きスペースまで広げる"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "横に広げる"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "縦に広げる"
@@ -6062,7 +6238,7 @@ msgid "Raise when clicking to focus"
 msgstr "クリックしてフォーカスを当てる時ウィンドウを上に出す"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "ウィンドウフォーカス"
 
@@ -6320,29 +6496,29 @@ msgstr "かなり薄い影"
 msgid "Dropshadow"
 msgstr "ドロップシャドウ"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Everythingランチャー"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Everythingランチャー"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Everythingの設定"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Everythingダイアログを表示する"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Everythingモジュール"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Everything起動"
 
@@ -6350,145 +6526,146 @@ msgstr "Everything起動"
 msgid "Everything Settings"
 msgstr "Everythingの設定"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "利用できるプラグイン"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "上へ"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "下へ"
 
 #
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "設定"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "有効"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "\"ALL\"に表示する"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "トップレベルに表示する"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "検索最小文字数"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "プラグイントリガー"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "デフォルトはプラグイン名"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "トリガーがかかったときのみ検索"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "プラグイン表示"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "詳細"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "デフォルトの表示形式"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "スクロールをアニメ化"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "アクティブ以外は入力を隠す"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "リストを隠す"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "クイックナビ"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Emacsスタイル"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Viスタイル"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "デフォルトの表示形式"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "スクロールをアニメ化"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "整列"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "整列"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "用途"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "使用頻度"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "最終使用"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "サブジェクトプラグイン"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "アクションプラグイン"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "オブジェクトプラグイン"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "ポップアップサイズ"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "ポップアップ幅"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "ポップアップ高"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "ポップアップ整列"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6497,35 +6674,27 @@ msgstr "ポップアップ整列"
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "エッジポップアップサイズ"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "ジオメトリ"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Everythingコレクション"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "アクション"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "項目"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "プラグインがロードされていません"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "クリップボードへコピーする"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6566,147 +6735,60 @@ msgstr ""
 "ビューモードを切替えます.<br><hilight>&lt;ctrl+3&gt;</hilight>でサムビュー"
 "モードを切替えます."
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "開く..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "ファイルを開く..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "アプリケーションの編集"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "新しいアプリケーションエントリ"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "sudoで実行する"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "開く..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "端末を開く"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "実行ファイル名"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Everythingアプリケーション"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "端末起動コマンド"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "すべて"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "計算器"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "コピー..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "移動..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "ゴミ箱へ移動"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "フォルダを開く (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "日付で整列"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "名前で整列"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "最近のファイル"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Everything ファイル"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "最近のファイルを表示する"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "最近のファイルを検索する"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "キャッシュされているファイルを検索する"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "使用したディレクトリをキャッシュする"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "キャッシュをクリアする"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "ダイアログを表示する"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "ウィンドウに切換える"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "全面表示を切換える"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "他のデスクトップへ移す"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "ファイルアイコン"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "ファイルタイプ"
 
@@ -6751,19 +6833,19 @@ msgid "Select an image"
 msgstr "画像を選択する"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "ファイルマネージャ"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "ホーム"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "ルート"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6784,7 +6866,7 @@ msgstr ""
 "これで好きなように設定できます.<br>\n"
 "ちょっと面倒ですがよろしくお願いします.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6803,7 +6885,7 @@ msgstr ""
 "これではまずいので, 念のためデフォルトの設定に置き換えました.<br>\n"
 "ご不便をおかけしますが, よろしくお願いします.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "ファイルマネージャの設定が更新されました"
 
@@ -6883,96 +6965,100 @@ msgstr "マウント時にファイルマネージャを開く"
 msgid "Device"
 msgstr "プレビュー"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "その他のアプリケーション..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "開く"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "開く..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "既知のアプリケーション"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "特定のアプリケーション"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "全アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "カスタムコマンド"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "コピーが異常終了しました"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "移動が異常終了しました"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "削除が異常終了しました"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "スレーブからの未知の操作が異常終了しました"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "%s のコピー終了"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "%s コピー中 (ETA: %d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "%s の移動終了"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "%s 移動中 (ETA: %d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "削除終了"
 
 #
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "ファイルを削除中..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7007,7 +7093,7 @@ msgstr "%d 操作を処理"
 msgid "Filemanager is idle"
 msgstr "ファイルマネージャは空いています"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM 操作情報"
 
@@ -7019,35 +7105,39 @@ msgstr "ガジェットマネージャ"
 msgid "Available Gadgets"
 msgstr "使えるガジェット"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "モード"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "カスタム画像"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "カスタム色"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "透明"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "アニメーション"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "背景"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "背景オプション"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "移動/大きさ変更を始める"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "自由"
@@ -7270,15 +7360,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "この IBar を本当に削除しますか."
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "新しいアイコンを作る"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "プロパティ"
 
@@ -7323,7 +7413,7 @@ msgstr "すべてのデスクトップのウィンドウを表示する"
 msgid "Show windows from active desktop"
 msgstr "現在のデスクトップのウィンドウを表示する"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7445,31 +7535,31 @@ msgstr ""
 "シェルフではマウスの右ボタンは使用できません.<br>すでに内部コードでコンテキス"
 "トメニュー用に確保されています.<br>このボタンはポップアップでしか使えません."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "ページャーのポップアップを表示する"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "ページャーのポップアップで右のデスクトップに移る"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "ページャーのポップアップで左のデスクトップに移る"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "ページャーのポップアップで上のデスクトップに移る"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "ページャーのポップアップで下のデスクトップに移る"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "ページャーのポップアップで次のデスクトップに移る"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "ページャーのポップアップで前のデスクトップに移る"
 
@@ -7489,133 +7579,92 @@ msgstr "システムコントロール"
 msgid "Temperature Settings"
 msgstr "温度計の設定"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "センサー"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "セ氏"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "カ氏"
 
 #
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "表示単位"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "監視間隔"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "低温"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "温度計"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "温度計"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "次へ"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Enlightenment にようこそ"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "一つ選んでください"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "プロファイル"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"システムにメニューファイルがありません.<br>アプリケーションメニューの詳しい使"
-"い方については,<br>www.enlightenment.org<br>にあるマニュアルを参照してくださ"
-"い."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "アプリケーションメニューを選択する"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "ランチャーバー"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "アプリケーションを選択する"
-
-#
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "デスクトップファイル"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "デスクトップにアイコンを表示しない"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "デスクトップにアイコンを表示する"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "フォーカスモード"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "クリックしてフォーカスを移す"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "フォーカスを得たウィンドウにポインタを移す"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "追加するアイコンを選択する"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "プロファイルを選択する"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "クイック起動"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "アプリケーションを選択する"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "使用頻度"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7657,7 +7706,7 @@ msgstr "左:"
 msgid "Right:"
 msgstr "右:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "ミュート"
 
@@ -7681,40 +7730,54 @@ msgstr "キーバインドでボリューム変更時にポップアップを表
 msgid "Sound Cards"
 msgstr "サウンドカード"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "ミキサーの設定"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "システム全体の動作に使うミキサー"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "ミキサーを起動..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "ミキサーモジュールの設定"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "解像度の変更"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "ミキサーの設定を更新しました"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"ミキサーモジュールの設定内容が変更されました.<br>古い設定内容は新しいデフォル"
-"トの設定に置き換わっています. <br>ご不便をおかけします."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "ミキサーモジュールの設定"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "システムのオフラインモードの切替えができません"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnManデーモンが動いていません"
 
@@ -7743,124 +7806,343 @@ msgstr "パスフレーズを平文で表示する"
 msgid "Ok"
 msgstr "了解"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "ネットワークサービスに未接続"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "サービスが存在しません"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "ネットワークサービスに接続"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "サービスのパスフレーズが設定できません"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "オフラインモード"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "コントロール"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "ConnManがありません"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "ConnManサーバーが見つかりません"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "オフラインモード: 無線はすべて使用不可"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "接続無し"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "接続されていません"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "切断"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "未知の名前です"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "エラー無し"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "空き"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "ファイルとの対応"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "設定"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "ログイン"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "オンライン"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "失敗"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "有効"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "利用可能"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "接続中"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "オフライン"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "別の systray があります"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "使える systray ガジェットは1つだけですが、すでに存在します"
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
+#~ msgid "Dim Screen"
+#~ msgstr "スクリーンを暗くする"
+
+#~ msgid "Undim Screen"
+#~ msgstr "スクリーンを明るくする"
+
+#~ msgid "Resizeable"
+#~ msgstr "サイズ変更可"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "このガジェットの移動/大きさ変更を終了する"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment で Ecore が初期化できません.\n"
+#~ "メモリー不足かもしれません."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment でファイルシステムが初期化できません.\n"
+#~ "メモリー不足かもしれません."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenmentで X との接続が初期化できません.\n"
+#~ "環境変数 DISPLAY の定義を確認してください."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment で接続システムが初期化できません.\n"
+#~ "メモリー不足かもしれません."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment で IPC システムが初期化できません.\n"
+#~ "メモリー不足かも知れません."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment で xinerama のラッピングが準備できません.\n"
+#~ "そんなばかな..."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment で randr のラッピングが準備できません.\n"
+#~ "そんなばかな..."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment で Evas システムが初期化できません.\n"
+#~ "メモリー不足かも知れません."
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment で初期スクリーンが準備できません.\n"
+#~ "メモリー不足かもしれません."
+
+#~ msgid "Check SVG Support"
+#~ msgstr "SVGサポートチェック"
+
+#~ msgid "Setup FM"
+#~ msgstr "ファイルマネージャを準備中"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment でシェルフシステムが準備できません."
+
+#~ msgid "New Application"
+#~ msgstr "新しいアプリケーション"
+
+#~ msgid "Background panning"
+#~ msgstr "背景をパンさせる"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "X軸パンファクタ"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Y軸パンファクタ"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "ディスプレイ電源管理シグナル"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "現在のディスプレイサーバーでは DPMS は使えません"
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "現在のディスプレイサーバーには DPMS 拡張機能がありません"
+
+#~ msgid "Default is plugin name"
+#~ msgstr "デフォルトはプラグイン名"
+
+#~ msgid "Actions"
+#~ msgstr "アクション"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "クリップボードへコピーする"
+
+#~ msgid "Open With..."
+#~ msgstr "開く..."
+
+#~ msgid "Open File..."
+#~ msgstr "ファイルを開く..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "アプリケーションの編集"
+
+#~ msgid "New Application Entry"
+#~ msgstr "新しいアプリケーションエントリ"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "sudoで実行する"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "端末を開く"
+
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment でテーマシステムが準備できません."
+#~ msgid "Run Executable"
+#~ msgstr "実行ファイル名"
+
+#~ msgid "Calculator"
+#~ msgstr "計算器"
+
+#~ msgid "Copy To ..."
+#~ msgstr "コピー..."
+
+#~ msgid "Move To ..."
+#~ msgstr "移動..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "ゴミ箱へ移動"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "フォルダを開く (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "日付で整列"
+
+#~ msgid "Sort by Name"
+#~ msgstr "名前で整列"
+
+#~ msgid "Recent Files"
+#~ msgstr "最近のファイル"
+
+#~ msgid "Show Dialog"
+#~ msgstr "ダイアログを表示する"
+
+#~ msgid "Switch to Window"
+#~ msgstr "ウィンドウに切換える"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "全面表示を切換える"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "他のデスクトップへ移す"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "システムにメニューファイルがありません.<br>アプリケーションメニューの詳し"
+#~ "い使い方については,<br>www.enlightenment.org<br>にあるマニュアルを参照して"
+#~ "ください."
+
+#~ msgid "Select application menu"
+#~ msgstr "アプリケーションメニューを選択する"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "ランチャーバー"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "デスクトップにアイコンを表示しない"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "デスクトップにアイコンを表示する"
+
+#~ msgid "Focus mode"
+#~ msgstr "フォーカスモード"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "クリックしてフォーカスを移す"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "フォーカスを得たウィンドウにポインタを移す"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "追加するアイコンを選択する"
+
+#~ msgid "Quick Launch"
+#~ msgstr "クイック起動"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "ミキサーモジュールの設定内容が変更されました.<br>古い設定内容は新しいデ"
+#~ "フォルトの設定に置き換わっています. <br>ご不便をおかけします."
 
 #~ msgid "Add Application..."
 #~ msgstr "アプリケーションの追加..."
@@ -8482,12 +8764,6 @@ msgstr ""
 #~ msgid "Shut Down Immediately"
 #~ msgstr "ただちに終了する"
 
-#~ msgid "Shut Down"
-#~ msgstr "シャットダウン"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "ディスクへサスペンド"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "デスクトップロック"
 
@@ -8623,9 +8899,6 @@ msgstr ""
 #~ msgid "Mixer Module Configuration"
 #~ msgstr "ミキサーモジュールの設定"
 
-#~ msgid "Back"
-#~ msgstr "戻る"
-
 #~ msgid "Choose Language"
 #~ msgstr "言語選択"
 
@@ -10273,9 +10546,6 @@ msgstr ""
 #~ msgid "Desktop Settings"
 #~ msgstr "仮想デスクトップの設定"
 
-#~ msgid "Stop editing"
-#~ msgstr "編集を終了する"
-
 #~ msgid "Add Mouse"
 #~ msgstr "マウスバインド追加"
 
@@ -10466,9 +10736,6 @@ msgstr ""
 #~ msgid "Everyone"
 #~ msgstr "その他"
 
-#~ msgid "By Mod Time"
-#~ msgstr "更新日で"
-
 #~ msgid "Name Only"
 #~ msgstr "名前だけ"
 
@@ -10678,9 +10945,6 @@ msgstr ""
 #~ msgid "Follow Speed"
 #~ msgstr "追跡速度"
 
-#~ msgid "%1.2f px/s"
-#~ msgstr "%1.2f ピクセル/秒"
-
 #~ msgid "Autoscroll Speed:"
 #~ msgstr "自動スクロール速度"
 
@@ -10907,9 +11171,6 @@ msgstr ""
 #~ msgid "Check Very Slow (60 sec)"
 #~ msgstr "60 秒ごと"
 
-#~ msgid "Digital Display"
-#~ msgstr "デジタル表示"
-
 #~ msgid "Very Small"
 #~ msgstr "かなり小さい"
 
index b62118e..a7cfdf3 100755 (executable)
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-09-03 09:15+0000\n"
 "Last-Translator: Chanrithy Thim <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "អំពី Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "បិទ"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,14 +44,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "រក្សារ​សិទ្ធិ &copy; 1999-2008, ដោយ​ក្រុម​អភិវឌ្ឍន៍ Enlightenment ។<br><br>យើង​សង្ឃឹម​ថា​អ្នក​នឹង​"
 "រីករាយ​ក្នុង​ការ​ប្រើ​វា​ដូច​យើង​រីករាយ​ក្នុង​ការ​សរសេរ​វា ។<br><br>កម្មវិធី​នេះ​ផ្ដល់​ដោយ​គ្មាន​ការ​ធានា​"
@@ -62,8 +61,9 @@ msgstr ""
 "ច្រើន​គី​មិន​ទាន់​រួចរាល់ ឬក៏​មិន​ទាន់​មាន ហើយ​មាន​កំហុស​ជា​ច្រើន​ទៀត ។ អ្នក​ត្រូវ​តែ​មាន <hilight>ភាព​ប្រុង​"
 "ប្រយ័ត្ន!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>ក្រុម</title>"
 
 #: src/bin/e_actions.c:365
@@ -80,616 +80,640 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឍប់​បង្អួច​នេះ​ឬ?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "បាទ/​ចាស"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "ទេ"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចេញ ឬ?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "អ្នក​បាន​ស្នើ​ចេញ​ពី Enlightenment ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ចេញ ឬ?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចាក​ចេញ ឬ?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "អ្នក​កំពុង​នឹង​ចាកចេញ ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ធ្វើ​បែប​នេះ ឬ?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​បិទ ឬ?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "អ្នក​បាន​ស្នើ​បិទ​កុំព្យូទ័រ​របស់​អ្នក ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​បិទ ឬ?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចាប់​ផ្ដើម​ឡើង​វិញ ឬ?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "អ្នក​បាន​ស្នើ​ចាប់​ផ្ដើម​កុំព្យូទ័រ​របស់​អ្នក​ឡើង​វិញ ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ចាប់​ផ្ដើម​វា​ឡើង​វិញ ឬ?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "អ្នក​បាន​ស្នើ​ផ្អាក​កុំព្យូទ័រ​របស់​អ្នក ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ផ្អាក ឬ?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "បង្អួច : សកម្មភាព"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "ផ្លាស់ទី"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "ម៉ឺនុយ"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "ម៉ឺនុយ បង្អួច"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "លើក​ឡើង"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "ទាប​ជាង"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "បញ្ឈប់"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "អតិបរមា"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "ផ្ទៃតុ"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "អេក្រង់"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "ផ្លាស់ទី"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "ផ្លាស់ទី"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "ផ្លាស់ទី"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "ជ្រើស​ទាំងអស់"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "ដំណើរការ"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "ពាក្យ​បញ្ជា"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "កម្មវិធី"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "ចាប់ផ្តើម​ឡើង​វិញ"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "ចេញ"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "ប្រព័ន្ធ"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "ចាក​ចេញ"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "ចាប់​ផ្ដើម​ឡើងវិញ"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "ចាក់សោ"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "អេក្រង់"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "អេក្រង់"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -697,18 +721,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -716,20 +738,20 @@ msgstr ""
 msgid "OK"
 msgstr "យល់​ព្រម"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "បោះ​​​បង់"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -740,7 +762,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -749,11 +771,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -761,92 +783,92 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "ថ្នាក់​បង្អួច"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -854,69 +876,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "កម្រិត​ខ្ពស់"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "មូល​ដ្ឋាន"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "អនុវត្ត"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "ផ្នែក​បន្ថែម"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "ម៉ូឌុល"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -924,22 +950,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -960,106 +986,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "រូបតំណាង"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "ថ្នាក់​បង្អួច"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "ប្រភេទ"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "ប្រភេទ Mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "ទូទៅ"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "ជម្រើស"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "លុប"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "កាត់"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "ចម្លង"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "បិទភ្ជាប់"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "ជ្រើស​ទាំងអស់"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1095,314 +1120,314 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "កម្មវិធី"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1434,12 +1459,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1447,7 +1472,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr ""
 
@@ -1463,7 +1488,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1483,17 +1508,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1502,7 +1527,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1518,52 +1543,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "ផ្លាស់ទី"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1609,14 +1624,14 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr ""
@@ -1668,155 +1683,162 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "ម៉ឺនុយ បង្អួច"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "អេក្រង់"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1837,7 +1859,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1996,7 +2018,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2073,15 +2094,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "ដំណើរការ"
@@ -2096,20 +2115,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "ម៉ូឌុល"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2155,11 +2160,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2172,7 +2177,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2180,76 +2185,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2284,7 +2287,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2314,7 +2317,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2331,7 +2334,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2342,7 +2345,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2351,427 +2354,478 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
 msgstr ""
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
+#: src/bin/e_main.c:803
+msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
+#: src/bin/e_main.c:814
+msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
+#: src/bin/e_main.c:818
+msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
+#: src/bin/e_main.c:824
+msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1008
-msgid "Setup Wallpaper"
+#: src/bin/e_main.c:828
+msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1013
-msgid "Enlightenment cannot set up its desktop background system."
+#: src/bin/e_main.c:835
+msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1018
-msgid "Setup Mouse"
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1023
-msgid "Enlightenment cannot configure the mouse settings."
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1028
-msgid "Setup Bindings"
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1033
-msgid "Enlightenment cannot set up its bindings system."
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1038
-msgid "Setup Shelves"
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
+#: src/bin/e_main.c:908
+msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
+#: src/bin/e_main.c:949
+msgid "Almost Done"
 msgstr ""
 
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2779,7 +2833,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2787,7 +2841,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2795,42 +2849,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2838,16 +2884,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2858,26 +2904,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "ពាក្យ​បញ្ជា"
@@ -2886,16 +2932,16 @@ msgstr "ពាក្យ​បញ្ជា"
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2903,113 +2949,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3017,156 +3063,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3177,12 +3223,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3210,140 +3256,145 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "ជ្រើស​ទាំងអស់"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3351,32 +3402,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "ដែលអាចប្រតិបត្តិ"
@@ -3429,17 +3481,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3452,10 +3504,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "ដំណើរការ"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "កម្មវិធី"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "ផ្ទៃតុ"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3468,7 +3535,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3506,9 +3573,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3550,7 +3617,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3558,7 +3625,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3566,7 +3633,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3574,7 +3641,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3582,47 +3649,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3631,11 +3698,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3644,90 +3711,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "ផ្ទៃតុ"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3744,7 +3794,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3754,12 +3804,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3767,184 +3817,210 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "ចាក់សោ"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "អេក្រង់"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3990,102 +4066,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4231,34 +4307,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4339,17 +4428,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4372,13 +4461,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4388,7 +4475,7 @@ msgid "Main Menu"
 msgstr "ម៉ឺនុយ បង្អួច"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4408,7 +4495,7 @@ msgid "Comments"
 msgstr "ពាក្យ​បញ្ជា"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4419,7 +4506,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4487,19 +4574,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4643,18 +4730,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4674,42 +4761,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4744,7 +4835,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4752,7 +4843,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4781,7 +4872,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4790,7 +4881,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4803,12 +4894,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4825,7 +4916,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4842,377 +4933,387 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5220,11 +5321,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5289,10 +5394,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5304,6 +5407,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5324,25 +5433,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5358,15 +5467,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5393,19 +5502,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5528,6 +5637,10 @@ msgstr "កម្មវិធី"
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5557,23 +5670,43 @@ msgstr "ថ្នាក់​បង្អួច"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr ""
 
@@ -5594,6 +5727,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5628,11 +5762,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5733,13 +5862,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5797,7 +5926,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6047,28 +6176,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6076,146 +6205,146 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr ""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6224,37 +6353,28 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "កម្មវិធី"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "ជម្រើស"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6276,152 +6396,63 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "កម្មវិធី"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "កម្មវិធី"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "ដែលអាចប្រតិបត្តិ"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "កម្មវិធី"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "ពាក្យ​បញ្ជា"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "ពាក្យ​បញ្ជា"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "កម្មវិធី"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6467,19 +6498,19 @@ msgid "Select an image"
 msgstr "ជ្រើស​ទាំងអស់"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6490,7 +6521,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6500,7 +6531,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6577,95 +6608,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6700,7 +6735,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6712,36 +6747,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6968,15 +7007,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 #, fuzzy
 msgid "Properties"
 msgstr "កម្មវិធី"
@@ -7021,7 +7060,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7139,31 +7178,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7183,128 +7222,90 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "ផ្លាស់ទី"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7346,7 +7347,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7370,38 +7371,53 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "ម៉ូឌុល"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7428,121 +7444,157 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "អេក្រង់"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "អេក្រង់"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "ជម្រើស"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "កម្មវិធី"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "កម្មវិធី"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "ដែលអាចប្រតិបត្តិ"
+
+#, fuzzy
 #~ msgid "UPower"
 #~ msgstr "ទាប​ជាង"
 
index 607de66..ddd3cd1 100755 (executable)
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2011-03-12 13:51-0800\n"
 "Last-Translator: Daniel Juyung Seo <seojuyung2@gmail.com>\n"
 "Language-Team: Korean <KO@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment 정보"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "닫기"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,18 +43,19 @@ msgstr ""
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Enlightenment 팀</title>"
 
 #: src/bin/e_actions.c:365
@@ -70,619 +70,644 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "이 창을 강제종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "예"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "아니오"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "정말 종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Enlightement를 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "로그아웃 하시겠습니까?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "로그아웃 하시겠습니까?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "시스템을 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "시스템을 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "시스템을 재시작하시겠습니까?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "시스템을 재시작하시겠습니까?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "시스템을 정지 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "시스템을 대기 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "시스템을 대기 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "창 : 움직임"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "이동"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "크기변경"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "메뉴"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "창 메뉴"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "말아올림"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "아래로"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "강제종료"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "창 : 상태"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "고정 상태"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "아이콘 상태"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "전체화면 상태"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "최대화"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "세로 최대화"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "가로 최대화"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "최대화 상태 \"일반\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "최대화 상태 \"확장\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "최대화 상태 \"채우기\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "테두리"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "데스크탑"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "화면"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "마우스를 화면 0 으로"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "마우스를 화면 1로"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "마우스를 화면으로 보내기"
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "마우스를 앞의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "마우스를 뒤의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "마우스 앞/뒤 화면으로 보내기..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "시스템 종료"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "창 이동 정보"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "크기변경"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "아이콘 선택"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "아이콘 생성"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "창 : 이동"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "다음 데스크탑으로"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "이전 데스크탑으로"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "데스크탑으로..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "메인 메뉴 표시"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "즐겨찾기 메뉴 표시"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "모든 응용프로그램 메뉴 표시"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "클라이언트 메뉴 표시"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "메뉴 표시..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "실행"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "명령"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "응용프로그램"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "재시작"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "종료"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enligtenment : 모드"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "프리젠테이션 모드 토글"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "오프라인 모드 토글"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "시스템"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "로그아웃"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "바로 끄기"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "끄기"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "재기동"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "대기모드"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "대기모드"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "하이버네이션"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "창 정리"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "이 화면"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "이 화면"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "바탕 화면으로 설정"
 
@@ -690,18 +715,16 @@ msgstr "바탕 화면으로 설정"
 msgid "Color Selector"
 msgstr "색 선택"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -709,20 +732,20 @@ msgstr "색 선택"
 msgid "OK"
 msgstr "확인"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "취소"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -737,7 +760,7 @@ msgstr ""
 "로운 기능을 위한 의도로 이해해주시기 바랍니다. <br>번거로우시겠지만, 원하시는"
 "데로 다시 설정해주시길 바랍니다."
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -750,11 +773,11 @@ msgstr ""
 "사용하시던 버전보다 더 낮은 Enlightement를 설치하신 것 같습니다.<br><br>예상"
 "치 못한 에러를 막기 위해 설정을 초기화하였습니다."
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 설정 저장 중 오류가 발생하였습니다."
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -762,93 +785,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "설정이 갱신되었습니다."
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(창 없음)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "사용안함"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -858,69 +881,73 @@ msgstr ""
 "Enlightenment 설정 중 저장되다 만 파일이<br>있습니다. (흔히 일어나진 않습니"
 "다.)<br><br>데이터 손상을 막기 위해 다음 파일을 삭제하였습니다.<br>%s"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "고급설정"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "기본"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "적용"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "확장"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "모듈"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "비밀번호를 입력해주세요."
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "인증 시스템 에러"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -928,22 +955,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "프리젠테이션 모드를 활성화하시겠습니까?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -964,106 +991,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "이름"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "메모"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "아이콘"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "클래스"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "분류"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "일반"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "시작 알림"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "터미널에서 실행"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "옵션"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "아이콘 선택"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "삭제"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "잘라내기"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "복사"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "전체 선택"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1100,313 +1126,313 @@ msgid ""
 "application failed to start."
 msgstr "Enlightment가 %s 프로그램을 실행하는데 <br>실패하였습니다."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "응용프로그램 실행 오류"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 프로그램이 예상치 않게 종료되었습니다."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "코드 %i 을(를) %s 프로그램이 남겼습니다."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s가 인터럽트 시그널에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s가 종료 시그널에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s가 중단 시그널에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s가 부동소수점 오류에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s가 세그먼테이션 오류에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s가 버스 오류에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s가 %i번 시그널에 의해 중단되었습니다."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "오류 기록"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "오류 메세지가 없음."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "이 메세지 저장"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "이 에러 로그는 %s/%s.log 파일에 저장됩니다."
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "오류 메세지"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "시그널 정보 오류"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "출력 데이터"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "출력물이 없음."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "존재하지 않는 경로"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s는 존재하지 않음."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i개 파일"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "링크"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "중지"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "새로 고침"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "숨김 파일 표시"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "정렬순서 저장"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "정렬"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "새 디렉토리"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "응용프로그램 속성"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "화일 속성"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "아이콘 사이즈 (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "새 디렉토리 작성"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "디렉토리 명:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s 이름 변경:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "재시도"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "오류"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "전부 아니오"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "전부 예"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "경고"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "파일이 이미 존재합니다, 덮어쓰기겠습니까?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "무시"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "전부 무시"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "삭제 확인"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "삭제하시겠습니까<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1438,12 +1464,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "이동식 장치"
 
@@ -1451,7 +1477,7 @@ msgstr "이동식 장치"
 msgid "File:"
 msgstr "파일:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "크기:"
 
@@ -1467,7 +1493,7 @@ msgstr "화일 형태:"
 msgid "Permissions"
 msgstr "권한"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "소유자:"
 
@@ -1487,17 +1513,17 @@ msgstr "소유자는 읽을수 있음"
 msgid "Owner can write"
 msgstr "소유자는 쓸수 있음"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "미리보기"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "기본값"
 
@@ -1506,7 +1532,7 @@ msgid "Thumbnail"
 msgstr "미리보기"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "사용자 지정"
 
@@ -1522,50 +1548,41 @@ msgstr ""
 msgid "Select an Image"
 msgstr "이미지 선택"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "이동"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "크기변경가능"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "제거"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1613,14 +1630,14 @@ msgstr "위치"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "크기"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "고정상태"
@@ -1672,160 +1689,166 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr "고정 내용을 기억"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "창"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "항상 위에"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr ""
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "설정"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "수직으로 최대화"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "수평으로 최대화"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "최대화에서 복원"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "아이콘 편집"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "아이콘 생성"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "즐겨찾기에 추가"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "IBar에 추가"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "새 IBar 원본 만들기"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "단순한 위치 설정"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "테두리"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "고정"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "기억"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "아이콘화"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "저장"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "화면"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "항상 위에"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "보통"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "항상 아래로"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "창 목록"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "페이저"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1846,7 +1869,7 @@ msgid "ICCCM Properties"
 msgstr "ICCM 속성"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "제목"
 
@@ -2005,7 +2028,6 @@ msgid "Size, Position and Locks"
 msgstr "크기, 위치, 고정상태"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "허용"
@@ -2085,15 +2107,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "파일"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "실행"
@@ -2108,20 +2128,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "모듈"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "설정"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "모듈 설정"
@@ -2159,7 +2165,7 @@ msgstr "도구 추가"
 msgid "Remove Gadget"
 msgstr "도구 제거"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2167,11 +2173,11 @@ msgstr ""
 msgid "Layout"
 msgstr "레이아웃"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "입력기 오류"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2184,7 +2190,7 @@ msgstr "메인"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "자주 실행하는 응용프로그램"
 
@@ -2192,76 +2198,74 @@ msgstr "자주 실행하는 응용프로그램"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "응용 프로그램"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "창"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "잃어버린 창"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "정보"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "테마"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "가상"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "모든 창 표시/숨기기"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(응용프로그램 없음)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "가상 데스크탑 설정"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(창 없음)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "이름 없음!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Shelf 추가"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Shelf 삭제"
 
@@ -2296,7 +2300,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "스타일"
 
@@ -2326,7 +2330,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 초"
@@ -2343,7 +2347,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2354,7 +2358,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2363,52 +2367,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment이 Ecore를 초기화 할 수 없습니다!\n"
-"메모리가 부족합니까?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment이 파일 시스템을 초기화 할 수 없습니다!\n"
-"메모리가 부족합니까?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2416,7 +2390,7 @@ msgstr ""
 "Enlightenment이 종료 시그널 관리자를 설정 할 수 없습니다.\n"
 "메모리가 부족합니까?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2424,7 +2398,7 @@ msgstr ""
 "Enlightenment이 재시작 시그널 관리자를 설정 할 수 없습니다.\n"
 "메모리가 부족합니까?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2432,64 +2406,44 @@ msgstr ""
 "Enlightenment이 USER 시그널 관리자를 설정 할 수 없습니다.\n"
 "메모리가 부족합니까?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"X 접속을 초기화 할 수 없습니다.\n"
-"DISPLAY 값이 있습니까?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"비상 경고 시스템을 초기화 할 수 없습니다.\n"
-"DISPLAY 값이 있습니까?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment가 IPC 시스템을 초기화할 수 없습니다.\n"
-"메모리가 부족합니까?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr "Enlightenment가 xinerama wrapping을 설정할 수 없습니다."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr "Enlightenment가 randr wrapping을 설정할 수 없습니다."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment가 Evas system을 초기화할 수 없습니다.\n"
-"메모리가 부족합니까?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2499,323 +2453,444 @@ msgstr ""
 "설치된 Evas아 Ecore의 소프트웨어 버퍼 렌더링 엔진을 확인 하십\n"
 "시오."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"비상 경고 시스템을 초기화 할 수 없습니다.\n"
+"DISPLAY 값이 있습니까?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "파일 레지스트리 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "설정 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "테마 시스템을 설정 할 수 없습니다."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "글꼴 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "글꼴 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "테마 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"스크린을 초기화 할 수 없습니다.\n"
-"메모리가 부족하지 않습니까?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "초기화 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "초기화 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
+"Enlightenment이 파일 시스템을 초기화 할 수 없습니다!\n"
+"메모리가 부족합니까?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr ""
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Evas가 버퍼 캔버스를 만들 수 없는 것을 발견 했습니다. Evas가\n"
-"소프트웨어 버퍼 엔진을 지원하는지 확인 하십시오.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
-"Evas가 PNG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 PNG\n"
-"를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:734
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Evas가 JPEG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 JPEG\n"
-"를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Evas가 EET 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 EET\n"
-"를 지원 하는지 확인 하십시오.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "ACPI 설정"
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "DPMS 설정을 할 수 없습니다."
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
-msgstr ""
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMS 설정"
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
-msgstr ""
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "DPMS 설정을 할 수 없습니다."
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "화면 보호기를 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr ""
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "데스크탑 고정 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "팝업 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "마우스 설정"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "시스템 명령 시스템을 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "동작 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr ""
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "파일관리자"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "메세지 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "DND 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
-msgstr ""
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
+msgstr "바인딩 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "확장 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "창 기억 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "색상 클래스 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "가젯 관리 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "ACPI 설정"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMS 설정"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "DPMS 설정을 할 수 없습니다."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "바탕화면 설정"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "배경화면 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "마우스 설정"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "바인딩 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Shelf 시스템을 설정 할 수 없습니다."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "썸네일 시스템을 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "시스템 명령 시스템을 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "썸네일 시스템을 초기화 할 수 없습니다.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "테마 시스템을 설정 할 수 없습니다."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "정렬순서 저장"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Evas가 버퍼 캔버스를 만들 수 없는 것을 발견 했습니다. Evas가\n"
+"소프트웨어 버퍼 엔진을 지원하는지 확인 하십시오.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Evas가 PNG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 PNG\n"
+"를 지원 하는지 확인 하십시오.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Evas가 JPEG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 JPEG\n"
+"를 지원 하는지 확인 하십시오.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Evas가 PNG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 PNG\n"
+"를 지원 하는지 확인 하십시오.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Evas가 EET 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 EET\n"
+"를 지원 하는지 확인 하십시오.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2823,7 +2898,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2834,39 +2909,31 @@ msgstr ""
 "제가 있는 모듈을 설정에서 제거 하십시오.<br>확장 기능 설정에서 기능을<br> 새"
 "로 설정해서문제를 해결 하십시오.<br>."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
-"modules from your configuration.<br><br>The module configuration dialog "
-"should let you select your<br>modules again."
-msgstr ""
-
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
+"modules from your configuration.<br><br>The module configuration dialog "
+"should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "%s 모듈 읽기"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "모듈 읽기 오류"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2875,11 +2942,11 @@ msgstr ""
 "오류가 있는 추가기능: %s<br>이 모듈의 전체 경로:<br>%s<br>오류 보고서:<br>"
 "%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "모듈이 필요로하는 기능을 포함하고 있지 않습니다."
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2887,16 +2954,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 모듈"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "이 모듈을 제거 하시겠습니까?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2907,26 +2974,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "이 도구 막대를 삭제 하시겠습니까?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "메모"
@@ -2935,16 +3002,16 @@ msgstr "메모"
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "시스템 체크 완료"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2952,113 +3019,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "로그아웃 문제"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "지금 로그아웃"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "기다림"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "로그아웃 취소"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "로그아웃이 진행중입니다"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenemnt 은 다른 요청으로 바쁩니다."
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "전원 끄기.<br><hilight>기다려주세요.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "대기모드"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "하이버네이션"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3066,158 +3133,158 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "자식 프로세스 오류:<br><br>%s<Br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "종료할 수 없음 - 이모탈 창."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "향후에"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "마지막 분에"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 년전"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 달전"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 주전"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 일전"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 시간전"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 분전"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "알수없음"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "시작 설정"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "가져오기..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "채우기와 넓히기 설정"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3233,12 +3300,12 @@ msgstr ""
 "로운 기능을 위한 의도로 이해해주시기 바랍니다. <br>번거로우시겠지만, 원하시는"
 "데로 다시 설정해주시길 바랍니다."
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "설정이 갱신됨"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3271,140 +3338,146 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "즐겨찾기에 추가"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "상위 디렉토리로"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "해상도"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "권한:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "수정:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "당신"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "보호됨"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "읽기전용"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "숨겨짐"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "읽기-쓰기"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "밧데리 전원이 낮을 경우 알림 표시"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "하이버네이션"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "밧데리 전원이 낮을 경우 알림 표시"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 분"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "경고"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "자동 감지"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "하드웨어"
 
@@ -3412,32 +3485,33 @@ msgstr "하드웨어"
 msgid "Battery"
 msgstr "밧데리"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "밧데리가 부족합니다!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC 전원을 연결해주세요."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "에러"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "시계"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "실행"
@@ -3501,17 +3575,17 @@ msgstr "설정이 갱신됨"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar 응용프로그램"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "시작 응용프로그램"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "응용프로그램 재시작"
 
@@ -3525,10 +3599,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "새 응용프로그램"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "실행"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "응용프로그램 재시작"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "데스크탑 이름"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3541,7 +3630,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3579,9 +3668,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "일반 설정"
 
@@ -3623,7 +3712,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3631,7 +3720,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3639,7 +3728,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3647,7 +3736,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3655,47 +3744,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "해상도 변경"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "저장"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "화면 해상도 설정"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "해상도"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "로그인 할때 적용"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "주파수"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "화면 돌리기"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "거울 처럼"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "기능 없음"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3704,11 +3793,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "주파수를 찾지 못했습니다"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3717,90 +3806,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "가상 데스크탑 설정"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "데스크탑 갯수"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "데스크탑 마우스 설정"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "객체를 화면 가장자리로 끌면 변경"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "바꿀때 데스크탑 주변에 있으면 변경"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "끄기"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "화대"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "애니메이션 속도"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f 초"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "바꾸기 효과"
 
@@ -3817,7 +3889,7 @@ msgid "Desktop Wallpaper"
 msgstr "데스크탑 배경화면"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3828,12 +3900,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "개인용"
 
@@ -3841,154 +3913,168 @@ msgstr "개인용"
 msgid "Screen Lock Settings"
 msgstr "화면 잠금 설정"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "대기모드"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "대기모드"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "사용자 지정 화면잠금"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "고정상태"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "모든 화면에서 표시"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "현재 화면 영역에서 보기"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "다음 화면 영역에서 보기 #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "로그인 상자 설정"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "X 화면보호기가 동작중일때 잠금"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f 초"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "다음 시간동안 입력이 없으면 잠금"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f 분"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "타이머"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "프리젠테이션 모드"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "테마 정의됨"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "테마의 배경화면"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "현재 배경화면"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "배경화면"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "화면보호기 설정"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "X 화면보호기 사용"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "대기모드"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "화면보호기"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "깜빡임"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "허용"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "허용 안함"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -3996,39 +4082,52 @@ msgstr "허용 안함"
 msgid "Miscellaneous"
 msgstr "기타 설정"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "디스플레이 전원관리 신호 (DPMS)"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "대기 시간"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "유휴 시간"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "꺼짐 시간"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "가상 데스크탑"
@@ -4073,102 +4172,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "단축 글쇠 설정"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "연결 추가"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "연결 삭제"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "연결 수정"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "모두 삭제"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "기본 설정 복원"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "동작"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "실행 인자"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4314,34 +4413,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "언어 설정"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "언어 선택기"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "언어가 선택됨"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "언어"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "언어"
 
@@ -4424,17 +4536,17 @@ msgid "Manager"
 msgstr "관리자"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "없음"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4458,13 +4570,11 @@ msgid "Menu Settings"
 msgstr "메뉴 설정"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment IBar 모듈"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "개인용"
@@ -4475,7 +4585,7 @@ msgid "Main Menu"
 msgstr "메인 메뉴 표시"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4495,7 +4605,7 @@ msgid "Comments"
 msgstr "메모"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4506,7 +4616,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "메뉴"
 
@@ -4574,19 +4684,19 @@ msgid "Images"
 msgstr "이미지"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "글꼴"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "테마"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "아이콘"
 
@@ -4732,18 +4842,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "배경 설정"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "테마 배경 사용"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "사진..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4763,42 +4873,46 @@ msgstr "이 데스크탑"
 msgid "This Screen"
 msgstr "이 화면"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "그림 선택..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4833,7 +4947,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "기본 테두리"
 
@@ -4841,7 +4955,7 @@ msgstr "기본 테두리"
 msgid "Window Border Selection"
 msgstr "창 테두리 선택"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4874,7 +4988,7 @@ msgid "Menu Background Base"
 msgstr "배경"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4883,7 +4997,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4897,12 +5011,12 @@ msgid "Menu Item Disabled"
 msgstr "사용안함"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4919,7 +5033,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4938,379 +5052,389 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "촛점"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "배경"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "색상"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "윈도우 매니저"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "기타 설정"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "프레임"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "라벨"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "버튼"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "슬라이더"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "라디오 버튼"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "체크 버튼"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "파일관리자"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "폰트 설정"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "가벼움"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "거대함"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d 픽셀"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "글꼴"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "바이트코드"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "자동"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5318,12 +5442,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "아이콘 테마 사용"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5388,11 +5516,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%2.2f 초"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5403,6 +5529,12 @@ msgstr ""
 msgid "Minimum"
 msgstr "최소"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "최대"
@@ -5423,25 +5555,25 @@ msgstr "로그인시 환영화면 보기"
 msgid "Transition Settings"
 msgstr "변화 설정"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "이벤트"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "시작"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "데스크탑 변경"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "배경 변경"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "변화"
 
@@ -5457,15 +5589,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5492,19 +5624,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "테마 변경"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "테두리"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "아이콘 테마"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "마우스 커서"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5635,6 +5767,11 @@ msgstr "응용프로그램"
 msgid "Border Icon"
 msgstr "테두리"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "단순한 위치 설정"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "단순한 위치 설정"
@@ -5666,24 +5803,47 @@ msgstr "다음 창"
 msgid "Animate"
 msgstr "움직이는 모양 사용"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "부드러운 가속 및 감속"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "가속"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "감속"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "마우스 가속"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "감속"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "부드러운 가속 및 감속"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "고정상태"
@@ -5705,6 +5865,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "시계"
@@ -5743,11 +5904,6 @@ msgstr "새로운 대화상자만 촛점을 가짐"
 msgid "Only dialogs with focused parent"
 msgstr "새로운 대화상자만 촛점을 가짐"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "촛점"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "기타 설정"
@@ -5852,13 +6008,13 @@ msgid "Fill available space"
 msgstr "사용 가능한 영역에 채움"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "수평"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "수직"
@@ -5917,7 +6073,7 @@ msgid "Raise when clicking to focus"
 msgstr "클릭 했을때 끌어 올림"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "창 포커스"
 
@@ -6169,33 +6325,33 @@ msgstr "매우 밝게"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "모두"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "모두"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "페이저 설정"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "모두"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "모두"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "모두"
@@ -6205,156 +6361,156 @@ msgstr "모두"
 msgid "Everything Settings"
 msgstr "터미널 설정"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "사용 가능한 응용 프로그램"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "위로 이동"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "아래로 이동"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "설정된 도구모음"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "사용"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "숨김 파일 표시"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "기본 대화창 상태"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "사용안함"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "기본값"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "움직이는 모양 사용"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "창 목록"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "기본값"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "움직이는 모양 사용"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "없음"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "없음"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "최근 수정:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "실행 인자"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "최소 높이"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6363,37 +6519,28 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "응용프로그램 재시작"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "동작"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6415,163 +6562,66 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "다른 프로그램으로 열기.."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "다른 프로그램으로 열기.."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "응용프로그램 편집"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "응용프로그램"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "다른 프로그램으로 열기.."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "터미널에서 실행"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "실행"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "응용프로그램 재시작"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "명령"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "터미널 명령"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "모두"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "아래로 이동"
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "정렬"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "이름 변경"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "모두"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "숨김 파일 표시"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "디렉토리 검색"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "사용자 정의 디렉토리"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "그림자 간격"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "전체화면"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "파일 아이콘"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "파일 형태"
 
@@ -6616,19 +6666,19 @@ msgid "Select an image"
 msgstr "이미지 선택"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "파일관리자"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6639,7 +6689,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6649,7 +6699,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6729,95 +6779,99 @@ msgstr ""
 msgid "Device"
 msgstr "미리보기"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "상위 디렉토리로 이동"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "열기"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "다른 프로그램으로 열기.."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "정의된 응용프로그램"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "모든 응용프로그램"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6852,7 +6906,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6864,37 +6918,41 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr "사용가능한 도구"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "이동"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "배경"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7141,15 +7199,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "이 막대의 원본을 삭제 하시겠습니까?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "새 아이콘 생성"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "속성"
 
@@ -7193,7 +7251,7 @@ msgstr "모든 데스크탑에서 창 표시"
 msgid "Show windows from active desktop"
 msgstr "활성화된 데스크탑에서 창 표시"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7313,31 +7371,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7357,128 +7415,91 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "온도 설정"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "센서"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "섭씨"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "화씨"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "표시 형태"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "확인 간격"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "고온"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "저온"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "온도"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "온도"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "선택된 막대 원본"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "이동"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7520,7 +7541,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7544,38 +7565,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "해상도 변경"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "모듈"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7602,127 +7639,248 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "오프라인 모드"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "보호됨"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "알수없는 이름"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "오류"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "설정"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "준비"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "온라인"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "실패"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "사용"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "사용 가능한 영역에 채움"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "연결됨"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "오프라인"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "테마 시스템을 설정 할 수 없습니다."
+#~ msgid "Dim Screen"
+#~ msgstr "이 화면"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "이 화면"
+
+#~ msgid "Resizeable"
+#~ msgstr "크기변경가능"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment이 Ecore를 초기화 할 수 없습니다!\n"
+#~ "메모리가 부족합니까?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "X 접속을 초기화 할 수 없습니다.\n"
+#~ "DISPLAY 값이 있습니까?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment가 IPC 시스템을 초기화할 수 없습니다.\n"
+#~ "메모리가 부족합니까?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr "Enlightenment가 xinerama wrapping을 설정할 수 없습니다."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr "Enlightenment가 randr wrapping을 설정할 수 없습니다."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment가 Evas system을 초기화할 수 없습니다.\n"
+#~ "메모리가 부족합니까?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "스크린을 초기화 할 수 없습니다.\n"
+#~ "메모리가 부족하지 않습니까?"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Shelf 시스템을 설정 할 수 없습니다."
+
+#~ msgid "New Application"
+#~ msgstr "새 응용프로그램"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "디스플레이 전원관리 신호 (DPMS)"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "기본 대화창 상태"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "동작"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "다른 프로그램으로 열기.."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "다른 프로그램으로 열기.."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "응용프로그램 편집"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "응용프로그램"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "터미널에서 실행"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "실행"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "아래로 이동"
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "정렬"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "이름 변경"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "그림자 간격"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "전체화면"
 
 #, fuzzy
 #~ msgid "Everything Aspell"
@@ -8001,9 +8159,6 @@ msgstr ""
 #~ msgid "Exit Immediately"
 #~ msgstr "임의로 종료"
 
-#~ msgid "Shut Down"
-#~ msgstr "시스템 종료"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "데스크탑 고정"
 
index d5da835..dfa7560 100755 (executable)
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-06-03 16:28+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr ""
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr ""
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,18 @@ msgstr ""
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
 msgstr ""
 
 #: src/bin/e_actions.c:365
@@ -69,612 +68,638 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Erê"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Na"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Guhestin"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Kuştin"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Sermase"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Guhestin"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Guhestin"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Guhestin"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr ""
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr ""
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -682,18 +707,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -701,20 +724,20 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -725,7 +748,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -734,11 +757,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -746,91 +769,91 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr ""
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -838,69 +861,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr ""
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr ""
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr ""
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr ""
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -908,22 +935,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -944,106 +971,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr ""
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr ""
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1079,313 +1105,313 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1417,12 +1443,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1430,7 +1456,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr ""
 
@@ -1446,7 +1472,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1466,17 +1492,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1485,7 +1511,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1501,51 +1527,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Guhestin"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1591,14 +1608,14 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr ""
@@ -1650,155 +1667,162 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Guhestin"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1819,7 +1843,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1978,7 +2002,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2055,15 +2078,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr ""
 
@@ -2077,20 +2098,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Guhestin"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2128,7 +2135,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2136,11 +2143,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2153,7 +2160,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2161,76 +2168,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2265,7 +2270,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2295,7 +2300,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2312,7 +2317,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2323,7 +2328,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2332,427 +2337,478 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
 msgstr ""
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr ""
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr ""
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2760,7 +2816,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2768,7 +2824,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2776,42 +2832,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2819,16 +2867,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2839,26 +2887,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr ""
 
@@ -2866,16 +2914,16 @@ msgstr ""
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2883,113 +2931,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2997,156 +3045,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3157,12 +3205,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3190,139 +3238,144 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3330,32 +3383,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr ""
 
@@ -3407,17 +3461,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3430,10 +3484,23 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+msgid "Create Launcher"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Sermase"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3446,7 +3513,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3484,9 +3551,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3528,7 +3595,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3536,7 +3603,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3544,7 +3611,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3552,7 +3619,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3560,47 +3627,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3609,11 +3676,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3622,90 +3689,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Sermase"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3722,7 +3772,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3732,12 +3782,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3745,182 +3795,208 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3966,102 +4042,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4207,34 +4283,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4315,17 +4404,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4348,12 +4437,10 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 msgid "Enlightenment Default"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4362,7 +4449,7 @@ msgid "Main Menu"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4379,7 +4466,7 @@ msgid "Comments"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4390,7 +4477,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4458,19 +4545,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4611,18 +4698,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4642,42 +4729,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4712,7 +4803,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4720,7 +4811,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4749,7 +4840,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4758,7 +4849,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4771,12 +4862,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4793,7 +4884,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4810,377 +4901,387 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5188,11 +5289,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5257,10 +5362,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5272,6 +5375,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5292,25 +5401,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5326,15 +5435,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5361,19 +5470,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5494,6 +5603,10 @@ msgstr ""
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5522,23 +5635,43 @@ msgstr ""
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr ""
 
@@ -5559,6 +5692,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5590,11 +5724,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5694,13 +5823,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5757,7 +5886,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6007,28 +6136,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6036,146 +6165,146 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Guhestin"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Guhestin"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr ""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6184,35 +6313,27 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr ""
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr ""
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6234,145 +6355,59 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr ""
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6417,19 +6452,19 @@ msgid "Select an image"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6440,7 +6475,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6450,7 +6485,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6527,95 +6562,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6650,7 +6689,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6662,36 +6701,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Guhestin"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6912,15 +6955,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr ""
 
@@ -6964,7 +7007,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7081,31 +7124,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7125,128 +7168,90 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Guhestin"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7288,7 +7293,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7312,38 +7317,52 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7370,116 +7389,124 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
index 9e8131d..3dc8529 100755 (executable)
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-01-31 14:58+0000\n"
 "Last-Translator: Joshas <Unknown>\n"
 "Language-Team: Lithuanian Translation team\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Apie Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Užverti"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,14 +44,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Autoriaus teisės &copy; 1999-2009, Enlightenment kūrėjų komanda."
 "<br><br>Tikimės, kad naudodamiesi šia programine įranga Jūs patirsite tokį "
@@ -65,8 +64,9 @@ msgstr ""
 "neegzistuoja ir gali būti daug programinės įrangos klaidų. Jūs buvote "
 "<hilight>ĮSPĖTI!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Komanda</title>"
 
 #: src/bin/e_actions.c:365
@@ -84,58 +84,58 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ar tikrai norite priverstinai užverti šį langą?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Taip"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Ar tikrai norite išeiti?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Jūs paprašėte išeiti iš Enlightenment aplinkos.<br><br>Ar tikrai norite "
 "išeiti?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Ar tikrai norite atsijungti?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Jūs tuoj atsijungsite nuo aplinkos.<br><br>Ar tikrai norite tai padaryti?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Ar tikrai norite išjungti kompiuterį?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Jūs paprašėte išjungti kompiuterį.<br><br>Ar tikrai norite tai padaryti?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Ar norite perkrauti kompiuterį?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -143,7 +143,7 @@ msgstr ""
 "Jūs paprašėte perkrauti kompiuterį.<br><br>Ar tikrai norite perkrauti "
 "kompiuterį?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -151,11 +151,11 @@ msgstr ""
 "Jūs paprašėte perjungti kompiuterį į laukimo režimą.<br><br>Ar tikrai norite "
 "tai padaryti?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Pereiti į miego režimą?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -163,551 +163,574 @@ msgstr ""
 "Jūs paprašėte perjungti kompiuterį į miego režimą.<br><br>Ar tikrai norite "
 "tai atlikti?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Langas : Veiksmai"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Perkelti"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Keisti dydį"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meniu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Lango meniu"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Pakelti"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Nuleisti"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Priverstinai uždaryti"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Langas : Būsena"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Perjungti prilipimo veikseną"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Perjungti piktogramų veikseną"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Perjungti pilno ekrano veikseną"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Padidinti"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Padidinti vertikaliai"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Padidinti horizontaliai"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Padidinti per visą ekraną"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "\"Gudri\" padidinimo veiksena"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "\"Išplėtimo\" padidinimo veiksena"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "\"Užpildymo\" padidinimo veiksena"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Paslėpimo aukštyn veiksenos perjungimas"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Paslėpimo žemyn veiksenos perjungimas"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Paslėpimo kairėn veiksenos perjungimas"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Paslėpimo dešinėn veiksenos perjungimas"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Paslėpimo veiksenos perjungimas"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Būsenos be rėmelių perjungimas"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Rėmelis"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Prisegimo būsenos perjungimas"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Darbalaukis"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Versti darbalaukį kairėn"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Versti darbalaukį dešinėn"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Versti darbalaukį aukštyn"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Versti darbalaukį žemyn"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Versti darbalaukį per ..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Rodyti darbalaukį"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Rodyti lentyną"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Versti darbalaukį į ..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Versti darbalaukį tiesiai ..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Persijungti į darbalaukį 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Persijungti į darbalaukį 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Persijungti į darbalaukį 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Persijungti į darbalaukį 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Persijungti į darbalaukį 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Persijungti į darbalaukį 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Persijungti į darbalaukį 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Persijungti į darbalaukį 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Persijungti į darbalaukį 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Persijungti į darbalaukį 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Persijungti į darbalaukį 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Persijungti į darbalaukį 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Persijungti į darbalaukį ..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Versti darbalaukį kairėn (Visus ekranus)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Versti darbalaukį dešinėn (Visus ekranus)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Versti darbalaukį aukštyn (Visus ekranus)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Versti darbalaukį žemyn (Visus ekranus)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Versti darbalaukį per ... (Visus ekranus)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Versti darbalaukį į ... (Visus ekranus)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Versti darbalaukį tiesiškai ... (Visus ekranus)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Versti darbalaukį šia kryptimi ..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Persijungti į darbalaukį 0 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Persijungti į darbalaukį 1 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Persijungti į darbalaukį 2 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Persijungti į darbalaukį 3 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Persijungti į darbalaukį 4 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Persijungti į darbalaukį 5 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Persijungti į darbalaukį 6 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Persijungti į darbalaukį 7 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Persijungti į darbalaukį 8 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Persijungti į darbalaukį 9 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Persijungti į darbalaukį 10 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Persijungti į darbalaukį 11 (Visus ekranus)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Persijungti į darbalaukį ... (Visus ekranus)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ekranas"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Perkelti žymeklį į ekraną 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Perkelti žymeklį į ekraną 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Perkelti žymeklį į ekraną ..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Perkelti žymeklį pirmyn per vieną ekraną"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Perkelti žymeklį atgal per vieną ekraną"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Perkelti žymeklį pirmyn/atgal per ekranus ..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Perkėlimo tekstas"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Daugiau"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Daugiau"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Keisti dydį po:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Versti darbalaukį šia kryptimi ..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Sukurti piktogramą"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Langas : Perkėlimas"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Į kitą darbalaukį"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Į ankstesnį darbalaukį"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Pagal darbalaukio # ..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Į darbalaukį ..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Rodyti pagrindinį meniu"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Rodyti mėgstamiausių meniu"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Rodyti visų programų meniu"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Rodyti klientų meniu"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Rodyti meniu ..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Vykdyti"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komanda"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Programa"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Paleisti iš naujo"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Išeiti dabar"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Veiksena"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Perjungti pristatymo veikseną"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Perjungti atjungties veikseną"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Atsijungti"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Iš kart išjungti"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Išjungti"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Perkrauti"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Sulaikyti"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Sulaikyti"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Užmigdyti"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Užrakinti"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Išvalyti langus"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Daugybinis : Veiksmai"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Uždelstas veiksmas"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Veiksmas"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Šiame ekrane"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Šiame ekrane"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Nustatyti kaip foną"
 
@@ -715,18 +738,16 @@ msgstr "Nustatyti kaip foną"
 msgid "Color Selector"
 msgstr "Spalvos parinkimas"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -734,20 +755,20 @@ msgstr "Spalvos parinkimas"
 msgid "OK"
 msgstr "Gerai"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -765,7 +786,7 @@ msgstr ""
 "viską susikonfigūruoti kaip pageidaujate.<br>Atsiprašome už sukeltus "
 "nepatogumus."
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -779,11 +800,11 @@ msgstr ""
 "Enlightenment versija. Tai yra blogai ir dėl <br>viso pikto buvo grąžintos "
 "pradinės nuostatų reikšmės. Atsiprašome už nepatogumus."
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problema įrašant Enlightenment nuostatas"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -791,96 +812,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Nuostatos atnaujintos"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Nepavyko užmigdyti."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(langų nėra)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Nepavyko sustabdyti."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Nepavyko sustabdyti."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Jus sveikina Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -891,57 +912,62 @@ msgstr ""
 "labai neįprasta.<br><br>Klaida įvyko šiame faile:<br>%s<br><br>Siekiant "
 "išvengti duomenų sugadinimo šis failas buvo ištrintas.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Sudėtingesnės"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Pagrindinės"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Pritaikyti"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Plėtiniai"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduliai"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Piktogramos parinktis"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Sudėtinis rodinys %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Klaida - nepalaikomas PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM palaikymas nebuvo įtrauktas į Enlightenment.<br>Darbalaukio užrakinimas "
 "išjungtas."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Užrakinimas nepavyko"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -949,15 +975,15 @@ msgstr ""
 "Nepavyko užrakinti darbalaukio, nes viena programa<br>perėmė klaviatūrą ir/"
 "arba pelę ir šio perėmimo nepavyko apeiti."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Prašome įvesti atrakinimo slaptažodį"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Atpažinimo sistemos klaida"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -968,11 +994,11 @@ msgstr ""
 "kodas: <hilight>%i</hilight>.<br>Tai yra blogai, ir to neturėtų įvykti. "
 "Prašome pranešti apie šią klaidą."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Įjungti pristatymo veikseną?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -982,11 +1008,11 @@ msgstr ""
 "<b>pristatymo</b> režimą ir laikinai išjungti ekrano užsklandą, užrakinimą "
 "ir energijos taupymą?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, bet padidinkite laukimo laiką"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne, ir daugiau neklauskite"
 
@@ -1012,106 +1038,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Darbalaukio elemento redaktorius"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Vardas"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Piktograma"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Bendrinis vardas"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Lango klasė"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorijos"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime tipai"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Darbalaukio failas"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Bendri"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Informavimas paleidžiant"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Vykdyti terminale"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Rodyti meniu"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Parinktys"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Parinkti piktogramą"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Parinkti vykdomąjį failą"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Šalinti"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Įdėti"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Pažymėti viską"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1150,316 +1175,316 @@ msgid ""
 msgstr ""
 "Enlightenment nepavyko paleisti programos: <br><br>%s<br>Programa nestartavo."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Programos vykdymo klaida"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s netikėtai nustojo veikusi."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Išėjimo kodas %i buvo grąžintas iš %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s vykdymą pertraukė petraukčių signalas."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s vykdymą pertraukė baigimo signalas."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s vykdymą pertraukė priešlaikinės baigties signalas."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s vykdymą pertraukė slankiojo kablelio klaida."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s vykdymą pertraukė nepertraukiamas priverstinio išjungimo signalas."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s vykdymą pertraukė segmentavimo klaida."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s vykdymą pertraukė komandų grandinės klaida."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s vykdymą pertraukė baigimo signalas."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s vykdymą pertraukė magistralės klaida."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s vykdymą pertraukė signalas nr. %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Likę rezultatai buvo atmesti. Norėdami juos peržiūrėti išsaugokite "
 "rezultatus.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Klaidų žurnalas"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Klaidos pranešimo nebuvo."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Išsaugoti šį pranešimą"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Šis klaidų žurnalas bus išsaugotas kaip %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informacija apie klaidą"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informacija apie klaidos signalą"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Išvedimo duomenys"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Išvedimo nebuvo."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Neegzistuojantis kelias"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neegzistuoja."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Klaida prijungiant"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Nepavyko prijungti įrenginio"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Klaida atjungiant"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Nepavyko atjungti įrenginio"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Išėmimo klaida"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Nepavyko išimti įrenginio"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i failų"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Nuoroda"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Nutraukti"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Paveldėti tėvinio elemento nuostatas"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Rodymo būdas"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Atnaujinti vaizdą"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Rodyti paslėptus failus"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Prisiminti rikiavimo tvarką"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Rikiuoti dabar"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Naujas katalogas"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Atjungti"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Prijungti"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Išmesti"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Naudoti programos pateiktą piktogramą "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Failo savybės"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Naudoti numatytąsias"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Tinklelio piktogramos"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Savos piktogramos"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Sąrašas"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Piktogramos dydis (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Parinkti foną ..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Parinkti perdangą ..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Sukurti naują katalogą"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Naujo katalogo vardas:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Pervadinti %s į:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Pervadinti failą"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Bandyti vėl"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Klaida"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Visiems ne"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Visiems taip"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Failas jau egzistuoja, perrašyti?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Praleisti"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Praleisti visus"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Vykdant veiksmą įvyko klaida.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Patvirtinti šalinimą"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ar tikrai norite pašalinti <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1492,12 +1517,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nežinomas tomas"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Keičiamasis įrenginys"
 
@@ -1505,7 +1530,7 @@ msgstr "Keičiamasis įrenginys"
 msgid "File:"
 msgstr "Failas:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Dydis:"
 
@@ -1521,7 +1546,7 @@ msgstr "Failo tipas"
 msgid "Permissions"
 msgstr "Leidimai"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Savininkas"
 
@@ -1541,17 +1566,17 @@ msgstr "Savininkas gali skaityti"
 msgid "Owner can write"
 msgstr "Savininkas gali rašyti"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Peržiūra"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Numatytasis"
 
@@ -1560,7 +1585,7 @@ msgid "Thumbnail"
 msgstr "Miniatiūra"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Savas"
 
@@ -1576,53 +1601,42 @@ msgstr "Informacija apie nuorodą"
 msgid "Select an Image"
 msgstr "Parinkite paveikslą"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Perkėlimo tekstas"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Pradėti įtaiso perkėlimą/dydžio keitimą"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Keisti dydį"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Automatiškai slinkti turinį"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Paprastas"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Įdubęs"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Išvaizda"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Baigi įtaiso perkėlimą/dydžio keitimą"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1671,14 +1685,14 @@ msgstr "Padėties"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Dydžio"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Sukrovimas"
@@ -1730,163 +1744,169 @@ msgstr "Atsijungimo paliekant šį langą atvirą"
 msgid "Remember these Locks"
 msgstr "Prisiminti šias blokuotes"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Langai"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Visada viršuje"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Lipnus"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Nuostatos"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Per visą ekraną"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Padidinti vertikaliai"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Padidinti horizontaliai"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Atkurti dydį"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Keisti piktogramą"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Sukurti piktogramą"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Įtraukti į mėgiamiausius"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Įtraukti į mėgiamiausius"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Spartusis klavišas"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Gudrus išdėstymas"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Paleisti"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Rėmelis"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Užraktai"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Prisiminti"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Lipnus"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Paleisti"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Suskleisti į piktogramą"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Suskleistas"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Ekranas"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Visada viršuje"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normalus"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Visada apačioje"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Prisegti prie darbalaukio"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Atsegti nuo darbalaukio"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Parinkti rėmelio stilių"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Naudoti E17 numatytąsias piktogramos nuostatas"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Naudoti programos pateiktą piktogramą "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Naudoti vartotojo nurodytą piktogramą"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Pasipriešinimas"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Langų sąrašas"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Puslapiuotojas"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Užduočių juosta"
 
@@ -1907,7 +1927,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM savybės"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Antraštė"
 
@@ -2080,7 +2100,6 @@ msgid "Size, Position and Locks"
 msgstr "Dydis, padėtis ir užraktai"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Leisti"
@@ -2158,15 +2177,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Failai"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Vykdyti"
@@ -2181,20 +2198,6 @@ msgstr "Pagrindinis"
 msgid "Mobile"
 msgstr "Moduliai"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Nuostatos"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modulio nuostatos"
@@ -2235,7 +2238,7 @@ msgstr "Pridėti įtaisą"
 msgid "Remove Gadget"
 msgstr "Išimti įtaisą"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Įrankių juostos nuostatos"
 
@@ -2243,11 +2246,11 @@ msgstr "Įrankių juostos nuostatos"
 msgid "Layout"
 msgstr "Išdėstymas"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Įvesties metodo klaida"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2263,7 +2266,7 @@ msgstr "Pagrindinis"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Mėgstamiausios programos"
 
@@ -2271,76 +2274,74 @@ msgstr "Mėgstamiausios programos"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Programos"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Langai"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Dingę langai"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Apie"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Apipavidalinimas"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtualus"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Lentynos"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Rodyti/slėpti visus langus"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(programų nėra)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Nustatyti virtualius darbalaukius"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(langų nėra)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Be vardo!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(lentynų nėra)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Pridėti lentyną"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Pašalinti lentyną"
 
@@ -2376,7 +2377,7 @@ msgid "Shrink to Content Width"
 msgstr "Sutraukti iki turinio dydžio"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stilius"
 
@@ -2406,7 +2407,7 @@ msgid "Hide duration"
 msgstr "Slėpimo trukmė"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekundės"
@@ -2423,7 +2424,7 @@ msgstr "Rodyti visuose darbalaukiuose"
 msgid "Show on specified Desktops"
 msgstr "Rodyti nurodytuose darbalaukiuose"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2440,7 +2441,7 @@ msgstr ""
 "arba jis nepriklauso Jums. Prašome patikrinti:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2453,76 +2454,22 @@ msgstr ""
 "Prašome patikrinti:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Parametrai:\n"
-"\t-display EKRANAS\n"
-"\t\tPrisijungti prie ekrano pavadintu EKRANAS.\n"
-"\t\tPvz.: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tPridėti NETIKRĄ xinerama ekraną (vietoje tikrų)\n"
-"\t\tsu nurodyta geometrija. Galite pridėti kiek norite. Jie\n"
-"\t\tpakeis tikrus xinerama ekranus, jei jų yra. Tai gali būti\n"
-"\t\tnaudojama xinerama modeliavimui.\n"
-"\t\tPvz.:: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tNaudoti konfigūracijos profilį CONF_PROFILE vietoje vartotojo parinkto "
-"ar tiesiog \"default\".\n"
-"\t-good\n"
-"\t\tBūti geru.\n"
-"\t-evil\n"
-"\t\tBūti blogu.\n"
-"\t-psychotic\n"
-"\t\tBūti psichotišku.\n"
-"\t-locked\n"
-"\t\tStartuoti su darbalaukio užraktu, bus prašoma slaptažodžio.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tJei Jums reikia šios pagalbos, šis parametras Jums nereikalingas.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti Ecore!\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti failų sistemos!\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2530,7 +2477,7 @@ msgstr ""
 "Enlightenment nepavyko nustatyti išėjimo signalo doroklės.\n"
 "Galbūt pritrūkote operatyviosios atminties?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2538,7 +2485,7 @@ msgstr ""
 "Enlightenment nepavyko nustatyti HUP signalo doroklė.\n"
 "Galbūt pritrūkote operatyviosios atminties?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2547,64 +2494,37 @@ msgstr ""
 "Enlightenment nepavyko nustatyti HUP signalo doroklė.\n"
 "Galbūt pritrūkote operatyviosios atminties?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti X prisijungimo.\n"
-"Ar nurodėte DISPLAY kintamąjį?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti avarinio įspėjimo sistemos.\n"
-"Ar nurodėte DISPLAY kintamąjį?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti prisijungimų sistemos.\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti IPC sistemos.\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nepavyko įrengti xinerama apgaubimo.\n"
-"Tai neturėjo įvykti."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nepavyko įrengti xinerama apgaubimo.\n"
-"Tai neturėjo įvykti."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko inicijuoti Evas sistemos.\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2614,7 +2534,7 @@ msgstr ""
 "atvaizdavimo Evas sistemoje. Prašome patikrinti ar Evas ir Ecore palaiko "
 "programinį X11 atvaizdavimo variklį."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2624,7 +2544,35 @@ msgstr ""
 "atvaizdavimo Evas sistemoje. Prašome patikrinti ar Evas ir Ecore palaiko "
 "programinį buferio atvaizdavimo variklį."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment nepavyko inicijuoti avarinio įspėjimo sistemos.\n"
+"Ar nurodėte DISPLAY kintamąjį?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2632,23 +2580,29 @@ msgstr ""
 "Enlightenment nepavyko sukurti katalogų Jūsų namų kataloge.\n"
 "Galbūt Jūs neturite namų katalogo arba diske nėra laisvos vietos?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment nepavyko nustatyti failų registro sistemos."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment nepavyko nustatyti konfigūracijos sistemos."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment nepavyko nustatyti apipavidalinimo sistemos."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment nepavyko nustatyti mastelio sistemos."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment nepavyko nustatyti žymeklio sistemos."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2656,92 +2610,42 @@ msgstr ""
 "Enlightenment nepavyko nustatyti kelių failų paieškai.\n"
 "Galbūt pritrūkote operatyviosios atminties?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment nepavyko nustatyti šriftų sistemos."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment nepavyko nustatyti apipavidalinimo sistemos."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nepavyko nustatyti inicijavimo ekrano.\n"
-"Galbūt pritrūkote operatyviosios atminties?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment nepavyko nustatyti intl sistemos."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Paleidžiamas internacionalinis palaikymas"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment nepavyko nustatyti intl sistemos."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment nepavyko inicijuoti FDO darbalaukio sistemos.\n"
 "Galbūt pritrūkote operatyviosios atminties?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Tikrinamas formatų palaikymas"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment pastebėjo, kad Evas negali sukurti buferio drobės. Prašome "
-"patikrinti ar Evas palaiko programinį buferio variklį.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment patebėjo, kad Evas negali įkelti PNG failų. Patikrinkite ar "
-"Evas palaiko PNG įkėlimą.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment patebėjo, kad Evas negali įkelti JPEG failų. Patikrinkite ar "
-"Evas palaiko JPEG įkėlimą.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment patebėjo, kad Evas negali įkelti EET failų. Patikrinkite ar "
-"Evas palaiko EET įkėlimą.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment pastebėjo, kad Evas negali įkelti 'Sans' šrifto. Patikrinkite "
-"ar Evas palaiko fontconfig ir fontconfig sistema apibrėžia 'Sans' šriftą.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Ekranų nustatymas"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2749,211 +2653,371 @@ msgstr ""
 "Enlightenment nepavyko nustatyti langų tvarkymo Jūsų sistemos ekranams. Gal "
 "būt fone veikia kita langų tvarkyklė?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "DPMS nustatymas"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Saistymo nustatymas"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment nepavyko nustatyti DPMS nuostatų."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMS nustatymas"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment nepavyko nustatyti DPMS nuostatų."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Ekrano užsklandos nustatymas"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment nepavyko nustatyti X ekrano užsklandos."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Energijos taupymo režimų nustatymas"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment nepavyko nustatyti energijos taupymo režimų."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Darbalaukio užrakto nustatymas"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment nepavyko nustatyti darbalaukio užrakto sustemos."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Iškylančiųjų langų nustatymas"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment nepavyko nustatyti iškylančiųjų langų sistemos."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Pranešimų sistemos nustatymas"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Parengiami keliai"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Sistemos valdymo nustatymas"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment nepavyko inicijuoti sistemos valdymo sistemos.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Veiksmų nustatymas"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment nepavyko nustatyti veiksmų sistemos."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Vykdymo sistemos nustatymas"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment nepavyko nustatyti exec sistemos."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "FM nustatymas"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Failų tvarkyklė"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment nepavyko inicijuoti failų tvarkyklės.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Pranešimų sistemos nustatymas"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment nepavyko nustatyti msg sistemos."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "DND nustatymas"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment nepavyko nustatyti dnd sistemos."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Įvesties perėmimo valdymo nustatymas"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment nepavyko nustatyti įvesties perėmimo valdymo sustemos."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Modulių nustatymas"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment nepavyko nustatyti modulių sistemos."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Prisiminimų nustatymas"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment negali nustatyti prisiminimų nuostatų."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Spalvų klasių nustatymas"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nepavyko nustatyti spalvų klasių sistemos."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Gadcon nustatymas"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment nepavyko nustatyti įtaisų valdymo sistemos."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "DPMS nustatymas"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMS nustatymas"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment nepavyko nustatyti DPMS nuostatų."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Energijos taupymo režimų nustatymas"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment nepavyko nustatyti energijos taupymo režimų."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Darbalaukio fono nustatymas"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment nepavyko nustatyti darbalaukio fono sistemos."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Pelės nustatymas"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nepavyko nustatyti pelės nuostatų."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Saistymo nustatymas"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment nepavyko nustatyti saistymo sistemos."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Lentynų nustatymas"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment nepavyko nustatyti lentynų sistemos."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Miniatiūrų kūrimo sistemos nustatymas"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment nepavyko inicijuoti miniatiūrų kūrimo sistemos.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment nepavyko inicijuoti sistemos valdymo sistemos.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment nepavyko inicijuoti miniatiūrų kūrimo sistemos.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment nepavyko nustatyti apipavidalinimo sistemos."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Failų rikiavimo nustatymas"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment nepavyko nustatyti failų rikiavimo sistemos."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Įkelti modulius"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Lentynų konfigūracija"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Beveik baigta"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Parametrai:\n"
+"\t-display EKRANAS\n"
+"\t\tPrisijungti prie ekrano pavadintu EKRANAS.\n"
+"\t\tPvz.: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tPridėti NETIKRĄ xinerama ekraną (vietoje tikrų)\n"
+"\t\tsu nurodyta geometrija. Galite pridėti kiek norite. Jie\n"
+"\t\tpakeis tikrus xinerama ekranus, jei jų yra. Tai gali būti\n"
+"\t\tnaudojama xinerama modeliavimui.\n"
+"\t\tPvz.:: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tNaudoti konfigūracijos profilį CONF_PROFILE vietoje vartotojo parinkto "
+"ar tiesiog \"default\".\n"
+"\t-good\n"
+"\t\tBūti geru.\n"
+"\t-evil\n"
+"\t\tBūti blogu.\n"
+"\t-psychotic\n"
+"\t\tBūti psichotišku.\n"
+"\t-locked\n"
+"\t\tStartuoti su darbalaukio užraktu, bus prašoma slaptažodžio.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tJei Jums reikia šios pagalbos, šis parametras Jums nereikalingas.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Tikrinamas formatų palaikymas"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment pastebėjo, kad Evas negali sukurti buferio drobės. Prašome "
+"patikrinti ar Evas palaiko programinį buferio variklį.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment patebėjo, kad Evas negali įkelti PNG failų. Patikrinkite ar "
+"Evas palaiko PNG įkėlimą.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment patebėjo, kad Evas negali įkelti JPEG failų. Patikrinkite ar "
+"Evas palaiko JPEG įkėlimą.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment patebėjo, kad Evas negali įkelti PNG failų. Patikrinkite ar "
+"Evas palaiko PNG įkėlimą.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment patebėjo, kad Evas negali įkelti EET failų. Patikrinkite ar "
+"Evas palaiko EET įkėlimą.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment pastebėjo, kad Evas negali įkelti 'Sans' šrifto. Patikrinkite "
+"ar Evas palaiko fontconfig ir fontconfig sistema apibrėžia 'Sans' šriftą.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment užstrigo įkrovos metu ir buvo paleistas iš naujo"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2961,7 +3025,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2973,7 +3037,7 @@ msgstr ""
 "problematiškus<br> modulius iš dabartinės konfigūracijos.<br>Modulių "
 "konfigūracijos langas turėtų leisti<br>vėl pasirinkti Jūsų modulius."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2985,20 +3049,12 @@ msgstr ""
 "problematiškus modulius iš dabartinės konfigūracijos.<br><br>Modulių "
 "konfigūracijos langas turėtų leisti<br>vėl pasirinkti Jūsų modulius."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Lentynų konfigūracija"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Beveik baigta"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Įkelti modulius"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3007,11 +3063,11 @@ msgstr ""
 "Įvyko klaida įkeliant modulį: %s<br>Modulis pavadintas %s nerastas modulių "
 "paieškos kataloguose."
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Klaida įkeliant modulį"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3020,11 +3076,11 @@ msgstr ""
 "Įkeliant modulį %s įvyko klaida.<br>Pilnas kelias į šį modulį:<br>"
 "%s<br>Klaida:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modulis neturi visų reikalingų funkcijų"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3034,16 +3090,16 @@ msgstr ""
 "Modulio API klaida<br>Klaida inicijuojant modulį: %s<br>Jis reikalauja bent "
 "%i modulių API versijos.<br>Enlightenment modulių API versija: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modulis"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Ar norite iškelti šį modulį?"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3057,28 +3113,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Lentyna #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ar tikrai norite pašalinti šią lentyną?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Jūs paprašėte pašalinti šią lentyną.<br><br>Ar esate įsitikinęs?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Baigti elementų perkėlimą/dydžio keitimą"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Pradėti elementų perkėlimą/dydžio keitimą"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Komentaras"
@@ -3087,16 +3143,16 @@ msgstr "Komentaras"
 msgid "Starting"
 msgstr "Paleidžiama"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Tikrinami sistemos leidimai"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Sistemos patikrinimas baigtas"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3106,35 +3162,35 @@ msgstr ""
 "Atsijungimas trunka per ilgai.<br>Nepavyksta užverti kai kurių programų."
 "<br>Ar norite atsijungti neuždarius veikiančių programų?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Atsijungimo problemos"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Atsijungti dabar"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Palaukti"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Atšaukti atsijungimą"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Vyksta atsijungimas"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Vyksta atsijungimas.<br><hilight>Prašome palaukti</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment užimtas kita užklausa"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3142,14 +3198,14 @@ msgstr ""
 "Atsijungiama.<br>Pradėjus atsijungimą negalima vykdyti<br>kitų sistemos "
 "veiksmų."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 "Išjungiama.<br>Pradėjus išjungimą negalima vykdyti kitų<br>sistemos veiksmų."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3157,7 +3213,7 @@ msgstr ""
 "Paleidžiama iš naujo.<br>Pradėjus paleidimą iš naujo<br>negalima vykdyti "
 "kitų sistemos veiksmų."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3165,63 +3221,64 @@ msgstr ""
 "Sustabdoma.<br>Negalima vykdyti kitų sistemos veiksmų,<br>kol sustabdymas "
 "nebus baigtas."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Užmigdoma.<br>Kol veiksmas nebus baigtas, negalima vykdyti<br>kitų sistemos "
 "veiksmų."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "OI! To neturėjo nutikti"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Nepavyko išjungti."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Nepavyko paleisti iš naujo."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Nepavyko sustabdyti."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Nepavyko užmigdyti."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Išjungti"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Išjungiama.<br><hilight>Prašome palaukti</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Paleidžiama iš naujo"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Paleidžiama iš naujo.<br><hilight>Prašome palaukti</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Sustabdoma"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Sustabdoma.<br><hilight>Prašome palaukti</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Užmigdoma"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Užmigdoma.<br><hilight>Prašome palaukti</hilight>"
 
@@ -3229,33 +3286,33 @@ msgstr "Užmigdoma.<br><hilight>Prašome palaukti</hilight>"
 msgid "About Theme"
 msgstr "Apie temą"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Nustatyti tema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Baigti elementų perkėlimą/dydžio keitimą"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Pradėti elementų perkėlimą/dydžio keitimą"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Nurodyti įrankių juostos turinį"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nepavyko paleisti poprocesio:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Negalima išeiti - neuždaromi langai."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3265,125 +3322,125 @@ msgstr ""
 "Enlightenment<br>negalės būti išjungtas tol, kol nebus užverti šie langai "
 "arba išjungtas<br>gyvavimo trukmės užraktas."
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f baitų"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Ateityje"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Paskutinę minutę"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "Prieš %li metus"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "Prieš %li mėnesius"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Prieš %li savaites"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "Prieš %li dienas"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "Prieš %li valandas"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Prieš %li minutes"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Puslapiuotojo nuostatos"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importuoti..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Užpildymo ir ištempimo parinktys"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Ištempti"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centruoti"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Viduje"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Užpildyti"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Failo kokybė"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Naudoti originalų failą"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3402,12 +3459,12 @@ msgstr ""
 "pataisyta pridėjus naujas nuostatas. Dabar galite viską susikonfigūruoti "
 "kaip pageidaujate.<br>Atsiprašome už sukeltus nepatogumus."
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "(nėra informacijos)"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3442,142 +3499,148 @@ msgstr "Aukštyn"
 msgid "Down"
 msgstr "Žemyn"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Įtraukti į mėgiamiausius"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Katalogu aukštyn"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Skiriamoji geba"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Leidimai:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Pakeista:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Jūs"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Apsaugotas"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Tik skaitymui"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Uždrausta"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Skaityti-rašyti"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Baterijos monitoriaus nuostatos"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Įspėti, kai baterija išsikrauna"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Tikrinimo dažnis:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tikas"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Užmigdyti"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Apklausa"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Rodyti perspėjimą baterijai išsikraunant"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Įspėti kai:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min."
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatiškai paslėpti po..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek."
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Įspėjimas"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Aptikti automatiškai"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Vidinis"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Neryškus"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Aparatinė įranga"
 
@@ -3585,32 +3648,33 @@ msgstr "Aparatinė įranga"
 msgid "Battery"
 msgstr "Baterija"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Jūsų baterija išsikrauna!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Rekomenduojame įjungti maitinimą."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "nėra"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "KLAIDA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Baterijos matuoklis"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Laikrodis"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Rodyti įrankių juostą"
@@ -3679,17 +3743,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar programos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Startuojant paleidžiamos programos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Paleisti programas iš naujo"
 
@@ -3703,10 +3767,25 @@ msgid "Apps"
 msgstr "Programos"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nauja programa"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Vykdyti"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Pasirinkite programas"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Darbalaukio failai"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar kita"
 
@@ -3719,7 +3798,7 @@ msgid "Available Profiles"
 msgstr "Turimi profiliai"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Parinkite profilį"
 
@@ -3757,9 +3836,9 @@ msgstr "Dialogo lango nuostatos"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Bendros nuostatos"
 
@@ -3801,7 +3880,7 @@ msgstr "Dialogų langai"
 msgid "Profiles"
 msgstr "Profiliai"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3812,7 +3891,7 @@ msgstr ""
 "spauskite atstatyti.<br>Jei nieko nepaspausite, senoji ekrano raiška<br>%dx"
 "%d at %d Hz bus sugrąžinta po %d sekundžių."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3823,7 +3902,7 @@ msgstr ""
 "spauskite atstatyti.<br>Jei nieko nepaspausite, senoji ekrano raiška<br>%dx"
 "%d bus sugrąžinta po %d sekundžių."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3834,7 +3913,7 @@ msgstr ""
 "spauskite atstatyti.<br>Jei nieko nepaspausite, senoji ekrano raiška<br>%dx"
 "%d at %d Hz bus sugrąžinta <hilight>TUOJAU PAT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3845,47 +3924,47 @@ msgstr ""
 "spauskite atstatyti.<br>Jei nieko nepaspausite, senoji ekrano raiška<br>%dx"
 "%d bus sugrąžinta <hilight>TUOJAU PAT</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Skiriamosios gebos keitimas"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Atstatyti"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Ekrano skiriamosios gebos nuostatos"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Skiriamoji geba"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Atstatyti prisijungus"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Kadrų dažnis"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Pasukimas"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Veidrodinis atspindys"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Trūkstamos funkcijos"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3898,11 +3977,11 @@ msgstr ""
 "šio plėtinio.<br>Tikėtina, kad  XRandR palaikymas nebuvo aptiktas "
 "<hilight>ecore</hilight> kompiliavimo metu."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Nerastas kadrų dažnis"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3915,93 +3994,74 @@ msgstr ""
 "naudojamas dabartinis kadrų dažnis<br>, kuris gali <hilight>sugadinti</"
 "hilight> Jūsų monitorių."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Virtualiųjų darbalaukių nuostatos"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Darbalaukių skaičius"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Darbalaukio perkėlimas pele"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Perkelti, kai objektai atvelkami prie ekrano krašto"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Apgaubti darbalaukius perkeliant"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Darbalaukiai"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Išjungta"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Slinkimas"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Mastelis"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Fono slinkimas"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animacijos"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f slinkimo daugiklis X-ašimi"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f slinkimo daugiklis Y-ašimi"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Perkėlimo animacija"
 
@@ -4018,7 +4078,7 @@ msgid "Desktop Wallpaper"
 msgstr "Darbalaukio fonas"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Nustatyti"
 
@@ -4029,12 +4089,12 @@ msgstr "Parinkti foną ..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Asmeniniai"
 
@@ -4042,160 +4102,174 @@ msgstr "Asmeniniai"
 msgid "Screen Lock Settings"
 msgstr "Ekrano užrakto nuostatos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Sulaikyti"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Sulaikyti"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Savas ekrano užraktas"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Užrakinti"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Rodyti visose ekrano juostose"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Rodyti dabartinio ekrano juostoje"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Rodyti ekrano juostoje #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Prisijungimo lango nuostatos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Užrakinti aktyvuojantis X ekrano užsklandai"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekundžių"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Užrakinti kai viršytas neveikos laikas"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutės"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Laikmačiai"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Jei pasyvinama prieš"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Pereiti į prezentacijos veikseną"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Apibrėžta tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Temos ekrano fonas"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Darbalaukio fonas"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Darbalaukio fonas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Ekrano užsklandos nuostatos"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Įjungti X ekrano užsklandą"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Sulaikyti"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Ekrano užsklanda"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Pradinė būsena"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Ištrynimas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Pageidautinas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Nepageidautinas"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Rodymo įvykiai"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Leisti"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Neleisti"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4203,39 +4277,52 @@ msgstr "Neleisti"
 msgid "Miscellaneous"
 msgstr "Įvairios parinktys"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Monitoriaus energijos valdymo sąsaja"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Šis ekrano serveris nepalaiko DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Šis ekrano serveris neturi DPMS plėtinio."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Monitoriaus energijos valdymo nuostatos"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Įjungti monitoriaus energijos valdymą"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Perėjimo į budėjimo būseną laikas"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Perėjimo į laukimo būseną laikas"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Išjungimo laikas"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtualūs darbalaukiai"
@@ -4284,74 +4371,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Krašto saistymo nuostatos"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Krašto saistymas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Pridėti saistymą"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Pašalinti saistymą"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Keisti saistymą"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Pašalinti visus"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Atkurti numatytuosius saistymus"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Veiksmas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Veiksmo parametrai"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Bendros parinktys"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Leisti saistymo aktyvavimą pilno ekrano langams"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Krašto saistymo seka"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Paspaudžiamas kraštas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Krašto saistymo klaida"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4360,28 +4447,28 @@ msgstr ""
 "Jūsų nurodyta saistymo klavišų seka jau naudojama veiksmo <hilight>%s</"
 "hilight><br>Prašome nurodyti kitą krašto saistymo seką."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4531,34 +4618,47 @@ msgid ""
 msgstr ""
 "Enlightenment nepavyko importuoti konfigūracijos<br>dėl kopijavimo klaidos."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Kalbos nuostatos"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Language parinkimas"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Sistemos numatytoji"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Parinkta lokalė"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Lokalė"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Kalba"
 
@@ -4649,17 +4749,17 @@ msgid "Manager"
 msgstr "Tvarkytuvė"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nieko"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Pelės saistymo seka"
 
@@ -4683,13 +4783,11 @@ msgid "Menu Settings"
 msgstr "Meniu nuostatos"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Asmeniniai"
@@ -4700,7 +4798,7 @@ msgid "Main Menu"
 msgstr "Rodyti pagrindinį meniu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Mėgiamiausi"
 
@@ -4720,7 +4818,7 @@ msgid "Comments"
 msgstr "Komentaras"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4732,7 +4830,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Rodyti meniu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Meniu"
 
@@ -4803,19 +4901,19 @@ msgid "Images"
 msgstr "Paveikslai"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Šriftai"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temos"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Piktogramos"
 
@@ -4968,18 +5066,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Darbalaukio fono nuostatos"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Naudoti temos darbalaukio foną"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Paveikslas..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Prisijungęs..."
 
@@ -4999,44 +5097,49 @@ msgstr "Šiame darbastalyje"
 msgid "This Screen"
 msgstr "Šiame ekrane"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Darbalaukio fono nuostatos..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Iškloti"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Slinkimas"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Pasirinkite paveikslą..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Paveikslo importavimo klaida"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment nepavyko importuoti paveikslo<br>dėl konvertavimo klaidų."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Darbalaukio fono importavimo klaida"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment nepavyko importuoti darbalaukio fono<br>dėl kopijavimo klaidos."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5074,7 +5177,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Numatytasis rėmelio stilius"
 
@@ -5082,7 +5185,7 @@ msgstr "Numatytasis rėmelio stilius"
 msgid "Window Border Selection"
 msgstr "Lango rėmelio pasirinkimas"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Prisiminti šį rėmelį šiam langui, kai jis kitą kartą pasirodys"
 
@@ -5115,7 +5218,7 @@ msgid "Menu Background Base"
 msgstr "Fonai"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Meniu antraštė"
 
@@ -5124,7 +5227,7 @@ msgid "Menu Title Active"
 msgstr "Meniu antraštė aktyvi"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Meniu elementas"
 
@@ -5138,12 +5241,12 @@ msgid "Menu Item Disabled"
 msgstr "Meniu elementas aktyvus"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Perkėlimo tekstas"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Pakeisti dydį tekstas"
 
@@ -5161,7 +5264,7 @@ msgid "Winlist Label"
 msgstr "Langų sąrašo užrašas"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Langų sąrašo antraštė"
 
@@ -5181,389 +5284,399 @@ msgid "File Manager Background Base"
 msgstr "Failų tvarkytuvė"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Aktyvinti"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Mygtuko tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Mygtuko tekstas išjungtas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Žymimojo langelio tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Žymimojo langelio tekstas išjungtas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Įrašo tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Mygtuko tekstas išjungtas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Užrašo tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Sąrašo elemento tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Sąrašo elemento tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Sąrašo elemento tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Sąrašo antraštė"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Sąrašo antraštė"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Akutės tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Akutės tekstas išjungtas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Šliaužiklio tekstas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Šliaužiklio tekstas išjungtas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Fonai"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Modulio užrašas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Spalvų klasės"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Spalvų klasių nustatymas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Spalvų klasių nustatymas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Spalvų klasių nustatymas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Pasirinkta spalva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Išmesti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Atsijungęs"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Šešėlio spalva"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Langų tvarkyklė"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Valdikliai"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Kita"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Antraštės juosta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Paprastas teksto blokas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Mažas teksto blokas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Didelis teksto blokas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Nuostatų antraštė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Apie antraštė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Apie versija"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Apie tekstas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Darbalaukio užrakto antraštė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Darbalaukio užrakto slaptažodis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Klaidos dialogas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf komanda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Pristatymo antraštė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Pristatymo tekstas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Pristatymo versija"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Įrašas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Rėmelis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Užrašas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Mygtukai"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Šliaužiklis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Akutės"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Žymimieji langeliai"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Tekstinio sąrašo elementas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Sąrašo elementas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Sąrašo antraštė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Failų tvarkyklė"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Darbalaukio piktograma"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Mažas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Didelis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Mažo stiliaus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normalaus stiliaus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Didelio stiliaus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Šriftų nuostatos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Mažutis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Didelis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Labai didelis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Milžiniškas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pikseliai"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Įjungti savas šriftų klases"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Paprastas peržiūros tekstas: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Šriftų klasės"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Įjungti šriftų klases"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Šriftas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Sudėtingas peržiūros tekstas.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Taškinė korekcija"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Baitinis kodas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Šrifto surogatas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Surogato pavadinimas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Įjungti surogatus"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Taškinė korekcija / Surogatai"
 
@@ -5571,12 +5684,17 @@ msgstr "Taškinė korekcija / Surogatai"
 msgid "Icon Theme Settings"
 msgstr "Piktogramų temos nuostatos"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Įjungti sudėtinį vaizdą"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Pasirinkite programas"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Piktogramų tema nustelbia bendrą temą"
@@ -5643,11 +5761,9 @@ msgid "Custom scaling factor"
 msgstr "Savas mastelio daugiklis"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f kartų"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5658,6 +5774,12 @@ msgstr "Taisyklės"
 msgid "Minimum"
 msgstr "Mažiausias"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f kartų"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Didžiausias"
@@ -5678,25 +5800,25 @@ msgstr "Rodyti prisistatymo langą prisijungiant"
 msgid "Transition Settings"
 msgstr "Keitimo nuostatos"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Įvykiai"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Paleistis"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Darbalaukio pakeitimas"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Fono pakeitimas"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Keitimo efektai"
 
@@ -5712,15 +5834,15 @@ msgstr " Importuoti..."
 msgid " Online..."
 msgstr " Prisijungęs..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Temų kategorijos"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Priskirti"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Išvalyti visus"
 
@@ -5749,19 +5871,19 @@ msgstr "Enlightenment nepavyko importuoti temos<br>dėl kopijavimo klaidos."
 msgid "Exchange themes"
 msgstr "Mainyti temas"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Rėmeliai"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Piktogramų tema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Pelės žymeklis"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Mastelis"
 
@@ -5892,6 +6014,11 @@ msgstr "Naudoti programos pateiktą piktogramą "
 msgid "Border Icon"
 msgstr "Rėmelis"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Gudrus išdėstymas"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Gudrus išdėstymas"
@@ -5923,24 +6050,47 @@ msgstr "Po langais"
 msgid "Animate"
 msgstr "Animacijos"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Tiesinis"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Tolygiai pagreitėjantis ir sulėtėjantis"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Pagreitėjimas"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Sulėtėjimas"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Pelės spartinimas"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Sulėtėjimas"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Tolygiai pagreitėjantis ir sulėtėjantis"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Mastelis"
@@ -5962,6 +6112,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Paskutinis langas po žymekliu"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Laikrodis"
@@ -6000,11 +6151,6 @@ msgstr "Dialogų langai"
 msgid "Only dialogs with focused parent"
 msgstr "Aktyvinami tik nauji dialogo langai"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Aktyvinti"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Kitos nuostatos"
@@ -6115,13 +6261,13 @@ msgid "Fill available space"
 msgstr "Užpildyti turimą erdvę"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontalus"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertikalus"
@@ -6182,7 +6328,7 @@ msgid "Raise when clicking to focus"
 msgstr "Pakelti spragtelėjus suaktyvuoti"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Lango aktyvinimas"
 
@@ -6440,33 +6586,33 @@ msgstr "Labai šviesus"
 msgid "Dropshadow"
 msgstr "Rodyti šešėlį"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Viskas"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Viskas"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "(nėra informacijos)"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Po viskuo"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Viskas"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Viskas"
@@ -6476,165 +6622,165 @@ msgstr "Viskas"
 msgid "Everything Settings"
 msgstr "Terminalo nuostatos"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Turimi profiliai"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Perkelti"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Perkelti"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Lentynų konfigūracija"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Rodyti meniu"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Rodyti meniu"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
-msgid "Plugin Trigger"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Numatytasis variklis"
+#: src/modules/everything/evry_config.c:412
+msgid "Plugin Trigger"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Išsamiau"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Numatytasis variklis"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animuotas perkėlimas"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Slėpimo laukimo laikas"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Numatytasis variklis"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Animuotas perkėlimas"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Paleidžiama"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Paleidžiama"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Vėliausiai naudoti"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Paskutinis pakeitimas:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Veiksmo parametrai"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Objekto spalva"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Paprastas"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Iškylantysis langas"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Iškylančiojo lango greitis"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Iškilti darbalaukio dešinėje"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Iškylančiojo lango nuostatos"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6643,39 +6789,30 @@ msgstr "Iškylančiojo lango nuostatos"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Iškylantysis langas"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Lango geometrija"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Paleisti programas iš naujo"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Veiksmas"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6697,167 +6834,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Atverti su..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Atverti su..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Pridėti programą"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nauja programa"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Atverti su..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Vykdyti terminale"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Vykdomasis"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Paleisti programas iš naujo"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Komanda"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Vykdyti komandą"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Viskas"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Daugiau"
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Rikiuoti dabar"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Pervadinti failą"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Viskas"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Rodyti paslėptus failus"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Paieškos katalogai"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Paieškos kelio nuostatos"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Vartotojo apibrėžti katalogai"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Išvalyti"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Dialogų langai"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Per visą ekraną"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Nusiųsti į darbalaukį"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Failų piktogramos"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Failų tipai"
 
@@ -6904,19 +6943,19 @@ msgid "Select an image"
 msgstr "Parinkite paveikslą"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Failų tvarkytuvė"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Namai"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Šakninis"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6934,7 +6973,7 @@ msgstr ""
 "pataisyta pridėjus naujas nuostatas. Dabar galite viską susikonfigūruoti "
 "kaip pageidaujate.<br>Atsiprašome už sukeltus nepatogumus."
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6950,7 +6989,7 @@ msgstr ""
 "versija. Tai yra blogai ir dėl <br>viso pikto buvo grąžintos pradinės "
 "nuostatų reikšmės. Atsiprašome už nepatogumus."
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Failų tvarkyklės nuostatos atnaujintos"
 
@@ -7030,95 +7069,99 @@ msgstr "Atverti failų tvarkyklę įrengus"
 msgid "Device"
 msgstr "Peržiūra"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Eiti į virškatalogį"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Kita programa..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Atverti"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Atverti su..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Žinomos programos"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specifinės programos"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Visos programos"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Sava komanda"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopijavimas nutraukiamas"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Perkėlimas nutraukiamas"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Šalinimas nutraukiamas"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Nežinomas veiksmas iš pagalbinio nutraukiamas"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "%s kopijavimas baigtas"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopijuojama %s (liko: %d sek.)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "%s perkėlimas baigtas"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Perkeliama %s (liko: %d sek.)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Šalinimas baigtas"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Šalinami failai"
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7153,7 +7196,7 @@ msgstr "Apdorojama %d veiksmų"
 msgid "Filemanager is idle"
 msgstr "Failų tvarkyklė be darbo"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM veiksmo informacija"
 
@@ -7165,37 +7208,42 @@ msgstr "Įtaisų tvarkyklė"
 msgid "Available Gadgets"
 msgstr "Turimi įtaisai"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Veiksenos"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Pasirinktas paveikslas"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Pasirinkta spalva"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Permatomas"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animacijos"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Fonas"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Fono slinkimas"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Pradėti įtaiso perkėlimą/dydžio keitimą"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Laisva"
@@ -7443,16 +7491,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ar tikrai norite pašalinti šį juostos šaltinį?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Sukurti naują piktogramą"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Savybės"
 
@@ -7496,7 +7544,7 @@ msgstr "Rodyti langus iš visų darbalaukių"
 msgid "Show windows from active desktop"
 msgstr "Rodyti langus iš aktyvaus darbalaukio"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7626,32 +7674,32 @@ msgstr ""
 "naudojamas vidinių kontekstinių meniu.<br>Šis mygtukas veikia tik "
 "iškylančiame lange."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Rodyti puslapiuotoją iškylančiame lange"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Iškilti darbalaukio dešinėje"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Iškilti darbalaukio kairėje"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Iškilti darbalaukio viršuje"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Iškilti darbalaukio apačioje"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Iškilti darbalaukio kairėje"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Iškilti darbalaukio kairėje"
@@ -7672,133 +7720,93 @@ msgstr "Sistemos valdikliai"
 msgid "Temperature Settings"
 msgstr "Temperatūros nuostatos"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Jutikliai"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsijaus"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Farenheito"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Rodyti vienetus"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Tikrinimo intervalas"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Aukšta temperatūra"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Žema temperatūra"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatūra"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatūra"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Toliau"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Jus sveikina Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Pasirinkite vieną"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profilis"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Jūsų sistemoje nepavyko<br>rasti meniu failų.<br>Prašome paskaityti "
-"dokumentaciją<br>www.enlightenment.org<br>jei norite sužinoti, kaip "
-"priversti veikti<br>Jūsų programų meniu."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Pasirinkite programos meniu"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Paleidimo juosta"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Pasirinkite programas"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Darbalaukio failai"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Nėra piktogramų darbalaukyje"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Įjungti darbalaukio piktogramas"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Aktyvavimo veiksena"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Langus aktyvuoja spragtelėjimas"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Langai aktyvuojami užvedus žymeklį"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Pasirinkite piktogramas, kurias norite pridėti"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Parinkite profilį"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Greita paleistis"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Pasirinkite programas"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Vėliausiai naudoti"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7840,7 +7848,7 @@ msgstr "Kairė:"
 msgid "Right:"
 msgstr "Dešinė"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Nutildyti"
 
@@ -7864,40 +7872,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Garso plokštės"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Maišiklio nuostatos"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Maišiklis naudosiantis visuotinius veiksmus"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Paleisti maišiklį..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Maišiklio modulio nuostatos"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Skiriamosios gebos keitimas"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Maišiklio nuostatos atnaujintos"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Maišiklio modulio nuostatų duomenys pakeisti.<br>Jūsų sena konfigūracija "
-"buvo pakeista numatytąja.<br>Atsiprašome už nepatogumus."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Maišiklio modulio nuostatos"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7924,139 +7946,362 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Atsijungęs"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Valdikliai"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Tinklo ryšio nuostatos"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Apsaugotas"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Nežinomas tomas"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Klaida prijungiant"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Iškloti"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Keitimo efektai"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "(nėra informacijos)"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Paprastas"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Variklis"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Įjungtas"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Užpildyti turimą erdvę"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Apsaugotas"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Atsijungęs"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Veikia kitas sistemos dėklas"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Vienu metu gali veikti tik vienas sistemos dėklo įtaisas ir šiuo metu vienas "
 "jau veikia."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Sistemos dėklas"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Sistemos dėklas"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment nepavyko nustatyti apipavidalinimo sistemos."
+#~ msgid "Acpi"
+#~ msgstr "Veiksmas"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Šiame ekrane"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Šiame ekrane"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Keisti dydį"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Baigi įtaiso perkėlimą/dydžio keitimą"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti Ecore!\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti failų sistemos!\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti X prisijungimo.\n"
+#~ "Ar nurodėte DISPLAY kintamąjį?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti prisijungimų sistemos.\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti IPC sistemos.\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nepavyko įrengti xinerama apgaubimo.\n"
+#~ "Tai neturėjo įvykti."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nepavyko įrengti xinerama apgaubimo.\n"
+#~ "Tai neturėjo įvykti."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko inicijuoti Evas sistemos.\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nepavyko nustatyti inicijavimo ekrano.\n"
+#~ "Galbūt pritrūkote operatyviosios atminties?"
+
+#~ msgid "Setup FM"
+#~ msgstr "FM nustatymas"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment nepavyko nustatyti lentynų sistemos."
+
+#~ msgid "New Application"
+#~ msgstr "Nauja programa"
+
+#~ msgid "Background panning"
+#~ msgstr "Fono slinkimas"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f slinkimo daugiklis X-ašimi"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f slinkimo daugiklis Y-ašimi"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Monitoriaus energijos valdymo sąsaja"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Šis ekrano serveris nepalaiko DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Šis ekrano serveris neturi DPMS plėtinio."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Numatytasis variklis"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Veiksmas"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Atverti su..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Atverti su..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Pridėti programą"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nauja programa"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Vykdyti terminale"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Vykdomasis"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Daugiau"
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Rikiuoti dabar"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Pervadinti failą"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Dialogų langai"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Per visą ekraną"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Nusiųsti į darbalaukį"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Jūsų sistemoje nepavyko<br>rasti meniu failų.<br>Prašome paskaityti "
+#~ "dokumentaciją<br>www.enlightenment.org<br>jei norite sužinoti, kaip "
+#~ "priversti veikti<br>Jūsų programų meniu."
+
+#~ msgid "Select application menu"
+#~ msgstr "Pasirinkite programos meniu"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Paleidimo juosta"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Nėra piktogramų darbalaukyje"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Įjungti darbalaukio piktogramas"
+
+#~ msgid "Focus mode"
+#~ msgstr "Aktyvavimo veiksena"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Langus aktyvuoja spragtelėjimas"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Langai aktyvuojami užvedus žymeklį"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Pasirinkite piktogramas, kurias norite pridėti"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Greita paleistis"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Maišiklio modulio nuostatų duomenys pakeisti.<br>Jūsų sena konfigūracija "
+#~ "buvo pakeista numatytąja.<br>Atsiprašome už nepatogumus."
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
index faa9f34..d86d841 100755 (executable)
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-09-11 09:46+0000\n"
 "Last-Translator: Ibrahim Elias <imen802003@netscape.net>\n"
 "Language-Team: Malay <ms@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Mengenai Enlightment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Tutup"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,18 +43,18 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
 msgstr ""
 
 #: src/bin/e_actions.c:365
@@ -70,614 +69,640 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ya"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Tidak"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Adakah anda pasti mahu keluar?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Anda memohon untuk keluar Enlightenment.<br><br>Adakah anda pasti mahu "
 "keluar?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Adakah anda pasti untuk log keluar?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Adakah anda pasti mahu tutup?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Alihkan"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu Tetingkap"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Naik"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimumkan"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimakan Menegak"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimakan Mendatar"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Alihkan"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Alihkan"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Alihkan"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr ""
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr ""
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -685,18 +710,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -704,20 +727,20 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -728,7 +751,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -737,11 +760,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -749,91 +772,91 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr ""
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -841,69 +864,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr ""
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr ""
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr ""
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr ""
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -911,22 +938,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -947,106 +974,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr ""
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr ""
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1082,313 +1108,313 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1420,12 +1446,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1433,7 +1459,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr ""
 
@@ -1449,7 +1475,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr ""
 
@@ -1469,17 +1495,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1488,7 +1514,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1504,51 +1530,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Alihkan"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1594,14 +1611,14 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr ""
@@ -1653,155 +1670,162 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Menu Tetingkap"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1822,7 +1846,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1981,7 +2005,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2058,15 +2081,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr ""
 
@@ -2080,20 +2101,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Alihkan"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2131,7 +2138,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2139,11 +2146,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2156,7 +2163,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2164,76 +2171,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2268,7 +2273,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2298,7 +2303,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2315,7 +2320,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2326,7 +2331,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2335,427 +2340,478 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
 msgstr ""
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr ""
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr ""
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr ""
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2763,7 +2819,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2771,7 +2827,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2779,42 +2835,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2822,16 +2870,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2842,26 +2890,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr ""
 
@@ -2869,16 +2917,16 @@ msgstr ""
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2886,113 +2934,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3000,156 +3048,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3160,12 +3208,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3193,139 +3241,144 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3333,32 +3386,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
 msgstr ""
 
@@ -3410,17 +3464,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3433,10 +3487,22 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+msgid "Create Launcher"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3449,7 +3515,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3487,9 +3553,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3531,7 +3597,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3539,7 +3605,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3547,7 +3613,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3555,7 +3621,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3563,47 +3629,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3612,11 +3678,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3625,89 +3691,72 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3724,7 +3773,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3734,12 +3783,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3747,182 +3796,208 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3968,102 +4043,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4209,34 +4284,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4317,17 +4405,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4350,13 +4438,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr ""
 
@@ -4366,7 +4452,7 @@ msgid "Main Menu"
 msgstr "Menu Tetingkap"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4383,7 +4469,7 @@ msgid "Comments"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4394,7 +4480,7 @@ msgid "Show gadget settings in top-level"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4462,19 +4548,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4615,18 +4701,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4646,42 +4732,46 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4716,7 +4806,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4724,7 +4814,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4753,7 +4843,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4762,7 +4852,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4775,12 +4865,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4797,7 +4887,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4814,377 +4904,387 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5192,11 +5292,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5261,10 +5365,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5276,6 +5378,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5296,25 +5404,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5330,15 +5438,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5365,19 +5473,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5498,6 +5606,10 @@ msgstr ""
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5526,23 +5638,43 @@ msgstr ""
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr ""
 
@@ -5563,6 +5695,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5594,11 +5727,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5697,13 +5825,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5760,7 +5888,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6010,28 +6138,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6039,146 +6167,146 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Alihkan"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Alihkan"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr ""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
-msgid "Hide input when inactive"
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
-msgid "Hide list"
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
-msgid "Quick Navigation"
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
+#: src/modules/everything/evry_config.c:483
+msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
+#: src/modules/everything/evry_config.c:488
+msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
+#: src/modules/everything/evry_config.c:493
+msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6187,35 +6315,27 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr ""
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr ""
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6237,145 +6357,59 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr ""
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr ""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6420,19 +6454,19 @@ msgid "Select an image"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6443,7 +6477,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6453,7 +6487,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6530,95 +6564,99 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6653,7 +6691,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6665,36 +6703,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Alihkan"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6917,15 +6959,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr ""
 
@@ -6969,7 +7011,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7086,31 +7128,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7130,128 +7172,90 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr ""
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Alihkan"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7293,7 +7297,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7317,38 +7321,52 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7375,116 +7393,124 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
index 75a0d02..f22c8a9 100755 (executable)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-05-09 22:20+0100\n"
 "Last-Translator: Audun Gangsto <feitingen@gmail.com>\n"
 "Language-Team: E17-nb <LL@li.org>\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Lukk"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Utviklerteamet</title>"
 
 #: src/bin/e_actions.c:365
@@ -69,54 +69,54 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nei"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Vil du virkelig avslutte?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Du har bedt om å avslutte Enlightenment.<br><br>Er du sikker?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Vil du virkelig logge ut?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr " "
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Er du sikker på at du vil restarte?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -124,572 +124,596 @@ msgstr ""
 "Du har bedt om å restarte datamaskinen din.<br><br>Er du sikker på at du vil "
 "restarte den?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Vindu : Handling"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Flytt"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 #, fuzzy
 msgid "Resize"
 msgstr "Endre Størrelse"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Vindusmeny"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Reis"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Senk"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Drep"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Vindu : Tilstand"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 #, fuzzy
 msgid "Sticky Mode Toggle"
 msgstr "Veksle Sett fast"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 #, fuzzy
 msgid "Iconic Mode Toggle"
 msgstr "Veksle Ikonmodus"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Veksle Fullskjerm modus"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksimer vertikalt"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksimer horisontalt"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maksimer fullskjerm"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimer"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimeringsmodus \"Ekspander\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximize Mode \"Fyll\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Veksle Skygg Opp Modus"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Veksle Skygg Ned Modus"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Veksle Skygg Venstre Modus"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Veksle Skygg Høyre Modus"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Veksle Skyggemodus"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Veksle Rammefri Tilstand"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Ramme"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Veksle Festet Modus"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Vipp Skrivebord Venstre"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Vipp Skrivebord Høyre"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Vipp Skrivebord Opp"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Vipp Skrivebord Ned"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Vipp Skrivebord Med..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Vis Skrivebordet"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Vis Hyllen"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Vipp Skrivebordet Til..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 #, fuzzy
 msgid "Flip Desktop Linearly..."
 msgstr "Vipp Skrivebordet Linjært..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Bytt til skrivebord 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Bytt til skrivebord 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Bytt til skrivebord 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Bytt til skrivebord 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Bytt til skrivebord 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Bytt til skrivebord 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Bytt til skrivebord 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Bytt til skrivebord 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Bytt til skrivebord 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Bytt til skrivebord 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Bytt til skrivebord 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Bytt til skrivebord 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Bytt til skrivebord..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vipp Skrivebordet Venstre (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vipp Skrivebordet Høyre (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vipp Skrivebordet Opp (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vipp Skrivebordet Ned (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vipp Skrivebordet Med... (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vipp Skrivebordet Til... (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vipp Skrivebordet Linjært... (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Vipp Skrivebordet I Retning..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Gå Til Skrivebord 0 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Gå Til Skrivebord 1 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Gå Til Skrivebord 2 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Gå Til Skrivebord 3 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Gå Til Skrivebord 4 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Gå Til Skrivebord 5 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Gå Til Skrivebord 6 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Gå Til Skrivebord 7 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Gå Til Skrivebord 8 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Gå Til Skrivebord 9 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Gå Til Skrivebord 10 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Gå Til Skrivebord 11 (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Gå Til Skrivebord... (Alle Skjermer)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Skjerm"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Send Muspeker Til Skjerm 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Send Muspeker Til Skjerm 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Send Muspeker Til Skjerm..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Send Muspeker Fram 1 Skjerm"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Send Muspeker Tilbake 1 Skjerm"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Send Muspeker Fram/Tilbake ... Skjermer"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Flytt tekst"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Mer..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Mer..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Endre Størrelse"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Vipp Skrivebordet I Retning..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Lag ikon"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Vindu : Flytting"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Til Neste Skrivebord"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Til Forrige Skrivebord"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Med Skrivebord #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Til skrivebord..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Vis Hovedmeny"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Vis Favorittmeny"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Vis Alle Programmer-meny"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Vis Klientermeny"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Vis meny..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Start"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Applikasjon"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Restart"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Avslutt nå"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modus"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Veksle Presentasjonsmodus"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Veksle Frakoblet Modus"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Slå av nå"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Slå av"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Hvilemodus"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Dvalemodus"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Lås"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Rydd vinduer"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Generelt : Handlinger"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Forsinket Handling"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Skjerm"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Skjerm"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Sett Som Bakgrunn"
 
@@ -697,18 +721,16 @@ msgstr "Sett Som Bakgrunn"
 msgid "Color Selector"
 msgstr "Fargevelger"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -716,20 +738,20 @@ msgstr "Fargevelger"
 msgid "OK"
 msgstr "Ok"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -740,7 +762,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -749,11 +771,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -761,94 +783,94 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Innstillinger Oppgradert"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Ingen vindu)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Beskrivelse: Utilgjengelig"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Velkommen til Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -856,57 +878,62 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Grunnleggende"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Bruk"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Utvidelser"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduler"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Foretrukket"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Feil - ingen PAM støtte"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Støtte for PAM ble ikke bygd inn i Enlightenment,<br>så skrivebordslås er "
 "utilgjengelig."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Lås feilet"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -914,15 +941,15 @@ msgstr ""
 "Låsing av skrivebordet mislyktes fordi et program<br>har grepet enten "
 "tastaturet eller musa eller begge<br>og grepet kan ikke bli brutt."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Vennligst fyll inn opplåsningspassordet ditt"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Autentiseringssystemfeil"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -930,11 +957,11 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktiver Presentasjonsmodus?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -944,12 +971,12 @@ msgstr ""
 "<b>presentasjons</b>modus og midlertidig slå av skjermsparer, -lås og "
 "strømsparing?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 #, fuzzy
 msgid "No, but increase timeout"
 msgstr "Nei, men øk tidsrommet"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Nei, og slutt å spør"
 
@@ -970,106 +997,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Navn"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Generelt Navn"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Vindusklasse"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "MIME-typer"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Skrivebordsfil"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Generelt"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Oppstartsvarsling"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Kjør i terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Vis i Menyer"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Innstillinger"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Velg et ikon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Velg et Program"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Slett"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Lim inn"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Velg Alle"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1112,322 +1138,322 @@ msgstr ""
 "Enlightenment klarte ikke kjøre applikasjonen:<br><br>"
 "%s<br><br>Applikasjonen startet ikke opp."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Feil ved kjøring av applikasjon"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s sluttet uventet å kjøre."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Feillogger"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Det var ingen feilmelding."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Lagre Denne Beskjeden"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Denne feilloggen vil bli lagret som %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Feilinformasjon"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Feilsignalinformasjon"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Det var ingen utdata"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Ikkeeksisterende filbane"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s eksisterer ikke."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Monteringsfeil"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Kan ikke montere enhet"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Avmonteringsfeil"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Kan ikke avmontere enhet"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Utløsningsfeil"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Kan ikke løse ut enhet"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 #, fuzzy
 msgid "Link"
 msgstr "Lenke"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Arv foreldreinnstillinger"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 #, fuzzy
 msgid "View Mode"
 msgstr "Visningsmodus"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Oppdater Visning"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Vis Skjulte Filer"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Husk Rekkefølge"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sorter Nå"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Opprett mappe"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Monter"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Løs Ut"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Bruk Applikasjonsforsynt ikon"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Filegenskaper"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Bruk standard"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Rutenettikoner"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Egendefinerte Ikoner"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 #, fuzzy
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonstørrelse (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Sett bakgrunn..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Sett overlapp..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 #, fuzzy
 msgid "Clear"
 msgstr "Rens"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Lag en ny Katalog"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nytt Katalognavn:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Omdøp %s til:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Feil"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nei til alle"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ja til alle"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Filen eksisterer allerede, skriv over?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Overse dette"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Overse alle"
 
 # Litt for direkte?
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, fuzzy, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "En feil oppsto mens en operasjon ble utført.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Bekreft Slett"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Er du sikker på at du vil slette<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1461,12 +1487,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Ukjent Volum"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Avtagbar Enhet"
 
@@ -1474,7 +1500,7 @@ msgstr "Avtagbar Enhet"
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Størrelse:"
 
@@ -1490,7 +1516,7 @@ msgstr "Filtype:"
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Eier"
 
@@ -1510,17 +1536,17 @@ msgstr "Eier kan lese"
 msgid "Owner can write"
 msgstr "Eier kan skrive"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Standard"
 
@@ -1529,7 +1555,7 @@ msgid "Thumbnail"
 msgstr "Miniatyr"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Egendefinert"
 
@@ -1545,53 +1571,42 @@ msgstr "Lenkeinformasjon"
 msgid "Select an Image"
 msgstr "Velg et Bilde"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Flytt tekst"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Start å flytt/endre størrelse på denne gadgeten"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Endre Størrelse"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Rull innhold automatisk"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Vanlig"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Innrammet"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Fjern"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Ferdig å flytte/endre størrelse på denne gadgeten"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1638,14 +1653,14 @@ msgstr "Posisjon"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Størrelse"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Nivå"
@@ -1697,163 +1712,169 @@ msgstr "Logge ut med dette vinduet oppe"
 msgid "Remember these Locks"
 msgstr "Husk disse låsene"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Vindu"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Alltid på toppen"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Fast"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Innstillinger"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maksimer vertikalt"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maksimer horisontalt"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 #, fuzzy
 msgid "Unmaximize"
 msgstr "Avmaksimer"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Rediger ikon"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Lag ikon"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Til Favorittmeny"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Tastatursnarvei"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Smart plassering"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Hopp over"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Ramme"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Låser"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Husk"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Fast"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Hopp over"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimér"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Opprullet"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Skjerm"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Alltid på toppen"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Fest til skrivebordet"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Løsne fra skrivebordet"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Velg Rammestil"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Bruk E17 Standard Ikonpreferanse"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Bruk Applikasjonsforsynt ikon"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Bruk Brukerdefinert Ikon"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Motstand"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Vindusliste"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Pager"
 msgstr "Sider"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Oppgavelinje"
 
@@ -1876,7 +1897,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM-egenskaper"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Tittel"
 
@@ -2050,7 +2071,6 @@ msgid "Size, Position and Locks"
 msgstr "Størrelse, posisjon og låser"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Tillat"
@@ -2128,15 +2148,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Filer"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Start"
@@ -2151,20 +2169,6 @@ msgstr "Kjerne"
 msgid "Mobile"
 msgstr "Moduler"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Innstillinger"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modulinnstillinger"
@@ -2203,7 +2207,7 @@ msgstr "Legg Til Gadget"
 msgid "Remove Gadget"
 msgstr "Fjern Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Verktøylinjeinnstillinger"
 
@@ -2212,11 +2216,11 @@ msgstr "Verktøylinjeinnstillinger"
 msgid "Layout"
 msgstr "Layout"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Feil ved skrivemetode"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 #, fuzzy
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
@@ -2233,7 +2237,7 @@ msgstr "Hoved"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Favoritter"
 
@@ -2241,77 +2245,75 @@ msgstr "Favoritter"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Applikasjoner"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Vinduer"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Mistede vinduer"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Om"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 #, fuzzy
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Hyller"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Vis/Skjul Alle Vinduer"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Ingen programmer)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Sett Virtuelle Skrivebord"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Ingen vindu)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Uten navn"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Ingen Hyller)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Legg til en Hylle"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Slett en Hylle"
 
@@ -2347,7 +2349,7 @@ msgid "Shrink to Content Width"
 msgstr "Krymp til Innholdsstørrelse"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2377,7 +2379,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2394,7 +2396,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2405,7 +2407,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2414,52 +2416,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarer ikke å initialisere Ecore!\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarer ikke å initialisere filsystemet.\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2467,7 +2439,7 @@ msgstr ""
 "Enlightenment klarer ikke å sette opp håndtering av exit-signal.\n"
 "Er du tom for minne?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2475,7 +2447,7 @@ msgstr ""
 "Enlightenment klarer ikke å sette opp håndtering av HUP-signal.\n"
 "Er du tom for minne?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2484,64 +2456,37 @@ msgstr ""
 "Enlightenment klarer ikke å sette opp håndtering av HUP-signal.\n"
 "Er du tom for minne?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment klarer ikke å initialisere X-tilkoblingen.\n"
-"Har du satt DISPLAY-variablen?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment klarer ikke å initialisere feilrapporteringssystemet.\n"
-"Har du satt DISPLAY-variablen?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarte ikke å sette opp tilkoblingssystemet.\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarte ikke å sette opp IPC-systemet.\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment klarte ikke å sette opp xinerama-grensesnittet.\n"
-"Dette burde ikke skje."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment klarte ikke å sette opp xinerama-grensesnittet.\n"
-"Dette burde ikke skje."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarte ikke å initialisere Evas.\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2551,7 +2496,7 @@ msgstr ""
 "programvarerendret X11 i Evas. Sjekk ved installasjon av Evas og\n"
 "Ecore at de støtter programvarerendret X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2562,7 +2507,35 @@ msgstr ""
 "Evas og\n"
 "Ecore at de støtter rendring til programvarebuffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment klarer ikke å initialisere feilrapporteringssystemet.\n"
+"Har du satt DISPLAY-variablen?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2570,23 +2543,29 @@ msgstr ""
 "Enlightenment klarer ikke lage underkataloger på ditt hjemmeområde.\n"
 "Mangler du hjemmeområde eller er disken din full?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment klarte ikke å sette opp konfigurasjonssystemet."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment klarte ikke sette opp draktsystemet."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment klarte ikke sette opp skriftsystemet."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2594,289 +2573,370 @@ msgstr ""
 "Enlightenment klarte ikke sette opp søkestier.\n"
 "Er du tom for minne?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment klarte ikke sette opp skriftsystemet."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment klarte ikke sette opp draktsystemet."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment klarte ikke sette opp oppstartsskjermbilde.\n"
-"Er du tom for minne?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment klarte ikke sette opp draktsystemet."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
+"Enlightenment klarer ikke å initialisere filsystemet.\n"
+"Er du tom for minne?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
+"Enlightenment klarte ikke sette opp vindushåndtering av alle skjermbildene.\n"
+"Kjører du en annen vindushåndterer?\n"
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment klarte ikke sette opp miniatyrbildesystemet.\n"
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
-"Enlightenment klarte ikke sette opp vindushåndtering av alle skjermbildene.\n"
-"Kjører du en annen vindushåndterer?\n"
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment klarte ikke sette opp sprettoppsystemet."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Meldinger"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment klarte ikke sette opp handlingssystemet."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr ""
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Filbehandler"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment klarer ikke å sette opp meldingssystemet."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment klarer ikke å sette opp dra-og-slipp-systemet."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment klarer ikke å sette opp håndtering av innenheter."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment klarer ikke å sette opp modulsystemet."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment klarer ikke å sette opp systemet som husker vindustatus."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment klarer ikke sette opp fargeklassesystemet."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment klarer ikke å sette opp dingskontrollsystemet."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr ""
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment klarte ikke sette opp koblingssysstemet."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment klarte ikke sette opp hyllesystemet."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment klarte ikke sette opp miniatyrbildesystemet.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment klarte ikke sette opp miniatyrbildesystemet.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment klarte ikke sette opp miniatyrbildesystemet.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment klarte ikke sette opp draktsystemet."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Husk Rekkefølge"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Nesten ferdig"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2884,7 +2944,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2892,7 +2952,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2900,20 +2960,12 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Nesten ferdig"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Last Inn Modul"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2922,11 +2974,11 @@ msgstr ""
 "Det oppstod en feil ved lasting av modulen: %s<br>Ingen modul kalt %s ble "
 "funnet i søkestien for moduler<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Feil ved lasting av modul"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2935,11 +2987,11 @@ msgstr ""
 "Det oppstod en feil ved lasting av modul: %s<br>Full sti til modulen:<br>"
 "%s<br>Følgende feil ble rapportert:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2949,16 +3001,16 @@ msgstr ""
 "Feil ved initialisering av modulen: %s<br>Den krever et modul-API med "
 "versjon: %i.<br>Enlightement rapporterer modul-API med versjon: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s-modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du laste ut denne modulen?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2969,28 +3021,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Hylle #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Ferdig å flytte/endre størrelse på denne gadgeten"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Start å flytt/endre størrelse på denne gadgeten"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Kommentar"
@@ -2999,16 +3051,16 @@ msgstr "Kommentar"
 msgid "Starting"
 msgstr "Starter"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Systemsjekk ferdig"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3016,113 +3068,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Logg ut nå"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Avbryt utlogging"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Utlogging pågår"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Utloggiing pågår.<br><hilight>Vennligst vent.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Slå av"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Slå av.<br><hilight>Vennligst vent.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3130,159 +3182,159 @@ msgstr ""
 msgid "About Theme"
 msgstr "Om tema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
 # (hehe)
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, fuzzy, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment kunne ikke gafle en barneprosess:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Kan ikke avslutte - udødelige vinduer."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år siden"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li måneder siden"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li uker siden"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dager siden"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timer siden"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minutter siden"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Temperaturinnstillinger"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importer..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Fyll"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3293,12 +3345,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Konfigurasjonen er oppgradert"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3326,142 +3378,148 @@ msgstr "Opp"
 msgid "Down"
 msgstr "Ned"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Oppløsning"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Tillatelser:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Du"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Vis advarsel når batterinivået er lavt"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Sjekk hvert:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Dvalemodus"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Vis advarsel når batterinivået er lavt"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Uklar"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3469,32 +3527,33 @@ msgstr ""
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Klokke"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Kjørbar fil"
@@ -3548,17 +3607,17 @@ msgstr "Konfigurasjonen er oppgradert"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3572,10 +3631,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Start"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Applikasjoner"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Skrivebord"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3588,7 +3662,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3626,9 +3700,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
@@ -3670,7 +3744,7 @@ msgstr ""
 msgid "Profiles"
 msgstr "Profiler"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3678,7 +3752,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3686,7 +3760,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3694,7 +3768,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3702,47 +3776,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Endre oppløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Lagre"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3751,11 +3825,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3764,91 +3838,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Antall skrivebord"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Skifte av skrivebord med musepeker"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Skrivebord"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animasjoner"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3865,7 +3922,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3876,12 +3933,12 @@ msgstr "Sett bakgrunn..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3889,155 +3946,169 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Hvilemodus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Hvilemodus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Lås"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Vis i Menyer"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Vis i Menyer"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekunder"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutter"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Veksle Presentasjonsmodus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Bakgrunn"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Bakgrunn"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Skjermbeskytter"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Hvilemodus"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Skjermbeskytter"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Innledende Tilstand"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Ikke foretrukket"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Tillat"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ikke tillat"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4045,37 +4116,51 @@ msgstr "Ikke tillat"
 msgid "Miscellaneous"
 msgstr "Diverse alternativer"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "Etter modifikasjonstid"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -4122,102 +4207,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Applikasjonslisteoppsett"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4364,34 +4449,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Språkinnstillinger"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Språkvelger"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Språk"
 
@@ -4474,17 +4572,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4507,13 +4605,11 @@ msgid "Menu Settings"
 msgstr "Menyoppsett"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Standard"
@@ -4524,7 +4620,7 @@ msgid "Main Menu"
 msgstr "Vis Hovedmeny"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4544,7 +4640,7 @@ msgid "Comments"
 msgstr "Kommentar"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4556,7 +4652,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Vis i Menyer"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menyer"
 
@@ -4627,19 +4723,19 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temaer"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikoner"
 
@@ -4786,18 +4882,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Bilde..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4817,42 +4913,47 @@ msgstr "Dette Skrivebordet"
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Vanlig"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Velg et bilde..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4888,7 +4989,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4896,7 +4997,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Valg av vindusbord"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Alltid bruk denne borden for dette vinduet"
 
@@ -4929,7 +5030,7 @@ msgid "Menu Background Base"
 msgstr "Bakgrunner"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4938,7 +5039,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4951,12 +5052,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Flytt tekst"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4973,7 +5074,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4993,383 +5094,393 @@ msgid "File Manager Background Base"
 msgstr "Filbehandler"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Bakgrunner"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Farger"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Farge 1:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Eget Farge"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Løs Ut"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Opprullet"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Andre innstillinger"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Knapper"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Liten"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 #, fuzzy
 msgid "Tiny"
 msgstr "Bitteliten"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Veldig stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Enorm"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5377,11 +5488,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5447,11 +5562,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5462,6 +5575,12 @@ msgstr ""
 msgid "Minimum"
 msgstr "Minimum"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5482,25 +5601,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Hendelser"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Oppstart"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5516,15 +5635,15 @@ msgstr " Importer..."
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5551,19 +5670,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Vindusramme"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Ikontema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5694,6 +5813,11 @@ msgstr "Bruk Applikasjonsforsynt ikon"
 msgid "Border Icon"
 msgstr "Ramme"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Smart plassering"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Smart plassering"
@@ -5725,24 +5849,47 @@ msgstr "Under Vinduer"
 msgid "Animate"
 msgstr "Animasjoner"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineær"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Glatt akselerasjon og deakselerasjon"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Akselerer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Deakselerer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Akselerer"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Deakselerer"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Glatt akselerasjon og deakselerasjon"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Nivå"
@@ -5764,6 +5911,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Siste vindu under musepekeren"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Klokke"
@@ -5802,11 +5950,6 @@ msgstr "Bare nye dialoger får fokus"
 msgid "Only dialogs with focused parent"
 msgstr "Bare nye dialoger får fokus"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Andre innstillinger"
@@ -5915,13 +6058,13 @@ msgid "Fill available space"
 msgstr "Fyll tilgjengelig plass"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5980,7 +6123,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6230,33 +6373,33 @@ msgstr "Veldig lys"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Alt"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Alt"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Pager oppsett"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Alltid nederst"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Alt"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Alt"
@@ -6266,160 +6409,161 @@ msgstr "Alt"
 msgid "Everything Settings"
 msgstr "Utvalgsinnstillinger"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Tilgjengelige moduler"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Flytt"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Flytt"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Kontrollpanel"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Vis i Menyer"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Vis i Menyer"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Detaljer"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Standard"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Automatisk rulling"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Vindusliste"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Standard"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Automatisk rulling"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Starter"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Starter"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Sist Endret:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Vanlig"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Listeinnstillinger"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Listeinnstillinger"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Listeinnstillinger"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6428,39 +6572,30 @@ msgstr "Listeinnstillinger"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Listeinnstillinger"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Prøv igjen"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Favoritter"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Applikasjoner"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6482,163 +6617,66 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Åpne med..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Åpne med..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Legg til Applikasjon"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Applikasjon"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Åpne med..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Kjør i terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Kjørbar fil"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Favoritter"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Kommando"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Kjør ..."
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Alt"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Mer..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Sorter Nå"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Gi nytt navn"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Alt"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Vis Skjulte Filer"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Rens"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Skyggeavstand"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Fullskjerm"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Send til skrivebord"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Filikoner"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Filtyper"
 
@@ -6685,19 +6723,19 @@ msgid "Select an image"
 msgstr "Velg et Bilde"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Filbehandler"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Hjem"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6708,7 +6746,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6718,7 +6756,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6798,95 +6836,99 @@ msgstr ""
 msgid "Device"
 msgstr "Forhåndsvisning"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Åpne"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Åpne med..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6921,7 +6963,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6933,37 +6975,42 @@ msgstr "Gadgetbehandler"
 msgid "Available Gadgets"
 msgstr "Tilgjengelige Gadgets"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Flytt"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Eget Bilde"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Eget Farge"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animasjoner"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Bakgrunner"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Start å flytt/endre størrelse på denne gadgeten"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Ledig"
@@ -7212,16 +7259,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Are you sure you want to delete this bar source?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Lag nytt ikon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -7265,7 +7312,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7385,31 +7432,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7429,130 +7476,93 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "Temperaturinnstillinger"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Føler"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Visningsenhet"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Oppdateringsinterval"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Høy temperatur"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Lav temperatur"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatur"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Neste"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Velkommen til Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Velg en"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Ingen ikoner på skrivebord"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Valgt Barkilde"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Hurtigstart"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Flytt"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7594,7 +7604,7 @@ msgstr "Venstre:"
 msgid "Right:"
 msgstr "Høyre:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Demp"
 
@@ -7619,40 +7629,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Lydkort"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Mikserinnstillinger"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mikser for bruk til globale handlinger:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Start mikser..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Miksemodul Innstillinger"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Endre oppløsning"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Mikserinnstillinger Oppdatert"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Miksemodulinnstillingsdataene har endret.<br>Din gamle konfigurasjon har "
-"blitt erstattet<br>med de nye standardinnstillingene.<br>Beklager bryderiet."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Miksemodul Innstillinger"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7679,134 +7703,282 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Kontroller"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "frakoble"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Ukjent"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Feil"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Fil:"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Posisjon"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfigurasjon"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "klar"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "pålogging"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Ingen"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Konfigurér"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Aktivert"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Fyll tilgjengelig plass"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "frakoble"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Ingen"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment klarte ikke sette opp draktsystemet."
+#~ msgid "Dim Screen"
+#~ msgstr "Skjerm"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Skjerm"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Endre Størrelse"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Ferdig å flytte/endre størrelse på denne gadgeten"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment klarer ikke å initialisere Ecore!\n"
+#~ "Er du tom for minne?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment klarer ikke å initialisere X-tilkoblingen.\n"
+#~ "Har du satt DISPLAY-variablen?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment klarte ikke å sette opp tilkoblingssystemet.\n"
+#~ "Er du tom for minne?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment klarte ikke å sette opp IPC-systemet.\n"
+#~ "Er du tom for minne?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment klarte ikke å sette opp xinerama-grensesnittet.\n"
+#~ "Dette burde ikke skje."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment klarte ikke å sette opp xinerama-grensesnittet.\n"
+#~ "Dette burde ikke skje."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment klarte ikke å initialisere Evas.\n"
+#~ "Er du tom for minne?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment klarte ikke sette opp oppstartsskjermbilde.\n"
+#~ "Er du tom for minne?"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment klarte ikke sette opp hyllesystemet."
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Applikasjoner"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Åpne med..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Åpne med..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Legg til Applikasjon"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Applikasjon"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Kjør i terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Kjørbar fil"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Mer..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Sorter Nå"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Gi nytt navn"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Skyggeavstand"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Fullskjerm"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Send til skrivebord"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Ingen ikoner på skrivebord"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Hurtigstart"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Miksemodulinnstillingsdataene har endret.<br>Din gamle konfigurasjon har "
+#~ "blitt erstattet<br>med de nye standardinnstillingene.<br>Beklager "
+#~ "bryderiet."
 
 #~ msgid "Add Application..."
 #~ msgstr "Legg til Applikasjon..."
@@ -8471,9 +8643,6 @@ msgstr ""
 #~ msgid "Everyone"
 #~ msgstr "Alle"
 
-#~ msgid "By Mod Time"
-#~ msgstr "Etter modifikasjonstid"
-
 #~ msgid "Allow Overlap"
 #~ msgstr "Tillat overlapping"
 
@@ -8522,8 +8691,5 @@ msgstr ""
 #~ msgid "Wait Exit"
 #~ msgstr "Vent ved avslutning"
 
-#~ msgid "%3.0f"
-#~ msgstr "%3.0f"
-
 #~ msgid "Places"
 #~ msgstr "Steder"
index 6920ff8..d8d1a32 100755 (executable)
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-06-09 15:31+0200\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-09-03 15:10+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team: Dutch <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@@ -24,20 +24,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Over Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -45,17 +44,18 @@ msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
+#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
-"Copyright &copy; 1999-2010, door het Enlightenment Ontwikkeling-team."
+"Copyright &copy; 1999-2011, door het Enlightenment Ontwikkeling-team."
 "<br><br>Wij hopen dat u plezier heeft van het gebruik van onze software, net "
 "zoveel als wij dat hebben om het te schrijven. <br><br>Deze software is "
 "beschikbaar zoals ie is zonder expliciete of vastgestelde garantie. Deze "
@@ -65,9 +65,9 @@ msgstr ""
 "het is niet stabiel. Vele features zijn niet compleet of bestaan nog niet "
 "eens en kunnen vele bugs hebben. U bent <hilight>GEWAARSCHUWD!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>Het Team</title>"
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>Het Team</><br><br>"
 
 #: src/bin/e_actions.c:365
 #, c-format
@@ -84,59 +84,59 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Weet u zeker dat u dit venster wilt forceren af te sluiten?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nee"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "U vroeg Enlightenment om af te sluiten.<br><br>Weet u zeker dat u wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Weet u zeker dat u wilt afmelden?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "U staat op het punt om af te melden.<br><br>Weet u zeker dat u dit wil doen?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
-msgstr "Weet u zeker dat u wilt afsluiten?"
+msgstr "Weet u zeker dat u uit wilt schakelen?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "U heeft gevraagd om uw computer uit te schakelen.<br><br>Weet u zeker dat u "
-"wilt afsluiten?"
+"wilt uitschakelen?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Weet u zeker dat u wilt herstarten?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -144,7 +144,7 @@ msgstr ""
 "U heeft gevraagd om uw computer te herstarten.<br><br>Weet u zeker dat u "
 "wilt herstarten?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -152,11 +152,11 @@ msgstr ""
 "U heeft gevraagd om uw computer in de pauzestand te zetten.<br><br>Weet u "
 "zeker dat u uw computer in de pauzestand wil zetten?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Weet u zeker dat u in slaapstand wilt gaan?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -164,540 +164,566 @@ msgstr ""
 "U heeft gevraagd om de computer in slaapstand te zetten.<br><br>Weet u zeker "
 "dat u alles op de schijf wilt bewaren?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
-msgstr "Venster: Acties"
+msgstr "Venster : Acties"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
-msgstr "Verander formaat"
+msgstr "Herschalen"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
-msgstr "Venster menu"
+msgstr "Venstermenu"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Verhoog"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Verlaag"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
-msgstr "Vernietigen"
-
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+msgstr "Beëindigen"
+
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Venster : Status"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Schakelen Vastgezette Modus"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Schakelen Icoon-modus"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Schakelen Volledig scherm-modus"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
-msgstr "Maximaliseer"
+msgstr "Maximaliseren"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Verticaal maximaliseren"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Horizontaal maximaliseren"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximaliseer over het volledig scherm"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
-msgstr "Maximaliseer mode \"Slim\""
+msgstr "Maximaliseer-modus \"Slim\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
-msgstr "Maximaliseer mode \"Vergroot\""
+msgstr "Maximaliseer modus \"Vergroot\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
-msgstr "Maximaliseer mode \"Vul\""
+msgstr "Maximaliseer modus \"Vul\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Schakelen Oprollen-modus"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Schakelen Afrollen-modus"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Schakelen Linksrollen-modus"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Schakelen Rechtsrollen-modus"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Schakelen Rol-modus"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Schakelen Vensterrandloze-status"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Stel rand in"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Schakel tussen randen"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Schakelen Vastgezette Status"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Draai Bureaublad Links"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Draai Bureaublad Rechts"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Draai Bureaublad Boven"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Draai Bureaublad Onder"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Draai Bureaublad met..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Bureaublad Weergeven"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Toon de Schelf"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Draai Bureaublad naar..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Draai Bureaublad Lineair..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Wissel Naar Bureaublad 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Wissel Naar Bureaublad 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Wissel Naar Bureaublad 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Wissel Naar Bureaublad 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Wissel Naar Bureaublad 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Wissel Naar Bureaublad 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Wissel Naar Bureaublad 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Wissel Naar Bureaublad 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Wissel Naar Bureaublad 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Wissel Naar Bureaublad 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Wissel Naar Bureaublad 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Wissel Naar Bureaublad 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Wissel Naar Bureaublad..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Draai Bureaublad Links (Alle Schermen)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Draai Bureaublad Rechts (Alle Schermen)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Draai Bureaublad Boven (Alle Schermen)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Draai Bureaublad Onder (Alle Schermen)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Draai Bureaublad Met... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Draai Bureaublad naar... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Draai Bureaublad Lineair... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Draai Bureaublad in richting..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Wissel Naar Bureaublad 0 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Wissel Naar Bureaublad 1 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Wissel Naar Bureaublad 2 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Wissel Naar Bureaublad 3 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Wissel Naar Bureaublad 4 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Wissel Naar Bureaublad 5 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Wissel Naar Bureaublad 6 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Wissel Naar Bureaublad 7 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Wissel Naar Bureaublad 8 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Wissel Naar Bureaublad 9 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Wissel Naar Bureaublad 10 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Wissel Naar Bureaublad 11 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Wissel Naar Bureaublad...  (Alle Schermen)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Scherm"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Zend Muis Naar Scherm 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Zend Muis Naar Scherm 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Zend Muis Naar Scherm..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Zend Muis 1 Scherm Verder"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Zend Muis 1 Scherm Terug"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Zend Muis Scherm Verder/Terug..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "Dim"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "Ontdim"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "Stel achtergrondlicht in"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "Achtergrondlicht Min"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "Achtergrondlicht Mid"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "Achtergrondlicht Max"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "Achtergrondlicht verstellen"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "Achtergrondlicht omhoog"
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr "Achtergrondlicht omlaag"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "Verplaats naar het midden"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Verplaats naar..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
-msgstr " Verplaats door..."
+msgstr "Verplaats door..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Herschaal door..."
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "Duw in richting..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Versleep icoon..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Venster : Verplaatsen"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Naar Volgend Bureaublad"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Naar Vorig Bureaublad"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Per Bureaublad #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Naar Bureaublad..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Hoofdmenu weergeven"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Favorietenmenu Weergeven"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Alle Applicatiesmenu Weergeven"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Clientmenu Weergeven"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Weergeven van Menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
-msgstr "Uitvoeren"
+msgstr "Voer uit"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Applicatie"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Herstarten"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Nu Afsluiten"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modus"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Schakel Presentatie-modus"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Schakel Offline-modus"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Systeem"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Afmelden"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Nu Uitschakelen"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Uitschakelen"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "Pauzeer nu"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Stand-by stand"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Slaapstand"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Vergrendelen"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Vensters Opruimen"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Generiek : Acties"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Uitgestelde Acties"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "ACPI"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Dim Scherm"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Ontdim Scherm"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Als Achtergrond Instellen"
 
@@ -705,18 +731,16 @@ msgstr "Als Achtergrond Instellen"
 msgid "Color Selector"
 msgstr "Kleurenkiezer"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -724,20 +748,20 @@ msgstr "Kleurenkiezer"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -756,7 +780,7 @@ msgstr ""
 "oplossen<br>door het toe te voegen. U kunt uw dingen nu her-instellen naar "
 "uw<br>wensen. Excuses voor de wijzigingen in uw instellingen.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -771,11 +795,11 @@ msgstr ""
 "uw instellingen nu teruggezet naar de<br>standaarden. Excuses voor het "
 "ongemak.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Instellingen Schrijfproblemen"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -786,19 +810,19 @@ msgstr ""
 "instellingenbestanden<br>van:<br> %s<br><br>naar:<br>%s<br><br>De rest van "
 "het schrijven is afgebroken voor uw veiligheid. <br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
-msgstr "Instellingen geupgrade"
+msgstr "Instellingen geüpgrade"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "De EET-bestandsafhandelaar is slecht."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "De bestandsdata is leeg."
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -806,17 +830,17 @@ msgstr ""
 "Het bestand is niet schrijfbaar. Wellicht is de schijf alleen-lezen<br>of u "
 "bent de rechten op uw bestanden kwijt."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 "Geheugen raakte op tijdens het voorbereiden van het schrijven.<br>Maak "
 "alstublieft geheugen vrij."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Dit is een algemene fout."
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -824,60 +848,61 @@ msgstr ""
 "Het instellingenbestand is te groot.<br>Het zou heel klein moeten zijn "
 "(hooguit een paar honderd KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 "U heeft I/O-fouten op uw schijf.<br>Misschien is ie aan vervanging toe?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "U raakte uit geheugen terwijl het bestand geschreven werd"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "Het bestand werd gesloten tijdens het schrijven."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Geheugen-toewijzing (mmap) van bestand faalde."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "X509 Encoding gefaald."
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Handtekening faalde."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "De handtekening was ongeldig."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Niet ondertekend."
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Feature niet ingebouwd."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "PRNG was niet seeded."
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "Encryptie gefaald."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+#, fuzzy
+msgid "Decryption failed."
 msgstr "Decryptie gefaald."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "De fout is onbekend voor Enlightenment."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -888,57 +913,61 @@ msgstr ""
 "instellingenbestand.<br> %s<br><br>Het bestand waar de fout plaatsvond was:"
 "<br>%s<br><br>Dit bestand is verwijderd om corrupte data te voorkomen."
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Eenvoudig"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Toepassen"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensies"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Modules"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "Instellingen"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Fout - Geen PAM-ondersteuning"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM-ondersteuning is niet ingebouwd in Enlightenment, "
 "dus<br>bureaubladvergrendeling is uitgeschakeld."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Vergrendeling Mislukt"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -947,15 +976,15 @@ msgstr ""
 "toetsenbord óf de muis óf beiden<br>vasthoudt en dit kan niet doorbroken "
 "worden."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Voer alstublieft uw ontgrendelingswachtwoord in"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
-msgstr "Authenticatie-systeemfout"
+msgstr "Authenticatiesysteem-fout"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -966,25 +995,25 @@ msgstr ""
 "de<br>authenticatiesessie. De foutcode was <hilight>%i</hilight>.<br>Dit is "
 "slecht en zou niet moeten gebeuren. Rapporteer alstublieft deze bug."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Presentatiemodus activeren?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
-"U vergrendelde het bureaublad te snel.<br><br>Wilt u de <b>presentatie</b>-"
+"U ontgrendelde het bureaublad te snel.<br><br>Wilt u de <b>presentatie</b>-"
 "modus inschakelen en tijdelijk de schermbeveiliging, vergrendelen en "
 "energiebesparing uitschakelen?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Neen, maar vergroot time-out"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Neen en stop met vragen"
 
@@ -1011,106 +1040,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Bureaublad-invulling-bewerker"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Naam"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Commentaar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
-msgstr "Icon"
+msgstr "Icoon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Generieke Naam"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Venster Klasse"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorieën"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mimetypen"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Desktopbestand"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Algemeen"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Opstart Melding"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Uitvoeren in terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Weergeven in Menus"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opties"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Selecteer een Icoon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Selecteer een Uitvoerbaar bestand"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Wis"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Knippen"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopieer"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Plakken"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Alles selecteren"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1118,7 +1146,7 @@ msgstr "Start Fout"
 
 #: src/bin/e_exec.c:218
 msgid "Enlightenment was unable to get current directory"
-msgstr "Enlightenment was niet in staat om de huidige map te verkrijgen."
+msgstr "Enlightenment was niet in staat om de huidige map te verkrijgen"
 
 #: src/bin/e_exec.c:225
 #, c-format
@@ -1153,314 +1181,314 @@ msgstr ""
 "Enlightenment was niet in staat om het programma te starten:<br><br>"
 "%s<br><br>Het programma starten mislukte."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Toepassings-uitvoerfout"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s is onverwachts opgehouden met draaien."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Een afsluitcode van %i is teruggekomen van %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
-msgstr "%s was onderbroken door een Onderbrekingssignaal."
+msgstr "%s werd onderbroken door een Onderbrekingssignaal."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr "%s was onderbroken door een Afsluitsignaal."
+msgstr "%s werd onderbroken door een Afsluitsignaal."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s was onderbroken door een Afbreeksignaal."
+msgstr "%s werd onderbroken door een Afbreeksignaal."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
-msgstr "%s was onderbroken door een Zwevende Punt-fout."
+msgstr "%s werd onderbroken door een Zwevende Punt-fout."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
-msgstr "%s was onderbroken door een ononderbreekbaar Afsluitsignaal."
+msgstr "%s werd onderbroken door een ononderbreekbaar Afsluitsignaal."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
-msgstr "%s was onderbroken door een segmentatiefout."
+msgstr "%s werd onderbroken door een segmentatiefout."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
-msgstr "%s was onderbroken door een gebroken pijp."
+msgstr "%swerd onderbroken door een gebroken pijp."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
-msgstr "%s was onderbroken door een Beëindigingssignaal."
+msgstr "%s werd onderbroken door een Beëindigingssignaal."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
-msgstr "%s was onderbroken door een Busfout."
+msgstr "%s werd onderbroken door een Busfout."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
-msgstr "%s was onderbroken door het signaalnummer %i."
+msgstr "%s werd onderbroken door het signaalnummer %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***De resterende uitvoer is afgeknot. Sla de uitvoer op om deze te zien.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
-msgstr "Fout-logbestanden"
+msgstr "Foutlog-bestanden"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Er was geen foutmelding."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Bewaar deze melding"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Deze foutmelding zal worden opgeslagen als %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Fout-informatie"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Fout-signaalinformatie"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Uitvoer-data"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Er was geen uitvoer."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Niet-bestaand pad"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s bestaat niet."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Aankoppelingsfout"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Kan apparaat niet aankoppelen."
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Afkoppelfout"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Kan apparaat niet afkoppelen"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Uitwerpfout"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Kan apparaat niet uitwerpen"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Bestanden"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Afbreken"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Erf ouderinstellingen"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Weergavemodus"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Ververs weergave"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Toon verborgen bestanden"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Onthoudt sortering"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sorteer nu"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nieuwe map"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Afkoppelen"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Aankoppelen"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Uitwerpen"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
-msgstr "Programmaeigenschappen"
+msgstr "Programma-eigenschappen"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Bestandseigenschappen"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Gebruik standaard"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Raster pictogrammen"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Aangepaste pictogrammen"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lijst"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Pictogramgrootte (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Stel achtergrond in..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Stel overlap in..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Wis"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Creëer een nieuwe map"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nieuwe mapnaam:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Hernoem %s naar:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Hernoem bestand"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Probeer opnieuw"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Fout"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Neen op alles"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ja op alles"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Bestand bestaat al, overschijven?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Negeer dit"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Negeer alles"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Er ontstond een fout tijdens het uitvoeren van de operatie.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Bevestig verwijderen"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Weet u zeker dat u <br><hilight>%s</hilight> wilt verwijderen?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1494,12 +1522,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Onbekend apparaat"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Verwijderbaar apparaat"
 
@@ -1507,7 +1535,7 @@ msgstr "Verwijderbaar apparaat"
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Grootte:"
 
@@ -1523,7 +1551,7 @@ msgstr "Bestandstype:"
 msgid "Permissions"
 msgstr "Rechten"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Eigenaar:"
 
@@ -1543,17 +1571,17 @@ msgstr "Eigenaar kan lezen"
 msgid "Owner can write"
 msgstr "Eigenaar kan schrijven"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Voorbeeld"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Standaard"
 
@@ -1562,7 +1590,7 @@ msgid "Thumbnail"
 msgstr "Miniatuur"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Aangepast"
 
@@ -1578,50 +1606,41 @@ msgstr "Link-informatie"
 msgid "Select an Image"
 msgstr "Selecteer een afbeelding"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Verplaatsen naar"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Start verplaatsen/herschalen"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Herschaalbaar"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Scroll inhoud automatisch"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Vlak"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Inleg"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Uiterlijk"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Verwijder"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Stop verplaatsen/herschalen van deze gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1631,11 +1650,11 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:64
 msgid "Window Locks"
-msgstr "Venster vergrendeling"
+msgstr "Venstersloten"
 
 #: src/bin/e_int_border_locks.c:282
 msgid "Generic Locks"
-msgstr "Algemeen slot"
+msgstr "Algemene sloten"
 
 #: src/bin/e_int_border_locks.c:283
 msgid "Lock the Window so it does only what I tell it to"
@@ -1653,7 +1672,7 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:289
 msgid "Do not allow the border to change on this window"
-msgstr "Sta niet toe dat het raamwerk verandert op dit venster"
+msgstr "Sta niet toe dat de rand verandert op dit venster"
 
 #: src/bin/e_int_border_locks.c:292
 msgid "Remember these Locks for this window next time it appears"
@@ -1661,7 +1680,7 @@ msgstr "Onthoud deze Sloten voor dit venster de volgende keer dat het opkomt"
 
 #: src/bin/e_int_border_locks.c:305
 msgid "Lock program changing:"
-msgstr "Vergrendel programma verandering:"
+msgstr "Vergrendel programmaverandering:"
 
 #: src/bin/e_int_border_locks.c:306 src/bin/e_int_border_locks.c:325
 #: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:174
@@ -1670,21 +1689,21 @@ msgstr "Positie"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
-msgstr "Grote"
+msgstr "Grootte"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Gestapeld"
 
 #: src/bin/e_int_border_locks.c:312 src/bin/e_int_border_locks.c:331
 msgid "Iconified state"
-msgstr "Geminimaliseerde staat"
+msgstr "Geiconiseerde staat"
 
 #: src/bin/e_int_border_locks.c:314 src/bin/e_int_border_locks.c:333
 #: src/bin/e_int_border_remember.c:723
@@ -1694,189 +1713,196 @@ msgstr "Vastzetten"
 #: src/bin/e_int_border_locks.c:316 src/bin/e_int_border_locks.c:335
 #: src/bin/e_int_border_remember.c:729
 msgid "Shaded state"
-msgstr "Ingeklapt"
+msgstr "Ingeklapte status"
 
 #: src/bin/e_int_border_locks.c:318 src/bin/e_int_border_locks.c:337
 msgid "Maximized state"
-msgstr "Maximaliseren"
+msgstr "Gemaximaliseerde status"
 
 #: src/bin/e_int_border_locks.c:320 src/bin/e_int_border_locks.c:339
 #: src/bin/e_int_border_remember.c:732
 msgid "Fullscreen state"
-msgstr "Volledig Scherm"
+msgstr "Volledig Scherm-status"
 
 #: src/bin/e_int_border_locks.c:324
 msgid "Lock me from changing:"
-msgstr "Sluit mij uit van verandering:"
+msgstr "Weerhoudt mij van verandering:"
 
 #: src/bin/e_int_border_locks.c:341 src/bin/e_int_border_remember.c:717
 msgid "Border style"
-msgstr "Vensterraam stijl"
+msgstr "Randstijl:"
 
 #: src/bin/e_int_border_locks.c:345
 msgid "Stop me from:"
-msgstr "Stop mij van:"
+msgstr "Weerhoudt mij van:"
 
 #: src/bin/e_int_border_locks.c:346
 msgid "Closing the window"
-msgstr "Venster sluiten"
+msgstr "Sluiten van het venster"
 
 #: src/bin/e_int_border_locks.c:348
 msgid "Exiting my login with this window open"
-msgstr "Sluit mijn aanmelding met dit venster open"
+msgstr "Sluiten van mijn aanmelding met dit venster open"
 
 #: src/bin/e_int_border_locks.c:352
 msgid "Remember these Locks"
 msgstr "Onthoud deze Sloten"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Venster"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "Altijd op voorgrond"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Vastgezet"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Instellingen"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Volledig scherm"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximaliseer verticaal"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximaliseer horizontaal"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Demaximaliseer"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Bewerk pictogram"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Creëer pictogram"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Voeg toe aan Favorietenmenu"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Voeg toe aan IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr "Creëer toetsenbord-sneltoets"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Plaatsing"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Overslaan"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Rand"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Sloten"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Onthouden"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Vastgezet"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Overslaan"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
-msgstr "Minimaliseren"
+msgstr "Iconiseer"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr "Oprollen"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr "Scherm %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Altijd op voorgrond"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Altijd op achtergrond"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Vastzetten op bureaublad"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Losmaken van bureaublad"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Selecteer randstijl"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Gebruik standaard pictograminstelling van E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Gebruik door programma gegeven pictogram"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Gebruik gebruikergedefineerd pictogram"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Bied weerstand aan"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Vensterlijst"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Taakbalk"
 
@@ -1897,7 +1923,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM-eigenschappen"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titel"
 
@@ -1955,7 +1981,7 @@ msgstr "Venstergroep"
 
 #: src/bin/e_int_border_prop.c:436
 msgid "Transient For"
-msgstr "Van voorbijgaande aard voor"
+msgstr "Doorlopend voor"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
@@ -1979,11 +2005,11 @@ msgstr "Dringend"
 
 #: src/bin/e_int_border_prop.c:444
 msgid "Request Delete"
-msgstr "Verwijderverzoek"
+msgstr "Verzoek verwijdering"
 
 #: src/bin/e_int_border_prop.c:445
 msgid "Request Position"
-msgstr "Positieverzoek"
+msgstr "Verzoek positie"
 
 #: src/bin/e_int_border_prop.c:466
 msgid "NetWM Properties"
@@ -2070,7 +2096,6 @@ msgid "Size, Position and Locks"
 msgstr "Grootte, Positie en Sloten"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Alles"
 
@@ -2092,11 +2117,11 @@ msgstr "Vensterrol"
 
 #: src/bin/e_int_border_remember.c:689
 msgid "Window type"
-msgstr "Venster type"
+msgstr "Venstertype"
 
 #: src/bin/e_int_border_remember.c:697
 msgid "wildcard matches are allowed"
-msgstr "Wildcard-overeenkomsten zijn toegestaan"
+msgstr "wildcard-overeenkomsten zijn toegestaan"
 
 #: src/bin/e_int_border_remember.c:699
 msgid "Transience"
@@ -2147,15 +2172,13 @@ msgid "Utilities"
 msgstr "Gereedschap"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Bestanden"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Starter"
 
@@ -2168,20 +2191,6 @@ msgstr "Kern"
 msgid "Mobile"
 msgstr "Mobiel "
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Instellingen"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Module-instellingen"
@@ -2219,19 +2228,19 @@ msgstr "Voeg gadget toe"
 msgid "Remove Gadget"
 msgstr "Verwijder gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Werkbalk-instellingen"
 
 #: src/bin/e_int_toolbar_config.c:82
 msgid "Layout"
-msgstr "Opmaak"
+msgstr "Indeling"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Invoermethode-fout"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2247,7 +2256,7 @@ msgstr "Algemeen"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Favoriete Programma's"
 
@@ -2255,76 +2264,74 @@ msgstr "Favoriete Programma's"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Programma's"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Vensters"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Verloren Vensters"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Over"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Thema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtueel"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Schelven"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Toon/Verberg alle vensters"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Geen toepassingen)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Stel virtuele bureaubladen in"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Geen Vensters)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Geen naam!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Geen Schelven)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Voeg een Schelf toe"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Verwijder een Schelf"
 
@@ -2359,7 +2366,7 @@ msgid "Shrink to Content Width"
 msgstr "Krimp naar breedte van inhoud"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Stijl"
 
@@ -2377,7 +2384,7 @@ msgstr "Toon bij muisklik"
 
 #: src/bin/e_int_shelf_config.c:213
 msgid "Hide timeout"
-msgstr "Verberg time-out"
+msgstr "Verberg-time-out"
 
 #: src/bin/e_int_shelf_config.c:217
 #, c-format
@@ -2386,10 +2393,10 @@ msgstr "%.1f seconden"
 
 #: src/bin/e_int_shelf_config.c:223
 msgid "Hide duration"
-msgstr "Verberg voortduring"
+msgstr "Verberg-voortduring"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f seconden"
@@ -2406,7 +2413,7 @@ msgstr "Toon op alle bureaubladen"
 msgid "Show on specified Desktops"
 msgstr "Toon op gespecificeerde bureaubladen"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2423,7 +2430,7 @@ msgstr ""
 "of is niet in uw bezit. Controleer alstublieft:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2436,76 +2443,19 @@ msgstr ""
 "Controleer alstublieft:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Opties:\n"
-"\t-display SCHERM\n"
-"\t\tVerbind met scherm genaamd SCHERM\n"
-"\t\tEG: -display:1.0\n"
-"\t-fake-xinerama-display WxH+X+Y\n"
-"\t\tVoeg een NEP-xinerama-scherm (in plaats van de echte)\n"
-"\t\tmet de opgegeven afmetingen. Voeg zoveel toe als u wilt. Ze\n"
-"\t\tvervangen allemaal de echte xinerama-schermen, indien aanwezig. Dit kan\n"
-"gebruikt worden om xinerama te simuleren.\n"
-"\t\tBijv.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tGebruikt het instellingenprofiel CONF_PROFILE in plaats van de door de "
-"gebruiker geselecteerde of gewoon \"standaard\".\n"
-"\t-good\n"
-"\t\tWees goed.\n"
-"\t-evil\n"
-"\t\tWees gemeen.\n"
-"\t-psychotic\n"
-"\t\tWees psychotisch.\n"
-"\t-locked\n"
-"\t\tStart met schermvergendeling aan zodat een wachtwoord wordt gevraagd.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIndien u deze hulp nodig heeft, heeft u deze optie niet nodig.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment Eina niet initialiseren!\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment Ecore niet\n"
-"initialiseren! Is uw geheugen vol?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment kan Eet niet initialiseren!\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan het Bestandssysteem niet initialiseren.\n"
-"Misschien heeft u niet genoeg geheugen vrij?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment kan Ecore niet initialiseren!\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2513,7 +2463,7 @@ msgstr ""
 "Enlightenment kan het Exit-Signaalbeheer niet initialiseren.\n"
 "Misschien heeft u niet genoeg geheugen vrij?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2521,7 +2471,7 @@ msgstr ""
 "Enlightenment kan het HUP-Signaalbeheerder niet initialiseren.\n"
 "Misschien heeft u niet genoeg geheugen vrij?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2529,63 +2479,31 @@ msgstr ""
 "Enlightenment kan geen USER-Signaalbeheer instellen.\n"
 "Misschien heeft u niet genoeg geheugen vrij?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan de Verbinding met de X-Server niet initialiseren.\n"
-"Heeft U de DISPLAY-Variabele ingesteld?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan de nood meldingssysteem niet initialiseren.\n"
-"Heeft U de DISPLAY-Variabele ingesteld?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment kan Ecore_IMF niet initialiseren!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan het Verbindingssysteem niet initialiseren.\n"
-"Misschien heeft u niet genoeg geheugen?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment kan Ecore_File niet initialiseren!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan het IPC-systeem niet initialiseren.\n"
-"Misschien heeft u niet genoeg vrij geheugen?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment kan Ecore_Con niet initialiseren!\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan Xinerama niet gebruiken.\n"
-"Dit moet niet gebeuren."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment kan Ecore_Ipc niet initialiseren!\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan randr niet instellen.\n"
-"Dit zou niet moeten gebeuren."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment kan Ecore_X niet initialiseren!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan het Evas Systeem niet initialiseren.\n"
-"Misschien heeft u niet genoeg vrij geheugen?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment kan Ecore_Evas niet initialiseren!\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2595,7 +2513,7 @@ msgstr ""
 "ondersteund in Evas. Controleer alstublieft uw installatie van Evas en\n"
 "Ecore en controleer of ze het Software X11-weergave-engine ondersteunen."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2605,7 +2523,31 @@ msgstr ""
 "ondersteund in Evas. Controleer alstublieft uw installatie van Evas en\n"
 "Ecore en controleer of ze het Softwarebuffer-weergave-engine ondersteunen."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment kan Edje niet initialiseren!\n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment kan E_Intl niet initialiseren!\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment kan de nood meldingssysteem niet initialiseren.\n"
+"Heeft U de DISPLAY-Variabele ingesteld?"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment kan E_Xinerama niet initialiseren!\n"
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment kan E_Randr niet initialiseren!\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2613,23 +2555,27 @@ msgstr ""
 "Enlightenment kan geen mappen in uw Persoonlijke map creëren.\n"
 "Wellicht heeft u geen Persoonlijke map of is uw harde schijf vol?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment kan haar bestandsregister-systeem niet instellen."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kan haar configuratiesysteem niet instellen."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment kan haar omgeving niet initialiseren."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment kan haar schaalsysteem niet instellen."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment kan haar pointersysteem niet instellen."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2637,94 +2583,41 @@ msgstr ""
 "Enlightenment kan haar zoekpaden niet instellen.\n"
 "Misschien heeft u niet genoeg geheugen vrij?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment kan haar lettertypesysteem niet instellen."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment kan haar thema-systeem niet initialiseren."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan init-scherm niet instellen.\n"
-"Misschien heeft u niet genoeg geheugen vrij?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment kan haar intl-systeem niet instellen."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Starten van internationale ondersteuning"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan haar intl-systeem niet instellen."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment kan het FDO-bureaubladsysteem niet initialiseren.\n"
-"Wellicht heeft niet genoeg geheugen vrij?"
-
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testen van formaat-ondersteuning"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment merkte op dat Evas geen buffercanvas kan creëren. Controleer\n"
-"alstublieft of Evas het Softwarebuffer-engine ondersteunt.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment merkte op dat Evas geen PNG-bestanden kan laden. Controleer\n"
-"alstublieft of Evas PNG-lader-ondersteuning heeft.\n"
+"Wellicht heeftu niet voldoende rechten op ~/.cache/efreet of\n"
+"heeft u niet genoeg geheugen vrij?"
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment merkte op dat Evas geen JPEG-bestanden kan laden. Controleer\n"
-"alstublieft of Evas JPEG-lader-ondersteuning heeft.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment merkte op dat Evas geen EET-bestanden kan laden. Controleer\n"
-"alstublieft of Evas EET-lader-ondersteuning heeft.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment merkte op dat Evas het 'Sans'-lettertype niet kan laden. "
-"Controleer\n"
-"alstublieft of Evas lettertypeinstel-\n"
-"ondersteuning heeft en of dat het 'Sans'-lettertype definieert.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Controleer SVG-ondersteuning."
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Stel schermen in"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2732,195 +2625,352 @@ msgstr ""
 "Enlightenment kon zich voor geen enkel beeldscherm als vensterbeheerder\n"
 "aanbieden. Wellicht loopt er al een andere vensterbeheerder?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Stel ACPI in"
+
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "Stel achtergrondlicht in"
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment kan het achtergrondlicht niet instellen."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Stel DPMS in"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment kan de DPMS-instellingen niet instellen."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Stel schermbeveiliging in"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment kan geen X-schermbeveiliging instellen."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "Stel energiebesparings-modi in"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment kan haar energiebesparings-modi niet instellen."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Stel bureaubladvergrendeling in"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment kan haar bureaubladvergrendelingssysteem niet instellen."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Stel popups in"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan het popup systeem niet instellen."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr "Stel berichtensysteem in"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Stel paden in"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Stel systeembediening in"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment kan haar Systeemcommando-systeem niet initialiseren.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Stel acties in"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment haar zijn actiesysteem niet instellen."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Stel uitvoeringssysteem in"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kan haar uitvoeringssysteem niet instellen."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Stel bestandsbeheerder in"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
+msgstr "Stel Bestandsbeheerder in"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan de bestandsbeheerder niet initialiseren.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Stel berichtensysteem in"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan het berichtensysteem niet instellen."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Stel DND in"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan het dnd-systeem niet instellen."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Stel grijpinvoerhandeling in"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment kan haar grijpinvoerhandeling-systeem niet instellen."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Stel modules in"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan haar Module-systeem niet instellen."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Instellen onthoudt"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kan haar herinneringsinstellingen niet instellen."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Stel kleurklassen in"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kan haar kleurklassen-systeem niet instellen."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Stel gadgets in"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment kan haar gadget-controlesysteem niet instellen."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Stel ACPI in"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Stel DPMS in"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment kan de DPMS-instellingen niet instellen."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Stel energiebesparing-modi in"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment kan haar energiebesparings-modi niet instellen."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Stel achtergrond in"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment kan haar bureaubladachtergrond-systeem niet instellen."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Stel muis in"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment kan de muisinstellingen niet instellen."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Stel bindingen in"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kan haar bindingssysteem niet instellen."
 
-#: src/bin/e_main.c:1038
-msgid "Setup Shelves"
-msgstr "Stel schelven in"
+#: src/bin/e_main.c:835
+msgid "Setup Shelves"
+msgstr "Stel schelven in"
+
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
+msgstr "Stel miniaturen in"
+
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr "Enlightenment kan haar miniatuur-systeem niet instellen\n"
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment kan het Pictorgramcache-systeem niet initialiseren.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment kan haar miniatuur-systeem niet instellen\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "Stel werkomgeving in"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment kan haar werkomgeving niet initialiseren.\n"
+
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
+msgstr "Stel bestandssortering in"
+
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
+msgstr "Enlightenment kan haar bestandssortering-systeem niet instellen."
+
+#: src/bin/e_main.c:908
+msgid "Load Modules"
+msgstr "Laad modules"
+
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Stel schelven in"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Bijna klaar"
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Opties:\n"
+"\t-display SCHERM\n"
+"\t\tVerbind met scherm genaamd SCHERM\n"
+"\t\tEG: -display:1.0\n"
+"\t-fake-xinerama-display WxH+X+Y\n"
+"\t\tVoeg een NEP-xinerama-scherm (in plaats van de echte)\n"
+"\t\tmet de opgegeven afmetingen. Voeg zoveel toe als u wilt. Ze\n"
+"\t\tvervangen allemaal de echte xinerama-schermen, indien aanwezig. Dit kan\n"
+"gebruikt worden om xinerama te simuleren.\n"
+"\t\tBijv.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tGebruikt het instellingenprofiel CONF_PROFILE in plaats van de door de "
+"gebruiker geselecteerde of gewoon \"standaard\".\n"
+"\t-good\n"
+"\t\tWees goed.\n"
+"\t-evil\n"
+"\t\tWees gemeen.\n"
+"\t-psychotic\n"
+"\t\tWees psychotisch.\n"
+"\t-locked\n"
+"\t\tStart met schermvergendeling aan zodat een wachtwoord wordt gevraagd.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIndien u deze hulp nodig heeft, heeft u deze optie niet nodig.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+"U voert Enlightenment direct uit. Dit is\n"
+"slecht. Voer alstublieft het uitvoerbare bestand \"enlightenment\"\n"
+"nooit uit. Gebruik de \"enlightenment_start\"-starter. Deze\n"
+"zal het opzetten van omgevingsvariabelen, paden \n"
+"en starten van elke andere benodigde services etc. afhandelen\n"
+"vooraleer Enlightenment zelf zal starten.\n"
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testen van formaat-ondersteuning"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment kan haar Schelf-systeem niet instellen."
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas geen buffercanvas kan creëren. Controleer\n"
+"alstublieft of Evas het Softwarebuffer-engine ondersteunt.\n"
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
-msgstr "Stel miniaturen in"
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas geen SVG-bestanden kan laden. Controleer\n"
+"of Evas SVG-lader-ondersteuning heeft.\n"
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr "Enlightenment kan haar miniatuur-systeem niet instellen\n"
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas geen JPEG-bestanden kan laden. Controleer\n"
+"of Evas JPEG-lader-ondersteuning heeft.\n"
 
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
-msgstr "Stel bestandssortering in"
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas geen PNG-bestanden kan laden. Controleer\n"
+"of Evas PNG-lader-ondersteuning heeft.\n"
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
-msgstr "Enlightenment kan haar bestandssortering-systeem niet instellen."
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas geen EET-bestanden kan laden. Controleer\n"
+"of Evas EET-lader-ondersteuning heeft.\n"
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
-msgstr "Laad modules"
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment merkte op dat Evas het 'Sans'-lettertype niet kan laden. "
+"Controleer\n"
+"alstublieft of Evas lettertypeinstel-\n"
+"ondersteuning heeft en of dat het 'Sans'-lettertype definieert.\n"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2931,11 +2981,11 @@ msgstr ""
 "een fout tijdens het laden van <br>de module genaamd: %s. Deze module is "
 "uitgeschakeld<br>en zal niet worden geladen."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment crashte vroeg in het startstadium en is herstart"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2946,7 +2996,7 @@ msgstr ""
 "een fout tijdens het laden van de module genaamd: %s<br><br> Deze module is "
 "uitgeschakeld en zal niet worden geladen."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2959,7 +3009,7 @@ msgstr ""
 "<br>instellingen- dialoogvenster zou u uw<br>modules weer moeten laten "
 "selecteren."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2972,20 +3022,12 @@ msgstr ""
 "moduleinstellingen- dialoogvenster zou u uw<br>modules weer moeten laten "
 "selecteren."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Stel schelven in"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Bijna klaar"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Laden van module: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2994,11 +3036,11 @@ msgstr ""
 "Bij het Laden van Module %s is een Fout opgetreden.<br>Er was geen Module "
 "met de Naam %s in de<br>Module-map gevonden.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Fout bij het Laden van de Module"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3008,11 +3050,11 @@ msgstr ""
 "naar de Module is:\n"
 "%s<br>De gemelde fout was:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Module bevat niet alle benodigde functies"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3023,16 +3065,16 @@ msgstr ""
 "minimum versie van Module API nodig van %i.<br>De module API die "
 "Enlightenment aangeeft is:  %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
-msgstr "Enlightenment %s Module"
+msgstr "Enlightenment %s -module"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Wilt u deze module ontladen?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3046,11 +3088,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Schelf #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet u zeker dat u deze Schelf wilt verwijderen?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3058,16 +3100,16 @@ msgstr ""
 "U heeft gevraagd om deze Schelf te verwijderen.<br><br>Weet u zeker dat u "
 "hem wilt verwijderen?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Stop verplaatsen/herschalen van gadgets"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Start verplaatsen/herschalen van gadgets"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Inhoud"
 
@@ -3075,55 +3117,55 @@ msgstr "Inhoud"
 msgid "Starting"
 msgstr "Bezig met starten"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
-msgstr "Controleren van systeemrechten"
+msgstr "Bezig met controleren van systeemrechten"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Systeemcontrole is klaar"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
-"Afmelden duurt te lang.<br>Sommige programma's weigeren te sluiten.<br>Wilt "
-"u alsnog het afmelden afmaken<br>zonder deze<br>programma's eerst te "
-"sluiten? <br><br>Automatisch afmelden in %d seconden."
+"Afmelden duurt te lang.<br>Sommige programma's weigeren af te sluiten."
+"<br>Wilt u alsnog het afmelden afmaken<br>zonder deze<br>programma's eerst "
+"af te sluiten? <br><br>Automatisch afmelden in %d seconden."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Afmeldproblemen"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Meld nu af"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Wacht langer"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Annuleer afmelden"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Bezig met afmelden"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Bezig met afmelden.<br><hilight>Een moment geduld.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment is bezig met een andere aanvraag"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3131,7 +3173,7 @@ msgstr ""
 "Bezig met afmelden.<br>U kunt geen andere systeemacties uitvoeren<br>wanneer "
 "het afmelden is begonnen."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3139,7 +3181,7 @@ msgstr ""
 "Bezig met uitschakelen.<br>U kunt geen andere systeemacties "
 "uitvoeren<br>wanneer het uitschakelen is begonnen."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3147,7 +3189,7 @@ msgstr ""
 "Bezig met herstarten.<br>U kunt geen andere systeemacties "
 "uitvoeren<br>wanneer het herstarten is begonnen."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3155,87 +3197,87 @@ msgstr ""
 "Bezig met pauzeren.<br>U kunt geen andere systeemacties uitvoeren<br>wanneer "
 "het pauzeren is begonnen."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
-"Bezig met slapen.<br>U kunt geen andere systeemacties uitvoeren<br>wanneer "
-"het slapen is begonnen."
+"Bezig met slapen.<br>U kunt geen andere systeemacties uitvoeren<br>totdat "
+"het slapen voltooid is."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Dit zou niet moeten gebeuren"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Uitschakelen is mislukt."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Herstarten is mislukt."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Pauzeren is mislukt."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Slapen is mislukt."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Bezig met uitschakelen"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Bezig met uitschakelen.<br><hilight>Een moment geduld.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Bezight met herstarten"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Bezig met herstarten.<br><hilight>Een moment geduld.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Bezig met pauzeren"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Bezig met pauzeren.<br><hilight>Een moment geduld.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Bezig met slapen"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Bezig met slapen.<br><hilight>Een moment geduld.</hilight>"
 
 #: src/bin/e_theme_about.c:14
 msgid "About Theme"
-msgstr "Over thema"
+msgstr "Over Thema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
-msgstr "Stel in als thema"
+msgstr "Stel in als Thema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Stop verplaatsen/herschalen van items"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Begin verplaatsen/herschalen van items"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Stel werkbalkinhoud in"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
@@ -3243,11 +3285,11 @@ msgstr ""
 "Enlightenment was niet in staat om een kinderproces te vertakken:<br><br>"
 "%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Kan niet afsluiten - onsterfelijke vensters."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3258,123 +3300,123 @@ msgstr ""
 "af te sluiten totdat deze venster<br>afgesloten zijn of de Lifespan-"
 "vergrendeling verwijderd is."
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "In de toekomst"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "In de laatste minuut"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li jaren geleden"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li maanden geleden"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li weken geleden"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dagen geleden"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li uren geleden"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuten geleden"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Afbeeldings-importeerinstellingen"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importeer"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Vul en Uitrekken-instellingen"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Uitrekken"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centreren"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Binnen"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Vullen"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Bestandskwaliteit"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Gebruik origineel bestand"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3393,12 +3435,12 @@ msgstr ""
 "oplossen<br>door het toe te voegen. U kunt uw dingen nu her-instellen naar "
 "uw<br>wensen. Excuses voor het ongemak.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s Instellingen geüpdate"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3432,139 +3474,145 @@ msgstr "Omhoog"
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Voeg toe aan Favorieten"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Ga een map omhoog"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr "Resolutie:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Rechten:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Aangepast:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "U"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Beschermd"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Alleen-lezen"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Lees-Schrijf"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Accumonitor-instellingen"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Toon een mededeling wanneer het accuniveau laag is"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Controleer elke:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tikken"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Slaapstand wanneer onder:"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Polling"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Toon lage accu-mededeling"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Melding wanneer op:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatisch weghalen na..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sec"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Mededeling"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Detecteer automatisch"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Intern"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Vage modus"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3572,35 +3620,35 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Accu"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Uw accu is laag!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC-stroom is aangeraden."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "FOUT"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Accu-meter"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Klok"
 
-#: src/modules/clock/e_mod_main.c:631
-#, fuzzy
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
-msgstr "Toon werkbalk"
+msgstr "Toon kalender"
 
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:268
 #: src/modules/conf/e_mod_main.c:367 src/modules/conf/e_mod_main.c:474
@@ -3664,17 +3712,17 @@ msgstr "Instellingenpaneel-instellingen geüpdate"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar-programma's"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Opstartprogramma's"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Herstart programma's"
 
@@ -3687,10 +3735,22 @@ msgid "Apps"
 msgstr "Programma's"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nieuw programma"
+msgid "Create Launcher"
+msgstr "Creeër Starter"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "Verwijder persoonlijke starters"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "Standaardprogramma's"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "Werkomgevingen"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar Overig"
 
@@ -3703,7 +3763,7 @@ msgid "Available Profiles"
 msgstr "Beschikbare profielen"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Selecteer een profiel"
 
@@ -3742,9 +3802,9 @@ msgstr "Dialoog-instellingen"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Algemene instellingen"
 
@@ -3786,7 +3846,7 @@ msgstr "Dialoogvensters"
 msgid "Profiles"
 msgstr "Profielen"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3797,7 +3857,7 @@ msgstr ""
 "Terugzetten indien dit niet zo is.<br>Als u niet op een knop drukt, zal de "
 "oude resolutie van<br>%dx%d at %d Hz teruggezet worden in %d seconden."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3808,7 +3868,7 @@ msgstr ""
 "Terugzetten indien dit niet zo is.<br>Als u niet op een knop drukt, zal de "
 "oude resolutie van<br>%dx%d teruggezet worden in %d seconden."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3820,7 +3880,7 @@ msgstr ""
 "oude resolutie van<br>%dx%d at %d Hz teruggezet worden <hilight>NU METEEN</"
 "hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3831,47 +3891,47 @@ msgstr ""
 "Terugzetten indien dit niet zo is.<br>Als u niet op een knop drukt, zal de "
 "oude resolutie van<br>%dx%dz teruggezet worden <hilight>NU METEEN</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Resolutie-verandering"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Terugzetten"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Schermresolutie-instellingen"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Terugzettten bij inloggen"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Ververs"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Oriëntatie"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Spiegeling"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Ontbrekende features"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3885,11 +3945,11 @@ msgstr ""
 "kan ook zo zijn dat<br>op het moment dat <hilight>ecore</hilight> gebouwd "
 "was, er<br>nog geen XRandR-ondersteuning gedecteerd was."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Geen verversrates gevonden"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3903,89 +3963,72 @@ msgstr ""
 "wanneer de resolutie<br> ingesteld wordt, welke <hilight>schade</hilight> "
 "kan veroorzaken aan uw scherm."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Virtuele bureaubladen-instellingen"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Aantal bureaubladen"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Bureaublad-flip"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Flip bij het slepen van objecten naar de schermrand"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Wissel bureaubladen tijdens het flippen"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Bureaubladen"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Uit"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Paneel"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Achtergrond-panning"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Animatiesnelheid"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "X-Axis pan-factor"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Y-Axis pan-factor"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Flip-animatie"
 
@@ -4002,7 +4045,7 @@ msgid "Desktop Wallpaper"
 msgstr "Bureaubladachtergrond"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Stel in"
 
@@ -4012,12 +4055,12 @@ msgstr "Selecteer een achtergrond..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -4025,184 +4068,210 @@ msgstr "Persoonlijk"
 msgid "Screen Lock Settings"
 msgstr "Schermvergrendelings-instellingen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Vergrendel bij opstarten"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Vergrendelen bij Slaapstand"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Aangepast schermvergendelings-commando"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Vergrendeling"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Toon op alle schermen"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Toon op huidig scherm"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Toon op scherm #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Inlogdoos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Vergrendel nadat X-schermbeveiliging geactiveerd wordt"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f seconden"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Vergrendel wanneer inactieve tijd wordt overschreden"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f van minuten"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Tijdklokken"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Stel voor indien gedeactiveerd van te voren"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Presentatiemodus"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Thema-gespecificeerd"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Thema-achtergrond"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Huidige achtergrond"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Achtergrond"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Schermbeveiligings-instellingen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Schakel X-schermbeveiliging in"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr "Slaapstand bij zwart scherm"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "Zelfs bij netstroom"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "Vertraag tot aan slaapstand"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Schermbeveiliging"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Aanvangs-time-out"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Afwisselde time-out"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Zwartmakend"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Geen voorkeur"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Blootstellingen-gebeurtenissen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Sta toe"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Sta niet toe"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Scherm-energiebeheer-signalering"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "De huidige display-server is niet <br>DPMS-capabel."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "De huidige display-server heeft niet <br>de DPMS-extensie."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Scherm-energiebeheer-instellingen"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Schakel Scherm-energiebeheer in"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Stand-bytijd"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Slaapstandtijd"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Uittijd"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr "DPMS"
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "Normaal achtergrondlicht"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "Dim achtergrondlicht"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr "Vaag tijd uit"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "Achtergrondlicht"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtuele bureaubladen"
@@ -4250,74 +4319,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Randbindingen-instellingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Randbindingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Voeg binding toe"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Verwijder binding"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Bewerk binding"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Verwijder alles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Zet standaardbindingen terug"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Actie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Actie-parameters"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Algemene instellingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Sta bindingsactivatie toe bij volledig scherm-vensters"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Rand-bindingsvolgorde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Klikbare rand"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Randbindings-fout"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4327,28 +4396,28 @@ msgstr ""
 "<br><hilight> %s</hilight>-actie. Kies alstublieft een andere "
 "toetsencombinatie-sequentie."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4497,34 +4566,52 @@ msgstr ""
 "Enlightenment was niet in staat om de instellingen te importeren<br>door een "
 "kopieerfout."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Taal-instellingen"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr "Mogelijke vertalingsproblemen"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, fuzzy, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+"U heeft enkele taalomgevingsvariabelen<br>ingesteld die mogelijk verstoring "
+"kunnen veroorzaken met<br>het vertonen van uw gekozen taal.<br>Indien u niet "
+"wilt dat deze verstoord raken, gebruik dan de<br>Omgevingsvariabelen-"
+"instellingen om deze terug te draaien.<br>De variabelen die mogelijk "
+"verstoring kunnen veroorzaken zijn de volgende:<br>%s"
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Taal-kiezer"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Systeemstandaard"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Taal geselecteerd"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Taal"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Taal"
 
@@ -4613,17 +4700,17 @@ msgid "Manager"
 msgstr "Beheerder"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Niets"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Muis-toewijzing-volgorde"
 
@@ -4645,12 +4732,10 @@ msgid "Menu Settings"
 msgstr "Menu-instellingen"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 msgid "Enlightenment Default"
 msgstr "Enlightenment Standaard"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
 msgstr "Persoonlijke Standaard"
 
@@ -4659,7 +4744,7 @@ msgid "Main Menu"
 msgstr "Hoofdmenu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favorieten"
 
@@ -4676,7 +4761,7 @@ msgid "Comments"
 msgstr "Commentaren"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4687,7 +4772,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Toon gadget-instellingen in hoogste niveau"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menu's"
 
@@ -4755,19 +4840,19 @@ msgid "Images"
 msgstr "Afbeeldingen"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Lettertypen"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Thema's"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Pictogrammen"
 
@@ -4913,18 +4998,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Achtergrond"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Gebruik thema-achtergrond"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Afbeelding..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Online..."
 
@@ -4944,46 +5029,51 @@ msgstr "Dit bureaublad"
 msgid "This Screen"
 msgstr "Dit scherm"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Achtergrond-instellingen..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Tegels"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Paneel"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Selecteer een afbeelding..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Afbeeldings-importeerfout"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment was niet in staat om de afbeelding te importeren<br>door "
 "conversiefouten."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Achtergrond-importeerfout"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment was niet in staat om de achtergrond te importeren<br>door een "
 "kopieerfout."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5020,7 +5110,7 @@ msgid "Error: can't start the request."
 msgstr "Fout: kan de aanvraag niet starten."
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Standaard randstijl"
 
@@ -5028,7 +5118,7 @@ msgstr "Standaard randstijl"
 msgid "Window Border Selection"
 msgstr "Vensterrand-selectie"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Herrinner vensterrand de volgende keer dat ie verschijnt"
 
@@ -5057,7 +5147,7 @@ msgid "Menu Background Base"
 msgstr "Basisachtergrond Menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Menu-titel"
 
@@ -5066,7 +5156,7 @@ msgid "Menu Title Active"
 msgstr "Actieve menu-titel"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menu-item"
 
@@ -5079,12 +5169,12 @@ msgid "Menu Item Disabled"
 msgstr "Uitgeschakeld menu-item"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Verplaats tekst"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Herschaal tekst"
 
@@ -5101,7 +5191,7 @@ msgid "Winlist Label"
 msgstr "Vensterlijst-label"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Vensterlijst-titel"
 
@@ -5118,377 +5208,387 @@ msgid "File Manager Background Base"
 msgstr "Basisachtergrond bestandsbeheerder"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Focus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Knoptekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Uitgeschakelde knop-tekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Controleer tekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Controleer tekst uitgeschakeld"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Itemtekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Itemtekst uitgeschakeld"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Labeltekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Lijst geselecteerde itemtekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Lijstitem-tekst (Even)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Basisachtergrond lijstitem (Even)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Lijstitem-tekst (Vreemd)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Basisachtergrond lijstitem (Vreemd)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Lijst koptekst (Even)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Basisachtergrond koptekst (Even)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Lijst koptekst (Vreemd)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Basisachtergrond koptekst (Vreemd)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Radiotekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Radiotekst uitgeschakeld"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Slidertekst"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Slidertekst uitgeschakeld"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Basisachtergrond omlijsting"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Basisachtergrond omlijsting scroller"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Module-label"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Composite Focus-uit-kleur"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Kleurklasse: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Geselecteerde %u gemixte kleurklassen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Geselecteerde %u niet-ingestelde kleurklassen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Geselecteerde %u gelijkmatige kleurklassen"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Niet-geselecteerde kleurklasse"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Aangepaste kleuren"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Object:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Omlijn:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Schaduw:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Tekst met toegepaste kleuren."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "Kleuren hangen af van themamogelijkheden"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Vensterbeheerder"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgets"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Anderen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Titelbalk"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Tekstblok vlak"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Tekstblok licht"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Tekstblok groot"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Opschrift-instellingen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Over titel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Over versie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Over tekst"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titel bureaubladvergrendeling"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Wachtwoord bureaubladvergrendeling"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Dialoogvenster-fout"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf-commando"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Opstartscherm-titel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
-msgstr " Opstartscherm-tekst"
+msgstr "Opstartscherm-tekst"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Opstartscherm-versie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "Digitale Klok"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Item"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Omlijsting"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Label"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Slider"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Radioknoppen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Controleknoppen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Tekstlijst-item"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Lijst-item"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Lijst-opschrift"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Bestandsbeheerder"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Bureaublad-pictogram"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Klein"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Groot"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Klein opgemaakt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normaal opgemaakt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Groot opgemaakt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Lettertype-instellingen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Klein"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Groot"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Erg groot"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Enorm"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Schakel aangepaste lettertype-klassen in"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basis-voorbeeldtekst: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Lettertypeklassen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Schakel lettertypeklasse in"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Geavanceerde voorbeeldtekst. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Lettertype-terugvallen"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Terugvalnaam"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Schakel terugvallen in"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Hinting / Terugvallen"
 
@@ -5496,11 +5596,16 @@ msgstr "Hinting / Terugvallen"
 msgid "Icon Theme Settings"
 msgstr "Pictogramthema-instellingen"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Schakel pictogramthema in"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Selecteer programma's"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "Pictogrammen overschijven algemeen thema"
 
@@ -5565,11 +5670,9 @@ msgid "Custom scaling factor"
 msgstr "Aangepaste schalingsfactor"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f keer"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5580,6 +5683,12 @@ msgstr "Beleid"
 msgid "Minimum"
 msgstr "Minimaal"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f keer"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximaal"
@@ -5600,25 +5709,25 @@ msgstr "Toon opstartscherm tijdens het inloggen"
 msgid "Transition Settings"
 msgstr "Overgangs-instellingen"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Opstarten"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Desk verandert"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Achtergrond verandert"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Overgangen"
 
@@ -5634,15 +5743,15 @@ msgstr "Importeer..."
 msgid " Online..."
 msgstr "Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Thema-categorieën"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Wijs toe"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Wis alle"
 
@@ -5673,19 +5782,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Wissel thema's uit"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Randen"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Pictogramthema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Muiscursor"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Schaling"
 
@@ -5806,6 +5915,10 @@ msgstr "Door toepassingen verschaffen"
 msgid "Border Icon"
 msgstr "Rand-pictogram"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Plaatsing"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Slimme plaatsing"
@@ -5834,23 +5947,43 @@ msgstr "Nieuwe vensters"
 msgid "Animate"
 msgstr "Animeren"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineair"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Versnel, daarna vertragen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Versnelling"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Vertraging"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+msgid "Pronounced Accelerate"
+msgstr "Uitgesproken acceleratie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+msgid "Pronounced Decelerate"
+msgstr "Uitgesproken vertraging"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Uitgesproken versnelling, daarna vertragen"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr "Stuiteren"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr "Stuiter meer"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Oprolling"
 
@@ -5871,6 +6004,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Meest recente venster onder de muis"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Klik"
 
@@ -5902,11 +6036,6 @@ msgstr "Alleen dialoogvensters"
 msgid "Only dialogs with focused parent"
 msgstr "Alleen dialoogvensters met gefocuste ouder"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Focus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Andere instellingen"
@@ -6004,13 +6133,13 @@ msgid "Fill available space"
 msgstr "Gebruik beschikbare ruimte"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontaal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Verticaal"
@@ -6067,7 +6196,7 @@ msgid "Raise when clicking to focus"
 msgstr "Breng naar voren bij klikken om te focussen"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Vensterfocus"
 
@@ -6324,28 +6453,28 @@ msgstr "Zeer licht"
 msgid "Dropshadow"
 msgstr "Vallende schaduw"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Alles-starter"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Toon Alles-starter"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Alles-instellingen"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Toon Alles-dialoogvenster"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Alles-module"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Start Alles"
 
@@ -6353,144 +6482,145 @@ msgstr "Start Alles"
 msgid "Everything Settings"
 msgstr "Alles-instellingen"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Beschikbare plugins"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Verplaats omhoog"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Verplaats omlaag"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Instellen"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Ingschakeld"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Toon in \"Alles\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Toon in hoogste niveau"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Minimaal aantal karakters voor zoeken"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Plugin-overeenkoming"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Standaard is plugin-naam"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Zoek alleen wanneer overeenkomend"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Plugin-weergave"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Gedetailleerd"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Standaardweergave"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Animeer scrollen"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Omhoog/omlaag selecteert volgende item in pictogramweergave"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Verberg invoer wanneer inactief"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Verberg lijst"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Snelle navigatie"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Emacs-stijl (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Vi-stijl (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Standaardweergave"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Animeer scrollen"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Omhoog/omlaag selecteert volgende item in pictogramweergave"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Sortering"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Sortering"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "Op gebruik"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Meest gebruikt"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Laatst gebruikt"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Onerwerp-plugins"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Actie-plugins"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Object-plugins"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Popup-grootte"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Popup-breedte"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Popup-hoogte"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Popup-plaatsing"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6499,35 +6629,27 @@ msgstr "Popup-plaatsing"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Rand Popup-grootte"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Afmetingen"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Alles-verzameling"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Acties"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Items"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Geen plugins geladen"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Kopieer naar klembord"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6559,145 +6681,59 @@ msgstr ""
 "actie uit en ga door<br>  <hilight>&lt;Tab&gt;</hilight> schakel tussen "
 "selecteerders<br>   <hilight>"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Openen met..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Open bestand..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Bewerk programma-vermelding"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Nieuwe programma-vermelding"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Openen met Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Openen met..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Open Terminalvenster hier"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Open programma"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Alles-programma's"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Commando's"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Terminalcommando"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Sudo GUI"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr "Alles-plugin"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Rekenmachine"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Kopiëren naar..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Verplaatsen naar..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Verplaatsen naar Prullenbak"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Open map (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Sorteren op datum"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Sorteren op naam"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Recente bestanden"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Alles-bestanden"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Toon recente bestanden"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Zoek recente bestanden"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Zoek gecachete bestanden"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Cache bezochte mappen"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Wis cache"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Toon dialoogvenster"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Schakel naar venster"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Schakelen Volledig Scherm"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Stuur naar bureaublad"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Bestandspictogrammen"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Bestandstypen"
 
@@ -6742,19 +6778,19 @@ msgid "Select an image"
 msgstr "Selecteer een afbeelding"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Bestandsbeheerder"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Thuis"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Systeem (Root)"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6773,7 +6809,7 @@ msgstr ""
 "oplossen<br>door het toe te voegen. U kunt nu uw dingen terug instellen naar "
 "uw<br> voorkeuren. Sorry voor de overlast in uw instellingen."
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6789,7 +6825,7 @@ msgstr ""
 "slecht en<br>uit voorzorg zijn uw instellingen nu teruggezet naar "
 "de<br>standaarden. Excuses voor het ongemak.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Fileman-instellingen geüpdate"
 
@@ -6866,95 +6902,99 @@ msgstr "Open bestandsbeheerder bij aankoppelen"
 msgid "Device"
 msgstr "Apparaat"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Ga naar hoofdmap"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Ander programma..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Open"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Openen met..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Bekende programma's"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specifieke programma's"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Alle programma's"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Aangepast commando"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiëren is afgebroken"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Verplaatsen is afgebroken"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Verwijderen is afgebroken"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr " Onbekende operatie van slave is afgebroken"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopiëren van %s is klaar"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Bezig met kopiëren van %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Verplaatsen van %s is klaar"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Bezig met verplaatsen van %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Verwijderen is klaar"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Bezig met verwijderen van bestanden..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6989,7 +7029,7 @@ msgstr "Bezig met verwerken van %d operatie(s)"
 msgid "Filemanager is idle"
 msgstr "Bestandsbeheerder is inactief"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM Operatie-info"
 
@@ -7001,35 +7041,39 @@ msgstr "Gadgets-beheerder"
 msgid "Available Gadgets"
 msgstr "Beschikbare Gadgets"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Modus"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Aangepaste afbeelding"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Aangepaste kleur"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparant"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animaties"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Achtergrondopties"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Start verplaatsen/herschalen"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Vrij"
@@ -7251,15 +7295,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Weet u zeker dat u deze bar-bron wilt verwijderen?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Creëer nieuw pictogram"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Eigenschappen"
 
@@ -7303,7 +7347,7 @@ msgstr "Toon vensters van alle bureaubladen"
 msgid "Show windows from active desktop"
 msgstr "Toon vensters van actief bureaublad"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7425,31 +7469,31 @@ msgstr ""
 "reeds gebruikt wordt door een interne<br>code voor contextmenu's.<br>Alleen "
 "deze knop werkt in de popup."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Toon pager-popup"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Popup bureaublad rechts"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Popup bureaublad links"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Popup bureaublad omhoog"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Popup bureaublad omlaag"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Popup volgende bureaublad"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Popup vorige bureaublad"
 
@@ -7469,131 +7513,89 @@ msgstr "Systeeminstellingen"
 msgid "Temperature Settings"
 msgstr "Temperatuur-instellingen"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Toon eenheden"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Ververs-interval"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Hoge temperatuur"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Lage temperatuur"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Temperaturen"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Volgende"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Welkom in Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Selecteer er één"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profiel"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-"Er waren geen menubestanden<br>gevonden op uw systeem.<br>Zie "
-"de<br>documentatie op<br>www.enlightenment.org<br> voor meer informatie "
-"over<br>hoe u uw<br>programmamenu's<br>werkend krijgt."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Selecteer programmamenu"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Starter-balk"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Selecteer programma's"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Bureaubladbestanden"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Geen pictogrammen op het bureaublad"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Schakel bureaubladpictogrammen in"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Focus-modus"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Klik om vensters te focussen"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
+msgstr "Grootte"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Cursor overheen een venster focust het"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "Selecteer voorkeursgrootte"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Selecteer pictogrammen om te te voegen"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr "Focus met. ..."
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Snelstarten"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Selecteer programma's"
+#: src/modules/wizard/page_060.c:37
+msgid "Mouse Over"
+msgstr "Muis-overheen"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7635,7 +7637,7 @@ msgstr "Links:"
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Dempen"
 
@@ -7659,40 +7661,52 @@ msgstr "Toon popup bij verandering volume via toetsencombinaties"
 msgid "Sound Cards"
 msgstr "Geluidskaarten"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Mixerinstellingen"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mixer om te gebruiken bij globale acties:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr "Toon bureaubladmelding bij volumewijzigingen"
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Open mixer..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Mixer-moduleinstellingen"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "Nieuw volume"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "Mixerpaneel"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "Volume veranderd"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Mixer-instellingen geüpdate"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Mixer-moduleinstellingen gewijzigd.<br>Uw oude instellingen zijn vervangen "
-"door nieuwe standaarden.<br>Excuses voor het ongemak."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
+msgstr "Mixer-module"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Kan systeem-offlinemodus niet schakelen"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnMan-daemon draait niet."
 
@@ -7710,7 +7724,7 @@ msgid ""
 "Connection Manager needs your passphrase for <br>the service <hilight>%s</"
 "hilight>"
 msgstr ""
-"Verbingsbeheerder heeft uw wachtwoord nodig voor <br>de service <hilight>"
+"Verbindingsbeheerder heeft uw wachtwoord nodig voor <br>de service <hilight>"
 "%s</ hilight>"
 
 #: src/modules/connman/e_mod_main.c:282
@@ -7721,122 +7735,351 @@ msgstr "Toon wachtwoord als lege tekst"
 msgid "Ok"
 msgstr "OK"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Verbreek de netwerkverbinding."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Service bestaat niet meer."
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Verbindt met netwerkverbinding."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Kan het wachtwoord van de service niet instellen"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Offline-modus"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Bediening"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Geen ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
-msgstr "Geen ConnMan-server gevonden"
+msgstr "Geen ConnMan-server gevonden."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Offline-modus: alle signalen zijn uitgeschakeld"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Geen verbinding"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "verbreken"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Onbekende naam"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Geen fout"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
-msgstr "Inactief"
+msgstr "inactief"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "toewijzing"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
-msgstr "configuratie"
+msgstr "instellingen"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "klaar"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "inloggen"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "online"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "fout"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "ingeschakeld"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "beschikbaar"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "verbonden"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "offline"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Een ander systeemvak bestaat reeds"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Er kan maar 1 systeemvak-gadget zijn en een andere bestaat reeds."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Systeemvak"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Systeemvak"
 
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment kan haar omgeving niet initialiseren."
+#~ msgid "Resizeable"
+#~ msgstr "Herschaalbaar"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Stop verplaatsen/herschalen van deze gadget"
+
+#~ msgid "Background panning"
+#~ msgstr "Achtergrond-panning"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "X-Axis pan-factor"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Y-Axis pan-factor"
+
+#~ msgid "Default is plugin name"
+#~ msgstr "Standaard is plugin-naam"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment Ecore niet\n"
+#~ "initialiseren! Is uw geheugen vol?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan het Bestandssysteem niet initialiseren.\n"
+#~ "Misschien heeft u niet genoeg geheugen vrij?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment kan de Verbinding met de X-Server niet initialiseren.\n"
+#~ "Heeft U de DISPLAY-Variabele ingesteld?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan het Verbindingssysteem niet initialiseren.\n"
+#~ "Misschien heeft u niet genoeg geheugen?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan het IPC-systeem niet initialiseren.\n"
+#~ "Misschien heeft u niet genoeg vrij geheugen?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan Xinerama niet gebruiken.\n"
+#~ "Dit moet niet gebeuren."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan randr niet instellen.\n"
+#~ "Dit zou niet moeten gebeuren."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan het Evas Systeem niet initialiseren.\n"
+#~ "Misschien heeft u niet genoeg vrij geheugen?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan init-scherm niet instellen.\n"
+#~ "Misschien heeft u niet genoeg geheugen vrij?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Controleer SVG-ondersteuning."
+
+#~ msgid "Setup FM"
+#~ msgstr "Stel bestandsbeheerder in"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment kan haar Schelf-systeem niet instellen."
+
+#~ msgid "New Application"
+#~ msgstr "Nieuw programma"
+
+#~ msgid "Actions"
+#~ msgstr "Acties"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Kopieer naar klembord"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "Openen met..."
+
+#~ msgid "Open File..."
+#~ msgstr "Open bestand..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Bewerk programma-vermelding"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Nieuwe programma-vermelding"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Openen met Sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Open Terminalvenster hier"
+
+#~ msgid "Run Executable"
+#~ msgstr "Open programma"
+
+#~ msgid "Calculator"
+#~ msgstr "Rekenmachine"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Kopiëren naar..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Verplaatsen naar..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Verplaatsen naar Prullenbak"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Open map (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Sorteren op datum"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Sorteren op naam"
+
+#~ msgid "Recent Files"
+#~ msgstr "Recente bestanden"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Toon dialoogvenster"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Schakel naar venster"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Schakelen Volledig Scherm"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Stuur naar bureaublad"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Er waren geen menubestanden<br>gevonden op uw systeem.<br>Zie "
+#~ "de<br>documentatie op<br>www.enlightenment.org<br> voor meer informatie "
+#~ "over<br>hoe u uw<br>programmamenu's<br>werkend krijgt."
+
+#~ msgid "Select application menu"
+#~ msgstr "Selecteer programmamenu"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Starter-balk"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Geen pictogrammen op het bureaublad"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Schakel bureaubladpictogrammen in"
+
+#~ msgid "Focus mode"
+#~ msgstr "Focus-modus"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Klik om vensters te focussen"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Cursor overheen een venster focust het"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Selecteer pictogrammen om toe te voegen"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Snelstarten"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Mixer-moduleinstellingen gewijzigd.<br>Uw oude instellingen zijn "
+#~ "vervangen door nieuwe standaarden.<br>Excuses voor het ongemak."
+
+#~ msgid "Acpi"
+#~ msgstr "ACPI"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Dim Scherm"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Ontdim Scherm"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Scherm-energiebeheer-signalering"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "De huidige display-server is niet <br>DPMS-capabel."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "De huidige display-server heeft niet <br>de DPMS-extensie."
 
 #, fuzzy
 #~ msgid "Selection"
@@ -8381,9 +8624,6 @@ msgstr "Systeemvak"
 #~ msgid "220 F"
 #~ msgstr "220 F"
 
-#~ msgid "Alarm Time"
-#~ msgstr "Alarm Tijd"
-
 #~ msgid "10 Mins"
 #~ msgstr "10 min"
 
index bd1175c..85efd83 100755 (executable)
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-11-28 18:55+0100\n"
 "Last-Translator: Mariusz Kozakowski <11mariom@gmail.com>\n"
 "Language-Team: \n"
@@ -25,20 +25,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -47,18 +46,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Zespół</title>"
 
 #: src/bin/e_actions.c:365
@@ -76,54 +76,54 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Na pewno chcesz zakończyć ten program?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Tak"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Zażądałeś opuszczenia Enlightenment.<br><br>Czy na pewno chcesz wyjść?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Czy na pewno chcesz się wylogować?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Zaraz nastąpi wylogowanie.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Czy na pewno chcesz wyłączyć?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Zażądałeś wyłączenia komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Czy na pewno chcesz uruchomić ponownie komputer?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -131,568 +131,592 @@ msgstr ""
 "Zażądałeś ponownego uruchomienia komputera.<br><br>Czy na pewno chcesz to "
 "zrobić?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Zażądałeś uśpienia komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Czy na pewno chcesz zahibernować komputer?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Zażądałeś zahibernowania komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Okno : Akcje"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Przesuń"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Zmień rozmiar"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Podnieś"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Obniż"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Zabij"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Okno : Stan"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Znacznik trybu przyklejenia"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Znacznik ikonizacji"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Znacznik trybu pełnego ekranu"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maksymalizuj pionowo"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maksymalizuj poziomo"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maksymalizuj na pełny ekran"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Tryb maksymalizacji \"inteligentny\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Tryb maksymalizacji \"rozrzerzaj\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Tryb maksymalizacji \"wypełnij\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Znacznik zwijania do góry"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Znacznik zwijania w dół"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Znacznik zwijania w lewo"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Znacznik zwijania w prawo"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Znacznik zwijania do góry"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Znaczik braku ramki"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Ramka"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Przełączaj pulpity w lewo"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Przełączaj pulpity w prawo"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Przełączaj pulpity w górę"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Przełączaj pulpity w dół"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Przełączaj pulpity o..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Pokaż pulpit"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Pokaż półkę"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Przełączaj na pulpit..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Przełączaj pulpity liniowo..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Przełącz na pulpit 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Przełącz na pulpit 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Przełącz na pulpit 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Przełącz na pulpit 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Przełącz na pulpit 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Przełącz na pulpit 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Przełącz na pulpit 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Przełącz na pulpit 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Przełącz na pulpit 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Przełącz na pulpit 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Przełącz na pulpit 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Przełącz na pulpit 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Przełąćz na pulpit..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Przesuń na lewy pulpit"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Przesuń na prawy pulpit"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Przesuń na górny pulpit"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Przesuń na dolny pulpit"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Przesuń pulpit przez…"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Przesuń pulpit do…"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Przesuwaj pulpit liniowo…"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Przesuń w kierunku…"
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Przejdź do pulpitu 0 (wszędzie)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Przejdź do pulpitu 1 (wszędzie)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Przejdź do pulpitu 2 (wszędzie)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Przejdź do pulpitu 3 (wszędzie)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Przejdź do pulpitu 4 (wszędzie)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Przejdź do pulpitu 5 (wszędzie)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Przejdź do pulpitu 6 (wszędzie)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Przejdź do pulpitu 7 (wszędzie)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Przejdź do pulpitu 8 (wszędzie)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Przejdź do pulpitu 9 (wszędzie)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Przejdź do pulpitu 10 (wszędzie)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Przejdź do pulpitu 11 (wszędzie)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Przejdź do pulpitu... (wszędzie)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Przesuń mysz na ekran 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Przesuń mysz na ekran 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Przesuń mysz na ekran..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Przesuń mysz do przodu o 1 ekran"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Przesuń mysz do tyłu o 1 ekran"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Przesuń mysz do przodu/tyłu o ... ekranów"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Wyłączanie"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Opis przesuwania"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Więcej..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Więcej..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Opis Zmiany Rozmiaru"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Przesuń w kierunku…"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Utwórz ikonę"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Okno : Przesuwanie"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Do następnego pulpitu"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Do poprzedniego pulpitu"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "O # pulpitów..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Do pulpitu..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Pokaż główne menu"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Pokaż menu Ulubione"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Pokaż menu Wszystkie aplikacje"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Pokaż menu klientów"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Pokaż menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Uruchom"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplikacja"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Zakończ"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Wyłącz teraz"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Tryby"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Tryb prezentacji"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Tryb offline"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Wyloguj"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Wyłącz teraz"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Wyłącz"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Ponowne uruchomienie"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Usypianie"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Usypianie"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernacja"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Uporządkuj okna"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Ogólne : Akcje"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Opóźnienie akcji"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Akcja"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Ten Ekran"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Ten Ekran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Ustaw jako tło"
 
@@ -700,18 +724,16 @@ msgstr "Ustaw jako tło"
 msgid "Color Selector"
 msgstr "Wybór koloru"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -719,20 +741,20 @@ msgstr "Wybór koloru"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -750,7 +772,7 @@ msgstr ""
 "Możesz teraz ponownie skonfigurować wszystko<br>jak chcesz. Przepraszamy za "
 "zamieszanie w twoich ustawieniach."
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -764,11 +786,11 @@ msgstr ""
 "<br>To jest niedobre i dla bezpieczeństwa zostały przywrócone<br>domyślne "
 "ustawienia. Przepraszamy za niedogodność."
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemy z zapisem ustawień"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -776,95 +798,95 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Ustawienia zaktualizowane"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Hibernacja nieudana."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Żadnemu)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Restet nieudany."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Witaj w Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -872,57 +894,62 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Ustawienia zaawansowane"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Proste"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Zastosuj"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Dodatki"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduły"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Właściwości ikony"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Pojemnik %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Błąd - brak obsługi PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment zbudowany bez obsługi PAM, więc<br>blokada pulpitu jest "
 "wyłączona."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Blokada nie powiodła się"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -930,15 +957,15 @@ msgstr ""
 "Nie powiodła się blokada ekranu, gdyż jedna<br>z aplikacji przechwyciła "
 "klawiaturę lub mysz<br> i nie udało się tego przechwycenia anulować."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Podaj hasło odblokowujące ekran"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Błąd systemu uwierzytelniania"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -949,11 +976,11 @@ msgstr ""
 "uwierzytalniania. Kod błędu to <highlight>%i</highligh>.<br>To niedobrze i "
 "nie powinno się wydarzyć. Proszę, zgłoś ten błąd."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Włączyć tryb prezentacji?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -962,11 +989,11 @@ msgstr ""
 "Odblokowałeś ekran za szybko.<br><br>Czy chcesz włączyć tryb <b>prezentacji</"
 "b> i tymczasowo wyłączyć wygaszacz, blokadę ekranu oraz oszczędzanie energii?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Nie, ale zwiększ czas oczekiwania"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Nie i nie pytaj więcej"
 
@@ -992,106 +1019,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Standardowa nazwa"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Klasa Okna"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorie"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Typy MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Plik desktop"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Ogólne"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Powiadomienie o uruchomieniu"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Uruchom w konsoli"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Pokaż w menu"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opcje"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Wybierz ikonę"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Wybierz plik wykonywalny"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Skasuj"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Wybierz wszystkie"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1132,314 +1158,314 @@ msgstr ""
 "Enlightenment nie był w stanie uruchomić aplikacji:<br><br>"
 "%s<br><br>Aplikacja nie uruchomiła się."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Błąd wykonania aplikacji"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s niespodziewanie zakończył działanie."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Kod wyjścia %i dostarczono od %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s został zakończony przez sygnał przerwania."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s został przerwany przez sygnał wyjścia."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s został przerwany przez sygnał anulowania."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s został przerwany przez błąd w obliczeniach zmiennoprzecinkowych."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s został przerwany przez naruszenie ochrony pamięci."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s został zakończony przez przerwany potok."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s został przerwany przez sygnał zakończenia."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s został przerwany przez błąd szyny."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s został przerwany przez sygnał o numerze %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Dziennik błędów"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Nie było wiadomości o błędzie."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Zapamiętaj ten komunikat"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Log błędu będzie zapisany jako %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informacja o błędzie"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informacja o sygnale błędu"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Dane wyjściowe"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Nie było danych wyjściowych."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Nieistniejąca ścieżka"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nie istnieje."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Błąd montowania"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Nie można zamontować urządzenia"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Błąd odmontowania"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Nie można odmontować urządzenia"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Błąd z wysuwaniem urządzenia"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Nie można wysunąć urządzenia"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i plików"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Łącze"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Anuluj"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Użyj ustawień katalogu nadrzędnego"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Tryb widoku"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Odśwież widok"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Pokaż ukryte pliki"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Zapamiętaj porządek"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sortuj teraz"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nowy katalog"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Odmontuj"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Zamontuj"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Wysuń"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Użyj ikonę dostarczoną przez program "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Właściwości pliku"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Użyj domyślny"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Siatka"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Własne ikony"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Wielkość ikony (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Zmień tło..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Ustaw warstwę…"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Stwórz nowy katalog"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nazwa nowego katalogu:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Zmień Nazwę %s na:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Zmień nazwę pliku"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Spróbuj ponownie"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Błąd"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nie dla wszystkich"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Tak dla wszystkich"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Plik już istnieje, nadpisać?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignoruj"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignoruj wszystkie"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Wystąpił błąd podczas wykonywania operacji.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Potwierdź skasowanie"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Jesteś pewien że chcesz usunąć<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1473,12 +1499,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nieznany wolumen"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Urządzenie usuwalne"
 
@@ -1486,7 +1512,7 @@ msgstr "Urządzenie usuwalne"
 msgid "File:"
 msgstr "Plik:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Rozmiar:"
 
@@ -1502,7 +1528,7 @@ msgstr "Typ pliku:"
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Właściciel:"
 
@@ -1522,17 +1548,17 @@ msgstr "Właściciel może czytać"
 msgid "Owner can write"
 msgstr "Właściciel może zapisywać"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Podgląd"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Domyślny"
 
@@ -1541,7 +1567,7 @@ msgid "Thumbnail"
 msgstr "Miniaturka"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Własne"
 
@@ -1557,53 +1583,43 @@ msgstr "Informacje odnośnika"
 msgid "Select an Image"
 msgstr "Wybierz obrazek"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Opis Przesuwania"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Rozpocznij Przesuwanie/Zmianę Rozmiaru składników"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Opis Zmiany Rozmiaru"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Automatycznie przewiń zawartość"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Zwykły"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Wstawka"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Usuń"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Zakończ przesuwanie/zmienianie rozmiaru"
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "Zakończ edycję"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1651,14 +1667,14 @@ msgstr "Pozycja"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Rozmiar"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Położenie"
@@ -1710,160 +1726,167 @@ msgstr "Zakończenie sesji, gdy to okno jest otwarte"
 msgid "Remember these Locks"
 msgstr "Zapamiętaj blokady"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Okno"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Zawsze na wierzchu"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Przyklej"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Ustawienia"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Pełny Ekran"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Zmaksymalizuj pionowo"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Zmaksymalizuj poziomo"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Zlikwiduj maksymalizację"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Edytuj ikonę"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Utwórz ikonę"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Dodaj do menu Ulubione"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Dodaj do IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Skrót klawiszowy"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Rozmieszczanie"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Pomiń"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Ramka"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Blokady"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Przyklej"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Pomiń"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Do ikony"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Zwiń"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Ekran"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Zawsze na wierzchu"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normalny"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Zawsze poniżej"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Przypnij do pulpitu"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Odepnij od pulpitu"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Wybierz typ obramowania"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Używaj domyślnych właściwości E17 dla ikon"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Użyj ikonę dostarczoną przez program "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Użyj ikonę zdefiniowaną przez użytkownika"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Przyciąganie"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista Okien"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Pasek zadań"
 
@@ -1884,7 +1907,7 @@ msgid "ICCCM Properties"
 msgstr "Właściwości ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Tytuł"
 
@@ -2058,7 +2081,6 @@ msgid "Size, Position and Locks"
 msgstr "Rozmiar, położenie i blokady"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Wszystko"
 
@@ -2135,15 +2157,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Pliki"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Uruchom"
@@ -2158,20 +2178,6 @@ msgstr "Rdzeń"
 msgid "Mobile"
 msgstr "Moduły"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Ustawienia modułów"
@@ -2212,7 +2218,7 @@ msgstr "Dodaj gadżet"
 msgid "Remove Gadget"
 msgstr "Usuń gadżet"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Ustawienia paska narzędzi"
 
@@ -2220,11 +2226,11 @@ msgstr "Ustawienia paska narzędzi"
 msgid "Layout"
 msgstr "Ułożenie"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Błąd metody wprowadzania"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2240,7 +2246,7 @@ msgstr "Główne"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Ulubione aplikacje"
 
@@ -2248,76 +2254,74 @@ msgstr "Ulubione aplikacje"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplikacje"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Utracone okna"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "O programie..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Wystrój"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Wirtualny"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Półki"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Pokaż/Ukryj Wszystkie Okna"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Brak aplikacji)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Ustaw wirtualne pulpity"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Brak okien)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Bez nazwy!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Brak półek)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Dodaj półkę"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Skasuj półkę"
 
@@ -2353,7 +2357,7 @@ msgid "Shrink to Content Width"
 msgstr "Zmniejsz do rozmiaru zawartości"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Styl"
 
@@ -2383,7 +2387,7 @@ msgid "Hide duration"
 msgstr "Okres chowania"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2400,7 +2404,7 @@ msgstr "Pokaż na wszystkich pulpitach"
 msgid "Show on specified Desktops"
 msgstr "Pokazuj na wybranych pulpitach"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2417,7 +2421,7 @@ msgstr ""
 "lub nie należą do ciebie. Sprawdź:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2430,52 +2434,22 @@ msgstr ""
 "Sprawdź:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nie może uruchomić Ecore!\n"
-"Może masz zbyt mało pamięci?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nie może uruchomić systemu plików.\n"
-"Może masz zbyt mało pamięci?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2483,7 +2457,7 @@ msgstr ""
 "Enlightenment nie może ustawić obsługi sygnału wyjścia. Może masz zbyt mało "
 "pamięci?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2491,7 +2465,7 @@ msgstr ""
 "Enlightenment nie może ustawić obsługi sygnału HUP.\n"
 "Może masz zbyt mało pamięci?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2499,64 +2473,37 @@ msgstr ""
 "Enlightenment nie może ustawić obsługi sygnału HUP.\n"
 "Może masz zbyt mało pamięci?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment nie może ustanowić połączenia z X\n"
-"Czy ustawiłeś zmienną DISPLAY?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment nie może ustanowić swojego systemu ostrzeżeń.\n"
-"Czy ustawiłeś zmienną DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nie może uruchomić systemu połączeń.\n"
-"Może masz zbyt mało pamięci?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nie może uruchomić systemu IPC.\n"
-"Może masz zbyt mało pamięci?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nie może uruchomić xineramy.\n"
-"Tak nie powinno się stać."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nie może uruchomić xineramy.\n"
-"Tak nie powinno się stać."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nie może uruchomić systemu Evas.\n"
-"Może masz zbyt mało pamięci?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2566,7 +2513,7 @@ msgstr ""
 "renderowania X11 w Evas. Proszę sprawdzić swoją instalację Evas i\n"
 "Ecore oraz czy wspierają one programowe renderowanie X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2576,7 +2523,35 @@ msgstr ""
 "renderowania do bufora w Evas. Proszę sprawdzić swoją instalację Evas i\n"
 "Ecore oraz czy wspierają one programowe renderowanie do bufora."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment nie może ustanowić swojego systemu ostrzeżeń.\n"
+"Czy ustawiłeś zmienną DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2584,23 +2559,29 @@ msgstr ""
 "Enlightenment nie może utworzyć katalogów w katalogu domowym.\n"
 "Może nie masz katalogu domowego lub dysk jest pełny?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment nie mógł ustawić systemu rejestrowania."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment nie może ustawić swojego systemu konfiguracji."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment nie może ustawić swojego systemu wystrojów."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment nie mógł ustawić systemu skalowania."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment nie może ustawić swojego systemu czcionek."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2608,94 +2589,44 @@ msgstr ""
 "Enlightenment nie może ustawić ścieżek by znaleźć pliki.\n"
 "Może masz zbyt mało pamięci?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment nie może ustawić swojego systemu czcionek."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment nie może ustawić swojego systemu wystrojów."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
-"Enlightenment nie może ustawić ekranu startowego.\n"
-"Może masz zbyt mało pamięci?"
+"Enlightenment nie może ustawić swojego systemu wspierania wielu języków."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Uruchamianie międzynarodowego wsparcia"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu wspierania wielu języków."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment nie może uruchomić systemu plików.\n"
 "Może masz zbyt mało pamięci?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Wsparcie formatu testowania"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment stwierdził, że Evas nie potrafi stworzyć bufora.\n"
-"Upewnij się, czy Evas wspiera programowe renderowanie do bufora.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment stwierdził, że Evas nie ładuje plików PNG. Sprawdź,\n"
-"czy Evas posiada moduł ładujący obrazy PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment stwierdził, że Evas nie ładuje plików JPG. Sprawdź,\n"
-"czy Evas posiada moduł ładujący obrazy JPG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment stwierdził, że Evas nie ładuje plików EET. Sprawdź,\n"
-"czy Evas posiada moduł ładujący pliki EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Evas nie może załadować czcionki Sans. Sprawdź, czy Evas ma wsparcie "
-"ustawień\n"
-"czcionek oraz czy systemowe ustawienia definiują czcionkę Sans.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Sprawdź obsługę SVG"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Opcje ekranów"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2704,202 +2635,340 @@ msgstr ""
 "Twoim\n"
 "systemie. Być może jest uruchomiony jakiś inny manedżer okien?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Ścieżki E"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Ścieżki E"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment nie może skonfigurować opcji myszki."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Opcje wygaszacza ekranu"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment nie może skonfigurować X screensaver."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Ustawienia trybów oszczędzania energii"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment nie może ustawić trybów oszczędzania energii."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Ustawienia blokady pulpitu"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment nie może ustawić swojego systemu blokowania ekranu."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment nie może ustawić swojego systemu wyskakujących okien."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Ustawienia systemu wiadomości"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Ścieżki E"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment nie może zainicjalizować systemu System Command.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Opcje akcji"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment nie może ustawić swojego systemu zdarzeń."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Ustawienia menadżera plików"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Menadżer plików"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment nie może uruchomić menadżera plików.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Ustawienia systemu wiadomości"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment nie może ustawić swojego systemu wiadomości."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Ustawienia \"przeciągnij i upuść\""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu \"przeciągnij i upuść\"."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu obsługi przechwytu "
 "wprowadzania."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Ustawienia modułów"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment nie może ustawić swojego systemu modułów."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Ustaw przypomnienia"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment nie może ustawić swojego systemu zapamiętywania."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Ustawienia klas kolorów"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nie może ustawić swojego systemu klas kolorów."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment nie może ustawić swojego systemu kontroli gadżetów."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Ścieżki E"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Ustawienia trybów oszczędzania energii"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment nie może ustawić trybów oszczędzania energii."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Ustawienia tapety"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment nie może ustawić systemu tła pulpitu"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Ustawienia myszki"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nie może skonfigurować opcji myszki."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment nie może ustawić swojego systemu powiązań."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Opcje półek"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment nie może ustawić swojego systemu półek."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Ustawienia dla miniaturek"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment nie może ustawić swojego systemu tworzenia miniatur.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment nie może zainicjalizować systemu System Command.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment nie może ustawić swojego systemu tworzenia miniatur.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment nie może ustawić swojego systemu wystrojów."
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Ustawienia porządkowania plików"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment nie może ustawić systemu porządkowania plików."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Załaduj moduły"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Skonfiguruj półki"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Prawie skończone"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Wsparcie formatu testowania"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment stwierdził, że Evas nie potrafi stworzyć bufora.\n"
+"Upewnij się, czy Evas wspiera programowe renderowanie do bufora.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment stwierdził, że Evas nie ładuje plików PNG. Sprawdź,\n"
+"czy Evas posiada moduł ładujący obrazy PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment stwierdził, że Evas nie ładuje plików JPG. Sprawdź,\n"
+"czy Evas posiada moduł ładujący obrazy JPG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment stwierdził, że Evas nie ładuje plików PNG. Sprawdź,\n"
+"czy Evas posiada moduł ładujący obrazy PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment stwierdził, że Evas nie ładuje plików EET. Sprawdź,\n"
+"czy Evas posiada moduł ładujący pliki EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Evas nie może załadować czcionki Sans. Sprawdź, czy Evas ma wsparcie "
+"ustawień\n"
+"czcionek oraz czy systemowe ustawienia definiują czcionkę Sans.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
@@ -2908,12 +2977,12 @@ msgstr ""
 "zrestartowany. Był problem podczas ładowania<br>modułu %s. Ten element "
 "został wyłączony<br>i nie będzie załadowany."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 "Enlightenment zawiesił się wcześnie podczas włączania i został zrestartowany."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2924,7 +2993,7 @@ msgstr ""
 "<br>Był problem podczas ładowania modułu %s<br><br>Ten element został "
 "wyłączony i nie będzie załadowany."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2936,7 +3005,7 @@ msgstr ""
 "można było usunąć<br>problematyczne moduły z konfiguracji. "
 "Okno<br>konfiguracji modułów pozwala na ich powtórne wybranie."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2948,20 +3017,12 @@ msgstr ""
 "przy usuwaniu problematycznych elementów z konfiguracji.<br><br>Okno "
 "konfiguracji modułów powinno pozwolić wybrać<br>moduły jeszcze raz."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Skonfiguruj półki"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Prawie skończone"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Załaduj moduł: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2970,11 +3031,11 @@ msgstr ""
 "Podczas ładowania modułu %s wystąpił błąd.<br>Nie odnaleziono modułu %s w "
 "katalogu modułów.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Błąd ładowania modułu"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2983,11 +3044,11 @@ msgstr ""
 "Podczas ładowania modułu %s wystąpił błąd.<br>Pełna ścieżka do modułu to:<br>"
 "%s<br>Zgłoszony błąd to:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Moduł nie zawiera wszystkich potrzebnych funkcji"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2998,16 +3059,16 @@ msgstr ""
 "modułu w wersji przynajmniej: %i.<br>API modułu polecane przez Enlightenment "
 "to: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Moduł %s dla Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Czy chciałbyś wyładować ten moduł?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3021,26 +3082,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Pólka #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz skasować tę półkę?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Zażądałeś usunięcia tej półki.<br><br>Czy na pewno chcesz ją usunąć?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Zakończ przesuwanie/zmianę rozmiaru składników"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Rozpocznij przesuwanie/zmianę rozmiaru składników"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Komentarz"
@@ -3049,16 +3110,16 @@ msgstr "Komentarz"
 msgid "Starting"
 msgstr "Włączanie"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Sprawdzanie uprawnień systemu"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Skończono sprawdzanie systemu"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3069,35 +3130,35 @@ msgstr ""
 "<br>Czy chcesz się wylogować mimo tego bez wcześnijeszego<br>zamykania tych "
 "aplikacji?<br><br>Samoczynne wylogowanie za %d sekund."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problemy przy wylogowaniu"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Wyloguj teraz"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Jeszcze poczekaj"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Anuluj wylogowanie"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Wylogowanie trwa"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Trwa wylogowanie<br><hilight>Proszę czękać.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment jest zajęty przez inne zadanie"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3105,7 +3166,7 @@ msgstr ""
 "Wylogowywanie.<br>Nie możesz wykonywać innych akcji systemu<br>odkąd proces "
 "się rozpoczął."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3113,73 +3174,76 @@ msgstr ""
 "Wyłączanie.<br>Nie możesz wykonywać innych akcji systemu<br>odkąd proces się "
 "rozpoczął."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
+"Wylogowywanie.<br>Nie możesz wykonywać innych akcji systemu<br>odkąd proces "
+"się rozpoczął."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! To się nie powinno zdarzyć"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Błąd wyłączania."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Restet nieudany."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hibernacja nieudana."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Wyłącz"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Wyłączanie.<br><hilight>Proszę czekać.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Resetowanie"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Resetowanie.<br><hilight>Proszę czekać.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Usypianie"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernowanie"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernowanie.<br><hilight>Przoszę czekać.</hilight>"
 
@@ -3187,33 +3251,33 @@ msgstr "Hibernowanie.<br><hilight>Przoszę czekać.</hilight>"
 msgid "About Theme"
 msgstr "O wystroju"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Ustaw jako wystrój"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Zakończ przesuwanie/zmianę rozmiaru składników"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Rozpocznij przesuwanie/zmianę rozmiaru składników"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Ustaw zawartość paska narzędzi"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nie zdołał stworzyć procesu potomnego:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Nie można wyjść - nieśmiertelne okna."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3223,125 +3287,125 @@ msgstr ""
 "to, że Enlightenment nie może zezwolić<br> sobie na wyjście dopóki te okna "
 "nie zostaną zamknięte<br> bądź usunięta blokada czasu działania."
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bajtów"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "W przyszłości"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Podczas ostatniej minuty"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li lat temu"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li miesięcy temu"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li tygodni temu"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dni temu"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li godzin temu"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minut temu"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Ustawienia Uruchamiania"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importuj..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opcje Wypełniania i rozciągania"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Rozciągnij"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Na środku"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Wewnątrz"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Wypełnij"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Jakość pliku"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Użyj oryginalnego pliku"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3358,12 +3422,12 @@ msgstr ""
 "starych brakuje. Ten zestaw naprawi to,<br>dodając nowe ustawienia. Możesz "
 "teraz ponownie skonfigurować wszystko<br>jak chcesz. Przepraszamy za kłopot."
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Zaktualizowano konfigurację"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3396,142 +3460,148 @@ msgstr "Góra"
 msgid "Down"
 msgstr "Dół"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Dodaj do menu Ulubione"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Katalog wyżej"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rozdzielczość"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Prawa dostępu:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Ostatnio zmodyfikowany:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Ty"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Chroniony"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Tylko do odczytu"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Zabronione"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Odczyt-zapis"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Ustawienia monitora baterii"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Pokaż alarm, gdy stan baterii jest niski"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Sprawdź co:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernacja"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Pokaż alarm gdy stan baterii jest niski"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automatyczne wykrywanie"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Zamazany"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Sprzęt"
 
@@ -3539,32 +3609,33 @@ msgstr "Sprzęt"
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Niski poziom baterii!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Zasilacz jest rekomendowany."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "BŁĄD"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Miernik baterii"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Zegar"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Pokaż pasek narzędzi"
@@ -3632,17 +3703,17 @@ msgstr "Zaktualizowano Konfigurację"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplikacje IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplikacje przy uruchamianiu"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Aplikacje przy restarcie"
 
@@ -3656,10 +3727,25 @@ msgid "Apps"
 msgstr "Aplikacje"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nowa aplikacja"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Uruchom"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Wybierz aplikacje"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Pliki desktop"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3672,7 +3758,7 @@ msgid "Available Profiles"
 msgstr "Dostępne profile"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Wybierz profil"
 
@@ -3710,9 +3796,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
@@ -3754,7 +3840,7 @@ msgstr ""
 msgid "Profiles"
 msgstr "Profile"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3762,7 +3848,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3770,7 +3856,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3778,7 +3864,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3786,47 +3872,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Zmiana rozdzielczości"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Przywróć"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Ustawienia rozdzielczości ekranu"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Przywróć przy starcie"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Obrót ekranu"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Odbicie lustrzane"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Brakujące funkcje"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3839,11 +3925,11 @@ msgstr ""
 "że w czasie<br>budowania <hilight>ecore</hilight> obsługa XRandR nie została "
 "wykryta."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3852,92 +3938,75 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Ustawienia wirtualnych pulpitów"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Liczba pulpitów"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Przełączanie pulpitów myszką"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 "Przeskocz do następnego pulpitu, gdy przeciągany obiekt jest na brzegu ekranu"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Zawijaj pulpity przy przełączaniu"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Pulpity"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Wyłącz"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Przewijanie"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Powiększanie"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animacja Przeskakiwania"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek."
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animacja przeskakiwania"
 
@@ -3954,7 +4023,7 @@ msgid "Desktop Wallpaper"
 msgstr "Tapeta"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Ustaw"
 
@@ -3965,12 +4034,12 @@ msgstr "Zmień tło..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Osobiste"
 
@@ -3978,185 +4047,213 @@ msgstr "Osobiste"
 msgid "Screen Lock Settings"
 msgstr "Ustawienia blokady ekranu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Blokuj przy starcie"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Blokuj przy usypianiu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Własne polecenie do zablokowania ekranu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Blokowanie"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Pokaż na wszystkich ekranach"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Pokaż na aktualnym ekranie"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Pokaż na ekranie #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Ustawienia okna logowania"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Blokuj po starcie wygaszacza ekranu dla X"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekund"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Blokuj po czasie bezczynności"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f min."
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Timer"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Proponuj, jeśli zdezaktywowano przed"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Tryb prezentacji"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Zdefiniowany w wystroju"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Tło pulpitu z wystroju"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Obecne tło pulpitu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Tło pulpitu"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Opcje wygaszacza ekranu"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Włącz X Screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Wyślij na Pulpit"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Wygaszacz ekranu"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Czas do aktywacji"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Czas do zmiany"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Pozwól"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Nie pozwalaj"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Inne"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Ustawienia zarządzania zasilaniem monitora"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Włącz zarządzanie zasilaniem monitora"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr ""
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "Według Czasu Modyfikacji"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Wirtualne pulpity"
@@ -4201,102 +4298,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Ustawienia Skrótów Klawiaturowych"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Usuń wszystkie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametry akcji"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Opcje ogólne"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Klikalna krawędź"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4445,34 +4542,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Opcje językowe"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Wybór Języka"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Lokalizacja wybrana"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Lokalizacja"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Język"
 
@@ -4562,17 +4672,17 @@ msgid "Manager"
 msgstr "Menadżer"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Brak"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Przypisane przyciski myszy"
 
@@ -4596,13 +4706,11 @@ msgid "Menu Settings"
 msgstr "Ustawienia menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Osobiste"
@@ -4612,7 +4720,7 @@ msgid "Main Menu"
 msgstr "Główne menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Ulubione"
 
@@ -4630,7 +4738,7 @@ msgid "Comments"
 msgstr "Komentarz"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4642,7 +4750,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Pokaż w menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menu"
 
@@ -4713,19 +4821,19 @@ msgid "Images"
 msgstr "Obrazy"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Czcionki"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Wystroje"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikony"
 
@@ -4876,18 +4984,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Ustawienia tła pulpitu"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Tło pulpitu z wystroju"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Obraz..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4907,44 +5015,49 @@ msgstr "Ten pulpit"
 msgid "This Screen"
 msgstr "Ten ekran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Opcje tapety"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Układanka"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Przewijanie"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Wybierz obraz..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Błąd wczytywania obrazu"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment nie był w stanie wczytać obrazu<br>ze względu na błąd "
 "konwersji."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Błąd importowania tła"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4982,7 +5095,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4990,7 +5103,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Wybór Ramki Okna"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamiętaj ramkę tego okna i użyj jej przy ponownym jego pokazaniu"
 
@@ -5023,7 +5136,7 @@ msgid "Menu Background Base"
 msgstr "Tło"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Tytuł menu"
 
@@ -5032,7 +5145,7 @@ msgid "Menu Title Active"
 msgstr "Tytuł aktywnego menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Element Menu"
 
@@ -5046,12 +5159,12 @@ msgid "Menu Item Disabled"
 msgstr "Element Menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Opis przesuwania"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Opis zmiany rozmiaru"
 
@@ -5069,7 +5182,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Tytuł na liście okien"
 
@@ -5088,386 +5201,396 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Element listy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Element Listy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Nagłówek Listy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Nagłówek Listy"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Tło Wystroju"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 #, fuzzy
 msgid "Scroller Frame Background Base"
 msgstr "Tło Wystroju"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Kolor 1:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Własne ikony"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Zwiniń"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Zarządca okien"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widżety"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Inne Ustawienia"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Pasek tytułowy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Zwykły blok tekstu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Mały blok tekstu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Duży blok tekstu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Tytuł 'O Programie'"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Wersja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Tekst 'O programie'"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Tekst Blokady Ekranu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Hasło blokady ekranu:"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Okno dialogowe błędu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Komenda bufora wykonania"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Tytuł ekranu powitalnego"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Tekst ekranu powitalnego"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Wersja ekranu powitalnego"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Pole wprowadzania"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Ramka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Opis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Suwak"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Przyciski typu \"Radio\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Przyciski wyboru"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Element listy tekstowej"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Element listy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Nagłówek listy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Menadżer plików"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Bufor wprowadzania"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Mały"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Duży"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Styl zmniejszony"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Styl normalny"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Styl zwiększony"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Ustawienia czcionek"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Malutki"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Duże"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Bardzo duże"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Ogromny"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pikseli"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Podgląd prostych ustawień: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Włącz klasy czcionek"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Podgląd zaawansowanych ustawień: 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Wygładzanie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Czcionki zastępcze"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nazwa czcionki zastępczej"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Włącz czcionki zastępcze"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5475,12 +5598,17 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Ustawienia wystroju ikon"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Włącz composite"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Wybierz aplikacje"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5546,11 +5674,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5561,6 +5687,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5581,25 +5713,25 @@ msgstr "Pokazuj ekran powitalny przy uruchamianiu"
 msgid "Transition Settings"
 msgstr "Ustawienia przejść"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Zmiana pulpitu"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Zmiana tła"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Przejścia"
 
@@ -5615,15 +5747,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5654,19 +5786,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Ramki"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Wystrój ikony"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Kursor myszy"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Skalowanie"
 
@@ -5793,6 +5925,10 @@ msgstr "Dostarczona przez program"
 msgid "Border Icon"
 msgstr "Ramka"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Rozmieszczanie"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Inteligentne rozmieszczanie"
@@ -5821,23 +5957,46 @@ msgstr "Nowe okna"
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Liniowe"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
-msgid "Accelerate, then decelerate"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
+msgid "Accelerate, then decelerate"
+msgstr "Przyspieszanie i zwalnianie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
+msgid "Accelerate"
+msgstr "Przyspieszanie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
+msgid "Decelerate"
+msgstr "Zwalnianie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Przyspieszenie myszki"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Zwalnianie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
 msgstr "Przyspieszanie i zwalnianie"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
-msgid "Accelerate"
-msgstr "Przyspieszanie"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
-msgid "Decelerate"
-msgstr "Zwalnianie"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Położenie"
@@ -5859,6 +6018,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Ostatnie okno pod myszką"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Kliknięcie"
 
@@ -5891,11 +6051,6 @@ msgstr "Tylko oknom dialogowym"
 msgid "Only dialogs with focused parent"
 msgstr "Tylko nowym oknom dialogowym, którch okno nadrzędne ma fokus"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Inne ustawienia"
@@ -6006,13 +6161,13 @@ msgid "Fill available space"
 msgstr "Wypełnij dostępną przestrzeń"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Poziomo"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Pionowo"
@@ -6071,7 +6226,7 @@ msgid "Raise when clicking to focus"
 msgstr "Kliknij, by aktywizować"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Aktywizacja okna"
 
@@ -6329,33 +6484,33 @@ msgstr "Bardzo Jasny"
 msgid "Dropshadow"
 msgstr "Cień"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Wszystko"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Wszystko"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Konfiguracja Podglądu Pulpitów"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Poniżej Wszystkiego"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Wszystko"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Wszystko"
@@ -6365,163 +6520,163 @@ msgstr "Wszystko"
 msgid "Everything Settings"
 msgstr "Ustawienia Terminala"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Dostępne Aplikacje"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Przesuń"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "W dół"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Potwierdź"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Włączony"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Pokaż w menu"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Pokaż w menu"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Domyślny Tryb Okien Dialogowych"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Wyłączony"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Domyślny"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animowane przeskakiwanie"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Lista Okien"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Szybka nawigacja"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Domyślny"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Animowane przeskakiwanie"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Nic"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Nic"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 #, fuzzy
 msgid "By usage"
 msgstr "Według Nazw"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Ostatinio zmodyfikowany:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Parametry Akcji"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Zwykły"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Ustawienia Okien Popup"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Ustawienia Okien Popup"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6530,38 +6685,30 @@ msgstr "Ustawienia Okien Popup"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Spróbuj ponownie"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Ulubione Aplikacje"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Akcje"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Elementy"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Nie załadowano żadnego modułu"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Skopiuj do schowka"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6583,162 +6730,66 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Bufor wprowadzania"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Zmień Nazwę Pliku"
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Edutuj Aplikację"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Aplikacja"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Otwórz za pomocą…"
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Uruchom w konsoli"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Plik Wykonywalny"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Ulubione Aplikacje"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Polecenie"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Komenda Terminala"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Wszystko"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Kalkulator"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Kopiuj do…"
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Więcej..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Przenieś do kosza"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Otwórz folder (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Sortuj według daty"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Sortuj według nazwy"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Zmień Nazwę Pliku"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Wszystko"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Pokaż Ukryte Pliki"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Katalogi Przeszukiwania"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Katalogi Zdefiniowane Przez Użytkownika"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Wyczyść pamięć podręczną"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Przesunięcie Cienia"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Przejdź do okna"
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Pełny Ekran"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Wyślij na pulpit"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ikony plików"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Typy plików"
 
@@ -6785,19 +6836,19 @@ msgid "Select an image"
 msgstr "Wybierz Ikonę"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Menadżer plików"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6815,7 +6866,7 @@ msgstr ""
 "ustawienia. Możesz teraz ponownie skonfigurować wszystko<br>jak chcesz. "
 "Przepraszamy za zamieszanie w twoich ustawieniach."
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6831,7 +6882,7 @@ msgstr ""
 "bezpieczeństwa zostały przywrócone<br>domyślne ustawienia. Przepraszamy za "
 "niedogodność."
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Zaktualizowano ustawnienia menadżera plików Fileman"
 
@@ -6910,95 +6961,99 @@ msgstr "Otwórz menadżer plików po zamontowaniu"
 msgid "Device"
 msgstr "Podgląd"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Katalog wyżej"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Inna aplikacja..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Otwórz za pomocą…"
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Znane aplikacje"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Określona aplikacja"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Wszystkie aplikacje"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiowanie przerwane"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Przenoszenie elementu przerwane"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Usuwanie przerwane"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7033,7 +7088,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7045,37 +7100,42 @@ msgstr "Menadżer gadżetów"
 msgid "Available Gadgets"
 msgstr "Dostępne gadżety"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Przesuń"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Przezroczysty"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animacje"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Tło"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Ustawienia Tła Pulpitu"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Rozpocznij Przesuwanie/Zmianę Rozmiaru składników"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Wolny"
@@ -7319,16 +7379,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Czy na pewno chcesz skasować to źródło paska?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Utwórz Ikonę"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Ustawienia"
 
@@ -7372,7 +7432,7 @@ msgstr "Pokaż okna ze wszystkich pulpitów"
 msgid "Show windows from active desktop"
 msgstr "Pokaż okna z aktywnego pulpitu"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7492,31 +7552,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7536,131 +7596,91 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "Ustawienia temperatury"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Czujniki"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Stopnie Celsjusza"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Jednostki wyświetlania"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Okres pomiaru"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Wysoka temperatura"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Niska temperatura"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Poziomy temperatury"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Dalej"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Witaj w Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Wybierz jeden"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Nie znaleziono plików<br>menu w Twoim systemie<br>Zobacz<br>dokumentację "
-"na<br>www.enlightenment.org<br>dla szczegółów<br>jak zrobić,<br>aby menu "
-"aplikacji<br>działało."
 
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Wybierz menu aplikacji."
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Wybierz profil"
 
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Wybierz aplikacje"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Pliki desktop"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Brak ikon na pulpicie"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Włącz ikony na pulpicie"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Tryb aktywacji okna"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Kliknięcie aktywuje okno"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Aktywne okno pod myszą"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Wybierz ikony do dodania"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Szybkie uruchamianie"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Wybierz aplikacje"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Przesuń"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7702,7 +7722,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7726,38 +7746,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Zmiana rozdzielczości"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Tryb widoku"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7784,138 +7820,348 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Tryb offline"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Bez Wygładzania"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Chroniony"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Nieznane"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Błąd"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Układanka"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Przejścia"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfiguracja"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Zwykły"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Pojemnik"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Konfiguracja"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Włączony"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Wypełnij dostępną przestrzeń"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Chroniony"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Pojemnik"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment nie może ustawić swojego systemu wystrojów."
+#~ msgid "Acpi"
+#~ msgstr "Akcja"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Ten Ekran"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Ten Ekran"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Opis Zmiany Rozmiaru"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Zakończ przesuwanie/zmienianie rozmiaru"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić Ecore!\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić systemu plików.\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment nie może ustanowić połączenia z X\n"
+#~ "Czy ustawiłeś zmienną DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić systemu połączeń.\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić systemu IPC.\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić xineramy.\n"
+#~ "Tak nie powinno się stać."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić xineramy.\n"
+#~ "Tak nie powinno się stać."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może uruchomić systemu Evas.\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nie może ustawić ekranu startowego.\n"
+#~ "Może masz zbyt mało pamięci?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Sprawdź obsługę SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Ustawienia menadżera plików"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment nie może ustawić swojego systemu półek."
+
+#~ msgid "New Application"
+#~ msgstr "Nowa aplikacja"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Domyślny Tryb Okien Dialogowych"
+
+#~ msgid "Actions"
+#~ msgstr "Akcje"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Skopiuj do schowka"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Bufor wprowadzania"
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Zmień Nazwę Pliku"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Edutuj Aplikację"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Aplikacja"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Uruchom w konsoli"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Plik Wykonywalny"
+
+#~ msgid "Calculator"
+#~ msgstr "Kalkulator"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Kopiuj do…"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Więcej..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Przenieś do kosza"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Otwórz folder (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Sortuj według daty"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Sortuj według nazwy"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Zmień Nazwę Pliku"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Przesunięcie Cienia"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Przejdź do okna"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Pełny Ekran"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Wyślij na pulpit"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Nie znaleziono plików<br>menu w Twoim systemie<br>Zobacz<br>dokumentację "
+#~ "na<br>www.enlightenment.org<br>dla szczegółów<br>jak zrobić,<br>aby menu "
+#~ "aplikacji<br>działało."
+
+#~ msgid "Select application menu"
+#~ msgstr "Wybierz menu aplikacji."
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Brak ikon na pulpicie"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Włącz ikony na pulpicie"
+
+#~ msgid "Focus mode"
+#~ msgstr "Tryb aktywacji okna"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Kliknięcie aktywuje okno"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Aktywne okno pod myszą"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Wybierz ikony do dodania"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Szybkie uruchamianie"
 
 #~ msgid "Add Application..."
 #~ msgstr "Dodaj program..."
@@ -8300,12 +8546,6 @@ msgstr ""
 #~ msgid "Exit Immediately"
 #~ msgstr "Zakończ Natychmiast"
 
-#~ msgid "Shut Down"
-#~ msgstr "Wyłączanie"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Wyślij na Pulpit"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Blokada Pulpitu"
 
@@ -8876,9 +9116,6 @@ msgstr ""
 #~ msgid "Enlightenment was unable to fork a child process:<br><br>%s %s<br>"
 #~ msgstr "Enlightenment nie zdołał stworzyć procesu potomnego:<br><br>%s<br>"
 
-#~ msgid "Stop editing"
-#~ msgstr "Zakończ edycję"
-
 #~ msgid "Bars, Menus, etc."
 #~ msgstr "Paski, Menu, etc."
 
@@ -8981,9 +9218,6 @@ msgstr ""
 #~ msgid "Everyone"
 #~ msgstr "Wzyscy"
 
-#~ msgid "By Mod Time"
-#~ msgstr "Według Czasu Modyfikacji"
-
 #~ msgid "Toggle Edit Mode"
 #~ msgstr "Znacznik Trybu Edycji"
 
@@ -9368,9 +9602,6 @@ msgstr ""
 #~ msgid "Wait Exit"
 #~ msgstr "Czekaj na Zakończenie"
 
-#~ msgid "%3.0f"
-#~ msgstr "%3.0f"
-
 #~ msgid "Places"
 #~ msgstr "Miejsca"
 
index 5575ce6..1b03346 100755 (executable)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
-"PO-Revision-Date: 2011-05-14 01:34-0000\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
+"PO-Revision-Date: 2011-11-17 10:28-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre o Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Fechar"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,29 +43,28 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
-"Direitos de autor &copy; 1999-2011, pela equipa de desenvolvimento do "
-"Enlightenment.<br><br>Esperamos que goste desta aplicação tanto como nós "
-"gostámos de a desenvolver.<br><br>Esta aplicação é disponibilizada no modo "
-"\"AS-IS\" e não possui qualquer garantia explícita ou implícita. Este "
-"programa é regido pelas condições do licenciamento, por isso não se esqueça "
-"de ler os ficheiros COPYING e COPYING-PLAIN instalados no sistema.<br><br>O "
-"Enlightenment ainda está em <hilight>INTENSO DESENVOLVIMENTO</hilight> e não "
-"é estável. Muitas funcionalidades estão incompletas ou inexistentes e as "
-"aplicações podem conter diversos erros. Considere-se <hilight>AVISADO!</"
-"hilight>"
-
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
-msgstr "<title>A Equipa</title>"
+"<title>Direitos de autor &copy; 1999-2011, pela equipa de desenvolvimento do "
+"Enlightenment.<br><br>Esperamos que aprecie esta aplicação tanto quanto nós "
+"gostámos de a desenvolver.<br><br>A aplicação é disponibilizada no modo \"AS-"
+"IS\" e não possui qualquer garantia, explicita ou implícita. A aplicação "
+"está restringida às condições de licenciamento, por isso não se esqueça de "
+"ler os ficheiros COPYING e COPYING-PLAIN instalados no seu sistema.<br><br>O "
+"Enlightenment <hilight>ainda está em desenvolvimento</> e não é estável. "
+"Algumas funcionalidades não estão concluídas e podem existir diversos erros. "
+"Considere-se <hilight>AVISADO!</>"
+
+#: src/bin/e_about.c:48
+msgid "<title>The Team</><br><br>"
+msgstr "<title>A equipa</><br><br>"
 
 #: src/bin/e_actions.c:365
 #, c-format
@@ -83,614 +81,640 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Tem a certeza que quer fechar esta janela?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Tem a certeza que quer sair?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Solicitou a saída do Enlightenment.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Tem a certeza que quer sair da sessão?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Está prestes a sair da sessão.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Tem a certeza que quer desligar?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Solicitou para desligar o computador.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Tem a certeza que quer reiniciar?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Solicitou o reinício do computador.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Solicitou a suspensão do computador.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Tem a certeza que quer hibernar?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Solicitou a hibernação do computador.<br><br>Tem a certeza que o quer fazer?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Ajustar tamanho"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu da janela"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Erguer"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Baixar"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Terminar"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Alternar modo fixo"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Alternar modo de ícones"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Alternar modo de ecrã completo"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em todo o ecrã"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximizar o modo \"Inteligente\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximizar o modo \"Expandir\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximizar o modo \"Preencher\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Alternar enrolamento para cima"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Alternar enrolamento para baixo"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Alternar enrolamento para a esquerda"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Alternar enrolamento para a direita"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Alternar enrolamento"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Alternar estado dos contornos"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Definir contorno"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Deslocar entre contornos"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Alternar modo fixado"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Área de trabalho"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Mudar para a área de trabalho à esquerda"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Mudar para a área de trabalho à direita"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Mudar para a área de trabalho de cima"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Mudar para a área de trabalho de baixo"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Mudar área de trabalho em..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Mostrar a área de trabalho"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mostrar o painel"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Mudar para a área de trabalho..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Mudar área de trabalho linearmente..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Mudar para a área de trabalho 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Mudar para a área de trabalho 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Mudar para a área de trabalho 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Mudar para a área de trabalho 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Mudar para a área de trabalho 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Mudar para a área de trabalho 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Mudar para a área de trabalho 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Mudar para a área de trabalho 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Mudar para a área de trabalho 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Mudar para a área de trabalho 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Mudar para a área de trabalho 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Mudar para a área de trabalho 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Mudar para a área de trabalho..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Mudar para a área de trabalho à esquerda (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Mudar para a área de trabalho à direita (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Mudar para a área de trabalho de cima (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Mudar para a área de trabalho de baixo (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Mudar área de trabalho em...(todos os ecrãs)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Mudar para a área de trabalho...(todos os ecrãs)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Mudar área de trabalho linearmente...(todos os ecrãs)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Mudar área de trabalho na direção..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Mudar para a área de trabalho 0 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Mudar para a área de trabalho 1 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Mudar para a área de trabalho 2 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Mudar para a área de trabalho 3 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Mudar para a área de trabalho 4 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Mudar para a área de trabalho 5 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Mudar para a área de trabalho 6 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Mudar para a área de trabalho 7 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Mudar para a área de trabalho 8 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Mudar para a área de trabalho 9 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Mudar para a área de trabalho 10 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Mudar para a área de trabalho 11 (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Mudar para a área de trabalho... (todos os ecrãs)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ecrã"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar rato para o ecrã 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar rato para o ecrã 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Enviar rato para o ecrã..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Avançar o rato 1 ecrã"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Recuar o rato 1 ecrã"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Recuar/avançar o rato nos ecrãs..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr "Escurecer"
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr "Clarear"
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr "Definir iluminação"
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr "Mínimo"
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr "Média"
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr "Máximo"
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr "Ajuste de iluminação"
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr "Aumentar"
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr "Diminuir"
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "Mover para o centro"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Mover para..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr "Mover por..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Ajustar em..."
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "Enviar para a direção..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Arrastar ícone..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Janela : Mover"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Para a área de trabalho seguinte"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Para a área de trabalho anterior"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Para a área de trabalho #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Para a área de trabalho..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Mostrar menu principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Mostrar menu de favoritos"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Mostrar menu de aplicações"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Mostrar menu de clientes"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Mostrar menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Iniciar"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplicação"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Sair agora"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modo"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Alternar o modo de demonstração"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Alternar o modo \"off-line\""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Desligar agora"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Desligar"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "Suspender agora"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Limpar janelas"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Genérico : Ações"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Ação adiada"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Escurecer ecrã"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Restaurar ecrã"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Definir como papel de parede"
 
@@ -698,18 +722,16 @@ msgstr "Definir como papel de parede"
 msgid "Color Selector"
 msgstr "Seletor de cor"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -717,20 +739,20 @@ msgstr "Seletor de cor"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -748,7 +770,7 @@ msgstr ""
 "esse facto.<br> Mais tarde poderá configurar o Enlightenment ao seu gosto. "
 "Desculpe qualquer inconveniente.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -759,14 +781,14 @@ msgstr ""
 "As suas definições são mais recentes que as do Enlightenment.<br>Isto é "
 "muito estranho e só acontece se reverter o Enlightenment ou caso tenha "
 "copiado as definições de um local em que está instalada uma versão mais "
-"recente do Enlightenment.<br>Isto é mau e por precaução, as suas definições "
-"foram restauradas para as omissões.<br>Desculpe qualquer inconveniente.<br>"
+"recente do Enlightenment.<br>Isto é mau e por precaução, as definições "
+"originais foram restauradas.<br>Desculpe qualquer inconveniente.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas ao escrever as definições do Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -776,19 +798,19 @@ msgstr ""
 "Ocorreu um erro ao mover os ficheiros de configuração<br>de:<br>"
 "%s<br><br>para:<br>%s<br><br>A tarefa foi terminada para sua segurança.<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Definições atualizadas"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "O identificador do ficheiro EET está errado."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Os dados do ficheiro estão vazios."
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -796,17 +818,17 @@ msgstr ""
 "Não pode escrever no ficheiro. Pode ser que o ficheiro seja de leitura<br>ou "
 "não tenha acesso aos ficheiros."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 "Ficou sem memória ao preparar o ficheiro.<br>Por favor, liberte espaço de "
 "memória."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Este é um erro genérico."
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -814,59 +836,59 @@ msgstr ""
 "O ficheiro das definições é muito grande.<br>Em princípio seria pequeno "
 "(algumas centenas de KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr "Possui erros de E/S no disco.<br>Talvez precise de ser substituído?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "Ficou sem espaço durante a escrita do ficheiro"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "O ficheiro foi fechado durante a escrita."
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Falha ao fazer \"memory-mapping (mmap)\" do ficheiro."
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "Falha na codificação X509."
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Falha de assinatura"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "A assinatura era inválida."
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Não assinado"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Funcionalidade não implementada."
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "O PRNG não foi semeado."
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
-msgstr "Falha de encriptação."
+msgstr "Falha ao cifrar."
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
-msgstr "Falha de decriptação."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
+msgstr "Falha ao decifrar."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "O erro não é reconhecido pelo Enlightenment."
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -877,57 +899,61 @@ msgstr ""
 "ocorreu no ficheiro:<br>%s<br><br>Este ficheiro foi apagado para evitar a "
 "danificação dos dados.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Aplicar"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensões"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Módulos"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Contentor %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte a PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "O Enlightenment não foi compilado com suporte a PAM, logo<br>o bloqueio não "
 "é permitido."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Falha ao bloquear"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -935,15 +961,15 @@ msgstr ""
 "O bloqueio da área de trabalho falhou pois uma aplicação<br>apoderou-se do "
 "teclado, do rato ou de ambos e<br>essa posse não pode ser quebrada."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Por favor, indique a senha de desbloqueio"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Erro de autenticação"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -954,11 +980,11 @@ msgstr ""
 "do erro foi <hilight>%i</hilight>.<br>Isto é mau e não deveria acontecer. "
 "Por favor, reporte este erro."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Ativar o modo de demonstração?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -968,11 +994,11 @@ msgstr ""
 "de <b>demonstração</b> e inativar temporariamente a proteção de ecrã, os "
 "bloqueios e a poupança de energia?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Não, mas aumentar o tempo limite"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Não e parar de perguntar"
 
@@ -998,132 +1024,128 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de itens da área de trabalho"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nome genérico"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe da janela"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorias"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Tipos mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Ficheiro \"desktop\""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Geral"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notificação de arranque"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Executar no terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Mostrar nos menus"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opções"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Selecione um ícone"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Selecione um executável"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Colar"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Selecionar tudo"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
 msgstr "Erro de execução"
 
 #: src/bin/e_exec.c:218
-#, fuzzy
 msgid "Enlightenment was unable to get current directory"
-msgstr ""
-"O Enlightenment não conseguiu importar a imagem<br>devido a erros de "
-"conversão."
+msgstr "O Enlightenment não conseguiu obter o diretório atual"
 
 #: src/bin/e_exec.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to change to directory:<br><br>%s"
-msgstr "O Enlightenment não conseguiu derivar o processo:<br><br>%s<br>"
+msgstr "O Enlightenment não conseguiu alterar o diretório:<br><br>%s"
 
 #: src/bin/e_exec.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to restore to directory:<br><br>%s"
-msgstr "O Enlightenment não conseguiu derivar o processo:<br><br>%s<br>"
+msgstr "O Enlightenment não conseguiu restaurar o diretório:<br><br>%s"
 
 #: src/bin/e_exec.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s"
-msgstr "O Enlightenment não conseguiu derivar o processo:<br><br>%s<br>"
+msgstr "O Enlightenment não conseguiu derivar o processo:<br><br>%s"
 
 #: src/bin/e_exec.c:389
 msgid "Application run error"
@@ -1138,315 +1160,315 @@ msgstr ""
 "O Enlightenment não conseguiu executar a aplicação:<br><br>%s<br><br>Ocorreu "
 "um erro ao iniciar."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Erro de execução da aplicação"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s terminou inesperadamente."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "O código de saída %i foi indicado por %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s foi interrompido por um sinal de interrupção."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um sinal de saída."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um sinal de cancelamento."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s foi interrompido por um erro de vírgula flutuante."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s foi interrompido por um sinal ininterrupto."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s foi interrompido por uma falha de segmentação."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um canal destruído."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s foi interrompido por um sinal de término."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um erro de comunicação."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s foi interrompido pelo sinal %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Os detalhes remanescentes foram truncados. Grave os detalhes para os ver."
 "***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Registo de erros"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Não existe mensagem de erro."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Gravar esta mensagem"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Este erro vai ser gravado como %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informações do erro"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informações do sinal de erro"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Dados de saída"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Não existem dados."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Caminho inexistente."
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s não existe."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Erro ao montar"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Incapaz de montar dispositivo"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Erro ao desmontar"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Incapaz de desmontar dispositivo"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Erro de ejeção"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Incapaz de ejetar dispositivo"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i ficheiros"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Ligação"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Herdar definições da principal"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Modo de visualização"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Atualizar visualização"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Mostrar ficheiros ocultos"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Lembrar ordenação"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Ordenar agora"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Novo diretório"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Montar"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Ejetar"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Propriedades da aplicação"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propriedades do ficheiro"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
-msgstr "Utilizar as omissões"
+msgstr "Utilizar originais"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Ícones em grelha"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Ícones personalizados"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamanho de ícones (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Definir imagem de fundo..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Definir sobreposição..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Criar novo diretório"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nome do novo diretório:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renomear ficheiro"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Erro"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Não a tudo"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Sim a tudo"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "O ficheiro já existe, substituir?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorar"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorar tudo"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Ocorreu um erro ao executar a operação.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmação"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Tem a certeza que quer apagar<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1480,12 +1502,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Desconhecido"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispositivo amovível"
 
@@ -1493,7 +1515,7 @@ msgstr "Dispositivo amovível"
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -1509,7 +1531,7 @@ msgstr "Tipo de ficheiro:"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Dono:"
 
@@ -1529,26 +1551,26 @@ msgstr "Dono pode ler"
 msgid "Owner can write"
 msgstr "Dono pode escrever"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Antevisão"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
-msgstr "Omissões"
+msgstr "Padrão"
 
 #: src/bin/e_fm_prop.c:429
 msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -1564,50 +1586,41 @@ msgstr "Informações da ligação"
 msgid "Select an Image"
 msgstr "Selecione uma imagem"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Mover para"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Mover/ajustar tamanho"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Passível de ajuste"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Deslocar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Simples"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Encaixar"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Aspeto"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Remover"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Parar de mover/ajustar este \"gadget\""
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr "Parar de mover"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1656,14 +1669,14 @@ msgstr "Posição"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Tamanho"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Empilhamento"
@@ -1715,154 +1728,161 @@ msgstr "Sair da sessão com esta janela aberta"
 msgid "Remember these Locks"
 msgstr "Lembrar estes bloqueios"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Janela"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "Sempre por cima"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Fixa"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Definições"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Ecrã completo"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Restaurar"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Editar ícone"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Criar ícone"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Adicionar ao menu de favoritos"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Adicionar à IBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr "Criar atalho de teclado"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Colocação"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Ignorar"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Contorno"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Bloqueios"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Fixa"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Ignorar"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimizar"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr "Enrolar"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, c-format
 msgid "Screen %d"
 msgstr "Ecrã %d"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Sempre por cima"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Sempre por baixo"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Fixar na área de trabalho"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Desfixar da área de trabalho"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Selecione o tipo de contorno"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
-msgstr "Utilizar as preferências dos ícones E17"
+msgstr "Utilizar as preferências padrão dos ícones E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Utilizar ícone da aplicação"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Utilizar ícone definido pelo utilizador"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Criar resistência"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista de janelas"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Paginador"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Barra de tarefas"
 
@@ -1883,7 +1903,7 @@ msgid "ICCCM Properties"
 msgstr "Propriedades ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Título"
 
@@ -2057,7 +2077,6 @@ msgid "Size, Position and Locks"
 msgstr "Tamanho, posição e bloqueios"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Tudo"
 
@@ -2134,15 +2153,13 @@ msgid "Utilities"
 msgstr "Utilitários"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Ficheiros"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Iniciador"
 
@@ -2155,20 +2172,6 @@ msgstr "Núcleo"
 msgid "Mobile"
 msgstr "Móvel"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Definições"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Definições do módulo"
@@ -2206,7 +2209,7 @@ msgstr "Adicionar \"gadget\""
 msgid "Remove Gadget"
 msgstr "Remover \"gadget\""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Definições da barra de ferramentas"
 
@@ -2214,11 +2217,11 @@ msgstr "Definições da barra de ferramentas"
 msgid "Layout"
 msgstr "Disposição"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Método de introdução"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2234,7 +2237,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Aplicações favoritas"
 
@@ -2242,76 +2245,74 @@ msgstr "Aplicações favoritas"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplicações"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Janelas"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Janelas perdidas"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Sobre"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtual"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Painéis"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Mostrar/ocultar todas as janelas"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Sem aplicações)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Definir as área de trabalho virtuais"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Sem janelas)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Sem painéis)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Adicionar um painel"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Apagar um painel"
 
@@ -2346,7 +2347,7 @@ msgid "Shrink to Content Width"
 msgstr "Ajustar à largura do conteúdo"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Estilo"
 
@@ -2376,7 +2377,7 @@ msgid "Hide duration"
 msgstr "Ocultar duração"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -2393,7 +2394,7 @@ msgstr "Mostrar em todas as área de trabalho"
 msgid "Show on specified Desktops"
 msgstr "Mostrar nas áreas de trabalho indicadas"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2410,7 +2411,7 @@ msgstr ""
 "ou você não é o proprietário. Por favor, verifique:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2423,77 +2424,19 @@ msgstr ""
 "Por favor, verifique:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Opções:\n"
-"\t-display DISPLAY\n"
-"\t\tLiga ao ecrã com o nome DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdiciona um ecrã xinerama falso (ao invés dos reais)\n"
-"\t\tdado pela geometria. Adicione quantos quiser. Estes irão\n"
-"\t\tsubstituir os ecrãs reais, se existentes. Pode também ser\n"
-"\t\tser utilizado para simular o xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUtilize o perfil de configuração CONF_PROFILE ao invés do perfil "
-"selecionado pelo utilizador.\n"
-"\t-good\n"
-"\t\tSeja bondoso.\n"
-"\t-evil\n"
-"\t\tSeja maléfico.\n"
-"\t-psychotic\n"
-"\t\tSeja psicótico.\n"
-"\t-locked\n"
-"\t\tIniciar com bloqueio de área de trabalho para que lhe seja pedida a "
-"senha.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tSe precisar desta ajuda, você não precisa desta opção.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "O Enlightenment não consegue iniciar o Eina!\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o Ecore!\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "O Enlightenment não consegue iniciar o Eet!\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o sistema de ficheiros.\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "O Enlightenment não consegue iniciar o Ecore!\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2501,7 +2444,7 @@ msgstr ""
 "O Enlightenment não consegue configurar o sinal de saída.\n"
 "Será que tem memória suficiente?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2509,7 +2452,7 @@ msgstr ""
 "O Enlightenment não consegue configurar o sinal do HUP.\n"
 "Será que tem memória suficiente?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2517,63 +2460,31 @@ msgstr ""
 "O Enlightenment não consegue configurar o sinal de UTILIZADOR.\n"
 "Será que tem memória suficiente?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"O Enlightenment não consegue iniciar a ligação ao X.\n"
-"Configurou a variável DISPLAY?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"O Enlightenment não consegue iniciar o sistema de alertas.\n"
-"Configurou a variável DISPLAY?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "O Enlightenment não consegue iniciar o Ecore_IMF!\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o sistema de ligações.\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "O Enlightenment não consegue iniciar Ecore_File!\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o sistema IPC.\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "O Enlightenment não consegue iniciar Ecore_Con!\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"O Enlightenment não consegue configurar o xinerama.\n"
-"Não é suposto isto acontecer."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "O Enlightenment não consegue iniciar Ecore_Ipc!\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"O Enlightenment não consegue configurar o randr.\n"
-"Não é suposto isto acontecer."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "O Enlightenment não consegue iniciar Ecore_X!\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o Evas!\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "O Enlightenment não consegue iniciar Ecore_Evas!\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2583,7 +2494,7 @@ msgstr ""
 "processamento X11 no Evas. Por favor, verifique a instalação\n"
 "do Evas e do Ecore e verifique se ambos possuem suporte ao X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2593,7 +2504,31 @@ msgstr ""
 "\"Software Buffer\" no Evas. Por favor, verifique a instalação\n"
 "do Evas e do Ecore e verifique se ambos possuem suporte \"Software Buffer\"."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "O Enlightenment não consegue iniciar o Edje!\n"
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "O Enlightenment não consegue iniciar E_Intl!\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"O Enlightenment não consegue iniciar o sistema de alertas.\n"
+"Configurou a variável DISPLAY?"
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "O Enlightenment não consegue iniciar E_Xinerama!\n"
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "O Enlightenment não consegue iniciar E_Randr!\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2601,23 +2536,27 @@ msgstr ""
 "O Enlightenment não conseguiu criar os diretórios na sua pasta pessoal.\n"
 "A pasta pessoal existe? Será que o disco está cheio?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "O Enlightenment não consegue configurar o registo do sistema."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "O Enlightenment não consegue configurar o sistema de configurações."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr "O Enlightenment não consegue configurar este ambiente."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "O Enlightenment não consegue configurar o sistema de escalas."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr "O Enlightenment não consegue configurar o sistema de cursor."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "O Enlightenment não consegue configurar o sistema de cursores."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2625,94 +2564,42 @@ msgstr ""
 "O Enlightenment não consegue configurar os diretórios de pesquisa.\n"
 "Será que tem memória suficiente?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "O Enlightenment não consegue configurar as letras do sistema."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "O Enlightenment não consegue configurar o tema."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"O Enlightenment não consegue iniciar o ecrã.\n"
-"Será que tem memória suficiente?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
+msgstr "O Enlightenment não consegue configurar ecrã inicial."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Iniciando o suporte internacional"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "O Enlightenment não consegue configurar o sistema de internacionalização"
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "O Enlightenment não consegue iniciar o sistema FDO.\n"
-"Será que tem memória suficiente?"
-
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "A testar o suporte ao formato"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"O Enlightenment encontrou o Evas mas não conseguiu criar o \"buffer\" da "
-"tela.\n"
-"Verifique se o Evas tem suporte ao motor de \"Software Buffer\".\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"O Enlightenment encontrou o Evas mas não carregou os ficheiros PNG.\n"
-"Verifique se o Evas tem suporte ao carregamento de ficheiros PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"O Enlightenment encontrou o Evas mas não carregou os ficheiros JPEG.\n"
-"Verifique se o Evas tem suporte ao carregamento de ficheiros JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"O Enlightenment encontrou o Evas mas não carregou os ficheiros EET.\n"
-"Verifique se o Evas tem suporte ao carregamento de ficheiros EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"O Enlightenment encontrou o Evas mas não carregou o tipo de letra \"Sans\".\n"
-"Verifique se o Evas tem suporte e pode configurar o tipo de letra \"Sans\".\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Verificar o suporte a SVG"
+"Tem permissões de escrita em ~/.cache/efreet?\n"
+"Possui espaço livre em disco? A memória é suficiente?"
 
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Configurar ecrãs"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2720,202 +2607,358 @@ msgstr ""
 "Ocorreu uma falha ao configurar o gestor de janelas Enlightenment para os\n"
 "ecrã do seu sistema. Será que já existe outro gestor de janelas ativo?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Configurar ACPI"
+
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
+msgstr "Configurar iluminação"
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
+msgstr "O Enlightenment não consegue configurar a iluminação."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Configurar DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "O Enlightenment não consegue configurar as definições DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Configurar proteção de ecrã"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "O Enlightenment não consegue configurar o protetor de ecrã do X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
+msgstr "Configurar modos de energia"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+"O Enlightenment não consegue configurar os modos de poupança de energia."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Configurar bloqueio do sistema"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "O Enlightenment não consegue configurar o sistema de bloqueio."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Configurar alertas"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "O Enlightenment não consegue configurar o sistema de alertas."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr "Configurar mensagens do sistema"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Configurar caminhos"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Configuras controlos do sistema"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "O Enlightenment não consegue iniciar os comandos do sistema.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Configurar ações"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "O Enlightenment não consegue configurar o sistema de ações."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Configurar execuções do sistema"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "O Enlightenment não consegue configurar o sistema de execuções."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Configurar GF"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
+msgstr "Configurar gestor de ficheiros"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "O Enlightenment não consegue iniciar o gestor de ficheiros.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Configurar mensagens do sistema"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "O Enlightenment não consegue configurar o sistema de mensagens."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Configurar arrastar e largar"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "O Enlightenment não consegue configurar o sistema de arrastar e largar."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Configurar a gestão da captura de entradas"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
-"O Enlightenment não consegue configurar a gestão da captura de entradas."
+"O Enlightenment não consegue configurar o sistema da captura de entradas."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Configurar módulos"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "O Enlightenment não consegue configurar o sistema de módulos."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Configurar lembretes"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "O Enlightenment não consegue configurar as definições de lembretes."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Configurar classes de cor"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "O Enlightenment não consegue configurar as classes de cor."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Configurar Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "O Enlightenment não consegue configurar o sistema de \"gadgets\"."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Configurar ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Configurar DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "O Enlightenment não consegue configurar as definições DPMS."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Configurar poupança de energia"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-"O Enlightenment não consegue configurar os modos de poupança de energia."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Configurar papel de parede"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "O Enlightenment não consegue configurar a imagem da área de trabalho."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Configurar rato"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "O Enlightenment não consegue configurar as definições do rato."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Configurar atalhos"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "O Enlightenment não consegue configurar o sistema de atalhos."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Configurar painéis"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "O Enlightenment não consegue configurar o sistema do painel."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Configurar miniaturas"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "O Enlightenment não consegue configurar o sistema de miniaturas.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "O Enlightenment não consegue iniciar a cache de ícones.\n"
+
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "O Enlightenment não consegue iniciar o sistema XSettings.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr "Configurar ambiente de trabalho"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "O Enlightenment não consegue iniciar o ambiente de trabalho.\n"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Configurar organização de ficheiros"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 "O Enlightenment não consegue configurar o sistema de organização dos "
 "ficheiros."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Carregar módulos"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configurar painéis"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Quase terminado"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Opções:\n"
+"\t-Ecrã DISPLAY\n"
+"\t\tLiga ao ecrã com o nome DISPLAY.\n"
+"\t\tEx: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdiciona um ecrã xinerama falso (ao invés dos reais)\n"
+"\t\tDado pela geometria. Adicione quantos quiser. Estes irão\n"
+"\t\tsubstituir os ecrãs reais, se existentes. Pode também ser\n"
+"\t\tser utilizado para simular o xinerama.\n"
+"\t\tEx: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUtilize o perfil de configuração CONF_PROFILE ao invés do perfil "
+"selecionado pelo utilizador.\n"
+"\t-good\n"
+"\t\tSeja bondoso.\n"
+"\t-evil\n"
+"\t\tSeja maléfico.\n"
+"\t-psychotic\n"
+"\t\tSeja psicótico.\n"
+"\t-locked\n"
+"\t\tIniciar com bloqueio de área de trabalho para que lhe seja pedida a "
+"senha.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tSe precisar desta ajuda, você não precisa desta opção.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+"Está a executar diretamente o enlightenment. Isto\n"
+"não é bom. Não execute o ficheiro \"enlightenment\".\n"
+"Utilize o lançador \"enlightenment_start\". Este irá\n"
+"fazer a gestão das variáveis de ambiente, caminhos,\n"
+"bem como iniciar outros serviços necessários,\n"
+"antes da sessão ser iniciada.\n"
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "A testar o suporte ao formato"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"O Enlightenment encontrou o Evas mas não conseguiu criar o \"buffer\" da "
+"tela.\n"
+"Verifique se o Evas tem suporte ao motor de \"Software Buffer\".\n"
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"O Evas mas não consegue abrir os ficheiros SVG. Verifique se o Evas tem "
+"suporte a ficheiros SVG.\n"
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"O Evas mas não consegue abrir os ficheiros JPEG. Verifique se o Evas tem "
+"suporte a ficheiros JPEG.\n"
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"O Evas mas não consegue abrir os ficheiros PNG. Verifique se o Evas tem "
+"suporte a ficheiros PNG.\n"
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"O Evas mas não consegue abrir os ficheiros EET. Verifique se o Evas tem "
+"suporte a ficheiros EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"O Enlightenment encontrou o Evas mas não carregou o tipo de letra \"Sans\".\n"
+"Verifique se o Evas tem suporte e pode configurar o tipo de letra \"Sans\".\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
@@ -2923,11 +2966,11 @@ msgstr ""
 "O Enlightenment terminou ao iniciar e<br>foi reiniciado. Ocorreu um erro ao "
 "carregar o<br>módulo: %s. Este módulo foi desativado<br>e não será carregado."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "O Enlightenment terminou ao iniciar e foi reiniciado."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2938,7 +2981,7 @@ msgstr ""
 "carregar o módulo: %s.<br><br>Este módulo foi desativado e não será "
 "carregado."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2950,7 +2993,7 @@ msgstr ""
 "corrigir os problemas<br>dos módulos. O diálogo de configuração<br>dos "
 "módulos deve permitir-lhe escolher<br>os módulos a carregar."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2962,20 +3005,12 @@ msgstr ""
 "corrigir os problemas dos módulos.<br><br>O diálogo de configuração dos "
 "módulos deve permitir-lhe escolher<br>os módulos a carregar."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configurar painéis"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Quase terminado"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Carregando módulo: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2984,11 +3019,11 @@ msgstr ""
 "Ocorreu um erro ao carregar o módulo: %s<br>Nenhum módulo com o nome %s foi "
 "encontrado nos<br>diretórios dos módulos.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Erro ao carregar o módulo"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2997,11 +3032,11 @@ msgstr ""
 "Ocorreu um erro ao carregar o módulo: %s<br>O caminho para o módulo é:<br>"
 "%s<br>O erro reportado foi:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "O módulo não contém as funções necessárias"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3011,16 +3046,16 @@ msgstr ""
 "Erro na API do módulo<br>Erro ao iniciar o módulo: %s<br>O módulo requer a "
 "versão mínima API: %i.<br>O módulo API com advertências é: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s do Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Pretende desativar este módulo?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3034,26 +3069,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Painel #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem a certeza que quer apagar este painel?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Pediu para apagar este painel.<br><br>Tem a certeza que o quer apagar?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
-msgstr "Parar a deslocar/ajustar os \"gadgets\""
+msgstr "Parar de deslocar/ajustar os \"gadgets\""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Iniciar a deslocação/ajustamento de \"gadgets\""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Conteúdo"
 
@@ -3061,16 +3096,16 @@ msgstr "Conteúdo"
 msgid "Starting"
 msgstr "A iniciar"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "A verificar as permissões do sistema"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Terminadas as verificações"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3081,35 +3116,35 @@ msgstr ""
 "querem ser fechadas.<br>Pretende continuar<br>apesar das aplicações<br>não "
 "terem sido fechadas?<br><br>Saída automática em %d segundos."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Erro ao sair da sessão"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Sair agora"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Esperar um pouco"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Cancelar"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "A sair da sessão"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "A sair da sessão.<br><hilight>Por favor, aguarde.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "O Enlightenment está ocupado com outro pedido"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3117,7 +3152,7 @@ msgstr ""
 "A sair da sessão.<br>Não pode executar quaisquer outras ações<br>após o "
 "início do processo."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3125,7 +3160,7 @@ msgstr ""
 "A desligar.<br>Não pode executar quaisquer outras ações<br>após o início do "
 "processo."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3133,7 +3168,7 @@ msgstr ""
 "Restaurando.<br>Não pode executar quaisquer outras ações<br>após o início do "
 "processo."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3141,63 +3176,63 @@ msgstr ""
 "A suspender.<br>Não pode executar quaisquer outras ações<br>após o início do "
 "processo."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "A hibernar.<br>Não pode executar quaisquer outras ações<br>após o início do "
 "processo."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! Não é suposto isto acontecer"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Falha ao desligar."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Falha ao repor."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Falha ao suspender."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Falha ao hibernar."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Desligar"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "A desligar.<br><hilight>Por favor, aguarde.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "A repor"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "A repor.<br><hilight>Por favor, aguarde.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "A suspender"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "A suspender<br><hilight>Por favor, aguarde.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "A hibernar"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "A hibernar.<br><hilight>Por favor, aguarde.</hilight>"
 
@@ -3205,33 +3240,33 @@ msgstr "A hibernar.<br><hilight>Por favor, aguarde.</hilight>"
 msgid "About Theme"
 msgstr "Sobre o tema"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Definir como tema"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar de deslocar/ajustar itens"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Iniciar a deslocação/ajustamento de itens"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Definir o conteúdo da barra de ferramentas"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "O Enlightenment não conseguiu derivar o processo:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Não pode sair- janelas não termináveis."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3241,123 +3276,123 @@ msgstr ""
 "significa que<br>não pode sair do Enlightenment até que essas janelas "
 "sejam<br>fechadas ou que o bloqueio seja removido.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "No futuro"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "No último minuto"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anos atrás"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li meses atrás"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li semanas atrás"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dias atrás"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li horas atrás"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minutos atrás"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Definições de importação de imagens"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Importar"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opções de preenchimento e ajuste"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Esticar"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrar"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Dentro"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Preencher"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualidade"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Utilizar original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3370,17 +3405,17 @@ msgstr ""
 "Os dados da configuração precisam de ser atualizados. As suas antigas "
 "configurações foram apagadas e foram iniciados novos valores padrão.<br>Isto "
 "irá ocorrer recorrentemente durante o desenvolvimento e não deve reportar "
-"nenhum erro.<br>Isto apenas significa que o módulo precisa de dados que as "
+"nenhum erro.<br>Isto apenas significa que o módulo precisa de dados que a "
 "sua antiga configuração não possui.<br>Este conjunto de valores irá corrigir "
 "esse facto.<br>Mais tarde, poderá configurar os dados ao seu gosto. Desculpe "
 "qualquer inconveniente.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "Configuração %s atualizada"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3391,8 +3426,8 @@ msgstr ""
 "A configuração do seu módulo é mais recente que a do módulo.<br>Isto é muito "
 "estranho e só acontece se reverter o módulo<br>ou caso tenha copiado a "
 "configuração de um local em que está instalada uma versão mais recente do "
-"módulo.<br>Isto é mau e por precaução, as suas definições foram restauradas "
-"para as omissões.<br>Desculpe qualquer inconveniente.<br>"
+"módulo.<br>Isto é mau e por precaução, as suas definições originais foram "
+"restauradas.<br>Desculpe qualquer inconveniente.<br>"
 
 #: src/bin/e_widget_config_list.c:60
 #: src/modules/conf_applications/e_int_config_apps.c:235
@@ -3413,139 +3448,144 @@ msgstr "Subir"
 msgid "Down"
 msgstr "Descer"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Subir um diretório"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 msgid "Resolution:"
 msgstr "Resolução:"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permissões:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Você"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Só leitura"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Leitura-Escrita"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Definições do monitor da bateria"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta se a bateria estiver fraca"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Verificar a cada:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f toques"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+msgid "Hibernate when below:"
+msgstr "Hibernar se inferior a:"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Análise"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Mostrar alerta de bateria fraca"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Alertar com:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Ignorar automaticamente em..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f seg"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Alerta"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Deteção automática"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Modo difuso"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Equipamento"
 
@@ -3553,35 +3593,35 @@ msgstr "Equipamento"
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "A bateria está fraca!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Deve ligar à corrente."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ERRO"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Medidor de bateria"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Relógio"
 
-#: src/modules/clock/e_mod_main.c:631
-#, fuzzy
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 msgid "Show calendar"
-msgstr "Mostrar barra de ferramentas"
+msgstr "Mostrar calendário"
 
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:268
 #: src/modules/conf/e_mod_main.c:367 src/modules/conf/e_mod_main.c:474
@@ -3622,8 +3662,8 @@ msgstr ""
 "A configuração do seu módulo é mais recente que a do módulo.<br>Isto é muito "
 "estranho e só acontece se reverter o módulo<br>ou caso tenha copiado a "
 "configuração de um local em que está instalada uma versão mais recente do "
-"módulo.<br>Isto é mau e por precaução, as suas definições foram restauradas "
-"para as omissões.<br>Desculpe qualquer inconveniente.<br>"
+"módulo.<br>Isto é mau e por precaução, as suas definições originais foram "
+"restauradas.<br>Desculpe qualquer inconveniente.<br>"
 
 #: src/modules/conf/e_mod_main.c:443
 msgid "Presentation"
@@ -3643,17 +3683,17 @@ msgstr "A configuração do painel de configurações foi atualizada"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplicações IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplicações de arranque"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Reiniciar aplicações"
 
@@ -3666,10 +3706,22 @@ msgid "Apps"
 msgstr "Aplicações"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nova aplicação"
+msgid "Create Launcher"
+msgstr "Criar lançador"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr "Apagar lançadores pessoais"
+
+#: src/modules/conf_applications/e_mod_main.c:45
+msgid "Default Applications"
+msgstr "Aplicações padrão"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+msgid "Desktop Environments"
+msgstr "Ambientes de trabalho"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Outras IBar"
 
@@ -3682,7 +3734,7 @@ msgid "Available Profiles"
 msgstr "Perfis disponíveis"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Selecione um perfil"
 
@@ -3720,9 +3772,9 @@ msgstr "Definições dos diálogos"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Definições gerais"
 
@@ -3754,7 +3806,7 @@ msgstr "Lembrar tamanho e posição dos diálogos"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:163
 msgid "Default Dialog Mode"
-msgstr "Diálogos por omissão"
+msgstr "Diálogos padrão"
 
 #: src/modules/conf_dialogs/e_mod_main.c:18
 msgid "Dialogs"
@@ -3764,7 +3816,7 @@ msgstr "Diálogos"
 msgid "Profiles"
 msgstr "Perfis"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3775,7 +3827,7 @@ msgstr ""
 "não premir o botão, a resolução antiga de<br>%dx%d e %d Hz será restaurada "
 "em %d segundos."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3786,7 +3838,7 @@ msgstr ""
 "não premir o botão, a resolução antiga de<br>%dx%d será restaurada em %d "
 "segundos."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3797,7 +3849,7 @@ msgstr ""
 "<br>Se não premir o botão, a resolução antiga de<br>%dx%d e %d Hz será "
 "restaurada <hilight>imediatamente</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3808,47 +3860,47 @@ msgstr ""
 "não premir o botão, a resolução antiga de<br>%dx%d será restaurada "
 "<hilight>imediatamente</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Alteração da resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Gravar"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Restaurar"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Definições da resolução do ecrã"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaurar ao iniciar"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Taxa de atualização"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotação"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Refletir"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Funções em falta"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3861,11 +3913,11 @@ msgstr ""
 "<br>É também possível que<br>na altura em que o <hilight>ecore</hilight> foi "
 "compilado,<br>não foi detetado o suporte ao XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Taxas de atualização não encontradas"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3879,89 +3931,72 @@ msgstr ""
 "definir<br>a resolução e tal facto poderá <hilight>danificar</hilight> o seu "
 "ecrã."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Definições das área de trabalho virtuais"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Número de áreas de trabalho"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Mudança da área de trabalho"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Mudar ao arrastar os objetos para os limites do ecrã"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Cobrir áreas de trabalho ao mudar"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Áreas de trabalho"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Desligado"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Secção"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Ampliação"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Movimento do fundo"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Velocidade da animação"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f seg"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Fator de movimento do eixo X"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Fator de movimento do eixo Y"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animação da mudança"
 
@@ -3978,7 +4013,7 @@ msgid "Desktop Wallpaper"
 msgstr "Imagem da área de trabalho"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Definir"
 
@@ -3988,12 +4023,12 @@ msgstr "Selecione um fundo..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Pessoal"
 
@@ -4001,184 +4036,210 @@ msgstr "Pessoal"
 msgid "Screen Lock Settings"
 msgstr "Definições do bloqueio do ecrã"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Bloquear ao iniciar"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Bloquear ao suspender"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Comando de bloqueio personalizado"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "A bloquear"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Mostrar em todos os ecrãs"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Mostrar no ecrã atual"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Mostrar no ecrã #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Caixa de início de sessão"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Bloquear depois de ativar o protetor de ecrã do X"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f segundos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Bloquear se exceder o tempo de inatividade"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Temporizadores"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Sugerir se desativado antes de"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Modo de demonstração"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Definido pelo tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Papel de parede do tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Papel de parede atual"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Papel de parede"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Definições da proteção de ecrã"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Ativar proteção de ecrã X"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Suspend on blank"
+msgstr "Suspender se vazia"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr "Mesmo se ligado à corrente"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr "Atraso até à suspensão"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Proteção de ecrã"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Tempo limite inicial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Alternação do tempo limite"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Apagando"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferida"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Não preferida"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Eventos de exposição"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Não permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Sinalização da gestão de energia"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "O servidor de exibição atual não tem<br>suporte a DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "O servidor de exibição atual não possui<br>a extensão DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Definições da gestão de energia"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ativar gestão de energia"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "\"Standby\""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Suspender"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Desligar"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr "DPMS"
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr "Normal"
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr "Escurecer iluminação"
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr "Duração"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr "Iluminação"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Áreas de trabalho virtuais"
@@ -4225,74 +4286,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Definições das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Adicionar atalho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Apagar atalho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modificar atalho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Apagar tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
-msgstr "Restaurar os atalhos omissos"
+msgstr "Restaurar os atalhos padrão"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parâmetros da ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Opções gerais"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir atalhos com janelas em ecrã completo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Combinação da associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Margem clicável"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Erro ao associar as margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4301,28 +4362,28 @@ msgstr ""
 "A combinação para o atalho do teclado já está a ser utilizada pela "
 "ação<br><hilight>%s</hilight>.<br>Por favor, escolha outra combinação."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4471,34 +4532,51 @@ msgstr ""
 "O Enlightenment não conseguiu importar a configuração<br>devido a erros de "
 "cópia."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Definições de idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr "Problemas com idiomas"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+"Você definiu algumas variáveis de localização<br>que podem interferir com o "
+"idioma escolhido.<br>Se não as quiser afetar, utilize as definições das "
+"variáveis de ambiente<br> para não as utilizar. As variáveis de ambiente que "
+"podem afetar o seu idioma são as seguintes:<br><br>%s."
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Seletor de idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
-msgstr "Omissões do sistema"
+msgstr "Padrões do sistema"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Idioma selecionado"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Idioma"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Idioma"
 
@@ -4586,17 +4664,17 @@ msgid "Manager"
 msgstr "Gestor"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nada"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Combinação dos atalhos do rato"
 
@@ -4605,9 +4683,8 @@ msgid "Keys"
 msgstr "Teclas"
 
 #: src/modules/conf_keybindings/e_mod_main.c:25
-#, fuzzy
 msgid "Mouse Buttons"
-msgstr "Definições do rato"
+msgstr "Botões do rato"
 
 #: src/modules/conf_keybindings/e_mod_main.c:29
 msgid "Hardware Switches"
@@ -4619,21 +4696,19 @@ msgid "Menu Settings"
 msgstr "Definições de menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 msgid "Enlightenment Default"
-msgstr "Omissões Enlightenment"
+msgstr "Padrões do Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 msgid "Personal Default"
-msgstr "Omissões pessoais"
+msgstr "Padrões pessoais"
 
 #: src/modules/conf_menus/e_int_config_menus.c:257
 msgid "Main Menu"
 msgstr "Menu principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Favoritos"
 
@@ -4650,7 +4725,7 @@ msgid "Comments"
 msgstr "Comentários"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4661,7 +4736,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Mostrar definições do \"gadget\" no nível superior"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menus"
 
@@ -4729,19 +4804,19 @@ msgid "Images"
 msgstr "Imagens"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Tipo de letra"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temas"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ícones"
 
@@ -4887,18 +4962,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Definições do papel de parede"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Utilizar papel de parede do tema"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Imagem..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "\"On-line\"..."
 
@@ -4918,46 +4993,50 @@ msgstr "Nesta área de trabalho"
 msgid "This Screen"
 msgstr "Neste ecrã"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Definições do papel de parede..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Mosaico"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+msgid "Pan"
+msgstr "Pan"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Selecione uma imagem..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Erro ao importar a imagem"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "O Enlightenment não conseguiu importar a imagem<br>devido a erros de "
 "conversão."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Erro ao importar o papel de parede"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "O Enlightenment não conseguiu importar o papel de parede<br>devido a erros "
 "de cópia."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4994,7 +5073,7 @@ msgid "Error: can't start the request."
 msgstr "Erro: incapaz de iniciar o pedido."
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Estilo dos contornos"
 
@@ -5002,7 +5081,7 @@ msgstr "Estilo dos contornos"
 msgid "Window Border Selection"
 msgstr "Contorno da janela selecionada"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Lembrar o contorno para esta janela na próxima vez que ela aparecer"
 
@@ -5031,7 +5110,7 @@ msgid "Menu Background Base"
 msgstr "Bases para o fundo do menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Título do menu"
 
@@ -5040,7 +5119,7 @@ msgid "Menu Title Active"
 msgstr "Título de menu ativo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Item de menu"
 
@@ -5053,12 +5132,12 @@ msgid "Menu Item Disabled"
 msgstr "Item do menu inativo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Mover texto"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Ajustar tamanho do texto"
 
@@ -5075,7 +5154,7 @@ msgid "Winlist Label"
 msgstr "Etiqueta da lista de janelas"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Título da lista de janelas"
 
@@ -5092,377 +5171,387 @@ msgid "File Manager Background Base"
 msgstr "Bases para o fundo do gestor de ficheiros"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Foco"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Texto do botão"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Texto do botão inativo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Texto da caixa de verificação"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Texto da caixa de verificação inativa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Texto de entrada"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Texto da entrada inativa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Texto da etiqueta"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Texto selecionado numa lista de itens"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Texto numa lista de itens (par)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Bases para o fundo da lista de itens (par)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Texto numa lista de itens (ímpar)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Bases para o fundo da lista de itens (ímpar)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Texto no cabeçalho da lista (par)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Bases para o fundo do cabeçalho da lista (par)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Texto no cabeçalho da lista (ímpar)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Bases para o fundo do cabeçalho da lista (ímpar)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Texto da caixa de opções"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Texto da caixa de opções inativa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Texto do cursor"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Texto do cursor inativo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Bases para o fundo da imagem"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Bases para o fundo da imagem da deslocação"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Etiqueta do módulo"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Cor ao retirar o realçe"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Cores"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Cor da classe: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Selecionou %u classes de cores mistas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Selecionou %u classes de cores não definidas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Selecionou %u classes de cores uniformes"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Nenhuma classe de cor selecionada"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Cores personalizadas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Objeto:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Contorno exterior:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Sombra:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Texto com cores aplicadas."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "As cores dependem da capacidade do tema."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Gestor de janelas"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "\"Widgets\""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Outros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Barra de título"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Bloco de texto simples"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Bloco de texto pequeno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Bloco de texto grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Cabeçalho de definições"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Sobre o título"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Sobre a versão"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Sobre o texto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Título do bloqueio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Senha do bloqueio"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Diálogo de erro"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Comando Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Título inicial"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Texto inicial"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Versão"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr "Relógio digital"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Imagem"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Botões"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Cursor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Botões de opção"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Botões de seleção"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Item da lista de texto"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Item da lista"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Cabeçalho da lista"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Gestor de ficheiros"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Ícone da área de trabalho"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Pequeno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Pequeno com estilo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normal com estilo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Grande com estilo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Definições da letra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Pequena"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Muito grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixeis"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ativar classes personalizadas de letras"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Antevisão básica do texto: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Classes da letra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Ativar classes de letra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Tipo de letra"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Antevisão avançada do texto: 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Sugestões"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "\"Bytecode\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Letra de recurso"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nome de recurso"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Ativar opções de recurso"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Sugestões/Recursos"
 
@@ -5470,11 +5559,15 @@ msgstr "Sugestões/Recursos"
 msgid "Icon Theme Settings"
 msgstr "Definições dos ícones"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Ativar tema de ícones"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr "Utilizar tema de ícones para as aplicações"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "Os ícones substituem o tema geral"
 
@@ -5539,11 +5632,9 @@ msgid "Custom scaling factor"
 msgstr "Escala personalizada"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
-msgstr "%1.2f vezes"
+msgid "%1.2f x"
+msgstr "%1.2f x"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5554,6 +5645,12 @@ msgstr "Política"
 msgid "Minimum"
 msgstr "Mínimo"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f vezes"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Máximo"
@@ -5574,25 +5671,25 @@ msgstr "Mostrar ecrã inicial ao arrancar"
 msgid "Transition Settings"
 msgstr "Definições de transição"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Eventos"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Arranque"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Alteração de área de trabalho"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Alteração do fundo"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transições"
 
@@ -5608,15 +5705,15 @@ msgstr "Importar..."
 msgid " Online..."
 msgstr "\"On-line\"..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Categorias de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Limpar tudo"
 
@@ -5646,19 +5743,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Trocar temas"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Contornos"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema de ícones"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Cursor do rato"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Escala"
 
@@ -5779,6 +5876,10 @@ msgstr "Disponibilizado pela aplicação"
 msgid "Border Icon"
 msgstr "Contorno dos ícones"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Colocação"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Colocação inteligente"
@@ -5807,23 +5908,43 @@ msgstr "Novas janelas"
 msgid "Animate"
 msgstr "Animar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linear"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Acelerar e depois desacelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Desacelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+msgid "Pronounced Accelerate"
+msgstr "Acelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+msgid "Pronounced Decelerate"
+msgstr "Desacelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Acelerar e depois desacelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr "Saltitar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr "Saltitar mais"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Escurecer"
 
@@ -5844,6 +5965,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Janelas mais recentes sobre o rato"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Clique"
 
@@ -5875,11 +5997,6 @@ msgstr "Apenas diálogos"
 msgid "Only dialogs with focused parent"
 msgstr "Apenas os diálogos com janela realçada"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Foco"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Outras definições"
@@ -5977,13 +6094,13 @@ msgid "Fill available space"
 msgstr "Preencher espaço disponível"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical"
@@ -6040,7 +6157,7 @@ msgid "Raise when clicking to focus"
 msgstr "Erguer ao clicar para realçar"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Foco"
 
@@ -6297,28 +6414,28 @@ msgstr "Muito leve"
 msgid "Dropshadow"
 msgstr "Sombra na retaguarda"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Everything - Lançador"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Mostrar Everything - Lançador"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Everything - Configuração"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Mostrar janela Everything"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Módulo Everything"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Executar Everything"
 
@@ -6326,144 +6443,144 @@ msgstr "Executar Everything"
 msgid "Everything Settings"
 msgstr "Definições do Everything"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "\"Plug-ins\" disponíveis"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Mover para cima"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Mover para baixo"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Configurar"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Ativo"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Mostrar em \"Tudo\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Mostrar no nível superior"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Mínimo de caracteres para pesquisa"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Invocador do \"plug-in\""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Default é o nome do \"plug-in\""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Apenas pesquisar se invocado"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Visualização de \"plug-ins\""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Detalhado"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Visualização padrão"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Deslocação animada"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Cima/Baixo seleciona o próximo item na visualização"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Ocultar entrada se inativo"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Ocultar lista"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Navegação rápida"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Estilo Emacs (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Estilo Vi (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Visualização por omissão"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Deslocação animada"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Cima/Baixo seleciona o próximo item na visualização"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Ordenação"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+msgid "No Sorting"
+msgstr " Sem ordenação"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "Por utilização"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Mais utilizado"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Último utilizado"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "\"Plug-ins\" temáticos"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "\"Plug-ins\" de ação"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "\"Plug-ins\" de objeto"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "\"Plug-ins\""
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Tamanho do alerta"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Largura do alerta"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Altura do alerta"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Alinhamento do alerta"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6472,35 +6589,27 @@ msgstr "Alinhamento do alerta"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Tamanho das margens do alerta"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Geometria"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Everything - Coleção"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Ações"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Itens"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Sem \"plug-ins\" carregados"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Copiar para a área de transferência"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6540,145 +6649,59 @@ msgstr ""
 "alterna os modos de visualização em lista<br><hilight>&lt;ctrl+3&gt;</"
 "hilight> alterna os modos de visualização em miniaturas"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Abrir com..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Abrir ficheiro..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Editar entrada da aplicação"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Nova entrada de aplicação"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Executar com Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Abrir com..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Abrir aqui um terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Processar executável"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Everything - Aplicações"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Comando do terminal"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Interface Sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 msgid "Everything Plugin"
 msgstr "Everything - \"Plug-in\""
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Calculadora"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Copiar para..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Mover para..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Mover para o lixo"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Abrir pasta (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Ordenar por data"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Ordenar por nome"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Ficheiros recentes"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Everything - Ficheiros"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Mostrar ficheiros recentes"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Pesquisar ficheiros recentes"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Pesquisar ficheiros em \"cache\""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Colocar em \"cache\" os diretórios visitados"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Limpar \"cache\""
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Mostrar janela"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Mudar para a janela"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Trocar para ecrã completo"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Enviar para a área de trabalho"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ícones de ficheiros"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipos de ficheiro"
 
@@ -6712,7 +6735,7 @@ msgstr "Utilizar imagem"
 
 #: src/modules/fileman/e_int_config_mime_edit.c:161
 msgid "Use Default"
-msgstr "Utilizar omissões"
+msgstr "Utilizar padrões"
 
 #: src/modules/fileman/e_int_config_mime_edit.c:290
 msgid "Select an Edje file"
@@ -6723,19 +6746,19 @@ msgid "Select an image"
 msgstr "Selecione uma imagem"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Gestor de ficheiros"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Pasta pessoal"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6753,7 +6776,7 @@ msgstr ""
 "corrigir esse facto.<br>Mais tarde poderá configurar o módulo ao seu gosto. "
 "Desculpe qualquer inconveniente.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6765,10 +6788,10 @@ msgstr ""
 "A configuração do seu módulo é mais recente que a do módulo.<br>Isto é muito "
 "estranho e só acontece se reverter o módulo<br>ou caso tenha copiado a "
 "configuração de um local em que está instalada uma versão mais recente do "
-"módulo.<br>Isto é mau e por precaução, as suas definições foram restauradas "
-"para as omissões.<br>Desculpe qualquer inconveniente.<br>"
+"módulo.<br>Isto é mau e por precaução, as suas definições originais foram "
+"restauradas.<br>Desculpe qualquer inconveniente.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Definições do gestor de ficheiros atualizadas"
 
@@ -6845,95 +6868,99 @@ msgstr "Abrir gestor de ficheiros ao montar"
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Ir para o diretório superior"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Outra aplicação..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Abrir com..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Aplicações conhecidas"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Aplicações específicas"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Todas as aplicações"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Comando personalizado"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "A cópia foi cancelada"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "A movimentação foi cancelada"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "A exclusão foi cancelada"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Foi abortada uma operação desconhecida"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Terminou a cópia de %s"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "A copiar %s (est: %d seg)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Terminou a movimentação de %s"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "A mover %s (est: %d seg)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "concluiu a exclusão"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Apagando ficheiros..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6968,7 +6995,7 @@ msgstr "A processar %d operação(ões)"
 msgid "Filemanager is idle"
 msgstr "O gestor de ficheiros está inativo"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Info da operação EFM"
 
@@ -6980,35 +7007,39 @@ msgstr "Gestor de \"gadgets\""
 msgid "Available Gadgets"
 msgstr "\"Gadgets\" disponíveis"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Modo"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Imagem personalizada"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Cor personalizada"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparente"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animações"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Imagem de fundo"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Opções do fundo"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Mover/ajustar tamanho"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Livre"
@@ -7230,15 +7261,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Tem a certeza que quer apagar esta barra?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Criar novo ícone"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -7282,7 +7313,7 @@ msgstr "Mostrar janelas de todas as áreas de trabalho"
 msgid "Show windows from active desktop"
 msgstr "Mostrar janelas da área de trabalho ativa"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7404,31 +7435,31 @@ msgstr ""
 "objeto de manipulação pelos<br>menus de contexto.<br>Este botão só funciona "
 "nos alertas."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Mostrar alerta do paginador"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Na área de trabalho à direita"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Na área de trabalho à esquerda"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Na área de trabalho de cima"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Na área de trabalho de baixa"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Na área de trabalho seguinte"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Na área de trabalho anterior"
 
@@ -7448,139 +7479,97 @@ msgstr "Controlos do sistema"
 msgid "Temperature Settings"
 msgstr "Definições de temperatura"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensors"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Unidades de exibição"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Intervalo de verificação"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Temperatura elevada"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Temperatura reduzida"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Temperaturas"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Bem-vindo ao Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Selecione um"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-"Não foram encontrados<br>os ficheiros de menu.<br>Por favor, veja "
-"a<br>documentação em<br>www.enlightenment.org<br>para mais detalhes<br> "
-"sobre fazer que <br>os menus da aplicação<br>funcionem."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
+msgstr "Ajuste de tamanho"
 
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Selecione o menu da aplicação"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "Selecione o tamanho"
 
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Barra de lançador"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr "Focar por..."
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Selecione as aplicações"
+#: src/modules/wizard/page_060.c:37
+msgid "Mouse Over"
+msgstr "Ao pasar com o rato"
 
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Ficheiros da área de trabalho"
+#: src/modules/mixer/app_mixer.c:161
+msgid "Capture"
+msgstr "Captura"
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Sem ícones na área de trabalho"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Ativar ícones na área de trabalho"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Modo de realce"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Clique para realçar as janelas"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Realçar janelas ao passar com o rato"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Selecione os ícones a adicionar"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Início rápido"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Selecione as aplicações"
-
-#: src/modules/mixer/app_mixer.c:161
-msgid "Capture"
-msgstr "Captura"
-
-#: src/modules/mixer/app_mixer.c:163
-msgid "Playback"
-msgstr "Reprodução"
+#: src/modules/mixer/app_mixer.c:163
+msgid "Playback"
+msgstr "Reprodução"
 
 #: src/modules/mixer/app_mixer.c:283
 msgid "Output"
@@ -7614,7 +7603,7 @@ msgstr "Esquerdo:"
 msgid "Right:"
 msgstr "Direito:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -7638,40 +7627,52 @@ msgstr "Mostrar alerta ao alterar o volume através do teclado"
 msgid "Sound Cards"
 msgstr "Placas de som"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
-msgstr "Definições do misturador"
+msgstr "Definições do gestor de som"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Misturador a utilizar para ações globais:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr "Exibir notificações ao alterar o volume"
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
-msgstr "Iniciar misturador..."
+msgstr "Iniciar gestor de som..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
-msgstr "Definições do misturador"
+msgstr "Definições do módulo de som"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr "Novo volume"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr "Gestor de som"
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr "Volume alterado"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
-msgstr "As definições do misturador foram atualizadas"
+msgstr "As definições do gestor de som foram atualizadas"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"As definições do módulo de mistura foram alterados.<br>A sua configuração "
-"foi substituída por novas omissões.<br>Desculpe qualquer inconveniente."
+#: src/modules/mixer/e_mod_main.c:1334
+msgid "Mixer Module"
+msgstr "Módulo gestor de som"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Não foi possível alternar para o modo \"off-line\"."
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "O serviço ConnMan não está em execução."
 
@@ -7700,119 +7701,1476 @@ msgstr "Mostrar senha como texto simples"
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Desligar do serviço de rede."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "O serviço já não existe"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Ligar a um serviço de rede."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Não foi possível definir a senha do serviço"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Modo \"off-line\""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Controlos"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Sem ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "O servidor ConnMan não foi encontrado."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Modo \"off-line\": todas as caixas de opção desligadas"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Sem ligação"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Não ligado"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "desligar"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Nome desconhecido"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Sem erro"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "inativo"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "associação"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "configuração"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "pronto"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "início de sessão"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "\"on-line\""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "falha"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "ativo"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "disponível"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "ligado"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "desligado"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Já existe uma bandeja do sistema"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Apenas pode existir uma bandeja de sistema e você já a tem."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr "Erro na bandeja do sistema"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr "A bandeja não funciona num painel que esteja por baixo do Everything."
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Bandeja do sistema"
 
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "O Enlightenment não consegue configurar este ambiente."
+#~ msgid "Spell checker"
+#~ msgstr "Correcteur orthographique"
+
+#~ msgid "Hunspell"
+#~ msgstr "Hunspell"
+
+#~ msgid "Enable Composite Support ?"
+#~ msgstr "Activer le support de l'extension composite ?"
+
+#~ msgid "Create a gradient..."
+#~ msgstr "Créer un dégradé…"
+
+#~ msgid "Diagonal Up"
+#~ msgstr "Diagonale montante"
+
+#~ msgid "Diagonal Down"
+#~ msgstr "Diagonale descendante"
+
+#~ msgid "Radial"
+#~ msgstr "Radial"
+
+#~ msgid "Geometry when moving or resizing"
+#~ msgstr "Géométrie en déplacement ou redimensionnement"
+
+#~ msgid "Keyboard move and resize"
+#~ msgstr "Déplacement et redimensionnement au clavier"
+
+#~ msgid "Move after resize on window configure request"
+#~ msgstr "Déplacer après redimensionnement"
+
+#~ msgid "Gradient..."
+#~ msgstr "Dégradé…"
+
+#~ msgid "Browse Folder..."
+#~ msgstr "Parcourir un dossier..."
+
+#~ msgid "Maximum History to List"
+#~ msgstr "Longueur max de l'historique à lister"
+
+#~ msgid "Command (CTRL+RETURN to utilize)"
+#~ msgstr "Commande (Ctrl+Entrée pour utiliser)"
+
+#~ msgid "Run Command Dialog"
+#~ msgstr "Fenêtre de commande"
+
+#~ msgid "History Sort"
+#~ msgstr "Tri de l'historique"
+
+#~ msgid "200 F"
+#~ msgstr "200 °F"
+
+#~ msgid "90 F"
+#~ msgstr "90 °F"
+
+#~ msgid "93 C"
+#~ msgstr "93 °C"
+
+#~ msgid "65 C"
+#~ msgstr "65 °C"
+
+#~ msgid "43 C"
+#~ msgstr "43 °C"
+
+#~ msgid "55 C"
+#~ msgstr "55 °C"
+
+#~ msgid "32 C"
+#~ msgstr "32 °C"
+
+#~ msgid "Maximum Number of Matched Apps to List"
+#~ msgstr "Nombre maximal d'applications à lister"
+
+#~ msgid "Maximum Number of Matched Exes to List"
+#~ msgstr "Nombre maximal d'exécutables à lister"
+
+#~ msgid "Size Of Font Cache"
+#~ msgstr "Taille du tampon de polices"
+
+#~ msgid "Size Of Image Cache"
+#~ msgstr "Taille du tampon d'images"
+
+#~ msgid "Animate the shading and unshading of windows"
+#~ msgstr "Animer l'enroulement et le déroulement des fenêtres"
+
+#~ msgid "A click on a window always raises it"
+#~ msgstr "Un clic sur une fenêtre la met toujours au premier plan"
+
+#~ msgid "A click in a window always focuses it"
+#~ msgstr "Un clic dans une fenêtre la focalise toujours"
+
+#~ msgid "Resist moving or resizing a window over an obstacle"
+#~ msgstr "Résister lors du déplacement/redimensionnement sur un obstacle"
+
+#~ msgid "Connman Server Operation Failed"
+#~ msgstr "Connman : échec de l'opération sur le serveur."
+
+#~ msgid ""
+#~ "Could not execute remote operation:<br>%s<br>Server Error <hilight>%s:</"
+#~ "hilight> %s"
+#~ msgstr ""
+#~ "Impossible d'exécuter l'opération distante :<br>%s<br>Erreur du serveur "
+#~ "<hilight>%s:</hilight> %s"
+
+#~ msgid "Connman Operation Failed"
+#~ msgstr "Connman : échec de l'opération."
+
+#~ msgid "Could not execute local operation:<br>%s"
+#~ msgstr "Impossible d'exécuter l'opération locale :<br>%s"
+
+#~ msgid "LAN"
+#~ msgstr "LAN"
+
+#~ msgid "Networks"
+#~ msgstr "Réseaux"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Autoriser la manipulation des fenêtres"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Impossible de monter le périphérique"
+
+#~ msgid "Done %ld / %ld byte"
+#~ msgstr "Fait %ld / %ld octet"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Délai avant le basculement quand la souris est au bord de l'écran:"
+
+#~ msgid "Dismiss alert automatically"
+#~ msgstr "Effacer l'alerte automatiquement"
+
+#~ msgid "Dismiss alert after:"
+#~ msgstr "Effacer l'alerte après:"
+
+#~ msgid "Choose a website from list..."
+#~ msgstr "Choisir un site web depuis une liste..."
+
+#~ msgid "get-e.org - Static"
+#~ msgstr "get-e.org - Statique"
+
+#~ msgid "get-e.org  - Animated"
+#~ msgstr "get-e.org - Animé"
+
+#~ msgid "[%s] Getting feed... DONE!"
+#~ msgstr "[%s] Recherche du flux... SUCCÈS !"
+
+#~ msgid "[%s] Getting feed... FAILED!"
+#~ msgstr "[%s] Recherche du flux... ÉCHEC !"
+
+#~ msgid "[%s] Parsing feed... DONE!"
+#~ msgstr "[%s] Analyse du flux... SUCCÈS !"
+
+#~ msgid "[%s] Parsing feed... FAILED!"
+#~ msgstr "[%s] Analyse du flux... ÉCHEC !"
+
+#~ msgid "[%s] Downloading of edje file..."
+#~ msgstr "[%s] Téléchargement du fichier edj..."
+
+#~ msgid "[%s] Download %d images of %d"
+#~ msgstr "[%s] Télécharge %d images de %d"
+
+#~ msgid "[%s] Choose an image from list"
+#~ msgstr "[%s] Choisir une image dans la liste"
+
+#~ msgid "[%s] Downloading of edje file... %d%% done"
+#~ msgstr "[%s] Téléchargement du fichier edj... %d%% OK"
+
+#~ msgid "[%s] Getting feed..."
+#~ msgstr "[%s] Recherche du flux..."
+
+#~ msgid "Clone Current Profile"
+#~ msgstr "Copier le profil courant"
+
+#~ msgid "Exit Immediately"
+#~ msgstr "Quitter immédiatement"
+
+#~ msgid "Shutting down of your system failed."
+#~ msgstr "L'arrêt de votre système a échoué."
+
+#~ msgid "Rebooting your system failed."
+#~ msgstr "Le redémarrage de votre système a échoué."
+
+#~ msgid "Shut Down Immediately"
+#~ msgstr "Éteindre immédiatement"
+
+#~ msgid "get-e.org"
+#~ msgstr "get-e.org"
+
+#~ msgid "X reports there are no root windows and %i screens!\n"
+#~ msgstr ""
+#~ "Le serveur X rapporte qu'il n'y a pas de fenêtres racine\n"
+#~ "alors qu'il y a %i écrans !\n"
+
+#~ msgid "Disable splash screen"
+#~ msgstr "Désactiver l'écran d'accueil"
+
+#~ msgid ""
+#~ "The theme you are using for your init splash<br>has a bug. It does not "
+#~ "respond to signals when<br>startup is complete. You should use an "
+#~ "init<br>splash theme that is correctly made or fix the<br>one you use."
+#~ msgstr ""
+#~ "Le thème de l'écran de démarrage est bogué<br>. Il ne répond pas aux "
+#~ "signaux au terme de la<br> mise en route. Vous devriez utiliser un thème "
+#~ "de<br>démarrage valide, ou corriger celui<br>que vous utilisez "
+#~ "actuellement."
+
+#~ msgid "When moving or resizing windows, resist at the boundaries"
+#~ msgstr ""
+#~ "Résister aux bords lors du déplacement/redimensionnement des fenêtres"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Parar de mover/ajustar este \"gadget\""
+
+#~ msgid "Resizeable"
+#~ msgstr "Passível de ajuste"
+
+#~ msgid "Background panning"
+#~ msgstr "Movimento do fundo"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Fator de movimento do eixo X"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Fator de movimento do eixo Y"
+
+#~ msgid "Default is plugin name"
+#~ msgstr "Default é o nome do \"plug-in\""
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "As definições do módulo de mistura foram alterados.<br>A sua configuração "
+#~ "foi substituída por novas omissões.<br>Desculpe qualquer inconveniente."
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o Ecore!\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o sistema de ficheiros.\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar a ligação ao X.\n"
+#~ "Configurou a variável DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o sistema de ligações.\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o sistema IPC.\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "O Enlightenment não consegue configurar o xinerama.\n"
+#~ "Não é suposto isto acontecer."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "O Enlightenment não consegue configurar o randr.\n"
+#~ "Não é suposto isto acontecer."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o Evas!\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "O Enlightenment não consegue iniciar o ecrã.\n"
+#~ "Será que tem memória suficiente?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Verificar o suporte a SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Configurar GF"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "O Enlightenment não consegue configurar o sistema do painel."
+
+#~ msgid "New Application"
+#~ msgstr "Nova aplicação"
+
+#~ msgid "Actions"
+#~ msgstr "Ações"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Copiar para a área de transferência"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "Abrir com..."
+
+#~ msgid "Open File..."
+#~ msgstr "Abrir ficheiro..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Editar entrada da aplicação"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Nova entrada de aplicação"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Executar com Sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Abrir aqui um terminal"
+
+#~ msgid "Run Executable"
+#~ msgstr "Processar executável"
+
+#~ msgid "Calculator"
+#~ msgstr "Calculadora"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Copiar para..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Mover para..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Mover para o lixo"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Abrir pasta (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Ordenar por data"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Ordenar por nome"
+
+#~ msgid "Recent Files"
+#~ msgstr "Ficheiros recentes"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Mostrar janela"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Mudar para a janela"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Trocar para ecrã completo"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Enviar para a área de trabalho"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Não foram encontrados<br>os ficheiros de menu.<br>Por favor, veja "
+#~ "a<br>documentação em<br>www.enlightenment.org<br>para mais detalhes<br> "
+#~ "sobre fazer que <br>os menus da aplicação<br>funcionem."
+
+#~ msgid "Select application menu"
+#~ msgstr "Selecione o menu da aplicação"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Barra de lançador"
+
+#~ msgid "Desktop Files"
+#~ msgstr "Ficheiros da área de trabalho"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Sem ícones na área de trabalho"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Ativar ícones na área de trabalho"
+
+#~ msgid "Focus mode"
+#~ msgstr "Modo de realce"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Clique para realçar as janelas"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Realçar janelas ao passar com o rato"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Selecione os ícones a adicionar"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Início rápido"
+
+#~ msgid "Select Applications"
+#~ msgstr "Selecione as aplicações"
+
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Escurecer ecrã"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Restaurar ecrã"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Sinalização da gestão de energia"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "O servidor de exibição atual não tem<br>suporte a DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "O servidor de exibição atual não possui<br>a extensão DPMS."
+
+#, fuzzy
+#~ msgid "Interaction"
+#~ msgstr "Definições de interação"
+
+#, fuzzy
+#~ msgid "Spell Checker"
+#~ msgstr "Terminadas as verificações"
+
+#, fuzzy
+#~ msgid "Everything Aspell"
+#~ msgstr "Everything - Ficheiros"
+
+#, fuzzy
+#~ msgid "Aspell"
+#~ msgstr "Tudo"
+
+#, fuzzy
+#~ msgid "Add Application..."
+#~ msgstr "Todas as aplicações"
+
+#, fuzzy
+#~ msgid "More..."
+#~ msgstr "Mover para..."
+
+#, fuzzy
+#~ msgid "To Favorites Menu"
+#~ msgstr "Mostrar menu de favoritos"
+
+#, fuzzy
+#~ msgid "Selection"
+#~ msgstr "Selecionando"
+
+#, fuzzy
+#~ msgid "Animated flip"
+#~ msgstr "Animar"
+
+#, fuzzy
+#~ msgid ""
+#~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
+#~ "error could not be<br>deterimined.<br><br>The file where the error "
+#~ "occurred was:<br>%s<br><br>This file has been deleted to avoid corrupt "
+#~ "data.<br>"
+#~ msgstr ""
+#~ "Ocorreu um erro ao escrever o<br>ficheiro de configurações.<br>%s<br>O "
+#~ "erro ocorreu no ficheiro:<br>%s<br><br>Este ficheiro foi apagado para "
+#~ "evitar a danificação dos dados.<br>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment's settings files are too big<br>for the file system they "
+#~ "are being saved to.<br>This error is very strange as the files "
+#~ "should<br>be extremely small. Please check the settings<br>for your home "
+#~ "directory.<br><br>The file where the error occurred was:<br>"
+#~ "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
+#~ msgstr ""
+#~ "Ocorreu um erro ao escrever o<br>ficheiro de configurações.<br>%s<br>O "
+#~ "erro ocorreu no ficheiro:<br>%s<br><br>Este ficheiro foi apagado para "
+#~ "evitar a danificação dos dados.<br>"
+
+#, fuzzy
+#~ msgid ""
+#~ "An output error occurred when writing the settings<br>files for "
+#~ "Enlightenment. Your disk is having troubles<br>and possibly needs "
+#~ "replacement.<br><br>The file where the error occurred was:<br>"
+#~ "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
+#~ msgstr ""
+#~ "Ocorreu um erro ao escrever o<br>ficheiro de configurações.<br>%s<br>O "
+#~ "erro ocorreu no ficheiro:<br>%s<br><br>Este ficheiro foi apagado para "
+#~ "evitar a danificação dos dados.<br>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot write its settings file<br>because it ran out of "
+#~ "space to write the file.<br>You have either run out of disk space or "
+#~ "have<br>gone over your quota limit.<br><br>The file where the error "
+#~ "occurred was:<br>%s<br><br>This file has been deleted to avoid corrupt "
+#~ "data.<br>"
+#~ msgstr ""
+#~ "Ocorreu um erro ao escrever o<br>ficheiro de configurações.<br>%s<br>O "
+#~ "erro ocorreu no ficheiro:<br>%s<br><br>Este ficheiro foi apagado para "
+#~ "evitar a danificação dos dados.<br>"
+
+#, fuzzy
+#~ msgid "Fileman"
+#~ msgstr "Gestor de ficheiros"
+
+#, fuzzy
+#~ msgid "Shelf"
+#~ msgstr "Painel #"
+
+#, fuzzy
+#~ msgid "Show home directory"
+#~ msgstr "Ir para o diretório superior"
+
+#, fuzzy
+#~ msgid "Move this gadget to"
+#~ msgstr "Parar de mover/ajustar este \"gadget\""
+
+#, fuzzy
+#~ msgid "Able to be resized"
+#~ msgstr "Mover após ajustar o tamanho"
+
+#, fuzzy
+#~ msgid "Remove this gadget"
+#~ msgstr "Remover \"gadget\""
+
+#, fuzzy
+#~ msgid "Powersaving policy"
+#~ msgstr "Comportamento da poupança de energia"
+
+#, fuzzy
+#~ msgid "Change Icon Properties"
+#~ msgstr "Propriedades da janela"
+
+#, fuzzy
+#~ msgid "Remove Icon"
+#~ msgstr "Remover"
+
+#, fuzzy
+#~ msgid "Add An Icon"
+#~ msgstr "Editar ícone"
+
+#, fuzzy
+#~ msgid "Color 1:"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Color 2:"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Fill Options"
+#~ msgstr "Opções"
+
+#, fuzzy
+#~ msgid "Gradient Creation Error"
+#~ msgstr "Erro de execução da aplicação"
+
+#, fuzzy
+#~ msgid "For some reason, Enlightenment was unable to create a gradient."
+#~ msgstr "O Enlightenment não conseguiu obter o diretório atual"
+
+#, fuzzy
+#~ msgid "Set Shelf Contents"
+#~ msgstr "Conteúdo do painel"
+
+#, fuzzy
+#~ msgid "Delete this Shelf"
+#~ msgstr "Apagar um painel"
+
+#, fuzzy
+#~ msgid "Add Application"
+#~ msgstr "Aplicação"
+
+#, fuzzy
+#~ msgid "Screensaver Timer"
+#~ msgstr "Proteção de ecrã"
+
+#, fuzzy
+#~ msgid "Animated shading"
+#~ msgstr "Deslocação animada"
+
+#, fuzzy
+#~ msgid "New Window Placement"
+#~ msgstr "Realce da nova janela"
+
+#, fuzzy
+#~ msgid "Border Icon Preference"
+#~ msgstr "Preferência de ícone"
+
+#, fuzzy
+#~ msgid "Automatic move and resize"
+#~ msgstr "Poupança de energia automática"
+
+#, fuzzy
+#~ msgid "Maximize Directions"
+#~ msgstr "Maximizar horizontalmente"
+
+#, fuzzy
+#~ msgid "Miscellaneous Options"
+#~ msgstr "Diversos"
+
+#, fuzzy
+#~ msgid "From other desks"
+#~ msgstr "Janelas de outras áreas de trabalho"
+
+#, fuzzy
+#~ msgid "From other screens"
+#~ msgstr "Janelas de outros ecrãs"
+
+#, fuzzy
+#~ msgid "Warp mouse"
+#~ msgstr "Enviar rato no final"
+
+#, fuzzy
+#~ msgid "Lock when Enlightenment starts"
+#~ msgstr "Padrões do Enlightenment"
+
+#, fuzzy
+#~ msgid "Screen Lock Timers"
+#~ msgstr "Bloqueio de ecrã"
+
+#, fuzzy
+#~ msgid "Wallpaper Mode"
+#~ msgstr "Papel de parede"
+
+#, fuzzy
+#~ msgid "User Wallpaper"
+#~ msgstr "Utilizar papel de parede do tema"
+
+#, fuzzy
+#~ msgid "Directory up"
+#~ msgstr "Novo diretório"
+
+#, fuzzy
+#~ msgid "Enter Presentation Mode"
+#~ msgstr "Modo de demonstração"
+
+#, fuzzy
+#~ msgid "Automatic Locking"
+#~ msgstr "Poupança de energia automática"
+
+#, fuzzy
+#~ msgid "Time after screensaver activated"
+#~ msgstr "Bloquear depois de ativar o protetor de ecrã do X"
+
+#, fuzzy
+#~ msgid "Idle time to exceed"
+#~ msgstr "Bloquear se exceder o tempo de inatividade"
+
+#, fuzzy
+#~ msgid "Suggest entering presentation mode"
+#~ msgstr "Ativar o modo de demonstração?"
+
+#, fuzzy
+#~ msgid "If deactivated before"
+#~ msgstr "Sugerir se desativado antes de"
+
+#, fuzzy
+#~ msgid "Use custom screenlock"
+#~ msgstr "Comando de bloqueio personalizado"
+
+#, fuzzy
+#~ msgid "Show %s Plugin"
+#~ msgstr "Mostrar ao passar com o rato"
+
+#, fuzzy
+#~ msgid "Show Executables"
+#~ msgstr "Processar executável"
+
+#, fuzzy
+#~ msgid "Set as Wallpaper"
+#~ msgstr "Configurar papel de parede"
+
+#, fuzzy
+#~ msgid "UPower"
+#~ msgstr "Baixar"
+
+#, fuzzy
+#~ msgid "Add Edge"
+#~ msgstr "Adicionar \"gadget\""
+
+#, fuzzy
+#~ msgid "Delete Edge"
+#~ msgstr "concluiu a exclusão"
+
+#, fuzzy
+#~ msgid "Modify Edge"
+#~ msgstr "Modificar atalho"
+
+#, fuzzy
+#~ msgid "Restore Mouse and Wheel Binding Defaults"
+#~ msgstr "Restaurar os atalhos padrão"
+
+#, fuzzy
+#~ msgid "Add Key"
+#~ msgstr "Adicionar"
+
+#, fuzzy
+#~ msgid "Delete Key"
+#~ msgstr "Confirma a exclusão?"
+
+#, fuzzy
+#~ msgid "Modify Key"
+#~ msgstr "Modificado:"
+
+#, fuzzy
+#~ msgid "Set Contents..."
+#~ msgstr "Conteúdo do painel"
+
+#, fuzzy
+#~ msgid "Select Action"
+#~ msgstr "Selecione as aplicações"
+
+#, fuzzy
+#~ msgid "Send to Deskop"
+#~ msgstr "Enviar para a área de trabalho"
+
+#, fuzzy
+#~ msgid "Uniconify"
+#~ msgstr "Minimizar"
+
+#, fuzzy
+#~ msgid "Unfullscreen"
+#~ msgstr "Ecrã completo"
+
+#, fuzzy
+#~ msgid "Window Action"
+#~ msgstr "Janela : Ações"
+
+#, fuzzy
+#~ msgid "Background Mode"
+#~ msgstr "Imagem de fundo"
+
+#, fuzzy
+#~ msgid "Active Plugins"
+#~ msgstr "\"Plug-ins\" de ação"
+
+#, fuzzy
+#~ msgid "Run Command Settings"
+#~ msgstr "Definições da letra"
+
+#, fuzzy
+#~ msgid "Maximum Apps to List"
+#~ msgstr "Largura máxima"
+
+#, fuzzy
+#~ msgid "Maximum Exes to List"
+#~ msgstr "Altura máxima"
+
+#, fuzzy
+#~ msgid "Speed"
+#~ msgstr "Suspender"
+
+#, fuzzy
+#~ msgid "Minimum Width"
+#~ msgstr "Largura mínima"
+
+#, fuzzy
+#~ msgid "Minimum Height"
+#~ msgstr "Altura mínima"
+
+#, fuzzy
+#~ msgid "Maximum Width"
+#~ msgstr "Largura máxima"
+
+#, fuzzy
+#~ msgid "Maximum Height"
+#~ msgstr "Altura máxima"
+
+#, fuzzy
+#~ msgid "X-Axis Alignment"
+#~ msgstr "Alinhamento"
+
+#, fuzzy
+#~ msgid "Y-Axis Alignment"
+#~ msgstr "Alinhamento"
+
+#, fuzzy
+#~ msgid "Terminal"
+#~ msgstr "Executar no terminal"
+
+#, fuzzy
+#~ msgid "Run Command"
+#~ msgstr "Comando"
+
+#, fuzzy
+#~ msgid "%1.1f"
+#~ msgstr "%1.0f"
+
+#, fuzzy
+#~ msgid "Position / Size"
+#~ msgstr "Posição"
+
+#, fuzzy
+#~ msgid "Description: Unavailable"
+#~ msgstr "Falha ao decifrar."
+
+#, fuzzy
+#~ msgid "More than one gadget selected."
+#~ msgstr "Mais que um módulo selecionado."
+
+#, fuzzy
+#~ msgid "No gadget selected."
+#~ msgstr "Nenhum módulo selecionado."
+
+#, fuzzy
+#~ msgid "Styles"
+#~ msgstr "Estilo"
+
+#, fuzzy
+#~ msgid "Selected Gadgets"
+#~ msgstr "Selecione uma imagem"
+
+#, fuzzy
+#~ msgid "Fast"
+#~ msgstr "Colar"
+
+#, fuzzy
+#~ msgid "Slow"
+#~ msgstr "Permitir"
+
+#, fuzzy
+#~ msgid "Very Slow"
+#~ msgstr "Muito preciso"
+
+#, fuzzy
+#~ msgid "150 F"
+#~ msgstr "%1.0f F"
+
+#, fuzzy
+#~ msgid "110 F"
+#~ msgstr "%1.0f F"
+
+#, fuzzy
+#~ msgid "130 F"
+#~ msgstr "%1.0f F"
+
+#, fuzzy
+#~ msgid "Favorites Menu"
+#~ msgstr "Mostrar menu de favoritos"
+
+#, fuzzy
+#~ msgid "Selected Applications"
+#~ msgstr "Selecione as aplicações"
+
+#, fuzzy
+#~ msgid "Desktop files scan done"
+#~ msgstr "Ficheiro \"desktop\""
+
+#, fuzzy
+#~ msgid "Desktop file scan"
+#~ msgstr "Ficheiro \"desktop\""
+
+#, fuzzy
+#~ msgid "Basic Settings"
+#~ msgstr "Definições da IBar"
+
+#, fuzzy
+#~ msgid "Scroll Settings"
+#~ msgstr "Definições de escala"
+
+#, fuzzy
+#~ msgid "Scroll Animate"
+#~ msgstr "Animação da deslocação"
+
+#, fuzzy
+#~ msgid "Scroll Speed"
+#~ msgstr "Velocidade da deslocação"
+
+#, fuzzy
+#~ msgid "Position Settings"
+#~ msgstr "Definições de transição"
+
+#, fuzzy
+#~ msgid "Icon Themes"
+#~ msgstr "Tema de ícones"
+
+#, fuzzy
+#~ msgid "Filename"
+#~ msgstr "Gestor de ficheiros"
+
+#, fuzzy
+#~ msgid "Available Modules"
+#~ msgstr "Perfis disponíveis"
+
+#, fuzzy
+#~ msgid "Load Module"
+#~ msgstr "Carregar módulos"
+
+#, fuzzy
+#~ msgid "Loaded Modules"
+#~ msgstr "Carregar módulos"
+
+#, fuzzy
+#~ msgid "Menu Item Captions"
+#~ msgstr "Item do menu ativo"
+
+#, fuzzy
+#~ msgid "About Dialog Title"
+#~ msgstr "Sobre o título"
+
+#, fuzzy
+#~ msgid "About Dialog Version"
+#~ msgstr "Sobre a versão"
+
+#, fuzzy
+#~ msgid "Settings Dialog Title"
+#~ msgstr "Diálogos a utilizar para as definições"
+
+#, fuzzy
+#~ msgid "List Item Odd Text"
+#~ msgstr "Texto numa lista de itens (ímpar)"
+
+#, fuzzy
+#~ msgid "Window Manager Colors"
+#~ msgstr "Gestor de janelas"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "Ativo"
+
+#, fuzzy
+#~ msgid "Widget Colors"
+#~ msgstr "\"Widgets\""
+
+#, fuzzy
+#~ msgid "Module Colors"
+#~ msgstr "Módulos"
+
+#, fuzzy
+#~ msgid "Outline Color"
+#~ msgstr "Contorno exterior:"
+
+#, fuzzy
+#~ msgid "Defaults"
+#~ msgstr "Padrão"
+
+#, fuzzy
+#~ msgid "Main Menu Settings"
+#~ msgstr "Definições de menu"
+
+#, fuzzy
+#~ msgid "Show Favorites"
+#~ msgstr "Mostrar menu de favoritos"
+
+#, fuzzy
+#~ msgid "Show Applications"
+#~ msgstr "Aplicações conhecidas"
+
+#, fuzzy
+#~ msgid "Show Generic"
+#~ msgstr "Genérico"
+
+#, fuzzy
+#~ msgid "Show Comments"
+#~ msgstr "Comentários"
+
+#, fuzzy
+#~ msgid "General Menu"
+#~ msgstr "Geral"
+
+#, fuzzy
+#~ msgid "Autoscroll Margin"
+#~ msgstr "Deslocamento automático"
+
+#, fuzzy
+#~ msgid "Idle Cursor"
+#~ msgstr "Cursor do rato"
+
+#, fuzzy
+#~ msgid "Use Enlightenment Cursor"
+#~ msgstr "Enlightenment"
+
+#, fuzzy
+#~ msgid "Use X Cursor"
+#~ msgstr "Cursor do rato"
+
+#, fuzzy
+#~ msgid "Cursor Size"
+#~ msgstr "Definições do cursor"
+
+#, fuzzy
+#~ msgid "Cache Settings"
+#~ msgstr "Definições do painel"
+
+#, fuzzy
+#~ msgid "Time until X screensaver starts"
+#~ msgstr "Bloquear depois de ativar o protetor de ecrã do X"
+
+#, fuzzy
+#~ msgid "Time until X screensaver alternates"
+#~ msgstr "Bloquear depois de ativar o protetor de ecrã do X"
+
+#, fuzzy
+#~ msgid "Follow the window as it moves"
+#~ msgstr "Segue a janela"
+
+#, fuzzy
+#~ msgid "Follow the window as it resizes"
+#~ msgstr "Segue a janela"
+
+#, fuzzy
+#~ msgid "Window Shading"
+#~ msgstr "Empilhamento"
+
+#, fuzzy
+#~ msgid "Automatically switch to desktop of new window"
+#~ msgstr "Mudar para a área de trabalho da nova janela"
+
+#, fuzzy
+#~ msgid "Window Border"
+#~ msgstr "Lista da janela"
+
+#, fuzzy
+#~ msgid "Prefer user defined icon"
+#~ msgstr "Utilizar ícone definido pelo utilizador"
+
+#, fuzzy
+#~ msgid "Prefer application provided icon"
+#~ msgstr "Utilizar ícone da aplicação"
+
+#, fuzzy
+#~ msgid "Click to focus"
+#~ msgstr "Clique para realçar as janelas"
+
+#, fuzzy
+#~ msgid "No new windows get focus"
+#~ msgstr "Realce da nova janela"
+
+#, fuzzy
+#~ msgid "All new windows get focus"
+#~ msgstr "Realce da nova janela"
+
+#, fuzzy
+#~ msgid "Only new dialogs get focus if the parent has focus"
+#~ msgstr "Apenas os diálogos com janela realçada"
+
+#, fuzzy
+#~ msgid "Resistance between windows:"
+#~ msgstr "Resistência ao arrastamento"
+
+#, fuzzy
+#~ msgid "Resistance to desktop gadgets:"
+#~ msgstr "Resistência ao arrastamento"
+
+#, fuzzy
+#~ msgid "Show iconified windows"
+#~ msgstr "Janelas minimizadas"
+
+#, fuzzy
+#~ msgid "Selection Settings"
+#~ msgstr "Definições de interação"
+
+#, fuzzy
+#~ msgid "Focus window while selecting"
+#~ msgstr "Enviar rato ao selecionar"
+
+#, fuzzy
+#~ msgid "Raise window while selecting"
+#~ msgstr "Enviar rato ao selecionar"
+
+#, fuzzy
+#~ msgid "Uncover windows while selecting"
+#~ msgstr "Enviar rato ao selecionar"
+
+#, fuzzy
+#~ msgid "Warp Settings"
+#~ msgstr "Definições da IBar"
+
+#, fuzzy
+#~ msgid "Show Favorites In Main Menu"
+#~ msgstr "Mostrar menu de favoritos"
+
+#, fuzzy
+#~ msgid "Show Applications In Main Menu"
+#~ msgstr "Mostrar menu de aplicações"
+
+#, fuzzy
+#~ msgid "Autoscroll Settings"
+#~ msgstr "Definições do cursor"
+
+#, fuzzy
+#~ msgid "%2.2f seconds"
+#~ msgstr "%.2f segundos"
+
+#, fuzzy
+#~ msgid "Connection Manager"
+#~ msgstr "Sem ligação"
+
+#, fuzzy
+#~ msgid "Wifi"
+#~ msgstr "Dentro"
+
+#, fuzzy
+#~ msgid "Specific Device"
+#~ msgstr "Aplicações específicas"
+
+#, fuzzy
+#~ msgid "Expand the window"
+#~ msgstr "Ao fechar a janela"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Você está a tentar que o Enlightenment se recorde de "
+#~ "aplicar<br>propriedades (tais como tamanho, localização, contornos...) "
+#~ "a<br>uma janela que <hilight>não possui propriedades únicas</hilight>."
+#~ "<br><br>Isto significa que a janela partilha as propriedades nome/classe, "
+#~ "transitoriedade, lista...<br>com as diversas janelas no ecrã e as "
+#~ "propriedades<br>desta janela serão aplicáveis a todas as outras<br>que "
+#~ "possuam as mesmas propriedades.<br><br>Isto apenas serve como aviso caso "
+#~ "você não tenha percebido o intuito da operação.<br>Se percebeu, prima "
+#~ "<hilight>Aplicar</hilight> ou <hilight>OK</hilight><br>e as suas "
+#~ "definições serão aceites. Prima <hilight>Cancelar</hilight><br>se você "
+#~ "não tem a certeza e neste caso nada será afetado."
+
+#, fuzzy
+#~ msgid "Shelf Size"
+#~ msgstr "Painel #"
+
+#, fuzzy
+#~ msgid "Scaling Factors"
+#~ msgstr "Escala personalizada"
+
+#, fuzzy
+#~ msgid "Personal scaling factor"
+#~ msgstr "Escala personalizada"
+
+#, fuzzy
+#~ msgid "Custom Grid Icons"
+#~ msgstr "Ícones personalizados"
+
+#, fuzzy
+#~ msgid "Custom Smart Grid Icons"
+#~ msgstr "Ícones personalizados"
+
+#, fuzzy
+#~ msgid "Configure Virtual Desktops"
+#~ msgstr "Definir as área de trabalho virtuais"
+
+#, fuzzy
+#~ msgid "Configure Contents..."
+#~ msgstr "Configurar painéis"
+
+#, fuzzy
+#~ msgid "Configure Shelf Contents"
+#~ msgstr "Configurar painéis"
+
+#, fuzzy
+#~ msgid "Configure Toolbar Contents"
+#~ msgstr "Definir o conteúdo da barra de ferramentas"
+
+#, fuzzy
+#~ msgid "Configure Dialog Title"
+#~ msgstr "Configurar painéis"
+
+#, fuzzy
+#~ msgid "Configure Heading"
+#~ msgstr "Configurar"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "Comentário"
+
+#, fuzzy
+#~ msgid "Temporary"
+#~ msgstr "Temperatura"
+
+#, fuzzy
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Mudar de área de trabalho com a roda do rato"
+
+#, fuzzy
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr "Mudar ao arrastar os objetos para os limites do ecrã"
+
+#, fuzzy
+#~ msgid "Polling (Internal)"
+#~ msgstr "Interno"
+
+#, fuzzy
+#~ msgid "%1.0f percent"
+#~ msgstr "%1.0f seg"
+
+#, fuzzy
+#~ msgid "Advanced Settings"
+#~ msgstr "Definições de escala"
+
+#, fuzzy
+#~ msgid ""
+#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
+#~ "this profile?"
+#~ msgstr ""
+#~ "Pediu para apagar \"%s\".<br><br>Tem a certeza que quer apagar este "
+#~ "painel?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this profile?"
+#~ msgstr "Tem a certeza que quer apagar este painel?"
+
+#, fuzzy
+#~ msgid "Plain Profile"
+#~ msgstr "Perfil"
+
+#, fuzzy
+#~ msgid "Suspend of your system failed."
+#~ msgstr "Falha ao suspender."
+
+#, fuzzy
+#~ msgid "Shutting down"
+#~ msgstr "Cabeçalho de definições"
+
+#, fuzzy
+#~ msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
+#~ msgstr "A desligar.<br><hilight>Por favor, aguarde.</hilight>"
+
+#, fuzzy
+#~ msgid "Rebooting"
+#~ msgstr "Reiniciar"
+
+#, fuzzy
+#~ msgid "Desktop Lock"
+#~ msgstr "Ícone da área de trabalho"
+
+#, fuzzy
+#~ msgid "Lock Screen"
+#~ msgstr "Ecrã"
+
+#, fuzzy
+#~ msgid "Logout"
+#~ msgstr "Sair"
+
+#, fuzzy
+#~ msgid "Desktop %i, %i"
+#~ msgstr "Ficheiro \"desktop\""
+
+#, fuzzy
+#~ msgid "Toolbar Configuration"
+#~ msgstr "configuração"
+
+#, fuzzy
+#~ msgid "Shelf Configuration"
+#~ msgstr "configuração"
+
+#, fuzzy
+#~ msgid "Enlightenment Configuration"
+#~ msgstr "Padrões do Enlightenment"
+
+#, fuzzy
+#~ msgid "Default Configuration Dialogs Mode"
+#~ msgstr "Diálogos a utilizar para as definições"
+
+#, fuzzy
+#~ msgid "Input Method Configuration"
+#~ msgstr "Erro ao importar o método de introdução"
+
+#, fuzzy
+#~ msgid "Language Configuration"
+#~ msgstr "Everything - Configuração"
+
+#, fuzzy
+#~ msgid "Search Path Configuration"
+#~ msgstr "Everything - Configuração"
+
+#, fuzzy
+#~ msgid "Dropshadow Configuration"
+#~ msgstr "Everything - Configuração"
+
+#, fuzzy
+#~ msgid "IBar Configuration"
+#~ msgstr "configuração"
+
+#, fuzzy
+#~ msgid "IBox Configuration"
+#~ msgstr "configuração"
+
+#, fuzzy
+#~ msgid "Virtual Desktops Configuration"
+#~ msgstr "Definições das área de trabalho virtuais"
+
+#, fuzzy
+#~ msgid "Temperature Configuration"
+#~ msgstr "Everything - Configuração"
+
+#, fuzzy
+#~ msgid "Mixer Configuration"
+#~ msgstr "configuração"
+
+#, fuzzy
+#~ msgid "Mixer Module Configuration"
+#~ msgstr "Definições do módulo de som"
+
+#, fuzzy
+#~ msgid "Choose Language"
+#~ msgstr "Idioma"
+
+#, fuzzy
+#~ msgid "Theme Bug Detected"
+#~ msgstr "Definido pelo tema"
+
+#, fuzzy
+#~ msgid "Init"
+#~ msgstr "Encaixar"
+
+#, fuzzy
+#~ msgid "Window Manipulation"
+#~ msgstr "Menu da janela"
+
+#, fuzzy
+#~ msgid "Both directions"
+#~ msgstr "Direção"
+
+#, fuzzy
+#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
+#~ msgstr "O Enlightenment não consegue configurar as definições do rato."
+
+#, fuzzy
+#~ msgid "Mouse Acceleration Settings"
+#~ msgstr "Velocidade do rato"
index 07461ae..c99a987 100755 (executable)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-02-14 05:00+0000\n"
 "Last-Translator: Teylo Laundos Aguiar <teylo.aguiar@gmail.com>\n"
 "Language-Team: None. But contact-me on <mdkcore@gmail.com>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Fechar"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,18 +43,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>O Time</title>"
 
 #: src/bin/e_actions.c:365
@@ -70,46 +70,46 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Você tem certeza que deseja matar esta janela?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Você requisitou sair do Enlightenment.<br><br>Você tem certeza que deseja "
 "sair?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Você tem certeza que deseja deslogar-se?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Você está perto de deslogar.<br><br>Você tem certeza que deseja isto?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Você tem certeza que deseja desligar?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -117,11 +117,11 @@ msgstr ""
 "Você requisitiu desligar o seu Computador.<br><br>Você tem certeza que "
 "deseja desligá-lo?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Você tem certeza que deseja reiniciar?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -129,7 +129,7 @@ msgstr ""
 "Você requisitou reiniciar o seu Computador.<br><br>Você tem certeza que "
 "deseja reiniciá-lo?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -137,11 +137,11 @@ msgstr ""
 "Você requisitou suspender o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Você tem certeza que deseja hibernar?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -149,551 +149,575 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Alternar Modo Viscoso"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Alternar Modo de Iconificação"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Alternar Modo Tela Cheia"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Alternar Modo de Sombra para Cima"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Alternar Modo de Sombra para Baixo"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Alternar Modo de Sombra para Esquerda"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Alternar Modo de Sobra para Direita"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Alternar Modo de Sombra"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Alernar Estado Sem Borda"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Borda"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Alternar Estado Rreso"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Mostrar a estante"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Mudar Para Área de Trabalho 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Girar Área de Trabalho à Esquerda (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Girar Área de Trabalho à Direita (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Girar Área de Trabalho para Cima (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Girar Área de Trabalho para Baixo (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Girar Área de Trabalho por... (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Girar Área de Trabalho para... (Todas as Janelas)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Girar Área de Trabalho na Direção..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Ir ao Desktop 0 (todas as telas)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Ir ao Desktop 1 (todas as telas)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Ir ao Desktop 2 (todas as telas)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Ir ao Desktop 3 (todas as telas)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Ir ao Desktop 4 (todas as telas)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Ir ao Desktop 5 (todas as telas)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Ir ao Desktop 6 (todas as telas)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Ir ao Desktop 7 (todas as telas)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Ir ao Desktop 8 (todas as telas)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Ir ao Desktop 9 (todas as telas)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Ir ao Desktop 10 (todas as telas)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Ir ao Desktop 11 (todas as telas)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Ir ao Desktop... (todas as telas)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Desligar"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Geometria da Movimentação da Janela"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Mais..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Mais..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Girar Área de Trabalho na Direção..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Criar Ícone"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Por Área de Trabalho #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lançar"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplicativo"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Sair agora"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modo"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Alternar modo de apresentação"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Alternar modo offline"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "DEsligar agora"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Desligar"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Travar"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Geral : Ações"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Ação"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Esta Tela"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Esta Tela"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Colocar Como Papel de Parede"
 
@@ -701,18 +725,16 @@ msgstr "Colocar Como Papel de Parede"
 msgid "Color Selector"
 msgstr "Seletor de Cores"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -720,20 +742,20 @@ msgstr "Seletor de Cores"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -744,7 +766,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -753,11 +775,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas com a Escrita das Configurações do Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -765,93 +787,93 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Configurações Atualizadas"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Sem Janelas)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Descrição: Indisponível"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -859,57 +881,62 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Aplicar"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensões"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Módulos"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Preferência de Ícone"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Contêiner %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte ao PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM não tem suporte gerado no Enlightenment, portanto<br>travamento da área "
 "de trabalho está desativado."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Falha ao Travar"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -917,15 +944,15 @@ msgstr ""
 "Travar a área de trabalho falhou porque alguma aplicação<br>está prendendo o "
 "teclado ou o mouse ou ambos<br>e sua garra é impossível de ser quebrada."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Por favor entre com sua senha de destravamento"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Erro no Sistema de Autenticação"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -936,22 +963,22 @@ msgstr ""
 "código de erro foi <hilight>%i</hilight>.<br>Isso é ruim e não podia ter "
 "acontecido. Por favor relate este bug."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Ativar modo de apresentação?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Não, e pare de perguntar"
 
@@ -978,106 +1005,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de Entrada da Área de Trabalho"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nome Genérico"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe da Janela"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorias"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Tipos Mime"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Arquivo da área de trabalho"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Geral"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Notificação de Inicialização"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Executar em um Terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Mostar nos Menus"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opções"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Selecione um Ícone"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Selecione um executável"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Colar"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1124,315 +1150,315 @@ msgstr ""
 "Enlightenment está impossibilitado de rodar a aplicação:<br><br>%s<br><br>A "
 "aplicação falhou ao iniciar."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "O código de saída %i foi retornado de %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s foi interrompido por um Sinal de Interrupção."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s foi interrompido por um Erro de Ponto Flutuante."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s foi interrompido por um Sinal de Morte Ininterruptável."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s foi interrompido por uma Falha de Segmentação."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s foi interrompido por um Sinal de Terminação."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s foi interrompido pelo sinal número %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***A saída que está faltando está truncada. Salve a saída para ver.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Este log de erro será salvo como %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Caminho não existente"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s não existe."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Erro ao montar"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Não foi possivel montar o dispositivo"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Erro ao desmontar"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Não foi possível desmontar o dispositivo"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Erro ao ejetar"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Não foi possivel ejetar o dispositivo"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Interromper"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Modo de Visão"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Usar Ícone Fornecido pelo Aplicativo "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Propriedades do Arquivo"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Usar padrão"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Ícones Customizados"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamanho do Ícone (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Definir plano de fundo"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Erro"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Não a todos"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Sim a todos"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Alerta"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Arquivo já existe.  Sobrescrever?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorar Isso"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Ocorreu um erro ao realizar uma operação.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Você tem certeza que deseja apagar<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1466,12 +1492,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume Desconhecido"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
@@ -1479,7 +1505,7 @@ msgstr "Dispositivo Removível"
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -1495,7 +1521,7 @@ msgstr "Tipo do Arquivo:"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Dono:"
 
@@ -1515,17 +1541,17 @@ msgstr "Dono pode ler"
 msgid "Owner can write"
 msgstr "Dono pode escrever"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Prever"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Padrão"
 
@@ -1534,7 +1560,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Customizado"
 
@@ -1550,53 +1576,42 @@ msgstr "Informação de Ligação"
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Mover"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Iniciar mover/redimensionar este gadget"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Redimensionar"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Remover"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Parar mover/redimensionar este gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1645,14 +1660,14 @@ msgstr "Posição"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Tamanho"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Empilhamento"
@@ -1704,163 +1719,169 @@ msgstr "Sair do meu login com esta janela aberta"
 msgid "Remember these Locks"
 msgstr "Lembrar estas travas"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Janelas"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Sempre por Cima"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Viscoso"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Configurações"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Tela Cheia"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Editar Ícone"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Criar Ícone"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Adicionar ao Menu de Favoritos"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Adicionar a Favoritos"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Atalho de Teclado"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Colocação Inteligente"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Omitir"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Borda"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Travas"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Viscoso"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Omitir"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Iconificar"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Protegido"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Tela"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Sempre por Cima"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Sempre por Baixo"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Prender à Área de Trabalho"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Desprender da Área de Trabalho"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Selecionar Estilo de Borda"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Usar Preferências Padrões de Ícone do E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Usar Ícone Fornecido pelo Aplicativo "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Usar Ícone Definido pelo Usuário"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Resistência"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Barra de tarefas"
 
@@ -1881,7 +1902,7 @@ msgid "ICCCM Properties"
 msgstr "Propriedades ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Título"
 
@@ -2055,7 +2076,6 @@ msgid "Size, Position and Locks"
 msgstr "Tamanho, Posição e Travas"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Permitir"
@@ -2133,15 +2153,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Arquivos"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Lançar"
@@ -2156,20 +2174,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Módulos"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Configurações"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Configurações dos Módulos"
@@ -2210,7 +2214,7 @@ msgstr "Adicionar Gadget"
 msgid "Remove Gadget"
 msgstr "Remover Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2218,11 +2222,11 @@ msgstr ""
 msgid "Layout"
 msgstr "Esquema"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Erro do Método de Entrada"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2238,7 +2242,7 @@ msgstr "Principal"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Aplicativos Favoritos"
 
@@ -2246,76 +2250,74 @@ msgstr "Aplicativos Favoritos"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplicativos"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Janelas"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Janelas Perdidas"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Sobre"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtual"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Bandejas"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Mostrar/Esconder Todas as Janelas"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Sem Aplicativos)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Sem Janelas)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
@@ -2351,7 +2353,7 @@ msgid "Shrink to Content Width"
 msgstr "Encolher ao Tamanho do Conteúdo"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2381,7 +2383,7 @@ msgid "Hide duration"
 msgstr "Esconder duração"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2398,7 +2400,7 @@ msgstr "Mostrar em todas as Áreas de Trabalho"
 msgid "Show on specified Desktops"
 msgstr "Mostrar numa Área de Trabalho específica"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2415,7 +2417,7 @@ msgstr ""
 "ou você não é o proprietário. Por favor cheque:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2428,52 +2430,22 @@ msgstr ""
 "Por favor cheque:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode inicializar Ecore!\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode inicializar o sistema de Arquivos.\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2481,7 +2453,7 @@ msgstr ""
 "Enlightenment não pode ajustar um alimentador do sinal da saída.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2489,7 +2461,7 @@ msgstr ""
 "Enlightenment não pode ajustar um alimentador do sinal HUP.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2498,64 +2470,37 @@ msgstr ""
 "Enlightenment não pode ajustar um alimentador do sinal HUP.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment não pode inicializar sua conexão com o X.\n"
-"Você setou sua variável DISPLAY?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment não pode inicializar seu sistema de alarme de emergência.\n"
-"Você setou sua variável DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode inicializar o sistema de conexões.\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode inicializar o sistema IPC.\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment não configurou o wrapping do xinerama.\n"
-"Isso não pode acontecer."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment não configurou o wrapping do xinerama.\n"
-"Isso não pode acontecer."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode inicializar o sistema Evas.\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2565,7 +2510,7 @@ msgstr ""
 "renderizando no Evas. Por favor cheque sua instalação do Evas e\n"
 "do Ecore e cheque o suporte deles a engine de renderização do Software X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2576,7 +2521,35 @@ msgstr ""
 "do Ecore e cheque o suporte deles a engine de renderização do Software "
 "Buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment não pode inicializar seu sistema de alarme de emergência.\n"
+"Você setou sua variável DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2584,23 +2557,29 @@ msgstr ""
 "Enlightenment não pode criar diretório no diretório de seu usuário.\n"
 "Talvez você não tenha um diretório ou o disco está cheio?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment não pode ativar seu sistema de arquivo de registro."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment não pode ativar seu sistema de configuração."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment não pode ativar seu sistema de tema."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment não pode ativar seu sistema de ponteiro."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2608,94 +2587,42 @@ msgstr ""
 "Enlightenment não pode ativar os caminhos para procurar arquivos.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment não pode ativar seu sistema de fonte."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment não pode ativar seu sistema de tema."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment não pode ativar a tela de inicialização.\n"
-"Talvez você esteja sem memória?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment não pode ativar seu sistema de internacionalização."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Iniciando Suporte Internacional"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment não pode ativar seu sistema de internacionalização."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment não pode inicializar o sistema de área de trabalho FDO.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testando Suporte de Formato"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment descobriu que o Evas não pode criar um buffer de tela. Por "
-"favor cheque\n"
-"se Evas tem suporte a engine do Software Buffer.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment descobriu que o Evas não pode carregar arquivos PNG. Cheque se "
-"o Evas tem\n"
-"suporte ao carregamento de PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment descobriu que o Evas não pode carregar arquivos JPEG. Cheque "
-"se o Evas tem\n"
-"suporte ao carregamento de JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment descobriu que o Evas não pode carregar arquivos EET. Cheque se "
-"o Evas tem\n"
-"suporte ao carregamento de EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Configurar Telas"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2704,215 +2631,354 @@ msgstr ""
 "em seu sistema.\n"
 "Talvez outro gerenciador de janela esteja rodando?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Configurar DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Configurar Uniões"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment não pode configurar as configurações DPMS"
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Configurar DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment não pode configurar as configurações DPMS"
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Configurar Proteção de Tela"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment não pode congigurar a proteção de tela do X."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Configurar modos de economia de energia"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Configurar Trava de Área"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de travamento da área de trabalho."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Configurar popups"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment não pode ativar seu sistema de popup."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Configurar Sistema de Mensagem"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Ativando Caminhos"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Configurar Controles do Sistema"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Comandos do Sistema.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Configurar Ações"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment não pode ativar seu sistema de ações."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Configurar Sistema de Execução"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment não pode ativar seu sistema de execução."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Configurar FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Gerenciador de Arquivo"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Configurar Sistema de Mensagem"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment não pode ativar seu sistema de mensagem."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Configurar DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment não pode ativar seu sistema dnd."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de manipulação da garra de entrada."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Configurar Módulos"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment não pode ativar seu sistema de módulo."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Configurar Lembraças"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment não pode instalar as configurações de lembrança."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Configurar Classes de Cor"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment não pode ativar seu sistema de casse de cor."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment não pode ativar seu sistema de controle de gadgets."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Configurar DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Configurar DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment não pode configurar as configurações DPMS"
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Configurar modos de economia de energia"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Configurar Papel de Parede"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de fundo da área de trabalho."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Configurar Mouse"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Configurar Uniões"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment não pode ativar seu sistema de ligações."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment não pode ativar seu sistema de bandeja."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Configurar Miniaturizador"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Miniaturização.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment não pode inicializar o sistema de Comandos do Sistema.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment não pode inicializar o sistema de Miniaturização.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment não pode ativar seu sistema de tema."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Configurar Disposição de Arquivo"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 "Enlightenment não pode configurar sua disposição do sistema de arquivos."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Carregar Módulos"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Configurar prateleiras"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Quase Pronto"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testando Suporte de Formato"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment descobriu que o Evas não pode criar um buffer de tela. Por "
+"favor cheque\n"
+"se Evas tem suporte a engine do Software Buffer.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment descobriu que o Evas não pode carregar arquivos PNG. Cheque se "
+"o Evas tem\n"
+"suporte ao carregamento de PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment descobriu que o Evas não pode carregar arquivos JPEG. Cheque "
+"se o Evas tem\n"
+"suporte ao carregamento de JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment descobriu que o Evas não pode carregar arquivos PNG. Cheque se "
+"o Evas tem\n"
+"suporte ao carregamento de PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment descobriu que o Evas não pode carregar arquivos EET. Cheque se "
+"o Evas tem\n"
+"suporte ao carregamento de EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment deixou de funcionar cedo ao iniciar e foi reiniciado"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2920,7 +2986,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2933,7 +2999,7 @@ msgstr ""
 "diálogo de configuração de módulos pode permitir que você selecione<br>seus "
 "módulos novamente."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2946,20 +3012,12 @@ msgstr ""
 "<br><br>A janela de diálogo de configuração de módulos pode permitir que "
 "você selecione seus<br>módulos novamente."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Configurar prateleiras"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Quase Pronto"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Carregar Módulos"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2968,11 +3026,11 @@ msgstr ""
 "Houve um erro carregando o módulo chamado: %s<br>Nenhum módulo chamado %s "
 "pode ser encontrado nos<br>diretórios de pesquisa de módulos.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Erro carregando Módulo"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2981,11 +3039,11 @@ msgstr ""
 "Houve um erro carregando o módulo chamado: %s<br>O caminho completo para "
 "este módulo é:<br>%s<br>O erro relatado foi:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Módulo não contém todas as funções necessárias"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2996,16 +3054,16 @@ msgstr ""
 "mínimo uma API de módulo versão: %i.<br>A API de módulo advertida pelo "
 "Enlightenment é %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s do Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3016,11 +3074,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Você tem certeza que deseja apagar esta bandeja?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3028,18 +3086,18 @@ msgstr ""
 "Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
 "deletar isso?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Comentário"
@@ -3048,16 +3106,16 @@ msgstr "Comentário"
 msgid "Starting"
 msgstr "Iniciando"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Verificando Permissões do Sistema"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Verificação do Sistema Pronta"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3068,113 +3126,113 @@ msgstr ""
 "<br>Você deseja terminar o logout<br>de qualquer maneira sem fechar "
 "estes<br>aplicativos antes?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problemas no logout"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Logout agora"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Aguardar mais"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Cancelar logout"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Logout em progresso"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment está ocupado com outra requisição"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "HIC! Isto não parece ser legal"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Falha ao desligar."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Resetando"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Resetando.<br><hilight>Por favor espere.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Suspendendo"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspendendo.<br><hilight>Por favor espere.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernando"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernando.<br><hilight>Por favor espere.</hilight>"
 
@@ -3182,23 +3240,23 @@ msgstr "Hibernando.<br><hilight>Por favor espere.</hilight>"
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Definir como Tema..."
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
@@ -3206,136 +3264,136 @@ msgstr ""
 "Enlightenment está impossibilitado de bifurcar um processo filho:<br><br>"
 "%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Não pode sair - janelas imortais."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr "Algumas janelas"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "No Futuro"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "No último Minuto"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Anos atrás"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Meses atrás"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Semanas atrás"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dias atrás"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Horas atrás"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minutos atrás"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Configurações do Pager"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importar..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Opções de Preencher e Estender"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Estender"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centralizar"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Dentro de"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Preencher"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Qualidade do Arquivo"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Usar arquivo original"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3346,12 +3404,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Configuração Atualizada"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3379,142 +3437,148 @@ msgstr "Para cima"
 msgid "Down"
 msgstr "Para baixo"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Adicionar a Favoritos"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Subir um Diretório"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Resolução"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Permissões:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Você"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Somente Leitura"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Leitura-Gravação"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Configurações do Monitor de Bateria"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Verificar a cada:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernar"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Exibir alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Estranho"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3522,32 +3586,33 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Sua bateria está baixa!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Fonte AC é recomendada."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Medidor de Bateria"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Relógio"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Mostrar Barra de Ferramentas"
@@ -3601,17 +3666,17 @@ msgstr "Configuração Atualizada"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Aplicativos do IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Inicializar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
@@ -3625,10 +3690,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nova Aplicação"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Lançar"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Reiniciar Aplicativos"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Nome da Área de Trabalho"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3641,7 +3721,7 @@ msgid "Available Profiles"
 msgstr "Perfis Disponíveis"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3679,9 +3759,9 @@ msgstr "Configurações dos Diálogos"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
@@ -3723,7 +3803,7 @@ msgstr "Diálogos"
 msgid "Profiles"
 msgstr "Perfis"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3731,7 +3811,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3739,7 +3819,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3747,7 +3827,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3755,47 +3835,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Mudar resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Configurações da Resolução da Tela"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Restaurar ao logar-se"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotação"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Espelhamento"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Características Perdidas"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3804,11 +3884,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Nenhuma Taxa de Atualização Encontrada"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3822,90 +3902,73 @@ msgstr ""
 "quando for ajustada<br>a resolução, o que poderá causar <hilight>dano</"
 "hilight> a sua tela."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Configurações de Áreas de Trabalho Virtuais"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Número de Áreas de Trabalho"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Virar Área de Trabalho com o Mouse"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Virar quando arrastar objetos na beira da tela"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Áreas de Trabalho"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Desligado"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Vidraça"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f seg"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3922,7 +3985,7 @@ msgid "Desktop Wallpaper"
 msgstr "Papel de Parede da Área de Trabalho"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3933,12 +3996,12 @@ msgstr "Definir plano de fundo"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Pessoal"
 
@@ -3946,159 +4009,173 @@ msgstr "Pessoal"
 msgid "Screen Lock Settings"
 msgstr "Configurações de Trava de Tela"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Suspender"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Suspender"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Customizar Trava de Tela"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Travar"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Mostrar em todas as zonas da tela"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Mostrar na zona da tela corrente"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Mostrar na zona da tela #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Configurações da Caixa de Login"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Travar quando o X screensaver iniciar"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f segundos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Travar quando o tempo ocioso estiver excedido"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minutos"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Alternar modo de apresentação"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Tema Definido"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Papel de Parede do Tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Papel de Parede da Área de Trabalho"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Papel de Parede"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Configurações do protetor de tela"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Habilitar X screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Suspender para o Disco"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Protetor de tela"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Estado Inicial"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Blanqueando"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferido"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Não Preferido"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Eventos de Exposição"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Não Permitir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4106,39 +4183,53 @@ msgstr "Não Permitir"
 msgid "Miscellaneous"
 msgstr "Opções Diversas"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Mostrar Sinalização do Gerenciador de Energia"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "O servidor de tela corrente não<br>tem a capacidade DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "O servidor de tela corrente não<br>tem a extensão DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Configurações de Gerenciamento de Energia da Tela"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ativar Gerenciamento de Energia da Tela"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Tempo para suspenção"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Tempo para suspender"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Tempo da desligar"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Voltar"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Áreas de Trabalho Virtuais"
@@ -4183,102 +4274,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Configurações de Ligações das Teclas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Adicionar Ligação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Apagar Ligação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Modificar Ligação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Apagar Tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Restaurar Ligações Padrões"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parâmetros da Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4429,34 +4520,47 @@ msgstr ""
 "Enlightenmnet está impossibilitado de importar a configuração<br>devido a um "
 "erro de cópia."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Configurações de Linguagem"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Seletor de Linguagem"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Locale Selecionado"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Locale"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Linguagem"
 
@@ -4548,17 +4652,17 @@ msgid "Manager"
 msgstr "Gerenciador"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Nenhum"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Sequência de Ligação do Mouse"
 
@@ -4581,13 +4685,11 @@ msgid "Menu Settings"
 msgstr "Configurações do Menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Pessoal"
@@ -4598,7 +4700,7 @@ msgid "Main Menu"
 msgstr "Mostar Menu Principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4618,7 +4720,7 @@ msgid "Comments"
 msgstr "Comentário"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4630,7 +4732,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Mostar nos Menus"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menus"
 
@@ -4701,19 +4803,19 @@ msgid "Images"
 msgstr "Imagens"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Fontes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temas"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ícones"
 
@@ -4863,18 +4965,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Configurações do Papel de Parede"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Usar Papel de Parede do Tema"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Figura..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4894,46 +4996,51 @@ msgstr "Esta Área de Trabalho"
 msgid "This Screen"
 msgstr "Esta Tela"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Ladrilho"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Vidraça"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Selecione uma Figura..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Erro ao Importar Figura"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment está impossibilitado de importar a figura<br>devido a erros de "
 "conversão."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Erro ao Importar Papel de Parede"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment está impossibilitado de importar o papel de parede<br>devido a "
 "um erro de cópia."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4971,7 +5078,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Estilo de Borda Padrão"
 
@@ -4979,7 +5086,7 @@ msgstr "Estilo de Borda Padrão"
 msgid "Window Border Selection"
 msgstr "Seleção da Borda da Janela"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Lembrar esta Borda desta janela na próxima vez que ela aparecer."
 
@@ -5012,7 +5119,7 @@ msgid "Menu Background Base"
 msgstr "Papéis de Parede"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Título do Menu"
 
@@ -5021,7 +5128,7 @@ msgid "Menu Title Active"
 msgstr "Título do Menu Ativo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -5035,12 +5142,12 @@ msgid "Menu Item Disabled"
 msgstr "Legendas dos Itens do Menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Redimensionar Texto"
 
@@ -5058,7 +5165,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -5078,384 +5185,394 @@ msgid "File Manager Background Base"
 msgstr "Gerenciador de Arquivo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Foco"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Texto dos Botões Desabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Texto dos Botões Desabilitado"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Papéis de Parede"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Cores"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Classes de Cor"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Configurar Classes de Cor"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Configurar Classes de Cor"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Configurar Classes de Cor"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Ícones Customizados"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Cor do Objeto"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Cor do Contorno"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Cor da Sombra"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Outras Configurações"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Pequeno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Configurações da Fonte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Realmente Grande"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Gigante"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ativar Classes de Fonte Customizadas"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualização de texto básica: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Classes da Fonte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Ativar Classe da Fonte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pré-visualização de Texto Avançada.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Sugerindo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Recuos da Fonte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Nome do Recuo"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Ativar Recuos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5463,12 +5580,17 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Configurações do Tema dos Ícones"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Ativar Composite"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Aplicativos Selecionados"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5534,11 +5656,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5549,6 +5669,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5569,25 +5695,25 @@ msgstr "Mostrar Tela de Abertura no Login"
 msgid "Transition Settings"
 msgstr "Configurações de Transição"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Eventos"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Inicializar"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Mudança de Área de Trabalho"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Mudança de Fundo"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Transições"
 
@@ -5603,15 +5729,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Categorias de Temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Limpar Tudo"
 
@@ -5642,19 +5768,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Bordas"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Tema do ìcone"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Cursos do Mouse"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5785,6 +5911,11 @@ msgstr "Usar Ícone Fornecido pelo Aplicativo "
 msgid "Border Icon"
 msgstr "Borda"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Colocação Inteligente"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Colocação Inteligente"
@@ -5816,24 +5947,47 @@ msgstr "Abaixo das Janelas"
 msgid "Animate"
 msgstr "Animar Rolagem"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linear"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Suavizar aceleração e desaceleração"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
-msgid "Decelerate"
-msgstr "Desacelerar"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
+msgid "Decelerate"
+msgstr "Desacelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Aceleração do Mouse"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Desacelerar"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Suavizar aceleração e desaceleração"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Empilhamento"
@@ -5855,6 +6009,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Janela mais recente sob o Mouse"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Relógio"
@@ -5893,11 +6048,6 @@ msgstr "Diálogos"
 msgid "Only dialogs with focused parent"
 msgstr "Somente novas janelas de diálogo pegam foco"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Foco"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Outras Configurações"
@@ -6008,13 +6158,13 @@ msgid "Fill available space"
 msgstr "Preencher espaço disponível"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertical"
@@ -6075,7 +6225,7 @@ msgid "Raise when clicking to focus"
 msgstr "Sobrepor quando clicar para pegar foco"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Foco da Janela"
 
@@ -6332,33 +6482,33 @@ msgstr "Muito Claro"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Qualquer coisa"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Qualquer coisa"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Configuração do Pager"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Abaixo de Qualquer Coisa"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Qualquer coisa"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Qualquer coisa"
@@ -6368,165 +6518,165 @@ msgstr "Qualquer coisa"
 msgid "Everything Settings"
 msgstr "Configurações do Terminal"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Perfis Disponíveis"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Mover"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Mover"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Configurar prateleiras"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Ativado"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Mostar nos Menus"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Mostar nos Menus"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Engine Padrão"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Desativado"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Engine Padrão"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Ajustes da Rolagem Automática"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Timeout para esconder"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Engine Padrão"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Ajustes da Rolagem Automática"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Iniciando"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Iniciando"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Mais usado recentemente"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Última Modificação:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Parâmetros da Ação"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Cor do Objeto"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Plano"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Altura Mínima"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6535,39 +6685,30 @@ msgstr "Popup"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Tentar novamente"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Reiniciar Aplicativos"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Ação"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Items"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6589,165 +6730,68 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Abrir com..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Abrir com..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Adicionar Aplicação"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nova Aplicação"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Abrir com..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Executar em um Terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Executável"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Reiniciar Aplicativos"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Comando"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Comando Definido"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Qualquer coisa"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Mais..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Sortear Agora"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Renomear Arquivo"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Qualquer coisa"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Diretórios de Pesquisa"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Usar Diretórios Definidos"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Limpar"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Diálogos"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Tela Cheia"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Enviar para Área de Trabalho"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ícones de Arquivo"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Tipos de Arquivo"
 
@@ -6794,19 +6838,19 @@ msgid "Select an image"
 msgstr "Selecione uma Imagem"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Gerenciador de Arquivo"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6817,7 +6861,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6827,7 +6871,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6907,95 +6951,99 @@ msgstr ""
 msgid "Device"
 msgstr "Prever"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Abrir com..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Comando Customizado"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7030,7 +7078,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7042,37 +7090,42 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr "Gadgets Disponíveis"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Mover"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Papéis de Parede"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Iniciar mover/redimensionar este gadget"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7319,16 +7372,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Você tem certeza que deseja apagar esta fonte da barra?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "iBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Criar Ícone Novo"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -7372,7 +7425,7 @@ msgstr "Mostrar janelas de todas as áreas de trabalho"
 msgid "Show windows from active desktop"
 msgstr "Mostrar janelas da área de trabalho ativa"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "iBox"
 
@@ -7494,31 +7547,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7538,130 +7591,93 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Unidades do Display"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Intervalo de Checagem"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Temperatura Alta"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Temperatura Baixa"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatura"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Próximo"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Selecionada Fonte da Barra"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Mais usado recentemente"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7703,7 +7719,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7727,38 +7743,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Mudar resolução"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Modo de Visão"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7785,137 +7817,301 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Alternar modo offline"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Protegido"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Volume Desconhecido"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Erro ao montar"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Ladrilho"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Transições"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Configuração"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Plano"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Engine"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Configurar"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Ativado"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Preencher espaço disponível"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Protegido"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Engine"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment não pode ativar seu sistema de tema."
+#~ msgid "Acpi"
+#~ msgstr "Ação"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Esta Tela"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Esta Tela"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Redimensionar"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Parar mover/redimensionar este gadget"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar Ecore!\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar o sistema de Arquivos.\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar sua conexão com o X.\n"
+#~ "Você setou sua variável DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar o sistema de conexões.\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar o sistema IPC.\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment não configurou o wrapping do xinerama.\n"
+#~ "Isso não pode acontecer."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment não configurou o wrapping do xinerama.\n"
+#~ "Isso não pode acontecer."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode inicializar o sistema Evas.\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment não pode ativar a tela de inicialização.\n"
+#~ "Talvez você esteja sem memória?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Configurar FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment não pode ativar seu sistema de bandeja."
+
+#~ msgid "New Application"
+#~ msgstr "Nova Aplicação"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Mostrar Sinalização do Gerenciador de Energia"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "O servidor de tela corrente não<br>tem a capacidade DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "O servidor de tela corrente não<br>tem a extensão DPMS."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Engine Padrão"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Ação"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Abrir com..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Abrir com..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Adicionar Aplicação"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nova Aplicação"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Executar em um Terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Executável"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Mais..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Sortear Agora"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Renomear Arquivo"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Diálogos"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Tela Cheia"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Enviar para Área de Trabalho"
 
 #~ msgid "Add Application..."
 #~ msgstr "Adicionar aplicativo ..."
@@ -8095,9 +8291,6 @@ msgstr ""
 #~ msgid "Favorites Menu"
 #~ msgstr "Menu de Favoritos"
 
-#~ msgid "Selected Applications"
-#~ msgstr "Aplicativos Selecionados"
-
 #~ msgid "Window Manager Colors"
 #~ msgstr "Gerenciador de Cores da Janela"
 
@@ -8354,12 +8547,6 @@ msgstr ""
 #~ msgid "Exit Immediately"
 #~ msgstr "Sair Imediatamente"
 
-#~ msgid "Shut Down"
-#~ msgstr "Desligar"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Suspender para o Disco"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Travar Área de Trabalho"
 
@@ -8445,9 +8632,6 @@ msgstr ""
 #~ msgid "Temperature Configuration"
 #~ msgstr "Configuração da Temperatura"
 
-#~ msgid "Back"
-#~ msgstr "Voltar"
-
 #~ msgid "Choose Language"
 #~ msgstr "Escolha a Linguagem"
 
index 0ae7a03..fa59942 100755 (executable)
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-11-25 12:09+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Despre Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Închide"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -44,18 +43,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Echipa</title>"
 
 #: src/bin/e_actions.c:365
@@ -70,621 +70,645 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Sigur doriți să terminați forțat această fereastră?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nu"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Sigur doriți să ieșiți?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Ați ales să ieșiți din Enlightenment.<br><br>Sigur doriți să ieșiți?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Sigur doriți să vă deautentificați?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Ați ales să ieșiți din sesiune.<br><br>Sigur doriți să ieșiți?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Sigur doriți să închideți calculatorul?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Ați ales să închideți calculatorul.<br><br>Sigur doriți să-l închideți?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Sigur doriți să reporniți calculatorul?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Ați ales să reporniți calculatorul.<br><br>Sigur doriți să-l reporniți?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Ați ales să suspendați calculatorul.<br><br>Sigur doriți să-l suspendați?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Sigur doriți să hibernați calculatorul?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Ați ales să hibernați calculatorul.<br><br>Sigur doriți să-l hibernați?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fereastră: Acțiuni"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Mută"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Redimensionează"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meniu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Meniu fereastră"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Ridică"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Coboară"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Termină"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fereastră: stare"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Comutare mod lipicios"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Comutare mod iconic"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Comutare mod pe tot ecranul"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximizează"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximizează vertical"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximiează orizontal"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximiează pe tot ecranul"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Mod maximizare „Inteligent”"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Mod maximizare „Expandat”"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Mod maximizare „Umplere”"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Comutare mod umbrire în sus"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Arată desktopul"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Arată raftul"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Comută la desktopul 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Comută la desktopul 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Comută la desktopul 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Comută la desktopul 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Comută la desktopul 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Comută la desktopul 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Comută la desktopul 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Comută la desktopul 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Comută la desktopul 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Comută la desktopul 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Comută la desktopul 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Comută la desktopul 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Comută desktopul..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Comută la desktopul 0 (toate ecranele)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Comută la desktopul 1 (toate ecranele)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Comută la desktopul 2 (toate ecranele)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Comută la desktopul 3 (toate ecranele)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Comută la desktopul 4 (toate ecranele)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Comută la desktopul 5 (toate ecranele)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Comută la desktopul 6 (toate ecranele)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Comută la desktopul 7 (toate ecranele)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Comută la desktopul 8 (toate ecranele)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Comută la desktopul 9 (toate ecranele)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Comută la desktopul 10 (toate ecranele)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Comută la desktopul 11 (toate ecranele)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Comută desktopul... (toate ecranele)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ecran"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Trimite cursorul pe ecranul 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Trimite cursorul pe ecranul 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Trimite cursorul pe ecranul..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Trimite cursorul mai în față cu un ecran"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Trimite cursorul înapoi cu un ecran"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Mută"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Mută"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Mută"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Redimensionează"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Selectează tot"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr ""
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fereastră: Mutare"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Către desktopul următor"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Către desktopul precedent"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Către Desktopul..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Afișează meniul principal"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Arată meniul „Favorite”"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Arată meniul „Toate aplicațiile”"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Lansează"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comandă"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplicație"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Repornește"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistem"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Ieşire din cont"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Oprește acum"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Oprește"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Repornește"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Suspendă"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Suspendă"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Hibernează"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Blochează"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr ""
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Ecran"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Ecran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr ""
 
@@ -692,18 +716,16 @@ msgstr ""
 msgid "Color Selector"
 msgstr "Selector culoare"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -711,20 +733,20 @@ msgstr "Selector culoare"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Renunță"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -735,7 +757,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -744,11 +766,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -756,91 +778,91 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr ""
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+msgid "Decryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr ""
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -848,69 +870,73 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Standard"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Aplică"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Extensii"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Module"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Blocare eșuată"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -918,22 +944,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -954,106 +980,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Nume"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Comentariu"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Iconiță"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Nume generic"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Categorii"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Tipuri MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Execută în terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Arată în meniuri"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Opțiuni"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Taie"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Copiază"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Lipește"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Selectează tot"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1089,314 +1114,314 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Eroare la montare"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Eroare la demontare"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Eroare la ejectare"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i fișiere"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Legătură"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Abandonează"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Mod de vizualizare"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Arată fișierele ascunse"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Redenumește"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Demontează"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Montează"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Ejectează"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Aplicație"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Proprietăți fișier"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Listă"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Curăță"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Redenumește fișierul"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Încearcă din nou"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Eroare"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignoră tot"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Confirmă ștergerea"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1428,12 +1453,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Dispozitiv amovibil"
 
@@ -1441,7 +1466,7 @@ msgstr "Dispozitiv amovibil"
 msgid "File:"
 msgstr "Fișier:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Dimensiune:"
 
@@ -1457,7 +1482,7 @@ msgstr "Tip fișier:"
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Proprietar:"
 
@@ -1477,17 +1502,17 @@ msgstr ""
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Previzualizează"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Implicit"
 
@@ -1496,7 +1521,7 @@ msgid "Thumbnail"
 msgstr "Miniatură"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Personalizat"
 
@@ -1512,52 +1537,42 @@ msgstr ""
 msgid "Select an Image"
 msgstr "Selectați o imagine"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Mută"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr ""
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Redimensionează"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Simplu"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
 msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1603,14 +1618,14 @@ msgstr "Poziție"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Dimensiune"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Stivuire"
@@ -1662,157 +1677,164 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Meniu fereastră"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Arată meniul „Favorite”"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Stivuire"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Ecran"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1833,7 +1855,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr ""
 
@@ -1992,7 +2014,6 @@ msgid "Size, Position and Locks"
 msgstr ""
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr ""
 
@@ -2069,15 +2090,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Lansează"
@@ -2092,20 +2111,6 @@ msgstr ""
 msgid "Mobile"
 msgstr "Module"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr ""
@@ -2143,7 +2148,7 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2151,11 +2156,11 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr ""
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2168,7 +2173,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr ""
 
@@ -2176,76 +2181,74 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr ""
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr ""
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr ""
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr ""
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2280,7 +2283,7 @@ msgid "Shrink to Content Width"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2310,7 +2313,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2327,7 +2330,7 @@ msgstr ""
 msgid "Show on specified Desktops"
 msgstr ""
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2338,7 +2341,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2347,427 +2350,478 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+msgid "Enlightenment cannot initialize Eina!\n"
 msgstr ""
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:229
+msgid "Enlightenment cannot initialize Eet!\n"
 msgstr ""
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:238
+msgid "Enlightenment cannot initialize Ecore!\n"
 msgstr ""
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
+#: src/bin/e_main.c:274
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
 msgstr ""
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:284
+msgid "Enlightenment cannot initialize Ecore_File!\n"
 msgstr ""
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:293
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
 msgstr ""
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:302
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
 msgstr ""
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot initialize Ecore_X!\n"
 msgstr ""
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:324
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
 msgstr ""
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr ""
+
+#: src/bin/e_main.c:368
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr ""
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:388
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr ""
+
+#: src/bin/e_main.c:397
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr ""
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr ""
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+msgid "Enlightenment cannot set up its environment."
+msgstr ""
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+msgid "Enlightenment cannot set up its pointer system."
 msgstr ""
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr ""
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr ""
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
+#: src/bin/e_main.c:526
+msgid "Enlightenment cannot set up its init screen."
 msgstr ""
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
 msgstr ""
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
+#: src/bin/e_main.c:596
+msgid "Setup Backlight"
 msgstr ""
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot configure the backlight."
 msgstr ""
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+msgid "Setup Message Bus"
+msgstr ""
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr ""
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
+#: src/bin/e_main.c:715
+msgid "Setup Filemanager"
 msgstr ""
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
+#: src/bin/e_main.c:803
+msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
+#: src/bin/e_main.c:814
+msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
+#: src/bin/e_main.c:818
+msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
+#: src/bin/e_main.c:824
+msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1008
-msgid "Setup Wallpaper"
+#: src/bin/e_main.c:828
+msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:1013
-msgid "Enlightenment cannot set up its desktop background system."
+#: src/bin/e_main.c:835
+msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1018
-msgid "Setup Mouse"
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1023
-msgid "Enlightenment cannot configure the mouse settings."
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1028
-msgid "Setup Bindings"
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1033
-msgid "Enlightenment cannot set up its bindings system."
+#: src/bin/e_main.c:868
+msgid "Enlightenment cannot initialize the XSettings system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1038
-msgid "Setup Shelves"
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot initialize its desktop environment.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
+#: src/bin/e_main.c:908
+msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
+#: src/bin/e_main.c:949
+msgid "Almost Done"
 msgstr ""
 
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1442
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1452
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1462
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1472
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2775,7 +2829,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2783,7 +2837,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2791,42 +2845,34 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr ""
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr ""
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2834,16 +2880,16 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2854,26 +2900,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr ""
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Comentariu"
@@ -2882,16 +2928,16 @@ msgstr "Comentariu"
 msgid "Starting"
 msgstr ""
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -2899,113 +2945,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3013,156 +3059,156 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr ""
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr ""
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr ""
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr ""
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr ""
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr ""
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3173,12 +3219,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr ""
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3206,140 +3252,146 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Selectează tot"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Hibernează"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr ""
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3347,32 +3399,33 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Executabil"
@@ -3425,17 +3478,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3448,10 +3501,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Lansează"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
 msgstr ""
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Aplicație"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Desktop"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3464,7 +3532,7 @@ msgid "Available Profiles"
 msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3502,9 +3570,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr ""
 
@@ -3546,7 +3614,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3554,7 +3622,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3562,7 +3630,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3570,7 +3638,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3578,47 +3646,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3627,11 +3695,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3640,90 +3708,73 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Desktop"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3740,7 +3791,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr ""
 
@@ -3750,12 +3801,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr ""
 
@@ -3763,189 +3814,216 @@ msgstr ""
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Suspendă"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Suspendă"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Blochează"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Arată în meniuri"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Arată în meniuri"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Personalizat"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Suspendă"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Ecran"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -3991,102 +4069,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4232,34 +4310,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr ""
 
@@ -4340,17 +4431,17 @@ msgid "Manager"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4373,13 +4464,11 @@ msgid "Menu Settings"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Implicit"
@@ -4390,7 +4479,7 @@ msgid "Main Menu"
 msgstr "Afișează meniul principal"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4410,7 +4499,7 @@ msgid "Comments"
 msgstr "Comentariu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4422,7 +4511,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Arată în meniuri"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr ""
 
@@ -4491,19 +4580,19 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr ""
 
@@ -4647,18 +4736,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4678,42 +4767,47 @@ msgstr ""
 msgid "This Screen"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Simplu"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4748,7 +4842,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4756,7 +4850,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
@@ -4785,7 +4879,7 @@ msgid "Menu Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4794,7 +4888,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr ""
 
@@ -4807,12 +4901,12 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4829,7 +4923,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr ""
 
@@ -4846,379 +4940,389 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
-msgid "Button Text"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:100
-msgid "Button Text Disabled"
+msgid "Button Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:101
-msgid "Check Text"
+msgid "Button Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:102
-msgid "Check Text Disabled"
+msgid "Check Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:103
-msgid "Entry Text"
+msgid "Check Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:104
-msgid "Entry Text Disabled"
+msgid "Entry Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:105
-msgid "Label Text"
+msgid "Entry Text Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:106
-msgid "List Item Text Selected"
+msgid "Label Text"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:107
-msgid "List Item Text (Even)"
+msgid "List Item Text Selected"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:108
-msgid "List Item Background Base (Even)"
+msgid "List Item Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:109
-msgid "List Item Text (Odd)"
+msgid "List Item Background Base (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:110
-msgid "List Item Background Base (Odd)"
+msgid "List Item Text (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:111
-msgid "List Header Text (Even)"
+msgid "List Item Background Base (Odd)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:112
-msgid "List Header Background Base (Even)"
+msgid "List Header Text (Even)"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:113
+msgid "List Header Background Base (Even)"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Personalizat"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Ejectează"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5226,11 +5330,15 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+msgid "Use icon theme for applications"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5295,10 +5403,8 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, c-format
-msgid "%1.2f times"
+msgid "%1.2f x"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
@@ -5310,6 +5416,12 @@ msgstr ""
 msgid "Minimum"
 msgstr ""
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr ""
@@ -5330,25 +5442,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5364,15 +5476,15 @@ msgstr ""
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr ""
 
@@ -5399,19 +5511,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5534,6 +5646,10 @@ msgstr "Aplicație"
 msgid "Border Icon"
 msgstr ""
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr ""
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr ""
@@ -5563,23 +5679,43 @@ msgstr ""
 msgid "Animate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+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:226
+msgid "Pronounced Acceleratem then decelerate"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Stivuire"
@@ -5601,6 +5737,7 @@ msgid "Most recent Window under the Mouse"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr ""
 
@@ -5633,11 +5770,6 @@ msgstr ""
 msgid "Only dialogs with focused parent"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr ""
@@ -5738,13 +5870,13 @@ msgid "Fill available space"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr ""
@@ -5802,7 +5934,7 @@ msgid "Raise when clicking to focus"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr ""
 
@@ -6052,28 +6184,28 @@ msgstr ""
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr ""
 
@@ -6081,152 +6213,153 @@ msgstr ""
 msgid "Everything Settings"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Mută"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Mută"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Confirmă ștergerea"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Arată în meniuri"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Arată în meniuri"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Implicit"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Implicit"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Stivuire"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Stivuire"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Simplu"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6235,38 +6368,29 @@ msgstr ""
 msgid "%1.2f"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Încearcă din nou"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Aplicație"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Opțiuni"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6288,158 +6412,65 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Redenumește fișierul"
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Aplicație"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Aplicație"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Execută în terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Executabil"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Aplicație"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Comandă"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Comandă"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Aplicație"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Redenumește fișierul"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Arată fișierele ascunse"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Curăță"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Maximiează pe tot ecranul"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr ""
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr ""
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr ""
 
@@ -6486,19 +6517,19 @@ msgid "Select an image"
 msgstr "Selectați o imagine"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6509,7 +6540,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6519,7 +6550,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6597,95 +6628,99 @@ msgstr ""
 msgid "Device"
 msgstr "Previzualizează"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6720,7 +6755,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6732,36 +6767,40 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Mută"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr ""
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr ""
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -6988,15 +7027,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Proprietăți"
 
@@ -7040,7 +7079,7 @@ msgstr ""
 msgid "Show windows from active desktop"
 msgstr ""
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr ""
 
@@ -7158,31 +7197,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7202,128 +7241,90 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Mută"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7365,7 +7366,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7389,38 +7390,53 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Volume changed"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Mod de vizualizare"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7447,126 +7463,178 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Eroare la montare"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Fișier:"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Poziție"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Simplu"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Redenumește"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+msgid "Systray Error"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Ecran"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Ecran"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Redimensionează"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Opțiuni"
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Redenumește fișierul"
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Aplicație"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Aplicație"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Execută în terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Executabil"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Redenumește fișierul"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Maximiează pe tot ecranul"
+
+#, fuzzy
 #~ msgid "Show home directory"
 #~ msgstr "Arată desktopul"
 
index bd6e294..bfc24d8 100755 (executable)
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2011-01-07 02:56+0200\n"
 "Last-Translator: Danny Moshnakov <admin@moshnakov.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -23,20 +23,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Об Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,14 +45,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2010, команда разработки Enlightenment Development."
 "<br><br>Мы надеемся, что вам так же понравится использовать эту программу, "
@@ -65,8 +64,9 @@ msgstr ""
 "стабильной. Многие возможности незакончены или вообще отсутствуют, и в них "
 "может быть много ошибок. Вас <hilight>ПРЕДУПРЕДИЛИ!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Команда</title>"
 
 #: src/bin/e_actions.c:365
@@ -83,45 +83,45 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Вы действительно хотите убить это окно?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Нет"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Вы запросили выйти из Enlightenment.<br><br>Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Вы действительно хотите завершить сессию?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Вы запросили завершить сессию.<br><br>Вы уверены, что Вы этого хотите?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Вы действительно хотите выключить компьютер?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -129,28 +129,28 @@ msgstr ""
 "Вы запросили выключить ваш компьютер.<br><br>Вы действительно хотите "
 "выключить?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Вы действительно хотите перегрузить компьютер?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Вы запросили перегрузить ваш компьютер.<br><br>Вы действительно хотите этого?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Вы запросили suspend компьютера.<br><br>Вы действительно хотите этого?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Вы действительно хотите \"заморозить\" систему?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -158,548 +158,574 @@ msgstr ""
 "Вы запросили \"заморозить\" ваш компьютер.<br><br>Вы действительно хотите "
 "этого?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Окно : Действия"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Двигать"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Изменить размер"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Меню Окна"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Повысить"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Понизить"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Убить"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Окно : Состояние"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Включить \"липкий\" режим окна"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Переключить опущеный режим"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Переключить полноэкранный режим"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Увеличить"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Увеличить в полный экран"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим увеличения \"Умный\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим увеличения \"Расширить\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим увеличения \"Заполнить\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Переключить режим свернуть вверх"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Переключить режим свернуть вниз"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Переключить режим свернуть влево"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Переключить режим свернуть вправо"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Переключить свёрнутый режим"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Переключить режим без бордюра"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Бордюр"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Переключить режим прикрепления"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Перенести стол влево"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Перенести стол вправо"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Перенести стол вверх"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Перенести стол вниз"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Перенести стол на..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Показать рабочий стол"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Показать полку"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Перенести стол на..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Перенести стол линейно..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Переключить на стол 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Переключить на стол 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Переключить на стол 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Переключить на стол 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Переключить на стол 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Переключить на стол 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Переключить на стол 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Переключить на стол 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Переключить на стол 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Переключить на стол 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Переключить на стол 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Переключить на стол 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Переключить на стол..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Перенести стол влево (все экраны)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Перенести стол вправо (все экраны)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Перенести стол вверх (все экраны)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Перенести стол вниз (все экраны)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Перенести стол через... (все экраны)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Перенести стол на... (все экраны)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Перенести стол линейно... (все экраны)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Перенести стол в направлении..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Переключиться на стол 0 (все экраны)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Переключиться на стол 1 (все экраны)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Переключиться на стол 2 (все экраны)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Переключиться на стол 3 (все экраны)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Переключиться на стол 4 (все экраны)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Переключиться на стол 5 (все экраны)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Переключиться на стол 6 (все экраны)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Переключиться на стол 7 (все экраны)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Переключиться на стол 8 (все экраны)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Переключиться на стол 9 (все экраны)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Переключиться на стол 10 (все экраны)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Переключиться на стол 11 (все экраны)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Переключиться на стол... (все экраны)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Экран"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Послать мышь на экран 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Послать мышь на экран 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Послать мышь на экран..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Послать мышь 1 экран вперёд"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Послать мышь 1 экран назад"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Послать мышь вперед/назад..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Геометрия передвижения"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Переместить в"
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Двигать по"
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Изменять размер по"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Перенести стол в направлении..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Создать иконку"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Окно : Передвижение"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "На следующий стол"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "На предыдущий стол"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "По # стола..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "На стол..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Показать главное меню"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Показать избранное меню"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Показать меню \"Все приложения\""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Показать меню клиента"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Показать меню..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Запустить"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Приложение"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Выход"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Выйти сейчас"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Режим"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Переключение режима презентаций"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Переключение режима оффлайн"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Системный"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Завершить сессию"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Выключить сейчас"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Выключить"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Перегрузить"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Приостановить"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Заморозить"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Расчистить окна"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Общее : Действия"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Отложеное выполнение"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "ACPI"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Затемнение экрана"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Отменить затемнение экрана"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Установить как фон"
 
@@ -707,18 +733,16 @@ msgstr "Установить как фон"
 msgid "Color Selector"
 msgstr "Диалог выбора цвета"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -726,20 +750,20 @@ msgstr "Диалог выбора цвета"
 msgid "OK"
 msgstr "ОК"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -750,7 +774,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -764,11 +788,11 @@ msgstr ""
 "версия Enlightenment.<br>Это неправильно, и поэтому ваша конфигурация "
 "была<br>восстановлена на стандартную. Извините за неудобство.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Проблемы сохранения параметров Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -776,96 +800,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Параметры обновлены"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Ошибка при переходе в режим заморозки."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "Никто"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Ошибка при переходе в режим ожидания."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Ошибка при переходе в режим ожидания."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Добро пожаловать в Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -876,57 +900,62 @@ msgstr ""
 "может быть<br>определена.<br><br>Файл в котором возникла ошибка:<br>"
 "%s<br><br>Этот файл был удалён с целью предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Базово"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Применить"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Расширения"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Модули"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Предпочтение иконки"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Ошибка - нет поддержки PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Поддержка PAM не была включена при сборке Enlightenment, "
 "поэтому<br>запирание экрана отключено."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Не удалось заблокировать"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -935,15 +964,15 @@ msgstr ""
 "клавиатура<br>удерживаются каким-то приложением,<br>и эту связь невозможно "
 "нарушить."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Пожалуйста, введите ваш пароль"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Ошибка системы опознавания"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -954,11 +983,11 @@ msgstr ""
 "<hilight>%i</hilight>.<br>Это плохо и такого не должно случатьса."
 "<br>Пожалуйста, сообщите об этой ошибке."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Активировать режим презентаций?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -968,11 +997,11 @@ msgstr ""
 "<b>презентаций</b> и временно отключить хранитель экрана, блокировку и "
 "энергосбережение?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Нет, но увеличить задержку"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Нет, и не спрашивать больше."
 
@@ -999,106 +1028,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Редактор программ"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Имя"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Иконка"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Стандартное имя"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Класс окна"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Категории"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Типы MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Файл Desktop"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Общие"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Уведомление о запуске"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Запустить в терминале"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Показывать в меню"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Опции"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Выбрать иконку"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Выберите исполняемый файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Выделить всё"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1138,313 +1166,313 @@ msgstr ""
 "Enlightenment не смог запустить приложение:<br><br>%s<br><br>приложение не "
 "запустилось."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Ошибка исполнения приложения"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s неожиданно закончил исполнение."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Код выхода %i был возвращен из %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s было прервано сигналом прерывания."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s было прервано сигналом выхода."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s было прервано сигналом аварийного прекращения работы."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s было прервано ошибкой плавающей точки."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s было прервано сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s было прервано ошибкой сегментации."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s было прервано ошибкой Broken Pipe."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s было прервано сигналом завершения."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s было прервано ошибкой Bus Error."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s было прервано сигналом номер %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** Остаток вывода был обрезан. Сохраните для просмотра. ***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Лог ошибки"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Не было сообщения ошибки."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Сохранить это сообщение"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Этот лог об ошибке будет сохранён как %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Информация об ошибке"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Информация о сигнале ошибки"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Выходные данные"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Не было данных."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Несуществующий путь"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s не существует."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Ошибка подключения"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Не удалось подключить устройство"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Ошибка отключения"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Не удалось отключить устройство"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Ошибка извлечения"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Не удалось извлечь устройство"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i файлов"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Ссылка"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Отменить"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Наследовать родительские настройки"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Режим отображения"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Обновить вид"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Показать скрытые файлы"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Запомнить очередность"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Сортировать"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Новый каталог"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Отключить"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Подключить"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Извлечь"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Свойства приложения"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Свойства файла"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Сетка иконок"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Пользовательские иконки"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Список"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Размер иконки (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Установить фон..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Установить перекрытие..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Создать новый каталог"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Имя нового каталога:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Переименовать %s в:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Переименовать файл"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Повторить"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Нет для всего"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Да для всего"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Файл уже существует, переписать?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Пропустить это"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Пропустить все"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Во время исполнения произошла ошибка.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Подтвердите удаление"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Вы действительно хотите стереть <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1478,12 +1506,12 @@ msgstr "%llu КиБ"
 msgid "%llu B"
 msgstr "%llu Б"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Неизвестный носитель"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Съёмное устройство"
 
@@ -1491,7 +1519,7 @@ msgstr "Съёмное устройство"
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Размер:"
 
@@ -1507,7 +1535,7 @@ msgstr "Тип файла:"
 msgid "Permissions"
 msgstr "Разрешения"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Владелец:"
 
@@ -1527,17 +1555,17 @@ msgstr "Владелец может читать"
 msgid "Owner can write"
 msgstr "Владелец может писать"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -1546,7 +1574,7 @@ msgid "Thumbnail"
 msgstr "Миниатюра"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Личные"
 
@@ -1562,50 +1590,42 @@ msgstr "Информация о ссылке"
 msgid "Select an Image"
 msgstr "Выбрать изображение"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Переместить в"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Начать сдвиг/размер"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Может менять размер"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Автопрокрутка содержимого"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Вклад"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Вид"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Убрать"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Завершить сдвиг/размер этого гаджета"
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "Закончить поиск"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1653,14 +1673,14 @@ msgstr "Позицию"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Уровень"
@@ -1712,162 +1732,169 @@ msgstr "Выйти из сессии когда это окно открыто"
 msgid "Remember these Locks"
 msgstr "Запомнить эти замки"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Окна"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Всегда поверху"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Липкий"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Настройки"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Полный экран"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Обычный размер"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Редактировать иконку"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Создать иконку"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Добавить в избранное"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Добавить в избранное"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Комбинация клавиш"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Расположение"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Пропускать"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Бордюр"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Замки"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Запомнить"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Липкий"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Пропускать"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Опустить"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Свёрнут"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Экран"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Всегда поверху"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Нормально"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Всегда понизу"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Прикрепить к столу"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Открепить от стола"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Выбор стиля бордюра"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Иконка по умолчанию от Е17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Иконка приложения "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Иконка пользователя"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Сопротивление"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Список окон"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Пейджер"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Панель задач"
 
@@ -1888,7 +1915,7 @@ msgid "ICCCM Properties"
 msgstr "Свойства ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Заголовок"
 
@@ -2062,7 +2089,6 @@ msgid "Size, Position and Locks"
 msgstr "Размер, позицию и замки"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Все"
 
@@ -2140,15 +2166,13 @@ msgid "Utilities"
 msgstr "Утилита"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Файл"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Запустить"
@@ -2164,20 +2188,6 @@ msgstr "Закрыть"
 msgid "Mobile"
 msgstr "Профиль"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Настройки"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Настройки модуля"
@@ -2215,7 +2225,7 @@ msgstr "Добавить гаджет"
 msgid "Remove Gadget"
 msgstr "Убрать гаджет"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Настройки панели инструментов"
 
@@ -2223,11 +2233,11 @@ msgstr "Настройки панели инструментов"
 msgid "Layout"
 msgstr "Расположение"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Ошибка метода ввода"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2243,7 +2253,7 @@ msgstr "Главное"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Избранные приложения"
 
@@ -2251,76 +2261,74 @@ msgstr "Избранные приложения"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Приложения"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Окна"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Потерянные окна"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "О..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Тема"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Виртуальный"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Полки"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Показать/скрыть все окна"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Нет приложений)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Установка виртуальных рабочих столов"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Нет окон)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Нет имени!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Нет Полок)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Добавить полку"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Удалить полку"
 
@@ -2355,7 +2363,7 @@ msgid "Shrink to Content Width"
 msgstr "Ужимать под размер содержимого"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Стиль"
 
@@ -2385,7 +2393,7 @@ msgid "Hide duration"
 msgstr "Время сокрытия"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f секунд"
@@ -2402,7 +2410,7 @@ msgstr "Показывать на всех столах"
 msgid "Show on specified Desktops"
 msgstr "Показывать на указанных столах"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2419,7 +2427,7 @@ msgstr ""
 "Пожалуйста, проверьте:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2432,52 +2440,22 @@ msgstr ""
 " Пожалуйста, проверьте:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может инициализировать Ecore!\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может инициализировать файловую систему.\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2485,7 +2463,7 @@ msgstr ""
 "Enlightenment не может настроить указатель сигнала выхода.\n"
 "Возможно, у вас недостаточно памяти?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2493,7 +2471,7 @@ msgstr ""
 "Enlightenment не может настроить указатель сигнала HUP.\n"
 "Возможно, у вас недостаточно памяти?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2501,63 +2479,37 @@ msgstr ""
 "Enlightenment не может настроить указатель сигнала USER.\n"
 "Возможно не достаточно памяти?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не может инициализировать подключение к X.\n"
-"Вы настроили переменную DISPLAY?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не может инициализировать аварийную систему сообщений.\n"
-"Вы настроили переменную DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может инициализировать систему подключений.\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может инициализировать систему IPC.\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не может настроить оболочку xinerama.\n"
-"Этого не должно случаться."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не может настроить оболочку randr.\n"
-"Этого не должно случаться."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может инициализировать систему Evas.\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2567,7 +2519,7 @@ msgstr ""
 "предоставление в Evas. Пожалуйста, проверьте вашу установку Evas и Ecore\n"
 "и проверьте, что они поддерживают предоставление Software X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2577,7 +2529,35 @@ msgstr ""
 "предоставление в Evas. Пожалуйста, проверьте вашу установку Evas и Ecore\n"
 "и проверьте, что они поддерживают предоставление Software Buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment не может инициализировать аварийную систему сообщений.\n"
+"Вы настроили переменную DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2585,23 +2565,29 @@ msgstr ""
 "Enlightenment не может создать директории в вашем домашнем каталоге.\n"
 "Возможно, у вас нет домашнего католога или диск заполнен?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment не может настроить систему реестра файлов."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment не может настроить систему настроек."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment не может настроить систему тем."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment не может настроить систему масштабирования."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment не может настроить систему указателей."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2609,95 +2595,42 @@ msgstr ""
 "Enlightenment не может настроить пути для поиска файлов.\n"
 "Возможно, у вас недостаточно памяти?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment не может настроить систему шрифтов."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment не может настроить систему тем."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не может настроить экран инициализации.\n"
-"Возможно, у вас недостаточно памяти?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment не может настроить систему языков."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Запускается языковая поддержка"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment не может настроить систему языков."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment не может инициализировать FDO систему стола.\n"
 "Возможно, у вас недостаточно памяти?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Проверка поддержки форматов"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment обнаружил, что Evas не может создать буферный слой. "
-"Пожалуйста, проверьте,\n"
-"что Evas поддерживает движок Software Buffer.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment обнаружил, что Evas не может загружать файлы PNG. Проверьте,\n"
-"что Evas имеет поддержку загрузчика PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment обнаружил, что Evas не может загружать файлы JPEG. Проверьте,\n"
-"что Evas имеет поддержку загрузчика JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment обнаружил, что Evas не может загружать файлы EET. Проверьте,\n"
-"что Evas имеет поддержку загрузчика EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment определил, что Evas не может загрузить шрифт 'Sans'. "
-"Проверьте,\n"
-"имеет ли Evas поддержку fontconfig, и определяет ли fontconfig шрифт "
-"'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Проверка поддержки SVG"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Настройка экранов"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2705,207 +2638,347 @@ msgstr ""
 "Настройка управления окнами для всех экранов на вашей системе не удалась.\n"
 "Возможно запущен другой менеджер окон?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Настройка ACPI"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Настройка привязок"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment не может настроить DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Настройка DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment не может настроить DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Настройка хранителя экрана"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment не может настроить хранитель экрана."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Настройка режимов энергосбережения"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment не может настроить систему энергосбережения."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Настройка блокировки"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment не может настроить систему блокировки рабочего стола."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Настройка подсказок"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не может настроить систему подсказок."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Настройка системы сообщений"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Настройка путей"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Настройка системы управления"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment не может настроить систему системных команд.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Настройка действий"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не может настроить систему действий."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Настройка системы запуска"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не может настроить систему запуска."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Настройка ФМ"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Файловый менеджер"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Настройка системы сообщений"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment не может настроить систему сообщений."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Настройка ДНД"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не может настроить систему ДНД."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Настройка обработчика захвата ввода"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment не может настроить систему обработки захвата ввода."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Настройка модулей"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не может настроить систему модулей."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Настройка запоминаний"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment не может настроить запоминание настроек."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Настройка цветовых классов"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не может настроить систему класса цветов."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Настройка контейнера гаджетов"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment не может настроить систему управления гаджетами."
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Настройка ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Настройка DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment не может настроить DPMS."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Настройка режимов энергосбережения"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment не может настроить систему энергосбережения."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Настройка фона"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не может настроить систему фона рабочего стола."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Настройка мыши"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment не может настроить параметры мыши."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Настройка привязок"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment не может настроить систему привязок."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Настройка полок"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment не может настроить систему полок."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Настройка генератора миниатюр"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment не может настроить систему Thumbnailing.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment не может настроить систему системных команд.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment не может настроить систему Thumbnailing.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment не может настроить систему тем."
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "Настрока очередности файлов"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не может настроить систему очередей."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Загрузка модулей"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Параметры полок"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Почти закончено"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Проверка поддержки форматов"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment обнаружил, что Evas не может создать буферный слой. "
+"Пожалуйста, проверьте,\n"
+"что Evas поддерживает движок Software Buffer.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment обнаружил, что Evas не может загружать файлы PNG. Проверьте,\n"
+"что Evas имеет поддержку загрузчика PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment обнаружил, что Evas не может загружать файлы JPEG. Проверьте,\n"
+"что Evas имеет поддержку загрузчика JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment обнаружил, что Evas не может загружать файлы PNG. Проверьте,\n"
+"что Evas имеет поддержку загрузчика PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment обнаружил, что Evas не может загружать файлы EET. Проверьте,\n"
+"что Evas имеет поддержку загрузчика EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment определил, что Evas не может загрузить шрифт 'Sans'. "
+"Проверьте,\n"
+"имеет ли Evas поддержку fontconfig, и определяет ли fontconfig шрифт "
+"'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment дал сбой при старте и был перезапущен"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2913,7 +2986,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2925,7 +2998,7 @@ msgstr ""
 "проблему с модулями в Вашей конфигурации.<br>Диалог конфигурации модулей "
 "позволит Вам выбрать нужные<br> модули заново."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2937,20 +3010,12 @@ msgstr ""
 "проблему с модулями в Вашей конфигурации.<br><br>Диалог конфигурации модулей "
 "позволит Вам выбрать нужные<br> модули заново."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Параметры полок"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Почти закончено"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Загрузка модуля: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2959,11 +3024,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Модуль с именем %s не был "
 "найден в<br>директориях поиска модулей.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Ошибка загрузки модуля"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2972,11 +3037,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Полный путь до этого модуля:"
 "<br>%s<br>Сообщение ошибки:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Модуль не содержит всех требуемых функций"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2987,16 +3052,16 @@ msgstr ""
 "минимальную версию API модулей: %i.<br>Версия API модуля объявленная для "
 "Enlightenment: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Модуль %s для Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Хотите выгрузить этот модуль?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3010,27 +3075,27 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Полка #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите стереть эту полку?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Закончить перемещения/изменения гаджетов"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Начать перемещение/изменение гаджетов"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Содержимое"
 
@@ -3038,16 +3103,16 @@ msgstr "Содержимое"
 msgid "Starting"
 msgstr "Запускается"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Проверка системных разрешений"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Проверка системы закончена"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3058,35 +3123,35 @@ msgstr ""
 "отказываются закрыться. <br>Вы хотите закончить выход, не закрывая эти "
 "<br>приложения?<br><br>Автоматический выход через %d секунд."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Проблемы с выходом из сессии"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Выйти сейчас"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Подождите ещё"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Отменить выход из сессии"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Выполняется завершение сессии"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Завершение сессии.<br><hilight>Пожалуйста подождите.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment занят другим обращением"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3094,7 +3159,7 @@ msgstr ""
 "Завершение сеанса.<br>Вы не можете выполнять другие действия<br>после "
 "завершения сеанса."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3102,7 +3167,7 @@ msgstr ""
 "Выключение.<br>Вы не можете выполнять другие действия<br>после того как "
 "инициировано выключение."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3110,7 +3175,7 @@ msgstr ""
 "Перезагрузка.<br>Вы не можете выполнять другие действия<br>после того как "
 "инициирована перезагрузка."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3118,63 +3183,64 @@ msgstr ""
 "Переход в режим ожидания.<br>Пока переход не завершится вы не можете "
 "выполнять<br>любые другие действия."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Заморозка.<br>Вы не можете выполнять другие действия<br>пока заморозка не "
 "завершится."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Блиииин! Этого не должно случаться"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ".Ошибка при выключении"
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Ошибка при перезагрузке."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Ошибка при переходе в режим ожидания."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Ошибка при переходе в режим заморозки."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Выключить"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Выключение.<br><hilight>Пожалуйста, ждите.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Перезагрузка"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Перезагрузка.<br><hilight>Пожалуйста, подождите.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Приостановка"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Переход в режим ожидания.<br><hilight>Пожалуйста, ждите.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Заморозка"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Переход в режим заморозки.<br><hilight>Пожалуйста, ждите.</hilight>"
 
@@ -3182,33 +3248,33 @@ msgstr "Переход в режим заморозки.<br><hilight>Пожал
 msgid "About Theme"
 msgstr "О теме"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Установить как тему"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Закончить перемещения/изменения элементов"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Начать перемещение/изменение элементов"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Установка содержимого панели инструментов"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment не смог запустить дочерний процесс:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Не могу выйти - бессмертные окна."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3218,123 +3284,123 @@ msgstr ""
 "Enlightenment не даст себе выйти, пока эти окна не будут закрыты,<br>или вы "
 "не уберёте флаг защиты.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f байт"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f КБ"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f МБ"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ГБ"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "В будущем"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "За последнюю минуту"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li лет назад"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li месяцев назад"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li недель назад"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li дней назад"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li часов назад"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li минут назад"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Настройки импорта изображения"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Импортировать"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Опции заполнения и растягивания"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Растянуть"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "По центру"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "В пределах"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Заполнить"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Качество файла"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Использовать оригинальный файл"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3345,12 +3411,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Конфигурационная панель"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3383,140 +3449,146 @@ msgstr "Вверх"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Добавить в избранное"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Каталог вверх"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Разрешение"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Разрешения:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Изменено:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Вы"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Защищено"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Только чтение"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Чтение-Запись"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Параметры монитора батареи"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Предупреждать при низком уровне заряда"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Проверять каждые:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f тиков"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Заморозить"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Пуллинг"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Показывать предупреждение низкого заряда"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Предупреждать когда:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f мин"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Автоматически скрыть через..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f сек"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Предупреждение"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Автоопределение"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Встроеный"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Нечеткий режим"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Устройства"
 
@@ -3524,32 +3596,33 @@ msgstr "Устройства"
 msgid "Battery"
 msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Низкий заряд батареи!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Рекомменуется запитаться от сети"
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Индикатор батареи"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Часы"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Показывать панель инструментов"
@@ -3607,17 +3680,17 @@ msgstr "Конфигурация конфигурационной панели 
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Приложения IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Стартовые приложения"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Перезапускаемые приложения"
 
@@ -3630,10 +3703,25 @@ msgid "Apps"
 msgstr "Приложения"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Новое приложение"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Запустить"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Выбор приложений"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Файлы рабочего стола"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar другое"
 
@@ -3646,7 +3734,7 @@ msgid "Available Profiles"
 msgstr "Доступные профили"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Выбрать профиль"
 
@@ -3684,9 +3772,9 @@ msgstr "Настройки диалога"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Общие настройки"
 
@@ -3728,7 +3816,7 @@ msgstr "Диалоги"
 msgid "Profiles"
 msgstr "Профили"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3739,7 +3827,7 @@ msgstr ""
 "<br>если нет. Если вы не нажмёте кнопку, старое разрешение<br>%dx%d на %d Гц "
 "будет восстановлено в течение %d секунд."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3750,7 +3838,7 @@ msgstr ""
 "<br>если нет. Если вы не нажмёте кнопку, старое разрешение<br>%dx%d будет "
 "восстановлено в течение %d секунд."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3761,7 +3849,7 @@ msgstr ""
 "<br>если нет. Если вы не нажмёте кнопку, старое разрешение<br>%dx%d на %d Гц "
 "будет восстановлено <hilight>сразу же</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3772,47 +3860,47 @@ msgstr ""
 "<br>если нет. Если вы не нажмёте кнопку, старое разрешение<br>%dx%d будет "
 "восстановлено <hilight>сразу же</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Смена разрешения"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Восстановить"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Настройки разрешения экрана"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Восстанавливать при входе"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Обновление"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Оборот"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Зеркально"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Отсутствует функционал"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3821,11 +3909,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Не найдены частоты экрана"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3838,90 +3926,73 @@ msgstr ""
 "частота будет использована при<br>выставлении разрешения экрана, что может "
 "<hilight>повредить</hilight> ваш экран."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Настройки виртуальных столов"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Количество рабочих столов"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Файлы рабочего стола"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Переход мышкой с краёв экрана при перетаскивании объектов"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Непрерывный рабочий стол (оборот вокруг при переходах)"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Рабочие столы"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Выкл."
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Гладко"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Увеличение"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Сдвиг фона"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Скорость анимации"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f сек"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Сдвиг по горизонтали (X)"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Сдвиг по вертикали (Y)"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Анимация перехода"
 
@@ -3938,7 +4009,7 @@ msgid "Desktop Wallpaper"
 msgstr "Обои стола"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Определить"
 
@@ -3948,12 +4019,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Личный"
 
@@ -3961,184 +4032,212 @@ msgstr "Личный"
 msgid "Screen Lock Settings"
 msgstr "Настройки блокировки экрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Блокировать при запуске"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Блокировать при приостановке"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Пользовательская комманда блокировки"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Блокировка"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Показывать на всех экранах"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Показывать на текущем экране"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Показывать на экране #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Окно входа в систему"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Блокировать по запуску хранителя экрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f секунд"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Блокировать по превышению времени бездействия"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f минут"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Таймеры"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Предлагать если выключено раньше"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Режим презентаций"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Указано темой"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Обои из темы"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Текущие обои"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Обои"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Настройки хранителя экрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Включить Х11 хранитель экрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Приостановить"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Хранитель экрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Время до начала"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Время чередования"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Затемнение"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Предпочтительно"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Не желательно"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Действия показа"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Разрешить"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Не позволять"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Сигналы управления энергопотреблением дисплея"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Текущий сервер экрана не поддерживает<br>DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Текущий сервер экрана<br>не имеет расширений DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Настройки управления энергопотреблением дисплея (DPMS)"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Включить управление энергопотреблением дисплея"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Время ожидания"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Время остановления"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Время выключения"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "Назад"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Виртуальные столы"
@@ -4185,102 +4284,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Настройки привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Привязки к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Добавить привязку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Удалить привязку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Изменить привязку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Удалить всё"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Вернуть привязки по умолчанию"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Параметры действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Основные опции"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Разрешить вызов привязок при полноэкранных окнах"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Последовательность привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Интерактивные края"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Ошибка привязки к краю"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4430,34 +4529,47 @@ msgid ""
 msgstr ""
 "Enlightenment не смог импортировать конфигурацию<br>из-за ошибки копирования."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Настройки языка"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Выбор языка"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "По умолчанию"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Выбранная локаль"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Локаль"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Язык"
 
@@ -4545,17 +4657,17 @@ msgid "Manager"
 msgstr "Менеджер"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ничего"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Последовательность привязок мыши"
 
@@ -4580,13 +4692,11 @@ msgid "Menu Settings"
 msgstr "Настройки меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Личный"
@@ -4596,7 +4706,7 @@ msgid "Main Menu"
 msgstr "Главное меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Избранные"
 
@@ -4614,7 +4724,7 @@ msgid "Comments"
 msgstr "Комментарии"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4626,7 +4736,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Показывать в меню верхнего уровня"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Меню"
 
@@ -4694,19 +4804,19 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Шрифты"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Темы"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Иконки"
 
@@ -4853,18 +4963,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Настройки обоев"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Использовать обои из темы"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Изображение..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "В сети..."
 
@@ -4884,43 +4994,48 @@ msgstr "Этот рабочий стол"
 msgid "This Screen"
 msgstr "Этот экран"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Настройки обоев..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Размножить"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Гладко"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Указать изображение..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Ошибка импорта изображения"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment не смог импортировать изображение<br>из-за ошибок в конверсии."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Ошибка импорта обоев"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment не смог импортировать обои<br>из-за ошибки копирования."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4957,7 +5072,7 @@ msgid "Error: can't start the request."
 msgstr "Ошибка: не удалось выполнить запрос."
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Стиль бордюра по умолчанию"
 
@@ -4965,7 +5080,7 @@ msgstr "Стиль бордюра по умолчанию"
 msgid "Window Border Selection"
 msgstr "Выбор границы окна (Бордюр)"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запомнить бордюр для этого окна на будущее"
 
@@ -4999,7 +5114,7 @@ msgid "Menu Background Base"
 msgstr "Фоны"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 #, fuzzy
 msgid "Menu Title"
 msgstr "Заголовок"
@@ -5009,7 +5124,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Menu Item"
 msgstr "Меню"
@@ -5023,13 +5138,13 @@ msgid "Menu Item Disabled"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 #, fuzzy
 msgid "Move Text"
 msgstr "Переместить в"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 #, fuzzy
 msgid "Resize Text"
 msgstr "Изменить размер"
@@ -5048,7 +5163,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 #, fuzzy
 msgid "Winlist Title"
 msgstr "Показывать название"
@@ -5069,408 +5184,418 @@ msgid "File Manager Background Base"
 msgstr "Файловый менеджер"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Фокусирование"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 #, fuzzy
 msgid "Button Text"
 msgstr "Кнопка"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 #, fuzzy
 msgid "Check Text"
 msgstr "Проверять каждые:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Фоны"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 #, fuzzy
 msgid "Scroller Frame Background Base"
 msgstr "Выбрать фон..."
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 #, fuzzy
 msgid "Module Label"
 msgstr "Модули"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Цветовой класс: %s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Выбрано %u смешаных цветовых классов"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Выбрано %u отключеных цветовых классов"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Выбрано %u постоянных цветовых классов"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Нет выбранного класса цвета"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Пользовательские цвета"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Объект:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Контур:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Тень:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Текст с применёнными цветами"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "Цвета зависят от возможностей темы"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Менеджер окон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Визуальные элементы"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Прочие"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 #, fuzzy
 msgid "Title Bar"
 msgstr "Заголовок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "Панель параметров"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 #, fuzzy
 msgid "About Title"
 msgstr "О теме"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 #, fuzzy
 msgid "About Text"
 msgstr "О теме"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 #, fuzzy
 msgid "Desklock Title"
 msgstr "Файл Desktop"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 #, fuzzy
 msgid "Dialog Error"
 msgstr "Диалог"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 #, fuzzy
 msgid "Exebuf Command"
 msgstr "Выполнить комманду"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 #, fuzzy
 msgid "Splash Title"
 msgstr "Показывать название"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 #, fuzzy
 msgid "Splash Text"
 msgstr "Заставка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 #, fuzzy
 msgid "Splash Version"
 msgstr "Заставка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 #, fuzzy
 msgid "Entry"
 msgstr "Повторить"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 #, fuzzy
 msgid "Frame"
 msgstr "Частота кадров"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 #, fuzzy
 msgid "Label"
 msgstr "Ярлыки иконки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 #, fuzzy
 msgid "Buttons"
 msgstr "Кнопка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 #, fuzzy
 msgid "Slider"
 msgstr "Фиксировать каналы"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 #, fuzzy
 msgid "Radio Buttons"
 msgstr "Кнопка питания"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 #, fuzzy
 msgid "Check Buttons"
 msgstr "Кнопка питания"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 #, fuzzy
 msgid "Text List Item"
 msgstr "Меню списка окон"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 #, fuzzy
 msgid "List Item"
 msgstr "Список"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 #, fuzzy
 msgid "List Header"
 msgstr "Лидер окна"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 #, fuzzy
 msgid "Filemanager"
 msgstr "Файловый менеджер"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Typebuf"
 msgstr "Тип:"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 #, fuzzy
 msgid "Desktop Icon"
 msgstr "Показывать иконки на рабочем столе"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Маленький"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Большой"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 #, fuzzy
 msgid "Normal Styled"
 msgstr "Нормально"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Настройки шрифта"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Крошечный"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Большой"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Очень большой"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Огромный"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d пикселей"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Включить пользовательские классы шрифтов"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 #, fuzzy
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Обычная тестовая строка: 123: а б в г!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Классы шрифтов"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Включить классы шрифта"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 #, fuzzy
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Расширеный простмотр текста: один два три четыре"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Подсказки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Запасные шрифты"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Запасное имя"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Включить запасные шрифты"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Подсказки / Запасные"
 
@@ -5478,12 +5603,17 @@ msgstr "Подсказки / Запасные"
 msgid "Icon Theme Settings"
 msgstr "Настройки темы иконки"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Включить компоновку"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Выберите приложения"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Переопределяет текущую тему"
@@ -5549,11 +5679,9 @@ msgid "Custom scaling factor"
 msgstr "Пользовательский масштабный коэффициент"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f раз"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5564,6 +5692,12 @@ msgstr "Политика"
 msgid "Minimum"
 msgstr "Минимум"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f раз"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Максимум"
@@ -5584,25 +5718,25 @@ msgstr "Показ заставки при входе"
 msgid "Transition Settings"
 msgstr "Настройки перехода"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "События"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Запуск"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Смена стола"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Изменить фон"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Переходы"
 
@@ -5618,15 +5752,15 @@ msgstr " Импортировать..."
 msgid " Online..."
 msgstr " В сети..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Категории темы"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Назначить"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Очистить всё"
 
@@ -5655,19 +5789,19 @@ msgstr "Enlightenment не смог импортировать тему<br>из-
 msgid "Exchange themes"
 msgstr "Смена темы"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Бордюры"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Тема иконки"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Курсор мыши"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Масштаб"
 
@@ -5788,6 +5922,10 @@ msgstr "Предоставлена приложением"
 msgid "Border Icon"
 msgstr "Иконка окна"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Расположение"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Умное расположение"
@@ -5816,23 +5954,46 @@ msgstr "Новые окна"
 msgid "Animate"
 msgstr "Оживлять"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Линейно"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Ускорение, затем замедление"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Ускорять"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
-msgid "Decelerate"
-msgstr "Замедлять"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
+msgid "Decelerate"
+msgstr "Замедлять"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Ускорение мыши"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Замедлять"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Ускорение, затем замедление"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Тень"
 
@@ -5853,6 +6014,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Последнее окно под мышкой"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Щелчок"
 
@@ -5884,11 +6046,6 @@ msgstr "Только диалоги"
 msgid "Only dialogs with focused parent"
 msgstr "Только диалоги с сфокусированным родителем"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Фокусирование"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Другие настройки"
@@ -5986,13 +6143,13 @@ msgid "Fill available space"
 msgstr "Заполнить доступное пространство"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Горизонтально"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Вертикально"
@@ -6049,7 +6206,7 @@ msgid "Raise when clicking to focus"
 msgstr "Поднимать при нажатии для фокуса"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Фокусировка окон"
 
@@ -6306,29 +6463,29 @@ msgstr "Очень светлая"
 msgid "Dropshadow"
 msgstr "Отброс тени"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Everything запускатель"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Everything запускатель"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Конфигурация Everything"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Показывать диалог Everything"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Модуль Everything"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Запуск Everything"
 
@@ -6336,144 +6493,145 @@ msgstr "Запуск Everything"
 msgid "Everything Settings"
 msgstr "Настройки Everything"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Доступные плагины"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Переместить вверх"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Переместить вниз"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Настроить"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Включено"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Показывать в списке \"Все\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Показывать в меню верхнего уровня"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Минимальное кол-во символов для поиска"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Срабатывание плагина"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "По умолчанию - имя плагина"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Искать только при срабатывании"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Вид плагина"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Подробно"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Вид по умолчанию"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Анимация прокрутки"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Вверх / Вниз выбирает следующий элемент в пиктограммах"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Скрывать ввод при бездействии"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Скрывать список"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Быстрая навигация"
 
-#: src/modules/everything/evry_config.c:484
+#: 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)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Стиль Vi (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Вид по умолчанию"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Анимация прокрутки"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Вверх / Вниз выбирает следующий элемент в пиктограммах"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Сортировка"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Сортировка"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "По использованию"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Наиболее используемый"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Последний использованный"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Плагины действий"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Плагины обьектов"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Плагины"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Размер подсказки"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Ширина подсказки"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Высота подсказки"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Выравнивание подсказки"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6482,36 +6640,27 @@ msgstr "Выравнивание подсказки"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Размер всплывающего края"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Геометрия"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Набор Everything"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Действие"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Элементы"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6533,157 +6682,60 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Открыть через..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Открыть через..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Приложение"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Новое приложение"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Открыть через..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Запустить в терминале"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Выберите исполняемый файл"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Приложения Everything"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Комманды"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Комманда вызова терминала"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Графическая оболочка для Sudo"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Всё"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Переместить в"
-
-#: src/modules/everything/evry_plug_files.c:1341
-#, fuzzy
-msgid "Move to Trash"
-msgstr "Переместить в"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Сортировать"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Переименовать файл"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Файлы Everything"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Показывать недавние файлы"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Поиск в недавних файлах"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Искать кэшированые файлы"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Кэшировать посещенные каталоги"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Очистить кэш"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Диалог"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Переключиться на окно"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Переключить полный экран"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Переслать на"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Иконки файлов"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Типы файлов"
 
@@ -6728,19 +6780,19 @@ msgid "Select an image"
 msgstr "Выбрать изображение"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Файловый менеджер"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Дом"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Корневой"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6751,7 +6803,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6766,7 +6818,7 @@ msgstr ""
 "новая версия ФМ.<br>Это плохо, и поэтому ваша конфигурация была "
 "восстановлена на стандартную.<br>Извините за неудобство.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Настройки файлового менеджера обновлены"
 
@@ -6845,95 +6897,99 @@ msgstr "Открыть менеджер файлов при монтирован
 msgid "Device"
 msgstr "Предварительный просмотр"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Перейти в родительский каталог"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Другое приложение"
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Открыть"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Открыть через..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Известные приложения"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Указаные приложения"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Все приложения"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Пользовательская комманда"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Копирование прервано"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Перемещение прервано"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Удаление прервано"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Неизвестная операция от ведомого прервана"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Копирование %s завершено"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Копирование %s (осталось примерно %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Перемещение %s завершено"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Перемещение %s (осталось примерно %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Удаление завершено"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Удаление файлов..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6968,7 +7024,7 @@ msgstr "Выполняется операций: %d"
 msgid "Filemanager is idle"
 msgstr "Файловый менеджер бездействует"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Информация операции EFM"
 
@@ -6980,35 +7036,39 @@ msgstr "Менеджер гаджетов"
 msgid "Available Gadgets"
 msgstr "Доступные гаджеты"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Режим"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Пользовательское изображение"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Пользовательский цвет"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Прозрачный"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Анимации"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Фон"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Настройки фона"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Начать сдвиг/размер"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Свободно"
@@ -7232,15 +7292,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Вы действительно хотите стереть источник этого пространства?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Создать новую иконку"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Свойства"
 
@@ -7284,7 +7344,7 @@ msgstr "Показывать окна со всех столов"
 msgid "Show windows from active desktop"
 msgstr "Показывать окна с текущего стола"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7406,36 +7466,36 @@ msgstr ""
 "она уже занята внутренним<br>кодом для контекстных меню.<br>Эта кнопка "
 "работает только в Подсказках"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Высота подсказки"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Перенести стол влево"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Скорость подсказки"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Перенести стол вниз"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Скорость подсказки"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7455,131 +7515,91 @@ msgstr "Модули управления системой"
 msgid "Temperature Settings"
 msgstr "Параметры температуры"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Сенсоры"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Цельсий"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Фаренгейту"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Градусная шкала по"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Интервал проверок"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Высокая температура"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 Ф"
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 Ц"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Низкая температура"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Температуры"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Далее"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Добро пожаловать в Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Выберите одно"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Профиль"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"На вашей системе<br>не найдены файлы меню.<br>Пожалуйста, обратитесь<br>к "
-"документации<br>www.enlightenment.org<br>для уточнения<br>деталей о "
-"функционировании<br>ваших меню приложений."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Выберите меню приложений"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Панель быстрого запуска"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Выберите приложения"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Файлы рабочего стола"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Без иконок на рабочем столе"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Включить иконки на рабочем столе"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Режим фокусирования"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Щелчок на окна для фокусирования"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Наведение мышки фокусирует окна"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Выберите иконки для добавления"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Упорядочивать предпочитаемые службы"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Быстрый запуск"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Выбор приложений"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Наиболее используемый"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7621,7 +7641,7 @@ msgstr "Левый:"
 msgid "Right:"
 msgstr "Правый:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Без звука"
 
@@ -7645,40 +7665,54 @@ msgstr "Показывать подсказку при смене громкос
 msgid "Sound Cards"
 msgstr "Звуковые карты"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Настройки микшера"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Микшер для главных действий:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Запустить микшер..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Настройки модулей микшера"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Смена разрешения"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Настройки микшера обновлены"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Настройки модулей микшера измены.<br>Ваша старая конфигурация была заменена "
-"новым умолчанием.<br>Приносим извинения за неудобства."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Настройки модулей микшера"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Не возможно переключить автономный режим системы."
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "Служба ConnMan не запущена."
 
@@ -7706,133 +7740,352 @@ msgstr "Показывать пароль открытым текстом"
 msgid "Ok"
 msgstr "ОК"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Отключиться от сетевого сервиса"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Сервис более не доступен"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Подключиться к сетевому сервису"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Не возможно установить пароль для сервиса"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Автономный режим"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Управление"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Нет ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Не найден сервер ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Автономный режим: все радиоустройства выключены"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Нет подключения"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Не подключено"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "отключено"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Неизвестное имя"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Размножить"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Переходы"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Конфигурационная панель"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Плагины"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "В сети..."
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Настроить"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Включено"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Модем не найден"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Не подключено"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Автономно"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Системный трей уже существует"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Возможно существование только одного гаджета системного трея."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Системный лоток"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Системный лоток"
 
+#~ msgid "Acpi"
+#~ msgstr "ACPI"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Затемнение экрана"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Отменить затемнение экрана"
+
+#~ msgid "Resizeable"
+#~ msgstr "Может менять размер"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Завершить сдвиг/размер этого гаджета"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать Ecore!\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать файловую систему.\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать подключение к X.\n"
+#~ "Вы настроили переменную DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать систему подключений.\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать систему IPC.\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не может настроить оболочку xinerama.\n"
+#~ "Этого не должно случаться."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не может настроить оболочку randr.\n"
+#~ "Этого не должно случаться."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может инициализировать систему Evas.\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не может настроить экран инициализации.\n"
+#~ "Возможно, у вас недостаточно памяти?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Проверка поддержки SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Настройка ФМ"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment не может настроить систему полок."
+
+#~ msgid "New Application"
+#~ msgstr "Новое приложение"
+
+#~ msgid "Background panning"
+#~ msgstr "Сдвиг фона"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Сдвиг по горизонтали (X)"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Сдвиг по вертикали (Y)"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Сигналы управления энергопотреблением дисплея"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Текущий сервер экрана не поддерживает<br>DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Текущий сервер экрана<br>не имеет расширений DPMS."
+
+#~ msgid "Default is plugin name"
+#~ msgstr "По умолчанию - имя плагина"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Действие"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Открыть через..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Открыть через..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Приложение"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Новое приложение"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Запустить в терминале"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Выберите исполняемый файл"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Переместить в"
+
+#, fuzzy
+#~ msgid "Move to Trash"
+#~ msgstr "Переместить в"
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Сортировать"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Переименовать файл"
+
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment не может настроить систему тем."
+#~ msgid "Show Dialog"
+#~ msgstr "Диалог"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Переключиться на окно"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Переключить полный экран"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Переслать на"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "На вашей системе<br>не найдены файлы меню.<br>Пожалуйста, обратитесь<br>к "
+#~ "документации<br>www.enlightenment.org<br>для уточнения<br>деталей о "
+#~ "функционировании<br>ваших меню приложений."
+
+#~ msgid "Select application menu"
+#~ msgstr "Выберите меню приложений"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Панель быстрого запуска"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Без иконок на рабочем столе"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Включить иконки на рабочем столе"
+
+#~ msgid "Focus mode"
+#~ msgstr "Режим фокусирования"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Щелчок на окна для фокусирования"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Наведение мышки фокусирует окна"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Выберите иконки для добавления"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Быстрый запуск"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Настройки модулей микшера измены.<br>Ваша старая конфигурация была "
+#~ "заменена новым умолчанием.<br>Приносим извинения за неудобства."
 
 #~ msgid "Create a gradient..."
 #~ msgstr "Создать градиент..."
@@ -7946,9 +8199,6 @@ msgstr "Системный лоток"
 #~ msgid "Start Scan"
 #~ msgstr "Начать поиск"
 
-#~ msgid "Stop Scan"
-#~ msgstr "Закончить поиск"
-
 #~ msgid "Cannot pair with device."
 #~ msgstr "Не удалось соединится с устройством"
 
@@ -8021,9 +8271,6 @@ msgstr "Системный лоток"
 #~ msgid "Illume-Keyboard-Toggle"
 #~ msgstr "Сменить-Illume-Клавиатуру"
 
-#~ msgid "Re-order preferred services"
-#~ msgstr "Упорядочивать предпочитаемые службы"
-
 #~ msgid "Connection Manager"
 #~ msgstr "Управление подключениями"
 
@@ -8075,9 +8322,6 @@ msgstr "Системный лоток"
 #~ msgid "Illume Softkey"
 #~ msgstr "Програмная клавиатура Illume"
 
-#~ msgid "Back"
-#~ msgstr "Назад"
-
 #~ msgid "Forward"
 #~ msgstr "Вперед"
 
index 667077f..9eb015f 100755 (executable)
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-08-07 11:08+0000\n"
 "Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovakian\n"
@@ -20,20 +20,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -42,18 +41,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Tím</title>"
 
 #: src/bin/e_actions.c:365
@@ -71,56 +71,56 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ste si istý, že chcete násilne ukončiť toto okno?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Áno"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Ste si istý, že chcete skončiť?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Požadujete ukončenie Enlightenment.<br><br>Ste si istý, že chcete skončiť?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Ste si istý, že sa chcete odhlásiť?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Chystáte sa odhlásiť.<br><br>Ste si istý, že to chcete?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Ste si istý, že chcete vypnúť počítač?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Požadujete vypnutie počítača.<br><br>Ste si istý, že chcete vypnúť počítač?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Ste si istý, že chcete reštartovať počítač?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -128,7 +128,7 @@ msgstr ""
 "Požadujete reštartovanie počítača.<br><br>Ste si istý, že chcete reštartovať "
 "počítač?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -136,11 +136,11 @@ msgstr ""
 "Požadujete prepnutie počítača do úsporného režimu.<br><br>Ste si istý, že "
 "chcete prepnúť počítač do úsporného režimu?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Ste si istý, že chcete prepnúť počítač do režimu spánku?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -148,551 +148,574 @@ msgstr ""
 "Požadujete prepnutie počítača do režimu spánku.<br><br>Ste si istý, že "
 "chcete prepnúť počítač do režimu spánku?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Okno : Operácie"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Presunúť"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Zmeniť veľkosť"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Vyššie"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Nižšie"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Násilne ukončiť"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Zmeniť Lepkavosť"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Zmeniť Ikonifikáciu"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Zmeniť Na celú obrazovku"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximalizovať"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximalizovať zvisle"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximalizovať vodorovne"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovať na celú obrazovka"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Inteligentný režim maximalizácie"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Režim maximalizácie „Zväčšiť“"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Režim maximalizácie „Vyplniť“"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Nastaviť režim Tieň hore"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Nastaviť režim Tieň dole"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Nastaviť režim Tieň doľava"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Nastaviť režim Tieň doprava"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Zmeniť režim Tieňa"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Zmeniť stav Bez okrajov"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Okraj"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Zmeniť stav Pripnutia"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Preklopiť plochu doľava"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Preklopiť plochu doprava"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Preklopiť Plochu hore"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Preklopiť plochu dolu"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Preklopiť plochu podľa..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Zobraziť plochu"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Zobraziť policu"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Preklopiť plochu na..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Preklopiť plochu lineárne..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Prepnúť na plochu 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Prepnúť na plochu 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Prepnúť na plochu 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Prepnúť na plochu 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Prepnúť na plochu 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Prepnúť na plochu 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Prepnúť na plochu 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Prepnúť na plochu 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Prepnúť na plochu 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Prepnúť na plochu 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Prepnúť na plochu 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Prepnúť na plochu 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Prepnúť na plochu 12"
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Preklopiť plochu vľavo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Preklopiť plochu vpravo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Preklopiť plochu hore (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Preklopiť plochu dolu (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Preklopiť plochu podľa... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Preklopiť plochu do... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Preklopiť plochu lineárne... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Prevrátiť desktop v smere..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Preklopiť na plochu 0 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Preklopiť na plochu 1 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Preklopiť na plochu 2 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Preklopiť na plochu 3 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Preklopiť na plochu 4 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Preklopiť na plochu 5 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Preklopiť na plochu 6 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Preklopiť na plochu 7 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Preklopiť na plochu 8 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Preklopiť na plochu 9 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Preklopiť na plochu 10 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Preklopiť na plochu 11 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Preklopiť na plochu... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Poslať myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Poslať myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Poslať myš na obrazovku..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslať myš dopredu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslať myš dozadu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslať myš dopredu/dozadu o obrazovky..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Pohnúť Text"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Viac..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Viac..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Zmena veľkosti:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Prevrátiť desktop v smere..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Vytvoriť Ikonu"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Okno : Presun"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Na ďalšiu plochu"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Na predošlú plochu"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Podľa č. plochy..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Zobraziť Hlavné menu"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Zobraziť menu Obľúbené"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Zobraziť všetky aplikácie Menu"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Zobraziť menu Klienti"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Zobraziť menu..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Spustiť"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Aplikácia"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Ukončiť teraz"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : režim"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Prepnúť režim prezentácie"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Prepnúť režim offline"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Odhlásiť sa"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Vypnúť teraz"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Vypnúť"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Úsporný režim"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Úsporný režim"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Režim spánku"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Usporiadať Okná"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Všeobecné : Operácie"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Odložená operácia"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Akcia"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Táto obrazovka"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Táto obrazovka"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Nastaviť ako pozadie"
 
@@ -700,18 +723,16 @@ msgstr "Nastaviť ako pozadie"
 msgid "Color Selector"
 msgstr "Výber farieb"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -719,20 +740,20 @@ msgstr "Výber farieb"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -751,7 +772,7 @@ msgstr ""
 "hodnoty.<br> Teraz môžete veci nakonfigurovať podľa svojej ľubovôle. "
 "Ospravedlňujeme sa za nepríjemnosti.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -765,11 +786,11 @@ msgstr ""
 "verzia Enlightenment.<br>To je zlé a preventívne bola vaša konfigurácia "
 "obnovená na predvolené hodnoty.<br>Ospravedlňujeme sa za nepríjemnosti.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problémy so zápisom nastavení Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -777,96 +798,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Nastavenia aktualizované"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Hibernácia zlyhala"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Žiadne Okná)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Zastavenie zlyhalo."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Zastavenie zlyhalo."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Vitajte v Enlightenment-e"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -877,57 +898,62 @@ msgstr ""
 "zatvorený. To je veľmi nezvyčajné.<br><br>Súbor, kde sa chyba vyskytla:<br>"
 "%s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Základné"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Použiť"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Rozšírenia"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduly"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Preferovaný"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Kontajner %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Chyba - chýba popdora PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Do Enlightenment nebola pridaná podpora PAM<br>takže zamykanie plochy je "
 "vypnuté."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Zamknutie zlyhalo"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -936,15 +962,15 @@ msgstr ""
 "ku klávesnici alebo myši, prípadne obidvom,<br>a tento vyhradený prístup sa "
 "nepodarilo zrušiť."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Prosím, zadajte heslo na odomknutie"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Chyba autentifikačného systému"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -955,11 +981,11 @@ msgstr ""
 "vytvoriť<br>autentifikovanú reláciu. Kód chyby je <hilight>%i</hilight>.<br> "
 "To nie je dobre a nemalo by sa to stávať. Prosím, ohláste túto chybu."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktivovať režim prezentácie?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -968,11 +994,11 @@ msgstr ""
 "Odomkli ste plochu príliš rýchlo.<br><br>Chcete umožniť <b>prezentáciu</b> a "
 "systému dočasne vypnúť šetrič obrazovky, zámok a úsporu energie?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Nie, ale zvýšenie zostávajuceho času"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Nie, a žiadosť o zastavenie"
 
@@ -998,106 +1024,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor záznamov plochy"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Meno"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Vešobecný názov"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Trieda Okna"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategórie"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Typy MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Súbor plochy"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Hlavné"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Upozorniť pri štarte"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Spustiť v termináli"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Zobraziť v ponukách"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Voľby"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Vybrať ikonu"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Vybrať spustiteľný súbor"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Vložiť"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Vybrať všetky"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1140,316 +1165,316 @@ msgstr ""
 "Enlightenment nemôže spustiť aplikáciu.<br><br>%s<br><br>Aplikácia zlyhala "
 "pri spustení."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Chyba pri Spustení Aplikácie"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s neočakávane ukončil svoj beh."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Návratová hodnota %2$s vrátila aplikácia %1$i."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s prerušil signál Interrupt."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s prerušil signál Quit."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s prerušil signál Abort."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s prerušila chyba pohyblivej desatinnej čiarky."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s prerušil signál Uninterruptable Kill."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s prerušila chyba segmentácie."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s prerušila prerušená rúra."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s prerušil signál Termination."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s prerušila chyba zbernice."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s prerušil signál č. %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Zvyšný výstup bol vynechaný vo výpise. Zobraziť ho môžete uložením "
 "výstupu.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Záznamy chýb"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Žiadne chybové hlásenie."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Uložiť túto správu"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Tento chybový záznam sa uloží ako %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informácia o chybe"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informácia chybového signálu"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Výstupné dáta"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Žiaden výstup."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Neexistujúca cesta"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neexistuje."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Chyba pri pripájaní"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Nedá sa pripojiť jednotka"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Chyba pri odpájaní"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Nedá sa odpojiť jednotka"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Chyba pri vysunutí"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Nedá sa vysunúť jednotka"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Súbory"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Zrušiť"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Zdedené rodičovské nastavenia"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Zobraziť režim"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Obnoviť zobrazenie"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Zobraziť skryté súbory"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Zapamätať objednávku"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Zoradiť teraz"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nový Adresár"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Premenovať"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Odpojiť"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Pripojiť"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Vysunúť"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Za predpokladu použitia ikôn "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Vlastnosti súboru"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Použiť predvolené"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Mriežka ikôn"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Vlastné ikony"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Zoznam"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Veľkosť ikony (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Nastaviť pozadie..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Nastaviť prekrývanie..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Vytvoriť nový adresár"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Názov nového adresára:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Premenovať %s na:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Premenovať súbor"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Opakovať"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nie pre všetko"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Áno na všetko"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Súbor už existuje, prepísať?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorovať"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorovať všetko"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Došlo ku chybe počas vykonávania operácie.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Potvrdiť zmazanie"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ste si istí, že chcete zmazať<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1482,12 +1507,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznámy zväzok"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Vymeniteľné Zariadenie"
 
@@ -1495,7 +1520,7 @@ msgstr "Vymeniteľné Zariadenie"
 msgid "File:"
 msgstr "Súbor:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Veľkosť:"
 
@@ -1511,7 +1536,7 @@ msgstr "Typ súboru:"
 msgid "Permissions"
 msgstr "Privilégiá"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Majiteľ:"
 
@@ -1531,17 +1556,17 @@ msgstr "Vlastník  môže čítať"
 msgid "Owner can write"
 msgstr "Vlastník  môže zapisovať"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Náhľad"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Predvolené"
 
@@ -1550,7 +1575,7 @@ msgid "Thumbnail"
 msgstr "Náhľad"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Vlastné"
 
@@ -1566,53 +1591,43 @@ msgstr "Linka informácie"
 msgid "Select an Image"
 msgstr "Vybrať obrázok"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Pohnúť Text"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Začiatok pohybu/zmeny veľkosti tohto gadgetu"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Zmeniť veľkosť"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Automaticky rolovať obsah"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Priame"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Zabudovaný"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Pohľad"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Ukončenie pohybu/zmeny veľkosti tohto gadgetu"
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "Ukončiť editovanie"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1660,14 +1675,14 @@ msgstr "Umiestnenie"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Veľkosť"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Usporiadanie"
@@ -1719,162 +1734,168 @@ msgstr "Odhláseniu s týmto oknom otvoreným"
 msgid "Remember these Locks"
 msgstr "Zapamätať si Zámky"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Okno"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Vždy Nad"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Lepkavé"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Nastavenia"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Celá Obrazovka"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximalizovať vertikálne"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximalizovať horizontálne"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Nemaximalizovať"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Upraviť Ikonu"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Vytvoriť Ikonu"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Pridať do obľúbených"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Pridať do obľúbených"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Klávesová skratka"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Inteligentné Umiestnenie"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Preskočiť"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Okraj"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Zámky"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Zapamätať"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Lepkavé"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Preskočiť"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimalizovať"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Schované"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Obrazovka"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Vždy Nad"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normálne"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Vždy Pod"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Pripnúť na plochu"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Odopnúť z plochy"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Vybrať ohraničený štýl"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Použiť E17 predvolené nastavenie ikôn"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Za predpokladu použitia ikôn "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Použi užívateľom definovanú ikonu"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Odolnosť"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Zoznam Okien"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Panel"
 
@@ -1895,7 +1916,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM vlastnosti"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Názov"
 
@@ -2071,7 +2092,6 @@ msgid "Size, Position and Locks"
 msgstr "Veľkosť, Umiestnenie a Zámky"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Povoiť"
@@ -2149,15 +2169,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Súbory"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Spustiť"
@@ -2172,20 +2190,6 @@ msgstr "Jadro"
 msgid "Mobile"
 msgstr "Moduly"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Nastavenia"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Moduly"
@@ -2226,7 +2230,7 @@ msgstr "Pridať Špecialitu"
 msgid "Remove Gadget"
 msgstr "Odstrániť Špecialitu"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Nastavenia panelu"
 
@@ -2234,11 +2238,11 @@ msgstr "Nastavenia panelu"
 msgid "Layout"
 msgstr "Rozloženie"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Chyba Metódy Vstupu"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2254,7 +2258,7 @@ msgstr "Hlavné"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Obľúbené Aplikácie"
 
@@ -2262,76 +2266,74 @@ msgstr "Obľúbené Aplikácie"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Aplikácie"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Okná"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Stratené Okná"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "O aplikácii..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Téma"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virtuálny"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Šelfy"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Ukázať/Schovať Všetky Okná"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Žiadne Aplikácie)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Nastaviť virtuálne plochy"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Žiadne Okná)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Žiadne meno!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(žiadne shelves)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Pridať shelf"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Odstránniť shelf"
 
@@ -2367,7 +2369,7 @@ msgid "Shrink to Content Width"
 msgstr "Zmenšiť na Veľkosť Obsahu"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr ""
 
@@ -2397,7 +2399,7 @@ msgid "Hide duration"
 msgstr "Zobraziť trvanie"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekúnd"
@@ -2414,7 +2416,7 @@ msgstr "Zobraziť na všetkých plochách"
 msgid "Show on specified Desktops"
 msgstr "Zobraziť na určených plochách"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2431,7 +2433,7 @@ msgstr ""
 "alebo nie ste vlastníkom. Prosím skontrolujte:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2444,76 +2446,22 @@ msgstr ""
 "Prosíme, skontrolujte:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Voľby:\n"
-"\t-display DISPLAY\n"
-"\t\tPripojí sa k obrazovke DISPLAY.\n"
-"\t\tnapr: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tPridá FALOŠNÚ xinerama obrazovku (namiesto skutočnej)\n"
-"\t\tdané geometriou. Môžete pridat koľko chcete. Všetky\n"
-"\t\tnahradzujú reálne obrazovky xinerama, ak nejaké sú.\n"
-"\t\tPoužiteľné k simulácii xineramy.\n"
-"\t\tnapr: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile PROFIL\n"
-"\t\tPoužiť profil PROFIL miesto použivatelského predvoleného alebo "
-"jednoducho \"predvoleného\".\n"
-"\t-good\n"
-"\t\tByť dobrý.\n"
-"\t-evil\n"
-"\t\tByť zlý.\n"
-"\t-psychotic\n"
-"\t\tByť psychotický.\n"
-"\t-locked\n"
-"\t\tspustiť zo zamknutou obrazovkou, takže bude vyžadované heslo.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tAk potrebujete túto nápovedu, nepotrebujete túto možnosť.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže zinicializovať Ecore!\n"
-"Možno máte nedostatok pamäte."
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže zinicializovať súborový systém.\n"
-"Možno máte nedostatok pamäte."
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2521,7 +2469,7 @@ msgstr ""
 "Enlightenment nemôže nastaviť handler signálu exit.\n"
 "Možno máte nedostatok pamäte."
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2529,7 +2477,7 @@ msgstr ""
 "Enlightenment nemôže nastaviť handler signálu HUP.\n"
 "Možno máte nedostatok pamäte."
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2538,64 +2486,37 @@ msgstr ""
 "Enlightenment nemôže nastaviť handler signálu HUP.\n"
 "Možno máte nedostatok pamäte."
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment sa nemôže spojiť s X serverom.\n"
-"Máte nastavenú premennú DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment nemôže zinicializovať záchranno-poplašný systém.\n"
-"Máte nastavenú premennú DISPLAY?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže zinicializovať systém spojení.\n"
-"Možno máte nedostatok pamäte."
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže zinicializovať systém IPC.\n"
-"Možno máte nedostatok pamäte."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nemôže nastaviť xinerama wrapping.\n"
-"K tomu by nemalo dochádzať."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment nemôže nastaviť xinerama wrapping.\n"
-"K tomu by nemalo dochádzať."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže zinicializovať systém Evas.\n"
-"Možno máte nedostatok pamäte."
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2605,7 +2526,7 @@ msgstr ""
 "vykresľovanie v Evas. Prosím skontrolujte, či Evas a\n"
 "Ecore podporujú engine so softvérovým vykresľovaním cez X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2616,7 +2537,35 @@ msgstr ""
 "v Evas. Prosím skontrolujte, či Evas a\n"
 " Ecore podporujú engine s vykresľovaním cez softvérový  buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment nemôže zinicializovať záchranno-poplašný systém.\n"
+"Máte nastavenú premennú DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2624,23 +2573,29 @@ msgstr ""
 "Enlightenment nemôže vytvoriť adresáre vo Vašom domovskom adresári.\n"
 "Možno nemáte domovský adresár alebo je disk plný."
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment nemôže nastaviť svoj súbor systému databázy Registry."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment nemôže spustiť systém nastavení."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment nemôže spustiť systém tém."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment nemôže nastaviť rozsah systému."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment nemôže nastaviť ukazovateľ systému."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2648,97 +2603,42 @@ msgstr ""
 "Enlightenment nemôže nastaviť cesty pre vyhľadávanie súborov.\n"
 "Možno máte nedostatok pamäte."
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment nemôže spustiť systém fontov."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment nemôže spustiť systém tém."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment nemôže spustiť úvodnú obrazovku.\n"
-"Možno máte nedostatok pamäte?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment nemôže spustiť intl systém."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Spúšťam medzinárodnú podporu"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment nemôže spustiť intl systém."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment nemôže inicializovať FDO plochu systému.\n"
 "Asi nedostatok pamäte?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testujem podporu formátu"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment zistil, že Evas nemôže vytvoriť buffer pre canvas. Prosím "
-"skontroluj,\n"
-"že Evas má podporu pre softvérový buffer engine.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment zistil, že Evas nemôže nahrať PNG súbory. Skontroluj či má "
-"Evas podporu\n"
-"pre nahrávanie PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment zistil, že Evas nemôže nahrať JPEG súbory. Skontroluj či má "
-"Evas podporu\n"
-"pre nahrávanie JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment zistil, že Evas nemôže nahrať EET súbory. Skontroluj či má "
-"Evas podporu\n"
-"pre nahrávanie EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment zistil, že Evas nemôže nahrať 'Sans' písmo. Skontrolujte, či "
-"má Evas\n"
-"podporu fontconfig a či fontconfig definuje 'Sans' písmo.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Nastaviť obrazovky"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2746,213 +2646,379 @@ msgstr ""
 "Nastavenie manažéra okien na všetkých obrazovkách v systéme zlyhalo.\n"
 "Nebeží už iný okenný manažér?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Nastavenie DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Nastaviť väzby"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment nie je schopný konfigurovať DPMS nastavenia."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Nastavenie DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment nie je schopný konfigurovať DPMS nastavenia."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Nastaviť šetrič obrazovky"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment nevie nakonfigurovať X šetrič."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Nastaviť mód úspory energie"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment nemôže nastaviť svoje módy šetrenia."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Nastavenie Desklock"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment nemôže nastaviť systém pre uzamknutie plochy."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Nastaviť vyskakovacie okná"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment nemôže spustiť popup systém."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Nastaviť systémové správy"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Nastavenie cesty"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Inštalačný systém kontroly"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment nemôže inicializovať systémové príkazy systému.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Nastaviť akciu"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment nemôže spustiť systém akcií."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Nastavenie výkonu systému"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenmentu sa nepodarilo nastaviť exec systém."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "nastavenie FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Správca súborov"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Nastaviť systémové správy"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment nemôže spustiť systém msg."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Nastavenie DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment nemôže spustiť systém dnd."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Nastaviť zachytenie vstupnej manipulácie"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment nemôže spustiť systém na spracovanie zachyteného\n"
 "vstupu."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Nastavenie modulov"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment nemôže spustiť systém modulov."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Nastaviť zapamätanie"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment nemôže nastaviť uložené nastavenia."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Nastavenie triedy farieb"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nemôže spustiť systém tried farieb."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Nastavenie gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment nemôže nastaviť systém pre ovládanie špecialít."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Nastavenie DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Nastavenie DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment nie je schopný konfigurovať DPMS nastavenia."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Nastaviť mód úspory energie"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment nemôže nastaviť svoje módy šetrenia."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Nastaviť obrázok pozadia"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenmentu sa nepodarilo nastaviť pozadia plochy systému."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Nastaviť myš"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nemôže konfigurovať nastavenia myši."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Nastaviť väzby"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment nemôže nastaviť systém klávesových skratiek."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Nastaviť shelvy"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment nemôže nastaviť shelf systém."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Nastaviť náhľady"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment nemôže zinicializovať Thumbnail systém.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment nemôže inicializovať systémové príkazy systému.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment nemôže zinicializovať Thumbnail systém.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment nemôže spustiť systém tém."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Nastavujem poradie súborov"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment nemôže nastaviť svoj súborový systém."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Spustiť moduly"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Konfigurovať shelvy"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Takmer hotovo"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Voľby:\n"
+"\t-display DISPLAY\n"
+"\t\tPripojí sa k obrazovke DISPLAY.\n"
+"\t\tnapr: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tPridá FALOŠNÚ xinerama obrazovku (namiesto skutočnej)\n"
+"\t\tdané geometriou. Môžete pridat koľko chcete. Všetky\n"
+"\t\tnahradzujú reálne obrazovky xinerama, ak nejaké sú.\n"
+"\t\tPoužiteľné k simulácii xineramy.\n"
+"\t\tnapr: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile PROFIL\n"
+"\t\tPoužiť profil PROFIL miesto použivatelského predvoleného alebo "
+"jednoducho \"predvoleného\".\n"
+"\t-good\n"
+"\t\tByť dobrý.\n"
+"\t-evil\n"
+"\t\tByť zlý.\n"
+"\t-psychotic\n"
+"\t\tByť psychotický.\n"
+"\t-locked\n"
+"\t\tspustiť zo zamknutou obrazovkou, takže bude vyžadované heslo.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tAk potrebujete túto nápovedu, nepotrebujete túto možnosť.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testujem podporu formátu"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže vytvoriť buffer pre canvas. Prosím "
+"skontroluj,\n"
+"že Evas má podporu pre softvérový buffer engine.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže nahrať PNG súbory. Skontroluj či má "
+"Evas podporu\n"
+"pre nahrávanie PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže nahrať JPEG súbory. Skontroluj či má "
+"Evas podporu\n"
+"pre nahrávanie JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže nahrať PNG súbory. Skontroluj či má "
+"Evas podporu\n"
+"pre nahrávanie PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže nahrať EET súbory. Skontroluj či má "
+"Evas podporu\n"
+"pre nahrávanie EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment zistil, že Evas nemôže nahrať 'Sans' písmo. Skontrolujte, či "
+"má Evas\n"
+"podporu fontconfig a či fontconfig definuje 'Sans' písmo.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment havaroval na začiatku a bol reštartovaný"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2960,7 +3026,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2972,7 +3038,7 @@ msgstr ""
 "problému<br>modulu vo vašej konfigurácii. Dialóg<br>nastavenie modulu vám "
 "vyberie<br>moduly znova."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2984,20 +3050,12 @@ msgstr ""
 "problému<br><br>modulu vo vašej konfigurácii. Dialóg nastavenie modulu vám "
 "vyberie<br>moduly znova."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Konfigurovať shelvy"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Takmer hotovo"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Spustiť moduly"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -3006,11 +3064,11 @@ msgstr ""
 "Došlo k chybe pri načítaní modulu: %s<br>Žiadny modul s názvom %s nebol "
 "nájdený v<br>adresároch s modulmi.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Chyba pri nahrávaní modulu"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3019,11 +3077,11 @@ msgstr ""
 "Došlo k chybe pri načítaní modulu: %s<br>Úplná cesta k modulu je:<br>"
 "%s<br>Došlo k chybe:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modul neobsahuje všetky potrebné funkcie"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3034,16 +3092,16 @@ msgstr ""
 "modul minimálne vo verzii: %i.<br>API modul v Enlightenment je vo verzii: %i."
 "<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Chceš unloadnúť tento modul?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3057,11 +3115,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Shelf #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ste si istý, že chcete zmazať tento šelf ?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3069,18 +3127,18 @@ msgstr ""
 "Požadujete zmazanie tohoto šelfu.<br><br>Ste si istý, že chcete ho chcete "
 "zmazať?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Ukončiť Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Začať Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Komentár"
@@ -3089,16 +3147,16 @@ msgstr "Komentár"
 msgid "Starting"
 msgstr "Štartujem"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Kontrola privilégií systému"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Kontrola systému skončená"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3108,42 +3166,42 @@ msgstr ""
 "Odhlasovanie trvá príliš dlho. Niektoré<br>aplikácie sa nechcú ukončiť."
 "<br>Chcete sa dokončiť odhlásenie<br>bez zatvorenia týchto<br>aplikácií?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Problém s odhlásením"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Odhlásiť teraz"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Počkať dlhšie"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Zrušiť odhlásenie"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Prebieha odhlásenie"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Prebieha odhlásenie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je zamestnaný inou požiadavkou"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "Odhlásenie.<br>Nemôžete vykonať ďalšie akcie systému<br>odhlásenie začalo."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3151,7 +3209,7 @@ msgstr ""
 "Vypínanie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3159,7 +3217,7 @@ msgstr ""
 "Resetovanie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3167,63 +3225,64 @@ msgstr ""
 "Pozastavenie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Hibernácia.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "EEK! K tomu nemalo dôjsť"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Vypnutie zlyhalo."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Reset zlyhal."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Zastavenie zlyhalo."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Hibernácia zlyhala"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Vypnutie"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Vypnutie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Resetovanie"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Resetovanie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Zastavenie"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Zastavenie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Hibernácia"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernácia.<br><hilight>Prosím čakajte.</hilight>"
 
@@ -3231,33 +3290,33 @@ msgstr "Hibernácia.<br><hilight>Prosím čakajte.</hilight>"
 msgid "About Theme"
 msgstr "O motíve"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Nastaviť ako motív"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Ukončiť Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Začať Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Nastaviť obsah panela nástrojov"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nemôže vytvoriť proces potomka:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Nie je možné skončiť - nesmrteľné okná."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3267,125 +3326,125 @@ msgstr ""
 "znamená, že<br>Enlightenment nebude možné ukončiť pokiaľ tieto okná "
 "nebudú<br>uzatvorené, alebo lifespan zámok nebude vypnutý.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytov"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.0f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "V budúcnosti"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "V poslednej minúte"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li pred rokmi"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li pred mesiacmi"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li pred týždňami"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li pred dňami"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li pred hodinami"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li pred minútami"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Nastavenia IBar"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Import..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Voľby vyplnenia a roztiahnutia"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Roztiahnuť"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Na stred"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Zaplniť"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr ""
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Použi originálny súbor"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3405,12 +3464,12 @@ msgstr ""
 "hodnoty.<br> Teraz môžete veci nakonfigurovať podľa svojej ľubovôle. "
 "Ospravedlňujeme sa za nepríjemnosti.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Konfigurácia Aktualizovaná"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3444,142 +3503,148 @@ msgstr "Hore"
 msgid "Down"
 msgstr "Dole"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Pridať do obľúbených"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Prejsť hore do adresára"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rozlíšenie"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Oprávnenia:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Zmenené:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Ty"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Chránené"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Iba na čítanie"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Zakázané"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Čítať-zapisovať"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Nastavenia stavu batérie"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Upozorniť keď bude batéria takmer vybitá"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Skontrolujte každý:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f dielov"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Režim spánku"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Zobraziť upozornenie pri slabej batérii"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Upozornenie pri:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Automatické zamietnutie v..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Výzva"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Automatická detekcia"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Interné"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Rozmazané"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hardwér"
 
@@ -3588,32 +3653,33 @@ msgstr "Hardwér"
 msgid "Battery"
 msgstr "Batéria"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Vaša batéria je slabá!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Doporučujem napojenie na AC sieť."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Ukazovateľ stavu batérie"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Hodiny"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Zobraziť lištu s nástrojmi"
@@ -3682,17 +3748,17 @@ msgstr "Konfigurácia Aktualizovaná"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar aplikácie"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Aplikácie po spustení"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Reštart aplikácií"
 
@@ -3705,11 +3771,26 @@ msgstr "Okraj"
 msgid "Apps"
 msgstr "Apps"
 
-#: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nová aplikácia"
+#: src/modules/conf_applications/e_mod_main.c:21
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Spustiť"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Vyber aplikácie"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Desktop Súbory"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar ďaľší"
 
@@ -3722,7 +3803,7 @@ msgid "Available Profiles"
 msgstr "Dostupné profily"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Vybrať profil"
 
@@ -3760,9 +3841,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Hlavné Nastavenia"
 
@@ -3804,7 +3885,7 @@ msgstr "Dialógy"
 msgid "Profiles"
 msgstr "Profily"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3812,7 +3893,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3820,7 +3901,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3828,7 +3909,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3836,47 +3917,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Zmeniť rozlíšenie"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Uložiť"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Obnoviť"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Nastavenie rozšírenia obrazovky"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Obnoviť pri prihlásení"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Točenie"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Zrkadlenie"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Chýbajúce Vlastnosti"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3885,11 +3966,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Nenájdená obnovovacia frekvencia"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3898,91 +3979,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Nastavenie virtuálnych plôch"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Počet Plôch"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Preklopenie Plochy Myšou"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Otočenie pri pretiahnutí objektov na okraj obrazovky"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Umožniť preklápanie plôch dookola"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Pracovné Plochy"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Vypnúť"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Priblížiť"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animácie"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animácia otočenia"
 
@@ -3999,7 +4063,7 @@ msgid "Desktop Wallpaper"
 msgstr "Obrázok plochy"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Nastaviť"
 
@@ -4010,12 +4074,12 @@ msgstr "Nastaviť pozadie..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Osobné"
 
@@ -4023,199 +4087,227 @@ msgstr "Osobné"
 msgid "Screen Lock Settings"
 msgstr "Nastavenie uzamknutia obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Úsporný režim"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Úsporný režim"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Vlastné zamknutie obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Zamknúť"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Ukázať na všetkých zónach obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Ukázať na aktuálnej zóne obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Ukázať v zóne obrazovky #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Nastavenia prihlasovacej obrazovky"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Zamknúť pri aktivovaní X screensaver"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekúnd"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Zamknúť pri prekročenej nečinnosti"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minút"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Časovač"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Ak je deaktivovaný predtým"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Zadať mód prezentácie"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Definovaná téma"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Obrázok témy"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Obrázok plochy"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Tapeta"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Nastavenia šetriča obrazovky"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Povoliť X screensaver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Úsporný režim"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Šetrič obrazovky"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Počiatočný Stav"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Nepreferovaný"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Expozícia udalosti"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Povoiť"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Nepovoliť"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Rozmanité"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Zobraziť signalizáciu správy napájania"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Zobraz nastavenia správy napájania"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Povoliť zobrazenie správy napájania"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Pohotovostný čas"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Pozastaviť čas"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Mimo času"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "Podľa Času Modifikácie"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Virtuálne Plochy"
@@ -4260,102 +4352,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Nastavenie väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Pridať väzbu"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Odstrániť väzbu"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Upraviť väzbu"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Odstrániť všetko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Obnoviť predvolené väzby"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Hlavné nastavenia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4502,34 +4594,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Nastavenie jazyka"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Výber jazyka"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Predvolené nastavenie systému"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Vybranie národného prostredia"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Národné prostredie"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4613,17 +4718,17 @@ msgid "Manager"
 msgstr "Manažér"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Žiadny"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4647,13 +4752,11 @@ msgid "Menu Settings"
 msgstr "Menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Osobné"
@@ -4664,7 +4767,7 @@ msgid "Main Menu"
 msgstr "Zobraziť Hlavné menu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Obľubené"
 
@@ -4684,7 +4787,7 @@ msgid "Comments"
 msgstr "Komentár"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4696,7 +4799,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Zobraziť v ponukách"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Ponuky"
 
@@ -4767,19 +4870,19 @@ msgid "Images"
 msgstr "Obrázky"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Fonty"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Témy"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikony"
 
@@ -4928,18 +5031,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Nastavenia tapety"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Použiť tapetu motívu"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Obrázok..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Pripojený..."
 
@@ -4959,42 +5062,47 @@ msgstr "Táto Plocha"
 msgid "This Screen"
 msgstr "Táto obrazovka"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Nastavenia tapiet..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Dlaždice"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Priame"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Vybrať obrázok"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Zlyhal import obrázka"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Zlyhal import tapety"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5030,7 +5138,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Predvolený štýl ohraničenia"
 
@@ -5038,7 +5146,7 @@ msgstr "Predvolený štýl ohraničenia"
 msgid "Window Border Selection"
 msgstr "Výber Okraju Okna"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamätať si okraj okna pre budúcnosť"
 
@@ -5071,7 +5179,7 @@ msgid "Menu Background Base"
 msgstr "Pozadia"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Názov menu"
 
@@ -5080,7 +5188,7 @@ msgid "Menu Title Active"
 msgstr "Aktívny titulok menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Položka Menu"
 
@@ -5094,12 +5202,12 @@ msgid "Menu Item Disabled"
 msgstr "Aktívna položka menu"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Pohnúť Text"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Zmeniť Veľkosť Textu"
 
@@ -5117,7 +5225,7 @@ msgid "Winlist Label"
 msgstr "Označenie zoznamu okien"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Názov Zoznamu Okien"
 
@@ -5137,389 +5245,400 @@ msgid "File Manager Background Base"
 msgstr "Správca súborov"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Zaostrenie"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Text tlačítka"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Text tlačítka zakázaný"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Skontroluj text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Vložiť text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Text tlačítka zakázaný"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Označiť text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Označiť položky textu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Označiť položky textu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Označiť položky textu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Hlavička Zoznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Hlavička Zoznamu"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Rádio text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Rádio text zakázaný"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Bežiaci text"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Bežiaci text zakázaný"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Pozadia"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Farby"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Farba tried"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Nastavenie triedy farieb"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Nastavenie triedy farieb"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Nastavenie triedy farieb"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Vlastná farba"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Vysunúť"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Nepripojený"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Farba tieňa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Okenný Manažér"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgety"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Ďaľšie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Názov Lišty"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Blok Textu Prostý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Blok Textu Svetlý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Blok Textu Veľký"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "O Titule"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "O Verzii"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "O Texte"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Titul Uzamknutej Plochy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Heslo pre Uzamknutie Plochy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Chyba Dialógu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf Príkaz"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Názov Úvodnej Obrazovky"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Text Úvodnej Obrazovky"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Verzia Úvodnej Obrazovky"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+#, fuzzy
+msgid "Digital Clock"
+msgstr "Digitálny Displej"
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Vstup"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Rámec"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Označenie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Posuvník"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Rádiové Tlačítko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Zaškrtávacie Tlačítko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Položka Textového Zoznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Položka Zoznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Hlavička Zoznamu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Správca súborov"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "IKony plochy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Malý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Veľký"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Štýl Malý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normálny Štýl"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Štýl Malý"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Nastavenia Fontov"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Drobné"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Veľký"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Skutočne veľký"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Obrovské"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixelov"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Jednoduchá ukážka textu: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Povoliť Triedu Fontu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Font"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pokročilá ukážka textu.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Vyhladzovanie"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Fonty Záloha"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Meno Zálohy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Povoliť Zálohy"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5527,11 +5646,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr "Nastavenie ikôn motívu"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Vybrať aplikácie"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5597,11 +5721,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f krát"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5612,6 +5734,12 @@ msgstr ""
 msgid "Minimum"
 msgstr "Minimálny"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f krát"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximálny"
@@ -5632,25 +5760,25 @@ msgstr "Zobraz Splash Screen pri prihlásení"
 msgid "Transition Settings"
 msgstr "Nastavenie prechodu"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Udalosti"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Spustenie"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Zmena pozadia"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Prechody"
 
@@ -5666,15 +5794,15 @@ msgstr " Import..."
 msgid " Online..."
 msgstr " Pripojený..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Kategórie motívov"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Priradiť"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Vymazať všetko"
 
@@ -5705,19 +5833,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr "Výmena témy"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Okraje"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Téma Ikony"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Kurzor Myši"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Rozpätie"
 
@@ -5848,6 +5976,11 @@ msgstr "Za predpokladu použitia ikôn "
 msgid "Border Icon"
 msgstr "Okraj"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Inteligentné Umiestnenie"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Inteligentné Umiestnenie"
@@ -5879,24 +6012,47 @@ msgstr "Pod Oknami"
 msgid "Animate"
 msgstr "Animácie"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Lineárne"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Plynulé zrýchlenie a spomalenie"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Zrýchliť"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Spomaliť"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Akcelerácia myši"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Spomaliť"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Plynulé zrýchlenie a spomalenie"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Rozpätie"
@@ -5918,6 +6074,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Posledné Okno pod Myšou"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Hodiny"
@@ -5951,15 +6108,10 @@ msgstr "Okná"
 msgid "Only dialogs"
 msgstr "Dialógy"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:226
-#, fuzzy
-msgid "Only dialogs with focused parent"
-msgstr "Iba nové dialógy získajú zaostrenie"
-
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Zaostrenie"
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:226
+#, fuzzy
+msgid "Only dialogs with focused parent"
+msgstr "Iba nové dialógy získajú zaostrenie"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
@@ -6071,13 +6223,13 @@ msgid "Fill available space"
 msgstr "Vyplniť dostupné miesto"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horizontálne"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertikálne"
@@ -6137,7 +6289,7 @@ msgid "Raise when clicking to focus"
 msgstr "Zdvihnúť pri zaostrení kliknutím"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Zaostrenie Okna"
 
@@ -6395,33 +6547,33 @@ msgstr "Veľmi Svetlé"
 msgid "Dropshadow"
 msgstr "Tieň"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Všetko"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Všetko"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Konfigurácia Pageru"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Pod Všetkým"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Všetko"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Všetko"
@@ -6431,165 +6583,165 @@ msgstr "Všetko"
 msgid "Everything Settings"
 msgstr "Nastavenia terminálu"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Dostupné profily"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Posunút Hore"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Posunút Hore"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Konfigurovať shelvy"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktivovaný"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Zobraziť v ponukách"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Zobraziť v ponukách"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Štandardný Mód Dialógu"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Podrobnosti"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Predvolené"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Animované pretočenie"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Skryť timeout"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "Predvolené"
-
-#: src/modules/everything/evry_config.c:500
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Animate scrolling"
-msgstr "Animované pretočenie"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Štartujem"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Štartujem"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 #, fuzzy
 msgid "By usage"
 msgstr "Podľa Mena"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "V poslednej dobe používané"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Posledná úprava:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Akcia"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Farba objektu"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Priame"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Rýchlosť popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Nastavenie Popup"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Nastavenie Popup"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6598,39 +6750,30 @@ msgstr "Nastavenie Popup"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Konfigurácia okna"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Reštart aplikácií"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Akcia"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6652,166 +6795,68 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Otvoriť s..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Otvoriť s..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Pridať aplikáciu"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Nová aplikácia"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Otvoriť s..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Spustiť v termináli"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Príkaz"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Reštart aplikácií"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Príkaz"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Definovaný Príkaz"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Všetko"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Viac..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Zoradiť teraz"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Premenovať súbor"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Všetko"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Zobraziť skryté súbory"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Prehliadnuť Adresáre"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Adresáre Definované Užívateľom"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Vyčistiť"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Dialógy"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Celá Obrazovka"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Presunúť na Plochu"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ikony súboru"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Typy súborov"
 
@@ -6858,19 +6903,19 @@ msgid "Select an image"
 msgstr "Vybrať obrázok"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Správca súborov"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Home"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6881,7 +6926,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6891,7 +6936,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Nastavenia fileman aktualizované"
 
@@ -6971,95 +7016,99 @@ msgstr ""
 msgid "Device"
 msgstr "Náhľad"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Ďaľšie aplikácie"
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Otvoriť s..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Známe aplikácie"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Konkrétne aplikácie"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Všetky aplikácie"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Vlastný príkaz"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7094,7 +7143,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7106,37 +7155,42 @@ msgstr "Správca gadgetov"
 msgid "Available Gadgets"
 msgstr "Dostupné Špeciality"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Mód"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Vlastný obrázok"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Vlastná farba"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Priehľadný"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animácie"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Pozadie"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Pozadia"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Začiatok pohybu/zmeny veľkosti tohto gadgetu"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Voľné"
@@ -7385,16 +7439,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ste si istý, že chcete zmazať zdroj tejto lišty?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Vytvoriť novú ikonu"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Vlastnosti"
 
@@ -7438,7 +7492,7 @@ msgstr "Ukázať okná zo všetkých plôch"
 msgid "Show windows from active desktop"
 msgstr "Ukázať okná z aktívnej plochy"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7559,32 +7613,32 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Rýchlosť popup"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7604,130 +7658,93 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "Nastavenia teploty"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Senzory"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celzius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Zobraziť Jednotky"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Interval Kontroly"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Vysoká Teplota"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Nízka Teplota"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Teplota"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Ďaľší"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Vitajte v Enlightenment-e"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Vyberte jednu"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Vybrať menu aplikácie"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Vybrať profil"
 
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Vybrať aplikácie"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Desktop Súbory"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Žiadne ikony na ploche"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Povoliť ikony na ploche"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Mód zaostrenia"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Klikni k zameraniu okna"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Myš nad zameranými oknami"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Vybrať ikony k pridaniu"
-
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Rýchle spustenie"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Vyber aplikácie"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "V poslednej dobe používané"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7769,7 +7786,7 @@ msgstr "Vľavo:"
 msgid "Right:"
 msgstr "Vpravo:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Stlmiť"
 
@@ -7793,38 +7810,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Zvukové karty"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Nastavenie zmiešavania"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Spustiť zmiešavanie..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Nastavenia modulu zmiešavania"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Zmeniť rozlíšenie"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Nastavenia zmiešavania aktualizované"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Nastavenia modulu zmiešavania"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7851,138 +7884,325 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Nepripojený"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Ovládacie prvky"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Nastavenie pripojenia k sieti"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Chránené"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Neznámy zväzok"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Chyba pri pripájaní"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Dlaždice"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Prechody"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfigurácia"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Priame"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Kontajnér"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Konfiguruj"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Aktivovaný"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Vyplniť dostupné miesto"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Chránené"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Nepripojený"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Ďalší systray existuje"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Tu môže byť len jeden gadget systray a ďalší už existuje."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Systray"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Systray"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment nemôže spustiť systém tém."
+#~ msgid "Acpi"
+#~ msgstr "Akcia"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Táto obrazovka"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Táto obrazovka"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Zmeniť veľkosť"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Ukončenie pohybu/zmeny veľkosti tohto gadgetu"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže zinicializovať Ecore!\n"
+#~ "Možno máte nedostatok pamäte."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže zinicializovať súborový systém.\n"
+#~ "Možno máte nedostatok pamäte."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment sa nemôže spojiť s X serverom.\n"
+#~ "Máte nastavenú premennú DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže zinicializovať systém spojení.\n"
+#~ "Možno máte nedostatok pamäte."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže zinicializovať systém IPC.\n"
+#~ "Možno máte nedostatok pamäte."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nemôže nastaviť xinerama wrapping.\n"
+#~ "K tomu by nemalo dochádzať."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment nemôže nastaviť xinerama wrapping.\n"
+#~ "K tomu by nemalo dochádzať."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže zinicializovať systém Evas.\n"
+#~ "Možno máte nedostatok pamäte."
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment nemôže spustiť úvodnú obrazovku.\n"
+#~ "Možno máte nedostatok pamäte?"
+
+#~ msgid "Setup FM"
+#~ msgstr "nastavenie FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment nemôže nastaviť shelf systém."
+
+#~ msgid "New Application"
+#~ msgstr "Nová aplikácia"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Zobraziť signalizáciu správy napájania"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Štandardný Mód Dialógu"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Akcia"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Otvoriť s..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Otvoriť s..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Pridať aplikáciu"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Nová aplikácia"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Spustiť v termináli"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Príkaz"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Viac..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Zoradiť teraz"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Premenovať súbor"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Dialógy"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Celá Obrazovka"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Presunúť na Plochu"
+
+#~ msgid "Select application menu"
+#~ msgstr "Vybrať menu aplikácie"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Žiadne ikony na ploche"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Povoliť ikony na ploche"
+
+#~ msgid "Focus mode"
+#~ msgstr "Mód zaostrenia"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Klikni k zameraniu okna"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Myš nad zameranými oknami"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Vybrať ikony k pridaniu"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Rýchle spustenie"
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -8919,9 +9139,6 @@ msgstr "Systray"
 #~ msgid "No Digital Display"
 #~ msgstr "Žiaden Digitálny Displej"
 
-#~ msgid "Digital Display"
-#~ msgstr "Digitálny Displej"
-
 #~ msgid "Top"
 #~ msgstr "Hore"
 
@@ -8990,9 +9207,6 @@ msgstr "Systray"
 #~ msgid "Show windows from all zones"
 #~ msgstr "Ukázať okná zo všetkých zón"
 
-#~ msgid "Stop editing"
-#~ msgstr "Ukončiť editovanie"
-
 #~ msgid "Desktop Lock Settings"
 #~ msgstr "Nastavenia Uzamknutia Plochy"
 
@@ -9069,9 +9283,6 @@ msgstr "Systray"
 #~ msgid "Everyone"
 #~ msgstr "Všetci"
 
-#~ msgid "By Mod Time"
-#~ msgstr "Podľa Času Modifikácie"
-
 #~ msgid "Toggle Edit Mode"
 #~ msgstr "Zmeniť Editovací Mód"
 
@@ -9339,9 +9550,6 @@ msgstr "Systray"
 #~ msgid "Wait Exit"
 #~ msgstr "Počkať pri Ukončení"
 
-#~ msgid "%3.0f"
-#~ msgstr "%3.0f"
-
 #~ msgid "Places"
 #~ msgstr "Miesta"
 
index 5f78792..422fd20 100755 (executable)
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk.HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2011-03-28 12:04+0100\n"
 "Last-Translator: Renato Rener <renato.rener@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -24,20 +24,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Zapri"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -47,14 +46,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2010, Razvojna ekipa Enlightenment.<br><br>Upamo da se "
 "boste ob uporabi teh programov prav tako zabavali, kot smo se mi pri pisanju."
@@ -66,8 +65,9 @@ msgstr ""
 "dokončane, ali pa sploh še ne obstajajo in naletite lahko na veliko hroščev. "
 "Bili ste <hilight>POSVARJENI!</hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Ekipa</title>"
 
 #: src/bin/e_actions.c:365
@@ -85,56 +85,56 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ste prepričani, da bi radi ubili to okno?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Ste prepričani, da bi radi izhod?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da želite izhod?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Ste prepričani, da bi se radi odjavili?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Zahtevali ste odjavo<br><br>Ste prepričani, da želite to?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Ste prepričani, da bi radi izklop?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Zahtevali ste izklop računalnika.<br><br>Ste prepričani, da hočete izklop?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Ste prepričani, da bi radi ponovni zagon?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -142,7 +142,7 @@ msgstr ""
 "Zahtevali ste ponovni zagon računalnika<br><br>Ste prepričani, da hočete "
 "ponovni zagon?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -150,11 +150,11 @@ msgstr ""
 "Zahtevali ste zaustavitev računalnika.<br><br>Ste prepričani, da hočete "
 "zaustavitev?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Ste prepričani, da bi radi uspavali računalnik?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -162,540 +162,566 @@ msgstr ""
 "Zahtevali ste uspavanje računalnika.<br><br>Ste prepričani, da hočete "
 "uspavanje?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Okno : Dejanja"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Premakni"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Spremeni velikost"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meni"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Meni okna"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Postavi v ospredje"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Postavi v ozadje"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Ubij"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Okno : Stanje"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Lepljivo"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Ikonizirano"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Razpni"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Razpni navpično"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Razpni vodoravno"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Razpni celozaslonsko"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Pametna razpetost"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Razpni·razširjeno"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Razpni zapolnjeno"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Zasenči navzgor"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Zasenči navzdol"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Zasenči levo"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Zasenči desno"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Zasenčeno"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Brez obrobe"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 msgid "Set Border"
 msgstr "Nastavi obrobo"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr "Kroži med obrobami"
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Pripeto"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Namizje"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Preklopi namizje v levo"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Preklopi namizje v desno"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Preklopi namizje gor"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Preklopi namizje dol"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Preklopi namizje za..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Prikaži namizje"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Prikaži polico"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Preklopi namizje na..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Preklopi namizje linearno"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Preklopi na namizje 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Preklopi na namizje 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Preklopi na namizje 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Preklopi na namizje 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Preklopi na namizje 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Preklopi na namizje 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Preklopi na namizje 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Preklopi na namizje 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Preklopi na namizje 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Preklopi na namizje 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Preklopi na namizje 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Preklopi na namizje 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Preklopi na namizje..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Preklopi namizje levo (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Preklopi namizje desno (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Preklopi namizje gor (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Preklopi namizje dol (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Preklopi namizje za... (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Preklopi namizje na... (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Preklopi namizje linearno... (Vsi zasloni)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Preklopi namizje v smeri..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Preklopi na namizje·0·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Preklopi na namizje·1·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Preklopi na namizje·2·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Preklopi na namizje·3·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Preklopi na namizje·4·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Preklopi na namizje·5·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Preklopi na namizje·6·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Preklopi na namizje·7·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Preklopi na namizje·8·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Preklopi na namizje·9·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Preklopi na namizje·10·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Preklopi na namizje·11·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Preklopi na namizje...·(Vsi zasloni)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Zaslon"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Pošlji miško na zaslon·0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Pošlji miško na zaslon·1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Pošlji miško na zaslon..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Pošlji miško naprej za 1 zaslon"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Pošlji miško nazaj za 1 zaslon"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Pošlji miško nazaj/naprej za zaslon/ov...·"
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 msgid "Move To Center"
 msgstr "Premakni na sredino"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 msgid "Move To..."
 msgstr "Premakni na..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 msgid "Move By..."
 msgstr "Premakni za..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 msgid "Resize By..."
 msgstr "Spremeni velikost za..."
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 msgid "Push in Direction..."
 msgstr "Potisni v smeri..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 msgid "Drag Icon..."
 msgstr "Vleci ikono..."
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Okno : Premikanje"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Na naslednje namizje"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Na prejšnje namizje"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Po namizju št:..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Na namizje..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Prikaži glavni meni"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Prikaži meni priljubljenih"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Prikaži meni vseh programov"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Prikaži lastni meni"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Prikaži meni..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Zaženi"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Program"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Ponovni zagon"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Izklop"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Izklopi zdaj"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment·:·Način"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Predstavitveni način"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Nepovezan način"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistem"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Odjavi"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Ugasni zdaj"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Ugasni"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Ponovni zagon"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 msgid "Suspend Now"
 msgstr "Zaustavi zdaj"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Zaustavi"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Uspavaj"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Zakleni"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Uredi okna"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Splošno : Dejanja"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Odloženo dejanje"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "Zatemni zaslon"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "Osvetli zaslon"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Nastavi za ozadje"
 
@@ -705,18 +731,16 @@ msgstr "Nastavi za ozadje"
 msgid "Color Selector"
 msgstr "Izbirnik barve"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -724,20 +748,20 @@ msgstr "Izbirnik barve"
 msgid "OK"
 msgstr "V Redu"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -754,7 +778,7 @@ msgstr ""
 "nastavitvena datoteka ne vsebuje. Sedaj<br>pa lahko ponovno nastavite stvari "
 "po svoje. Opravičujemo se za neprijetnosti.<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -769,11 +793,11 @@ msgstr ""
 "nastavili na privzete vrednosti. Prosimo, sprejmite naše<br>opravičilo za "
 "vse neprijetnosti.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Težave zapisovanja Enlightenment nastavitev"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -784,19 +808,19 @@ msgstr ""
 "<br>%s<br><br>v:<br>%s<br><br>Zaradi varnosti je bilo nadaljevanje pisanja "
 "opuščeno.<br>"
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Nastavitve posodobljene"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr "Oprimek·datoteke·EET je slab."
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr "Prazna vsebina datoteke"
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
@@ -804,17 +828,17 @@ msgstr ""
 "Datoteka ni zapisljiva. Disk je morda le za branje<br>ali pa ste izgubili "
 "dovoljenja za vaše datoteke."
 
-#: src/bin/e_config.c:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 "Med pripravo na zapisovanje je zmanjkalo spomina.<br>Prosimo, sprostite "
 "nekaj spomina."
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr "Tole je splošna napaka!"
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
@@ -822,59 +846,60 @@ msgstr ""
 "Nastavitvena datoteka je prevelika.<br>Morala bi biti zelo majhna (največ "
 "nekaj sto KB)."
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr "Na disku imate I/O napake.<br>Morda potrebuje zamenjavo?"
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr "Med zapisovanjem datoteke vam je zmanjkalo prostora"
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr "Datoteka je bila zaprta med zapisovanjem"
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "Spodletela pomnilniška preslikava (mmap)·datoteke "
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr "Spodletelo kodiranje X509"
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr "Podpisovanje spodletelo"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr "Neveljaven podpis"
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 msgid "Not signed."
 msgstr "Ni podpisano"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr "Funkcija ni vgrajena"
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr "PRNG ni bil sejan"
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr "Šifriranje spodletelo"
 
-#: src/bin/e_config.c:2161
-msgid "Decruption failed."
+#: src/bin/e_config.c:2194
+#, fuzzy
+msgid "Decryption failed."
 msgstr "Razšifriranje spodletelo"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 msgid "The error is unknown to Enlightenment."
 msgstr "Enlightenment te napake ne prepozna"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -886,57 +911,62 @@ msgstr ""
 "%s<br><br>Ta datoteka je bila zaradi preprečitve okvare podatkov izbrisana."
 "<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Osnovno"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Uveljavi"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Razširitve"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduli"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Zaželeno ikono"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Vsebovalnik %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Napaka - ni podpore PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Podpora za PAM ni vgrajena v Enlightenment, zato<br>je zaklepanje zaslona "
 "onemogočeno."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Zaklepanje spodletelo"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -944,15 +974,15 @@ msgstr ""
 "Zaklepanje namizja ni uspelo, ker je nek program<br>prevzel tipkovnico "
 "oziroma miško ali oboje<br>in se njegov prevzem ne more prekiniti."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Vnesite vaše geslo za odklepanje"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Napaka Sistemskega overjanja"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -963,11 +993,11 @@ msgstr ""
 "Koda napake<hilight>%i</hilight>.<br>To je slabo in se ne bi smelo dogajati. "
 "Prosimo, sporočite nam tega hrošča."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Aktiviram predstavitveni način?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -977,11 +1007,11 @@ msgstr ""
 "<b>predstavitveni</b> način in začasno onemogočili ohranjevalnik zaslona, "
 "zaklepanje in upravljanje porabe?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ne, ampak zvišaj časovno zakasnitev"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ne in ne sprašuj več"
 
@@ -1007,106 +1037,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Urejevalnik namiznih vnosov"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Ime"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Opomba"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Splošno ime"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Razred okna"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorije"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Vrste MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Datoteka namizja"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Splošno"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Zagonsko Obveščanje"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Zaženi v terminalu"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Prikaži v menijih"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Izberi ikono"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Izberi izvršilno datoteko"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Prilepi"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Izberi vse"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1145,314 +1174,314 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "uspel zagnati."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Napaka pri zagonu programa"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s se je nepričakovano zaustavil"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Javljena je bila izhodna koda %i iz %s"
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je bil prekinjen z Interrupt signalom"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je bil prekinjen s Quit signalom"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je bil prekinjen z Abort signalom"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s je bil prekinjen z napako plavajoče vejice"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s je bil prekinjen z neprekinitvenim Kill signalom"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s je bil prekinjen s segmentacijsko napako"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s je bil prekinjen s prekinjeno cevjo"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je bil prekinjen s Termination signalom"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s je bil prekinjen z napako vodila"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s je bil prekinjen s signalom Št. %i"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Preostali signal je bil prisilno prekinjen. Shrani signal za pregled.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Dnevniki Napak"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Ni bilo poročila o napaki"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Shrani to sporočilo"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "To poročilo o napaki bo shranjeno kot %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Informacija o napaki"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Informacija o napaki signala"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Izhodni podatki"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Ni bilo izhodnih podatkov"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Neobstoječa pot"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s ne obstaja"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Napaka priklopa"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Ne morem priklopiti naprave"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Napaka odklopa"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Ne morem odklopiti naprave"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Napaka izmeta"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Ne morem izvreči naprave"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Datoteke"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Bližnjica"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Opusti"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Prevzemi starševske nastavitve"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Način pogleda"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Osveži pogled"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Prikaži skrite datoteke"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Zapomni si zaporedje"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Razvrsti zdaj"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Nova Mapa"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Odklopi"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Priklopi"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Izvrzi"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "Lastnosti programa"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Lastnosti datoteke"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Uporabi privzeto"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Umreži ikone"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Ikone po meri"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Seznam"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikone (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Nastavi ozadje..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Nastavi prekrivnost"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Ustvari novo napo"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Ime nove mape"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj %s v:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Preimenuj datoteko"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Poskusi ponovno"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Napaka"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ne za vse"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Da za vse"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Datoteka že obstaja, prepišem?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Spreglej to"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Spreglej vse"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Med izvajanjem operacije je prišlo do napake.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Potrdi brisanje"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ste prepričani, da hočete izbrisati<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1486,12 +1515,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznana naprava"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Odstranljivi pogon "
 
@@ -1499,7 +1528,7 @@ msgstr "Odstranljivi pogon "
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Velikost:"
 
@@ -1515,7 +1544,7 @@ msgstr "Vrsta datoteke:"
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Lastnik:"
 
@@ -1535,17 +1564,17 @@ msgstr "Lastnik lahko bere"
 msgid "Owner can write"
 msgstr "Lastnik lahko piše"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Predogled"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Privzeto"
 
@@ -1554,7 +1583,7 @@ msgid "Thumbnail"
 msgstr "Sličica"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Po meri"
 
@@ -1570,50 +1599,41 @@ msgstr "Informacija o povezavi"
 msgid "Select an Image"
 msgstr "Izberi sliko"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "Premakni v"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "Začni Premikanje/Spreminjanje velikosti"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "Spremenljiva velikost"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Samodejno drsenje vsebine"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Golo"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Uokvirjeno"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Izgled"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Odstrani"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Prekini Premikanje/Spreminjanje velikosti tega predmeta"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1661,14 +1681,14 @@ msgstr "Položaj"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Velikost"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Obnašanje"
@@ -1720,154 +1740,161 @@ msgstr "Izhod iz prijavne seje če je to okno odprto"
 msgid "Remember these Locks"
 msgstr "Zapomni si te zaklepe"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Okno"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-msgid "Always on Top"
-msgstr "Vedno na vrhu"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Lepljivo"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Nastavitve"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Razpni navpično"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Razpni vodoravno"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Razveljavi Razpetost"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Uredi ikono"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Ustvari ikono"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 msgid "Add to Favorites Menu"
 msgstr "Dodaj k priljubljenim"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr "Dodaj b iBar"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 msgid "Create Keyboard Shortcut"
 msgstr "Ustvari bližnjico tipkovnice"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "Razpostavljanje"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Preskoči"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Obroba"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Zaklepe"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Lepljivo"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Preskoči"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Ikoniziraj"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 msgid "Shade"
 msgstr "Zavihaj"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Zaslon"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+msgid "Always on Top"
+msgstr "Vedno na vrhu"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Vedno spodaj"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Pripni na namizje"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Odpni z namizja"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Izberi slog obrobe"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Uporabi privzeto ikono iz E17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Uporabi privzeto ikono programa"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Uporabi uporabniško določeno ikono"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 msgid "Offer Resistance"
 msgstr "Nudi odpor"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Seznam oken"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Preklopnik namizij"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Opravilna vrstica"
 
@@ -1888,7 +1915,7 @@ msgid "ICCCM Properties"
 msgstr "Lastnosti ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Naslov"
 
@@ -2060,7 +2087,6 @@ msgid "Size, Position and Locks"
 msgstr "Velikost, lokacijo in zaklepe"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "Vse"
 
@@ -2137,15 +2163,13 @@ msgid "Utilities"
 msgstr "Pripomočki"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Datoteke"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 msgid "Launcher"
 msgstr "Zaganjalnik"
 
@@ -2158,20 +2182,6 @@ msgstr "Sredica"
 msgid "Mobile"
 msgstr "Mobilno"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Nastavitev Modulov"
@@ -2209,7 +2219,7 @@ msgstr "Dodaj gadget"
 msgid "Remove Gadget"
 msgstr "Odstrani gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Nastavitve Orodne vrstice"
 
@@ -2217,11 +2227,11 @@ msgstr "Nastavitve Orodne vrstice"
 msgid "Layout"
 msgstr "Razporeditev"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Napaka pri načinu vnosa"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2237,7 +2247,7 @@ msgstr "Glavni Meni"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Priljubljeni programi"
 
@@ -2245,76 +2255,74 @@ msgstr "Priljubljeni programi"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Programi"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Izgubljena okna"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "O Enlightenment"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Navidezna namizja"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Police"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Prikaži/skrij vsa okna"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Ni programov)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Nastavi navidezna namizja"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Ni oken)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Ni imena!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Ni polic)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Dodaj polico"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Izbriši polico"
 
@@ -2349,7 +2357,7 @@ msgid "Shrink to Content Width"
 msgstr "Skrči na širino vsebine"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Slog"
 
@@ -2379,7 +2387,7 @@ msgid "Hide duration"
 msgstr "Trajanje skritja"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%2f sek."
@@ -2396,7 +2404,7 @@ msgstr "Prikaži na vseh namizjih"
 msgid "Show on specified Desktops"
 msgstr "Prikaži na določenih namizjih"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2413,7 +2421,7 @@ msgstr ""
 "ali pa niso vaša last. Prosimo, preverite:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2426,76 +2434,22 @@ msgstr ""
 "Prosimo, preverite:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Možnosti:\n"
-"\t-zaslon ZASLON\n"
-"\t\tPoveži z zaslonom ZASLON.\n"
-"\t\tNPR: -zaslon :1.0\n"
-"\t-lažni-xinerama-zaslon WxH+X+Y\n"
-"\t\tDodaj lažni-xinerama-zaslon (namesto pravih)\n"
-"\t\tz geometrijo. Dodaj jih kolikor jih želiš. Zamenjali\n"
-"\t\tbodo vse prisotne xinerama zaslone. S tem lahko\n"
-"\t\tsimuliramo xinerama način.\n"
-"\t\tNPR: -lažni-xinerama-zaslon 800x600+0+0 -lažni-xinerama-zaslon "
-"800x600+800+0\n"
-"\t-profil CONF_PROFILE\n"
-"\t\tuporabi nastavitveni profil CONF_PROFILE namesto uporabnikovega profila "
-"default ali preprosto \"default\".\n"
-"\t-dober\n"
-"\t\tBodi dober.\n"
-"\t-hudoben\n"
-"\t\tBodi hudoben.\n"
-"\t-psihotičen\n"
-"\t\tBodi psohotičen.\n"
-"\t-zaklenjen\n"
-"\t\tZaženi z zaklenjenim zaslonom, da bo zahtevano geslo.\n"
-"\t-res-vem-kaj-delam-in-sprejemam-polno-odgovornost-za-to\n"
-"\t\tče potrebuješ to pomoč, ne potrebuješ te možnosti.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more zagnati Ecore!\n"
-"Vam mogoče primankuje spomina?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more zagnati datotečnega sistema.\n"
-"Ste mogoče ostali brez spomina?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2503,7 +2457,7 @@ msgstr ""
 "Enlightenment ne more nastaviti upravitelja izhodnih signalov.\n"
 "Ste mogoče ostali brez spomina?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2511,7 +2465,7 @@ msgstr ""
 "Enlightenment ne more nastaviti upravitelja HUP signalov.\n"
 "Ste mogoče ostali brez spomina?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2519,63 +2473,37 @@ msgstr ""
 "Enlightenment ne more nastaviti upravitelja UPORABNIŠKEGA signala.\n"
 "Ste mogoče ostali brez spomina?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne more ustvariti povezave z X serverjem.\n"
-"Ste že nastavili svojo DISPLAY spremenljivko?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment ne more pognati svojega alarmnega sistema.\n"
-"Ste že nastavili svojo DISPLAY spremenljivko?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more zagnati sistema povezav.\n"
-"Ste mogoče ostali brez spomina?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more zagnati sistema IPC.\n"
-"Ste mogoče ostali brez spomina?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne more nastaviti xinerama ovijanja.\n"
-"To se ne bi smelo dogajati."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment ne more nastaviti randr ovijanja.\n"
-"To se ne bi smelo zgoditi."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more zagnati sistema Evas.\n"
-"Ste mogoče ostali brez spomina?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2585,7 +2513,7 @@ msgstr ""
 "izrisovanja v Evas. Preverite vaše Evas in Ecore nastavitve in se\n"
 "prepričajte, da podpirajo programski X11 izrisovalni pogon."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2595,7 +2523,35 @@ msgstr ""
 "Buffer spomina. Preverite vaše Evas in Ecore nastavitve in se\n"
 "prepričajte, da podpirajo izrisovanje iz Software Buffer spomina."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne more pognati svojega alarmnega sistema.\n"
+"Ste že nastavili svojo DISPLAY spremenljivko?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2603,23 +2559,29 @@ msgstr ""
 "Enlightenment ne more ustvariti map v vaši domači mapi.\n"
 "Mogoče nimate domače mape ali pa imate poln disk?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment ne more nastaviti svojega sistema registrskih datotek."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ne more nastaviti nastavitvenega sistema."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment ne more nastaviti sistema tem."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment ne more nastaviti sistema razporejanja."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment ne more nastaviti sistema kazalca."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2627,93 +2589,42 @@ msgstr ""
 "Enlightenment ne more nastaviti poti za iskanje datotek.\n"
 "Mogoče ste ostali brez spomina?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment ne more nastaviti sistema pisav."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment ne more nastaviti sistema tem."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment ne more nastaviti zagonskega okna.\n"
-"Ste mogoče ostali brez spomina?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment ne more nastaviti mednarodnega sistema."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Začenjanje mednarodne podpore"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne more nastaviti mednarodnega sistema."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment ne more zagnati FDO datotečnega sistema.\n"
 "Ste mogoče ostali brez spomina?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Testiranje podpornega formata"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment je ugotovil, da Evas ne more ustvariti Buffer Canvas.\n"
-"Prepričajte se, da je v Evasu podpora za Software Buffer pogon.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je ugotovil, da Evas ne more odpirati PNG datotek.\n"
-"Prepričajte se, je v Evasu podpora za PNG nalagalnik.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je ugotovil, da Evas ne more odpirati JPEG datotek.\n"
-"Prepričajte se, je v Evasu podpora za JPEG nalagalnik.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment je ugotovil, da Evas ne more odpirati EET datotek.\n"
-"Prepričajte se, je v Evasu podpora za EET nalagalnik.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment je ugotovil, da Evas ne more odpirati 'Sans' pisav. preverite "
-"je v Evasu podpora za fontconfig.\n"
-" in ali sistemski fontconfig definira 'Sans' pisavo.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "Preveri podporo SVG"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Nastavi Zaslone"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2722,199 +2633,361 @@ msgstr ""
 "vašega sistema in pri tem klavrno propadel. Mogoče uporabljate drug\n"
 "upravljalnik z okni?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "Nastavi ACPI"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Nastavi Naveze"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment ne more nastaviti DPMS nastavitev."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Nastavi DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne more nastaviti DPMS nastavitev."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Nastavi Ohranjevalnik zaslona"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne more nastaviti X ohranjevalnika zaslona."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Nastavi načine varčevanja porabe"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+"Enlightenment ne more nastaviti svojega sistema za način upravljanja porabe"
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Nastavi zaklepanje"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ne more nastaviti svojega sistema zaklepanja namizja."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Nastavii pojavna okna"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne more nastaviti svojega sistema pojavnih oken"
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Nastavi sistem sporočil"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "Nastavi poti"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Nastavi sistemsko nadzorovanje"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne more zagnati sistema za sistemske ukaze.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Nastavi dejanja"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne more nastaviti svojega sistema dejanj."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Nastavi izvršilni sistem"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne more nastaviti izvršilnega sistema."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Nastavi FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Upravitelj datotek"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Nastavi sistem sporočil"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne more nastaviti sistema sporočil."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Nastavi DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne more nastaviti svojega·dnd sistema."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Nastavi ravnanje z zajemanjem vnosov"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment ne more nastaviti svojega sistema za ravnanje z zajemanjem "
 "vnosov."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Nastavi Module"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne more nastaviti·sistema modulov."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Nastavi zapomnitve"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment ne more nastaviti nastavitev zapomnitev."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Nastavi razrede barv"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne more nastaviti svojega sistema barvnih razredov."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Nastavi Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ne more nastaviti svojega sistema upravljanja z gadgeti"
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "Nastavi ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Nastavi DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment ne more nastaviti DPMS nastavitev."
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "Nastavi načine varčevanja porabe"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-"Enlightenment ne more nastaviti svojega sistema za način upravljanja porabe"
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Nastavi Ozadje"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne more nastaviti svojega sistema ozadja namizja."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Nastavi Miško"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne more nastaviti miškinih nastavitev."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Nastavi Naveze"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne more nastaviti svojega sistema navez."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Nastavi Police"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment ne more nastaviti svojega sistema polic."
+#: src/bin/e_main.c:846
+msgid "Setup Thumbnailer"
+msgstr "Nastavi Pomanjševanje sličic"
+
+#: src/bin/e_main.c:850
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr "Enlightenment ne more zagnati sistema za pomanjševanje slik.\n"
+
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment ne more zagnati sistema za sistemske ukaze.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ne more zagnati sistema za pomanjševanje slik.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment ne more nastaviti sistema tem."
+
+#: src/bin/e_main.c:889
+msgid "Setup File Ordering"
+msgstr "Nastavi Razvrščanje datotek"
+
+#: src/bin/e_main.c:893
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+"Enlightenment ne more nastaviti svojega sistema datotečnega razvrščanja."
+
+#: src/bin/e_main.c:908
+msgid "Load Modules"
+msgstr "Naloži module"
+
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Nastavi Police"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Skoraj zaključeno"
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Možnosti:\n"
+"\t-zaslon ZASLON\n"
+"\t\tPoveži z zaslonom ZASLON.\n"
+"\t\tNPR: -zaslon :1.0\n"
+"\t-lažni-xinerama-zaslon WxH+X+Y\n"
+"\t\tDodaj lažni-xinerama-zaslon (namesto pravih)\n"
+"\t\tz geometrijo. Dodaj jih kolikor jih želiš. Zamenjali\n"
+"\t\tbodo vse prisotne xinerama zaslone. S tem lahko\n"
+"\t\tsimuliramo xinerama način.\n"
+"\t\tNPR: -lažni-xinerama-zaslon 800x600+0+0 -lažni-xinerama-zaslon "
+"800x600+800+0\n"
+"\t-profil CONF_PROFILE\n"
+"\t\tuporabi nastavitveni profil CONF_PROFILE namesto uporabnikovega profila "
+"default ali preprosto \"default\".\n"
+"\t-dober\n"
+"\t\tBodi dober.\n"
+"\t-hudoben\n"
+"\t\tBodi hudoben.\n"
+"\t-psihotičen\n"
+"\t\tBodi psohotičen.\n"
+"\t-zaklenjen\n"
+"\t\tZaženi z zaklenjenim zaslonom, da bo zahtevano geslo.\n"
+"\t-res-vem-kaj-delam-in-sprejemam-polno-odgovornost-za-to\n"
+"\t\tče potrebuješ to pomoč, ne potrebuješ te možnosti.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Testiranje podpornega formata"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment je ugotovil, da Evas ne more ustvariti Buffer Canvas.\n"
+"Prepričajte se, da je v Evasu podpora za Software Buffer pogon.\n"
 
-#: src/bin/e_main.c:1048
-msgid "Setup Thumbnailer"
-msgstr "Nastavi Pomanjševanje sličic"
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je ugotovil, da Evas ne more odpirati PNG datotek.\n"
+"Prepričajte se, je v Evasu podpora za PNG nalagalnik.\n"
 
-#: src/bin/e_main.c:1053
-msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr "Enlightenment ne more zagnati sistema za pomanjševanje slik.\n"
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je ugotovil, da Evas ne more odpirati JPEG datotek.\n"
+"Prepričajte se, je v Evasu podpora za JPEG nalagalnik.\n"
 
-#: src/bin/e_main.c:1058
-msgid "Setup File Ordering"
-msgstr "Nastavi Razvrščanje datotek"
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment je ugotovil, da Evas ne more odpirati PNG datotek.\n"
+"Prepričajte se, je v Evasu podpora za PNG nalagalnik.\n"
 
-#: src/bin/e_main.c:1062
-msgid "Enlightenment cannot set up its order file system."
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
 msgstr ""
-"Enlightenment ne more nastaviti svojega sistema datotečnega razvrščanja."
+"Enlightenment je ugotovil, da Evas ne more odpirati EET datotek.\n"
+"Prepričajte se, je v Evasu podpora za EET nalagalnik.\n"
 
-#: src/bin/e_main.c:1077
-msgid "Load Modules"
-msgstr "Naloži module"
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment je ugotovil, da Evas ne more odpirati 'Sans' pisav. preverite "
+"je v Evasu podpora za fontconfig.\n"
+" in ali sistemski fontconfig definira 'Sans' pisavo.\n"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2925,11 +2998,11 @@ msgstr ""
 "do napake <br>nalaganja modula: %s. Ta modul je bil onemogočen<br>in ne bo "
 "naložen."
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment se je sesul ob zagonu in je bil ponovno zagnan."
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2940,7 +3013,7 @@ msgstr ""
 "do napake nalaganja modula: %s.<br><br>Ta modul je bil onemogočen in ne bo "
 "naložen."
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2952,7 +3025,7 @@ msgstr ""
 "ki<br>povzročajo težave iz vaših nastavitev. Module<br>lahko zatem znova "
 "izberete v<br>izbirniku Modulov"
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2964,20 +3037,12 @@ msgstr ""
 "odstranite module, ki povzročajo težave.<br><br>Module lahko znova izberete "
 "v izbirniku modulov."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Nastavi Police"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Skoraj zaključeno"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "Nalaganje modula: %s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2986,11 +3051,11 @@ msgstr ""
 "Pri zagonu modula %s je prišlo do napake.<br>Modul z imenom %s ni bil najden "
 "v<br>mapah za iskanje modulov."
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2999,11 +3064,11 @@ msgstr ""
 "Pri zagonu modula %s je prišlo do napake.<br>Pot do modula je:<br>"
 "%s<br>Sporočena napaka je:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modul ne vsebuje vseh potrebnih funkcij."
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3013,16 +3078,16 @@ msgstr ""
 "Napaka v Modulu API<br>Napaka pri zagonu modula: %s<br>Potrebuje najmanj "
 "Modul API verzije: %i<br>Enlightenment poroča Modul API verzije: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Bi radi Izklopili ta modul?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3036,11 +3101,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Polica št."
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ste prepričani, da hočete izbrisati to polico?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3048,16 +3113,16 @@ msgstr ""
 "Zahtevali ste izbris te police.<br><br>Ste prepričani, da jo hočete "
 "izbrisati?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Ustavi Premikanje/Spreminjanje velikosti gadgetov"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Začni Premikanje/Spreminjanje velikosti gadgetov"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "Vsebina"
 
@@ -3065,16 +3130,16 @@ msgstr "Vsebina"
 msgid "Starting"
 msgstr "Zaganjanje"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Pregledujem sistemska dovoljenja"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Pregled sistema končan"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3085,49 +3150,49 @@ msgstr ""
 "želite odjaviti<br>vseeno brez zaprtja teh <br>programov?<br><br>samodejna "
 "odjava v %d sekundah."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Težave pri odjavljanju"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Odjavi zdaj"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Čakaj..."
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Prekliči odjavo"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Odjava v teku..."
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Odjava v teku.<br><hilight>Prosimo počakajte.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je zaseden z drugo zahtevo."
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "Odjavljanje.<br>Ne morete izvajati drugih aktivnosti<br>ko se začne odjava."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 "Ugašanje.<br>Ne morete izvajati drugih aktivnosti<br>ko se začne ugašanje."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3135,7 +3200,7 @@ msgstr ""
 "Ponovni zagon.<br>Ne morete izvajati drugih aktivnosti<br>ko se začne "
 "ponovni zagon."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3143,61 +3208,62 @@ msgstr ""
 "Zaustavljanje.<br>Dokler je zaustavljanje v teku, ne morete<br>izvajati "
 "drugih aktivnosti."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr "Uspavanje <br>Ne morete izvajati drugih aktivnosti <br>pred zaključkom"
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Ups! To se ne bi smelo zgoditi"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Ugašanje spodletelo"
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Ponovni zagon spodletel"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Zaustavitev spodletela"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Spanje spodletelo"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Ugasni"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Izklop.<br><hilight>Prosimo počakajte.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Ponovno zaganjanje"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Ponovni zagon.<br><hilight>Prosimo počakajte.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Zaustavitev"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Zaustavljanje.<br><hilight>Prosimo počakajte.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Spanje"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Uspavanje <br><hilight>Prosimo, počakajte.</hilight>"
 
@@ -3205,33 +3271,33 @@ msgstr "Uspavanje <br><hilight>Prosimo, počakajte.</hilight>"
 msgid "About Theme"
 msgstr "O temi"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Nastavi kot temo"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Prekini Premikanje/Spreminjanje velikost predmetov"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Začni Premikanje/Spreminjanje velikosti predmetov"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Nastavi vsebino Orodne vrstice"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment ni uspel odcepiti hčerinskega procesa:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Izhod nemogoč - nesmrtna okna"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3241,123 +3307,123 @@ msgstr ""
 "pomeni,<br> da izhod iz Enlightenment ne bo mogoč, dokler se ta<br>okna ne "
 "zaprejo oziroma se jim ne odstrani zaklenjenost.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytov"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "V prihodnosti"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "V zadnji minuti"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "Pred %li let."
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "Pred %li mes."
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Pred %li ted."
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "Pred %li dn."
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "Pred %li ur."
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Pred %li min."
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznan"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Nastavitve uvoza slik"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "Uvozi"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Nastavitve zapolnjevanja·in razširjanja"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Raztegni"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Usredini"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Znotraj"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Zapolni"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Kvaliteta datoteke"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Uporabi originalno datoteko"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3374,12 +3440,12 @@ msgstr ""
 "datoteka ne vsebuje. Sedaj<br>pa lahko ponovno nastavite stvari po svoje. "
 "Opravičujemo se za nevšečnosti.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s Nastavitev posodobljena"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3413,140 +3479,146 @@ msgstr "Gor"
 msgid "Down"
 msgstr "Dol"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Dodaj k priljubljenim"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Premik v nadrejeno mapo"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Izberi ločljivost"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Dovoljenja:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Spremenjeno:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Ti"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Zaščiteno"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Le za branje"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Branje-Pisanje"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Nastavitev Skrbnika Baterije"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Preveri vsake:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tik."
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Uspavaj"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f·%%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Preverjanje"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "Prikaži obvestilo o prazni bateriji"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Prikaži obvestilo ko je stanje baterije na:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min."
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f·%%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Samodejna opustitev čez..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek."
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Opozorilo"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Samodejno zaznaj"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Notranje"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "Zmedeni način"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Strojna oprema"
 
@@ -3554,32 +3626,33 @@ msgstr "Strojna oprema"
 msgid "Battery"
 msgstr "Baterija"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Vaša baterija je prazna!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Priporoča se priklop na električni tok"
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Ni na voljo"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "NAPAKA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Merilnik baterije"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Ura"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Prikaži Orodno vrstico"
@@ -3644,17 +3717,17 @@ msgstr "Nastavitve Nastavitvene plošče posodobljene"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar programi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Zagonski programi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Programi ponovnega zagona"
 
@@ -3667,10 +3740,25 @@ msgid "Apps"
 msgstr "Programi"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Nov program"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Zaganjalnik"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Izberi programe"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Namizne datoteke"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar drugo"
 
@@ -3683,7 +3771,7 @@ msgid "Available Profiles"
 msgstr "Profili na voljo"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Izberi profil"
 
@@ -3721,9 +3809,9 @@ msgstr "Nastavitev pogovornih oken"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Splošne nastavitve"
 
@@ -3765,7 +3853,7 @@ msgstr "Pogovorna okna"
 msgid "Profiles"
 msgstr "Profili"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3776,7 +3864,7 @@ msgstr ""
 "Obnovi, če ni.<br>Če ne pritisnete gumba se bo stara ločljivost <br>%dx%d "
 "pri %d Hz shranila v %d sekundah."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3787,7 +3875,7 @@ msgstr ""
 "če ni.<br>Če ne pritisnete gumba se bo stara ločljivost <br>%dx%d obnovila v "
 "%d sekundah."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3798,7 +3886,7 @@ msgstr ""
 "ni.<br>Če ne pritisnete gumba se bo stara ločljivost <br>%dx%d pri %d Hz "
 "obnovila<hilight>TAKOJ!!!</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3809,47 +3897,47 @@ msgstr ""
 "Obnovi, če ni.<br>Če ne pritisnete gumba se bo stara ločljivost <br>%dx%d "
 "obnovila ·<hilight>TAKOJ!!!</hilight>"
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Sprememba ločljivosti"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Shrani"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Obnovi"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Nastavitev ločljivosti zaslona"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Izberi ločljivost"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Obnovi ločljivost ob prijavi"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Izberi osveževanje"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Kroženje"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Zrcaljenje"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Manjkajoče funkcije"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3863,11 +3951,11 @@ msgstr ""
 "času, ko je bil <hilight>ecore</hilight>zgrajen, podpora<br>za XRandR ni "
 "bila zaznana."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Ne najdem osveževalnih vrednosti"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3880,89 +3968,72 @@ msgstr ""
 "trenutna osveževalna vrednost uporabljena ob<br>nastavljanju resolucije, kar "
 "lahko povzroči <hilight>okvaro</hilight> vašega zaslona."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Nastavitev Navideznih namizij"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Število namizij"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 msgid "Desktop Flip"
 msgstr "Preklop namizij"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Preklopi namizje med vleko predmetov na rob zaslona"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Ovijaj namizja ob preklopu"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Namizja"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Izključeno"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Pult"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Povečava"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Nastavitve Ozadja"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "Hitrost animiranja"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "Dejavnik sukanja X-osi"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "Dejavnik sukanja Y-osi"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Animacija preklopa"
 
@@ -3979,7 +4050,7 @@ msgid "Desktop Wallpaper"
 msgstr "Ozadje namizja"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Nastavi"
 
@@ -3989,12 +4060,12 @@ msgstr "Izberi ozadje"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Osebno:"
 
@@ -4002,184 +4073,211 @@ msgstr "Osebno:"
 msgid "Screen Lock Settings"
 msgstr "Nastavitev zaklepanja zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "Zakleni zaslon ob zagonu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "Zakleni zaslon ob zaustavitvi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "Uporabniško določeno zaklepanje zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "Zaklepanje"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "Prikaži na vseh zaslonih"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "Prikaži na trenutnem zaslonu"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "Prikaži na zaslonu #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "Prijavno okno"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "Zakleni ob zagonu X ohranjevalnika zaslona"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sek."
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Zakleni po preseženem določenem času"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f min."
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Časomerji"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "Predlagaj ob predčasni deaktivaciji"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "Predstavitveni način"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Določeno po temi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Ozadje teme"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "Trenutno ozadje"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Ozadje"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Nastavitev ohranjevalnika zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "Omogoči X ohranjevalnik zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Zaustavi zdaj"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "Ohranjevalnik zaslona"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "Začetna časovna zakasnitev"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "Alternacijska Časovna zakasnitev"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Praznjenje"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Priljubljeno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Ne priljubljeno"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Dejanja izpostavljenosti"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Dovoli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Ne dovoli"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Mešano"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Prikaži signaliziranje upravljanja napajanja"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Trenutni zaslonski strežnik nima <br>DPMS sposobnosti."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Trenutni zaslonski strežnik nima <br>DPMS podaljška."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Nastavitve upravitelja napajanja zaslona"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Omogoči upravljanje napajanja zaslona"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Čas pripravljenosti"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Čas zaustavljanja"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Čas Izklopa"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Navidezna namizja"
@@ -4226,74 +4324,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Nastavitev navez robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Dodaj navezo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Izbriši navezo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Spremeni navezo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Izbriši vse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Obnovi privzete naveze"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Dejanje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametri dejanja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Splošne nastavitve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Dovoli uveljavitev navez s celozaslonskimi okni"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Zaporedje naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Vogal na klik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Napaka naveze roba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4302,28 +4400,28 @@ msgstr ""
 "Zaporedje tipk, ki ste ga izbrali, že uporablja dejanje<br><hilight>%s</"
 "hilight><br>Prosimo izberite drugo navezo za rob"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4473,34 +4571,47 @@ msgid ""
 msgstr ""
 "Enlightenment ni uspel uvoziti nastavitve<br>zaradi napake pri kopiranju."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Nastavitve jezika"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Izbirnik jezika"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Sistemsko privzeto"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Izbran prevod"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Prevod"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Jezik"
 
@@ -4588,17 +4699,17 @@ msgid "Manager"
 msgstr "Upravitelj"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Brez"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Zaporedje navez miške"
 
@@ -4622,13 +4733,11 @@ msgid "Menu Settings"
 msgstr "Nastavitev menijev"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Osebno:"
@@ -4638,7 +4747,7 @@ msgid "Main Menu"
 msgstr "Glavni Meni"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Priljubljeno"
 
@@ -4656,7 +4765,7 @@ msgid "Comments"
 msgstr "Pripombe"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4667,7 +4776,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Prikaži nastavitve gadgetov u vrhnjem nivoju"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Meniji"
 
@@ -4735,19 +4844,19 @@ msgid "Images"
 msgstr "Slike"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Pisave"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Teme"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikone"
 
@@ -4894,18 +5003,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Nastavitve ozadja"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Uporabi ozadje teme"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Slika..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Na Internetu..."
 
@@ -4925,42 +5034,47 @@ msgstr "To namizje"
 msgid "This Screen"
 msgstr "Ta zaslon"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Nastavitve ozadja"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Tlakovanje"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Pult"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Izberi sliko..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Napaka uvažanja slike"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment ni uspel uvoziti slike<br>zaradi napake pri pretvorbi ."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Napaka uvažanja ozadja"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment ni uspel uvoziti ozadja:<br>zaradi napake pri kopiranju."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4997,7 +5111,7 @@ msgid "Error: can't start the request."
 msgstr "Napaka: ne morem začeti povpraševanja"
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Privzeti slog obrobe"
 
@@ -5005,7 +5119,7 @@ msgstr "Privzeti slog obrobe"
 msgid "Window Border Selection"
 msgstr "Izbira okenskih obrob"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapomni si obrobo tega okna za naslednjič"
 
@@ -5034,7 +5148,7 @@ msgid "Menu Background Base"
 msgstr "Temelj ozadja menija"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Naslov menija"
 
@@ -5043,7 +5157,7 @@ msgid "Menu Title Active"
 msgstr "Naslov menija aktiven"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Predmet menija"
 
@@ -5056,12 +5170,12 @@ msgid "Menu Item Disabled"
 msgstr "Predmet menija onemogočen"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Premakni besedilo"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Spremeni velikost besedila"
 
@@ -5078,7 +5192,7 @@ msgid "Winlist Label"
 msgstr "Oznaka seznama oken"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Naslov seznama oken"
 
@@ -5095,377 +5209,387 @@ msgid "File Manager Background Base"
 msgstr "Temelj ozadja upravitelja datotek"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Besedilo gumba"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Onemogočeno besedilo gumba"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Besedilo preverke"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Onemogočeno besedilo potrditve"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Besedilo vnosa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "Onemogočeno besedilo vnosa"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Besedilo oznake"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "Besedilo predmeta seznama izbrano"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "Besedilo predmeta seznama (sodo)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "Ozadje predmeta seznama (sodo)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "Besedilo predmeta seznama (liho)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "Besedilo predmeta seznama (liho)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "Besedilo glave seznama (sodo)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "Ozadje glave seznama (sodo)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "Besedilo glave seznama  (liho)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "Ozadje glave seznama (liho)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Besedilo radijskega gumba"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Besedilo radijskega gumba onemogočeno"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Besedilo drsnika"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Besedilo drsnika onemogočeno"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "Temelj ozadja okvirja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "Temelj ozadja drsnega okvirja"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Oznaka modula"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "Kompozitiraj barvo fokusa navzven"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Barve"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "Razred barve:·%s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Izbrani %u razredi mešanih barv"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Izbrani %u razredi nenastavljenih barv"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Izbrani %u razredi·enotnih barv"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "Razred barve ni izbran"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "Barve po meri"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "Predmet:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "Obroba:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "Senca:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "Besedilo z nanešenimi barvami"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "Barve so odvisne od zmogljivosti teme"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Okenski upravitelj"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgeti"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "Drugi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Naslovna vrstica"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Raven del besedila"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Svetel del besedila"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Velik del besedila"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Glava nastavitev"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "O naslovu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "O različici"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "O besedilu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Naslov zaklepanja namizja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Geslo zaklepanja namizja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Napaka pogovornega okna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Ukaz izvršilnega pomnilnika"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Naslov predstavitvenega okna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Besedilo predstavitvenega okna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Različica predstavitvenega okna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Vnos"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Okvir"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Oznaka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Gumbi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Drsnik"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Radijski gumbi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Gumbi za preverjanje"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Predmet besedilnega seznama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Predmet seznama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Glava seznama"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Upravitelj datotek"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Vrsta pomnilnika"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Ikona namizja"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Majhna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Široka"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Majhno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normalno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Široko"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Nastavitev Pisav"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Majcena"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Velika"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Zelo velika"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Ogromna"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pik."
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Omogoči uporabniške razrede pisav"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Osnovni predogled besedila: 123: abcd·čćžšđ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Razredi Pisav"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Omogoči razred pisave"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Pisava"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Napredni·predogled besedila:.·123 abcd čćžšđ"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Namigovanje"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bitna koda"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Pisava zasilne povrnitve"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Ime zasilno-povrnitvene pisave"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Omogoči zasilno povrnitev"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Namigi·/·Povrnitve"
 
@@ -5473,11 +5597,16 @@ msgstr "Namigi·/·Povrnitve"
 msgid "Icon Theme Settings"
 msgstr "Nastavitev ikonskih tem"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr "Omogoči temo ikon"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Izberi programe"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr "To zamenja splošno temo"
 
@@ -5542,11 +5671,9 @@ msgid "Custom scaling factor"
 msgstr "Osebna nastavitev umerjanja"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f·krat"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5557,6 +5684,12 @@ msgstr "Politika"
 msgid "Minimum"
 msgstr "Najmanjše"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f·krat"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Največje"
@@ -5577,25 +5710,25 @@ msgstr "Prikaži prijavni zaslon ob prijavi"
 msgid "Transition Settings"
 msgstr "Nastavitev Prehodov"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Dogodki"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Zagon"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Sprememba namizja"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Sprememba ozadja"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Prehodi"
 
@@ -5611,15 +5744,15 @@ msgstr " Uvozi..."
 msgid " Online..."
 msgstr "Na Internetu..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Predmeti teme"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Dodeli"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Počisti vse"
 
@@ -5648,19 +5781,19 @@ msgstr "Enlightenment ni uspel uvoziti teme<br>zaradi napake pri kopiranju."
 msgid "Exchange themes"
 msgstr "Prenesi teme"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Obrobe"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Ikonske teme"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Miškini kazalci"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Umerjanje"
 
@@ -5781,6 +5914,10 @@ msgstr "Privzeta programska ikona"
 msgid "Border Icon"
 msgstr "Ikona okvirja"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "Razpostavljanje"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Pametno razpostavljanje"
@@ -5809,23 +5946,46 @@ msgstr "Nova okna"
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linearno"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "Pospeši in potem zaviraj"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Pospeši"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Zaviraj"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Pospeševanje miške"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Zaviraj"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Pospeši in potem zaviraj"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "Senčenje"
 
@@ -5846,6 +6006,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Zadnje uporabljeno okno pod kazalcem"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "Klik"
 
@@ -5877,11 +6038,6 @@ msgstr "Le nova pogovorna okna"
 msgid "Only dialogs with focused parent"
 msgstr "Le pogovorna okna s starševskimi v fokusu"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Druge nastavitve"
@@ -5979,13 +6135,13 @@ msgid "Fill available space"
 msgstr "Zapolni razpoložljivi prostor"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Vodoravno"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Navpično"
@@ -6042,7 +6198,7 @@ msgid "Raise when clicking to focus"
 msgstr "Privzdigni ob kliku za fokus"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fokus okna"
 
@@ -6299,28 +6455,28 @@ msgstr "Zelo svetla"
 msgid "Dropshadow"
 msgstr "Padajoča senca"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "Zaganjalnik modula Everything"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 msgid "Show Everything Launcher"
 msgstr "Prikaži zaganjalnik Everything"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "Nastavitev modula Everything"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "Prikaz pogovornega okna modulaEverything"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "Everything Modul"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "Zaženi Everything"
 
@@ -6328,144 +6484,145 @@ msgstr "Zaženi Everything"
 msgid "Everything Settings"
 msgstr "Nastavitev modula Everything"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "Dostopni vtičniki"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Premakni gor"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "Premakni dol"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "Nastavi"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Vklopljen"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "Prikaži v \"Vse\""
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "Prikaži v vrhnjem nivoju"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "Minimum znakov za iskanje"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "Stikalo vtičnikov"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "Privzet je vtičnik z imenom"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "Išči le ob zahtevi"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "Vtičnik pogled"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "Podrobno"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "Privzeti pogled"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "Animiraj drsenje"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "Gor/Dol izbere naslednji predmet v ikonskem pogledu"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "Skrij vnos ob neaktivnosti"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "Skrij seznam"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "Hitra navigacija"
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Emacs slog (ALT + n,p,f,b,m,i)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Vi slog (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "Privzeti pogled"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "Animiraj drsenje"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "Gor/Dol izbere naslednji predmet v ikonskem pogledu"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "Razvrščanje"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "Razvrščanje"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "Po uporabi"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "Največ uporabljano"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "Zadnje uporabljano"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "Vtičniki subjektov"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "Vtičniki dejanj"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "Vtičniki predmetov"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "Vtičniki"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "Velikost pojavnega okna"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "Širina pojavnega okna"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "Višina pojavnega okna"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "Poravnava pojavnega okna"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6474,35 +6631,27 @@ msgstr "Poravnava pojavnega okna"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "Mejna velikost pojavnega okna"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "Geometrija"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "Everything zbirka"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "Dejanja"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "Predmeti"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "Vtičniki niso naloženi"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "Kopiraj v odložišče"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6541,146 +6690,60 @@ msgstr ""
 "predogleda<br>    <hilight>&lt;ctrl+3&gt;</hilight> načini predogleda s "
 "sličico"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Pomnilnik izvršilne datoteke"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "Odpri z..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "Odpri datoteko..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "Uredi vnos programa"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "Nov program"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "Zaženi s Sudo"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Odpri z..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "Zaženi terminal tukaj"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-msgid "Run Executable"
-msgstr "Zaženi izvršilno datoteko"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "Everything programi"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "Ukazi"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "Ukaz Terminala"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Sudo GUI"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Everything zbirka"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "Kalkulator"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "Kopiraj v..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "Premakni v..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "Premakni v smeti"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "Odpri mapo (EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "Razvrsti po datumu"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "Razvrsti po imenu"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "Nedavne datoteke"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "Everything datoteke"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "Prikaži nedavne datoteke"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "Išči nedavne datoteke"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "Išči datoteke v pomnilniku"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "Shrani obiskane imenike v pomnilnik"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "Počisti pomnilnik"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "Prikaži pogovorno okno"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "Preklopi na okno"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "Preklop na celozaslonsko"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Pošlji na namizje"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Ikone datotek"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Vrste datotek"
 
@@ -6725,19 +6788,19 @@ msgid "Select an image"
 msgstr "Izberi sliko"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Upravitelj datotek"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Dom"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6755,7 +6818,7 @@ msgstr ""
 "vsebuje. Sedaj<br>pa lahko ponovno nastavite stvari po svoje. Opravičujemo "
 "se za nevšečnosti.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6771,7 +6834,7 @@ msgstr ""
 "zato smo vaše nastavitve<br>ponovno nastavili na privzete vrednosti. "
 "Prosimo, sprejmite naše<br>opravičilo za vse nevšečnosti.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Nastavitve upravitelja datotek posodobljene"
 
@@ -6848,95 +6911,99 @@ msgstr "Odpri upravljalnika datotek ob priklopu"
 msgid "Device"
 msgstr "Naprava"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Pojdi na nadrejeni imenik"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Drugi program..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Odpri"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Odpri z..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Znani programi"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Določeni programi"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Vsi programi"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Uporabniški ukaz"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopiranje opuščeno"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Premikanje opuščeno"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Brisanje opuščeno"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Opuščena neznana operacija podrejenca"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopiranje %s opravljeno"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopiranje %s (prib: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Premikanje %s opravljeno"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Premikanje %s (prib: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Izbris opravljen"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Brisanje datotek..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6971,7 +7038,7 @@ msgstr "Procesiranje·%d·operacij(e)"
 msgid "Filemanager is idle"
 msgstr "Upravljalnik datotek miruje"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Informacija EFM operacije"
 
@@ -6983,35 +7050,39 @@ msgstr "Upravitelj gadgetov"
 msgid "Available Gadgets"
 msgstr "Gadgeti na voljo"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "Način"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Uporabniško določena slika"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Uporabniško določena barva"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animiranje"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Ozadje"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "Možnosti ozadja"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "Začni Premikanje/Spreminjanje velikosti"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Prosto"
@@ -7233,15 +7304,15 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ste prepričani, da hočete zbrisati ta vir vrstice ?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "Modul IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "Ustvari novo ikono"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Lastnosti"
 
@@ -7285,7 +7356,7 @@ msgstr "Prikaži okna iz vseh namizij"
 msgid "Show windows from active desktop"
 msgstr "Prikaži okna iz aktivnega namizja"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7407,31 +7478,31 @@ msgstr ""
 "je že uporabljen v notranji<br>kodi za kontekstne menije.<br>Ta gumb deluje "
 "le pri pojavnem oknu."
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Prikaži pojavno okno preklopnika"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Pojavno okno namizja desno"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Pojavno okno namizja levo"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Pojavno okno namizja gor"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Pojavno okno namizja dol"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "Pojavno okno naslednjega namizja"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "Pojavno okno namizja prejšnje"
 
@@ -7451,131 +7522,91 @@ msgstr "Sistemski nadzor"
 msgid "Temperature Settings"
 msgstr "Nastavitev Temperature"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Tipala"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "Celzija"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Prikaži enote"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Preveri premor"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Visoka temperatura"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Nizka temperatura"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "Temperature"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Naslednje"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Dobrodošli v Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Izberi enega"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Na vašem sistemu niso<br> bile najdene meni datoteke.<br>Prosimo, poglejte "
-"v<br>dokumentacijo na<br>www.enlightenment.org<br>za več podrobnosti<br>kako "
-"nastaviti<br>programske menije<br>da bodo delovali."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Izberi programski meni"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Zaganjalna vrstica"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Izberi programe"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Namizne datoteke"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Na namizju ni ikon"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Omogoči namizne ikone"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Način fokusa"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Fokus·okna na klik"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Prehod z miško spravi okno v fokus"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Izberi ikone za dodajo"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Izberi profil"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Hitri zagon"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Izberi programe"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Največ uporabljano"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7617,7 +7648,7 @@ msgstr "Levi:"
 msgid "Right:"
 msgstr "Desni:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Nemo"
 
@@ -7641,41 +7672,54 @@ msgstr "Prikaži pojavno okno ob spremembi glasnosti s tipkovnimi navezami"
 msgid "Sound Cards"
 msgstr "Zvočne kartice:"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Nastavitev Mešalnika"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Mešalnik v uporabi za splošne aktivnosti:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Zaženi mešalnik..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Nastavitev modula Mešalnik"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Sprememba ločljivosti"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Nastavitve Mešalnika posodobljene"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Nastavitve podatkov mešalniškega modula spremenjene.<br>vaša stara "
-"konfiguracija je bila zamenjana z novo privzeto.<br>Oproščamo se za "
-"neprijetnosti."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Nastavitev modula Mešalnik"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Ne morem preklopiti na nepovezan način"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnMan Daemon ni zagnan"
 
@@ -7703,123 +7747,352 @@ msgstr "Pokaži geslo kot viden tekst"
 msgid "Ok"
 msgstr "V redu"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Odklopi se iz omrežne storitve"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Storitev več ne obstaja"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Poveži se v omrežno storitev"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Ne morem uveljaviti storitvenega gesla"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Nepovezan način"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Nadzor"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "Ni ConnMan-a"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "Ne najdem ConnMan strežnika"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Način brez povezave: vse povezave so izključene"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Ni Povezave"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Ni povezano"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "odklopi"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Neznano ime"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Brez napake"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "miruje"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "povezava"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "nastavitev"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "pripravljen"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "prijava"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "povezan"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "spodletelo"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "omogočeno"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "dosegljivo"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "povezano"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "nepovezano"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Obstaja že ena sistemska vrstica"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Obstaja lahko le ena sistemska vrstica in ena že obstaja."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Sistemska vrstica"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Sistemska vrstica"
 
-#, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment ne more nastaviti sistema tem."
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "Zatemni zaslon"
+
+#~ msgid "Undim Screen"
+#~ msgstr "Osvetli zaslon"
+
+#~ msgid "Resizeable"
+#~ msgstr "Spremenljiva velikost"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Prekini Premikanje/Spreminjanje velikosti tega predmeta"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more zagnati Ecore!\n"
+#~ "Vam mogoče primankuje spomina?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more zagnati datotečnega sistema.\n"
+#~ "Ste mogoče ostali brez spomina?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment ne more ustvariti povezave z X serverjem.\n"
+#~ "Ste že nastavili svojo DISPLAY spremenljivko?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more zagnati sistema povezav.\n"
+#~ "Ste mogoče ostali brez spomina?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more zagnati sistema IPC.\n"
+#~ "Ste mogoče ostali brez spomina?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne more nastaviti xinerama ovijanja.\n"
+#~ "To se ne bi smelo dogajati."
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment ne more nastaviti randr ovijanja.\n"
+#~ "To se ne bi smelo zgoditi."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more zagnati sistema Evas.\n"
+#~ "Ste mogoče ostali brez spomina?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment ne more nastaviti zagonskega okna.\n"
+#~ "Ste mogoče ostali brez spomina?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "Preveri podporo SVG"
+
+#~ msgid "Setup FM"
+#~ msgstr "Nastavi FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment ne more nastaviti svojega sistema polic."
+
+#~ msgid "New Application"
+#~ msgstr "Nov program"
+
+#~ msgid "Background panning"
+#~ msgstr "Nastavitve Ozadja"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "Dejavnik sukanja X-osi"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "Dejavnik sukanja Y-osi"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Prikaži signaliziranje upravljanja napajanja"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Trenutni zaslonski strežnik nima <br>DPMS sposobnosti."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Trenutni zaslonski strežnik nima <br>DPMS podaljška."
+
+#~ msgid "Default is plugin name"
+#~ msgstr "Privzet je vtičnik z imenom"
+
+#~ msgid "Actions"
+#~ msgstr "Dejanja"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Kopiraj v odložišče"
+
+#~ msgid "Exebuf"
+#~ msgstr "Pomnilnik izvršilne datoteke"
+
+#~ msgid "Open With..."
+#~ msgstr "Odpri z..."
+
+#~ msgid "Open File..."
+#~ msgstr "Odpri datoteko..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "Uredi vnos programa"
+
+#~ msgid "New Application Entry"
+#~ msgstr "Nov program"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "Zaženi s Sudo"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "Zaženi terminal tukaj"
+
+#~ msgid "Run Executable"
+#~ msgstr "Zaženi izvršilno datoteko"
+
+#~ msgid "Calculator"
+#~ msgstr "Kalkulator"
+
+#~ msgid "Copy To ..."
+#~ msgstr "Kopiraj v..."
+
+#~ msgid "Move To ..."
+#~ msgstr "Premakni v..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "Premakni v smeti"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "Odpri mapo (EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "Razvrsti po datumu"
+
+#~ msgid "Sort by Name"
+#~ msgstr "Razvrsti po imenu"
+
+#~ msgid "Recent Files"
+#~ msgstr "Nedavne datoteke"
+
+#~ msgid "Show Dialog"
+#~ msgstr "Prikaži pogovorno okno"
+
+#~ msgid "Switch to Window"
+#~ msgstr "Preklopi na okno"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Preklop na celozaslonsko"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Pošlji na namizje"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Na vašem sistemu niso<br> bile najdene meni datoteke.<br>Prosimo, "
+#~ "poglejte v<br>dokumentacijo na<br>www.enlightenment.org<br>za več "
+#~ "podrobnosti<br>kako nastaviti<br>programske menije<br>da bodo delovali."
+
+#~ msgid "Select application menu"
+#~ msgstr "Izberi programski meni"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Zaganjalna vrstica"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Na namizju ni ikon"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Omogoči namizne ikone"
+
+#~ msgid "Focus mode"
+#~ msgstr "Način fokusa"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Fokus·okna na klik"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Prehod z miško spravi okno v fokus"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Izberi ikone za dodajo"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Hitri zagon"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Nastavitve podatkov mešalniškega modula spremenjene.<br>vaša stara "
+#~ "konfiguracija je bila zamenjana z novo privzeto.<br>Oproščamo se za "
+#~ "neprijetnosti."
 
 #~ msgid "Interaction"
 #~ msgstr "Interakcija"
index c161701..1a7baa1 100755 (executable)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment E17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-03-08 02:01+0000\n"
 "Last-Translator: ersi <Unknown>\n"
 "Language-Team: Swedish\n"
@@ -20,20 +20,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Stäng"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -42,18 +41,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>The Team</title>"
 
 #: src/bin/e_actions.c:365
@@ -71,625 +71,648 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Är du säker på att du vill döda det här fönstret?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Du har valt att avsluta Enlightenment.<br><br>Är du säker på att du vill "
 "avsluta?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Vill du verkligen logga ut?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Är du säker på att du vill stänga av?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Är du säker på att du vill starta om?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Är du säker att du vill försätta datorn i viloläge?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Fönster : Händelser"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Flytta"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Ändra storlek"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Fönstermeny"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Höj"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Sänk"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Döda"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Fönster : Tillstånd"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Gör klibbig"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Minimera"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Aktivera helskärmsläge"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Maximera vertikalt"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Maximera horisontalt"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Maximera helskärm"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximeringspolicy \"Smart\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximeringspolicy \"Expandera\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximeringspolicy \"Fyll\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Gör ramlös"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Ram"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Vänd skrivbord åt vänster"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Vänd skrivbord åt höger"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Vänd skrivbord uppåt"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Vänd skrivbord nedåt"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Vänd skrivbord med..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Visa skrivbordet"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Visa hyllan"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Vänd skrivbord till..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Vänd skrivbord linjärt..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Byt till skrivbord 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Byt till skrivbord 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Byt till skrivbord 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Byt till skrivbord 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Byt till skrivbord 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Byt till skrivbord 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Byt till skrivbord 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Byt till skrivbord 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Byt till skrivbord 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Byt till skrivbord 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Byt till skrivbord 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Byt till skrivbord 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Byt till skrivbord..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vänd skrivbord vänster (Alla skärmar)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vänd skrivbord höger (Alla skärmar)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vänd skrivbord uppåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vänd skrivbord nedåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vänd skrivbord till... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vänd skrivbort linjärt... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Byt till skrivbord 0 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Byt till skrivbord 1 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Byt till skrivbord 2 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Byt till skrivbord 3 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Byt till skrivbord 4 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Byt till skrivbord 5 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Byt till skrivbord 6 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Byt till skrivbord 7 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Byt till skrivbord 8 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Byt till skrivbord 9 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Byt till skrivbord 10 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Byt till skrivbord 11 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Byt till skrivbord... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Skicka musen till skärm 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Skicka musen till skärm 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Skicka musen till skärm..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Skicka musen 1 skärm framåt"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Skicka musen 1 skärm bakåt"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Skicka musen till skärmen framför/bakom..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Flytta text"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Mer..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Mer..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Ändra storlek"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Välj en"
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Skapa ikon"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Fönster : Flytta"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "Till nästa skrivbord"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Till föregående skrivbord"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Till skrivbord..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Visa huvudmenyn"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Visa favoritprogramsmenyn"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Visa klientmeny"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Visa meny..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Kör"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Applikation"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Avsluta nu"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Aktivera helskärmsläge"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Gör klibbig"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Logga ut"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Stäng av nu"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Stäng av"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Vänteläge"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Vänteläge"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Viloläge"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Lås"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Städa upp fönster"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Händelse"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Denna skärm"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Denna skärm"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Sätt som bakgrund"
 
@@ -697,18 +720,16 @@ msgstr "Sätt som bakgrund"
 msgid "Color Selector"
 msgstr "Färgväljare"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -716,20 +737,20 @@ msgstr "Färgväljare"
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -740,7 +761,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -749,11 +770,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -761,94 +782,94 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Inställningar uppdaterade"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 msgid "Signature failed."
 msgstr ""
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Inga fönster)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 msgid "Encryption failed."
 msgstr ""
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Beskrivning: Otillgänglig"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Välkommen till Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -856,69 +877,74 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Enkelt"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Verkställ"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Tillbehör"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Moduler"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Ikonegenskaper"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Behållare %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Fel - Inget PAM-stöd"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Kan inte låsa"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Ange ditt lösenord för att låsa upp"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -926,22 +952,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -962,106 +988,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Namn"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Fönsterklass"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mimetyper"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Skrivbordsfil"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Allmänt"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Uppstartsindikering"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Kör i terminal"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Visa i menyer"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Välj en ikon"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Välj en körbar fil"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Klistra in"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Markera allt"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1104,321 +1129,321 @@ msgstr ""
 "Enlightenment kunde inte köra programmet:<br><br>%s<br><br>Programmet "
 "startar inte."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Programexekveringsfel"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s stannade oväntat."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Felloggar"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Det finns inget felmeddelande."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Spara detta meddelande"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Felinformation"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Signalinformation"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Det finns ingen utdata."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existerar inte."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 #, fuzzy
 msgid "Mount Error"
 msgstr "Körfel"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Körfel"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 #, fuzzy
 msgid "Eject Error"
 msgstr "Fel"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Länk"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Ärv förälderinställningar"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Visningsläge"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Uppdatera vy"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Visa dolda filer"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Kom ihåg ordning"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Sortera nu"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Ny katalog"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 #, fuzzy
 msgid "Mount"
 msgstr "Typsnitt"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Applikationsprioritet"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Filegenskaper"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Rutnätsikoner"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonstorlek (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 #, fuzzy
 msgid "Set background..."
 msgstr "Sätt som bakgrund"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Panelens innehåll"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Rensa"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Skapa ny mapp"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Namn på ny mapp:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Döp om %s till:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Fel"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Nej till allt"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Ja till allt"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 #, fuzzy
 msgid "Warning"
 msgstr "Startar"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Är du säker på att du vill ta bort<br><hilight>%s</hilight?"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Ignorera"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ignorera alla"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Bekräfta borttagning"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Är du säker på att du vill ta bort<br><hilight>%s</hilight?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1452,12 +1477,12 @@ msgstr ""
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Okänd volym"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1465,7 +1490,7 @@ msgstr ""
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Storlek:"
 
@@ -1481,7 +1506,7 @@ msgstr "Filtyp:"
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Ägare:"
 
@@ -1501,17 +1526,17 @@ msgstr "Ägaren kan läsa"
 msgid "Owner can write"
 msgstr "Ägaren kan skriva"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Förhandsgranska"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr ""
 
@@ -1520,7 +1545,7 @@ msgid "Thumbnail"
 msgstr "Tumnagel"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr ""
 
@@ -1536,53 +1561,43 @@ msgstr "Länkinformation"
 msgid "Select an Image"
 msgstr "Välj en bild"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Flytta text"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Flytta/ändra storlek på moduler"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Ändra storlek"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Rulla innehåll automatiskt"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Enkel"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Infälld"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr ""
+#: src/bin/e_gadcon.c:1991
+#, fuzzy
+msgid "Stop moving"
+msgstr "Sluta redigera"
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1628,14 +1643,14 @@ msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Storlek"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Stapla"
@@ -1687,161 +1702,167 @@ msgstr "Logga ut med detta fönster öppet"
 msgid "Remember these Locks"
 msgstr "Kom ihåg dessa lås"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "Fönster"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Alltid överst"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Klibbig"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Inställningar"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Helskärm"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Maximerad vertikalt"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Maximerad horisontalt"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Ej Maximerad"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Ändra ikon"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Skapa ikon"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Visa favoritprogramsmenyn"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 msgid "Add to IBar"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Tangentbordsgenväg"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Smart placering"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Ram"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Lås"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Minne"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "ICCCM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Klibbig"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Minimera"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Skymt"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Skärm"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Alltid överst"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Alltid underst"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Resistens"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Fönsterlista"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Sökare"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr ""
 
@@ -1862,7 +1883,7 @@ msgid "ICCCM Properties"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Titel"
 
@@ -2035,7 +2056,6 @@ msgid "Size, Position and Locks"
 msgstr "Storlek, position och lås"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Tillåt"
@@ -2117,15 +2137,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Filer"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Kör"
@@ -2140,20 +2158,6 @@ msgstr "Kärna"
 msgid "Mobile"
 msgstr "Moduler"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Inställningar"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Moduler"
@@ -2193,7 +2197,7 @@ msgstr "Lägg till"
 msgid "Remove Gadget"
 msgstr "Ta bort"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr ""
 
@@ -2201,11 +2205,11 @@ msgstr ""
 msgid "Layout"
 msgstr "Placering"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Inmatningsfel"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2221,7 +2225,7 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Favoritprogram"
 
@@ -2229,77 +2233,75 @@ msgstr "Favoritprogram"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Applikationer"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Fönster"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Förlorade fönster"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Om"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Virituell"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Paneler"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Visa/göm alla fönster"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Inga program)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 #, fuzzy
 msgid "Set Virtual Desktops"
 msgstr "Virtuella skrivbord"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Inga fönster)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Inget namn!!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -2335,7 +2337,7 @@ msgid "Shrink to Content Width"
 msgstr "Annpassa storlek efter innehåll"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 #, fuzzy
 msgid "Style"
 msgstr "Tema"
@@ -2366,7 +2368,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -2383,7 +2385,7 @@ msgstr "Visa på alla skrivbord"
 msgid "Show on specified Desktops"
 msgstr "Visa på valda skrivbord"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2394,7 +2396,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2403,52 +2405,22 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte initiera Ecore!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte initiera Filsystemet!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2456,7 +2428,7 @@ msgstr ""
 "Enlightenment kan inte starta en exit signal handler!\n"
 "Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2464,7 +2436,7 @@ msgstr ""
 "Enlightenment kan starta en HUP signal handler!\n"
 "Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2473,64 +2445,37 @@ msgstr ""
 "Enlightenment kan starta en HUP signal handler!\n"
 "Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan inte initiera sin X kontakt!\n"
-"har du ställt din DISPLAY variabel?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment kan inte initiera sitt emergency·alert·system!\n"
-"Har du ställt in din DISPLAY variabel?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte initiera connections system!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte initiera IPC systemet!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan inte sätta igång xinerama wrapping.\"Detta borde inte "
-"hända."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment kan inte sätta igång xinerama wrapping.\"Detta borde inte "
-"hända."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte initiera Evas systemet!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2540,7 +2485,7 @@ msgstr ""
 "Software X11 rendering i Evas. Kontrollera att din installation\n"
 "av Evas och Ecore stödjer Software X11 rendering."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2550,7 +2495,35 @@ msgstr ""
 "Software Buffer rendering i Evas. Kontrollera att din installation\n"
 "av Evas och Ecore stödjer Software X11 rendering."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment kan inte initiera sitt emergency·alert·system!\n"
+"Har du ställt in din DISPLAY variabel?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment kan inte starta Filhanteraren.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2558,23 +2531,29 @@ msgstr ""
 "Enlightenment kan inte skapa kataloger i din hemkatalog.\n"
 "Du kanske inte har någon hemkatalog eller är disken full?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr ""
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kan inte starta sitt konfigurationsystem."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment kan inte starta sitt tema system."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr ""
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
+msgstr "Enlightenment kan inte starta sitt font system."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2582,299 +2561,387 @@ msgstr ""
 "Enlightenment kan inte ställa sökvägarna för att hitta filer!\n"
 "Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment kan inte starta sitt font system."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment kan inte starta sitt tema system."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment kan inte ställa in init screen!\n"
-"Ditt minne kanske är slut?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment kan inte konfigurera sitt intl system."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr ""
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan inte konfigurera sitt intl system."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
+"Enlightenment kan inte initiera Filsystemet!\n"
+"Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
+#: src/bin/e_main.c:577
+msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
+#: src/bin/e_main.c:581
 msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Enlightenment upptäckte att Evas inte kan skapa buffer canvas. Kontrollera\n"
-"att Evas har Software Buffer enginge support.\n"
+"Enlightenment kan inte starta alla skärmarna på ditt system.\n"
+"Kanske en annan fönsterhanterare körs?\n"
 
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment upptäckte att Evas inte kan ladda PNG filer. Kontrollera\n"
-"att Evas har PNG loader support.\n"
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "E Sökvägar"
 
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment upptäckte att Evas inte kan ladda JPEG filer. Kontrollera\n"
-"att Evas har JPEG loader support.\n"
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "E Sökvägar"
 
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment upptäckte att Evas inte kan ladda EET filer. Kontrollera\n"
-"att Evas har EET loader support.\n"
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment kan inte starta Thumbnailing·systemet.\n"
 
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:794
-msgid "Setup Screens"
+#: src/bin/e_main.c:618
+msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:799
-msgid ""
-"Enlightenment set up window management for all the screens on your system\n"
-"failed. Perhaps another window manager is running?\n"
+#: src/bin/e_main.c:622
+msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
-"Enlightenment kan inte starta alla skärmarna på ditt system.\n"
-"Kanske en annan fönsterhanterare körs?\n"
 
-#: src/bin/e_main.c:805
-msgid "Setup Screensaver"
+#: src/bin/e_main.c:629
+msgid "Setup Powersave Modes"
 msgstr ""
 
-#: src/bin/e_main.c:810
-msgid "Enlightenment cannot configure the X screensaver."
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment kan inte starta sitt desk locking system."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan inte starta sitt popup system."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Meddelande"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "E Sökvägar"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kan inte starta sitt actions system."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr ""
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Filhanterare"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan inte starta sitt msg system."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan inte starta sitt dnd system."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment kan inte starta sitt input grab handling system."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan inte starta sitt modulsystem"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kan inte starta komihåg inställningar."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kan inte starta sitt color·class system."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment kan inte starta sitt gadget control system."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "E Sökvägar"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr ""
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr ""
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kan inte starta sitt bindningssystem."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment kan inte starta sitt panel system."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kan inte starta Thumbnailing·systemet.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment kan inte starta Thumbnailing·systemet.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment kan inte starta Thumbnailing·systemet.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment kan inte starta sitt tema system."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Kom ihåg ordning"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr ""
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Nästan klar"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment upptäckte att Evas inte kan skapa buffer canvas. Kontrollera\n"
+"att Evas har Software Buffer enginge support.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment upptäckte att Evas inte kan ladda PNG filer. Kontrollera\n"
+"att Evas har PNG loader support.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment upptäckte att Evas inte kan ladda JPEG filer. Kontrollera\n"
+"att Evas har JPEG loader support.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment upptäckte att Evas inte kan ladda PNG filer. Kontrollera\n"
+"att Evas har PNG loader support.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment upptäckte att Evas inte kan ladda EET filer. Kontrollera\n"
+"att Evas har EET loader support.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment kraschade tidigt vid uppstart och har startats om"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2882,7 +2949,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2890,7 +2957,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2898,20 +2965,12 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr ""
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Nästan klar"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Ladda modul"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2920,11 +2979,11 @@ msgstr ""
 "Det blev fel när modulen %s skulle laddas<br>Ingen modul med namnet %s kunde "
 "hittas i<br>sökvägarna för moduler.<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Fel vid öppnandet av modul"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2933,11 +2992,11 @@ msgstr ""
 "Det blev fel när modulen %s skulle laddas.<br>Den fulständiga sökvägen till "
 "denna modul är:<br> %s<br>Felet som rapporterades är:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modulen innehåller inte alla nödvändiga funktioner"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2948,16 +3007,16 @@ msgstr ""
 "%i av modul API<br>Versionen på API som rapporteras av Enlightenment är: %i."
 "<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Vill du stänga av denna modulen?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2968,11 +3027,11 @@ msgstr ""
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort denna panelen?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2980,18 +3039,18 @@ msgstr ""
 "Du har valt ta bort denna panelen.<br><br>Är du säker på att du vill ta bort "
 "den?"
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Sluta flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Kommentar"
@@ -3000,16 +3059,16 @@ msgstr "Kommentar"
 msgid "Starting"
 msgstr "Startar"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr ""
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3017,113 +3076,113 @@ msgid ""
 "first?<br><br>Auto logout in %d seconds."
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Logga ut nu"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Avbryt utloggning"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Utloggning pågår"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Utloggning pågår.<br><hilight>Vänligen vänta.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3131,34 +3190,34 @@ msgstr ""
 msgid "About Theme"
 msgstr ""
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Sluta flytta/ändra storlek på moduler"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Flytta/ändra storlek på moduler"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Panelens innehåll"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment kunde inte skapa en underprocess:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Kan inte avsluta - odödliga fönster"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3168,125 +3227,125 @@ msgstr ""
 "att<br>Enlightenment inte tillåter sig själv att avsluta förrän dessa "
 "fönster<br>är stängda eller livslängdslåset är borttaget.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år sedan"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li månader sedan"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li veckor sedan"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dagar sedan"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timmar sedan"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuter sedan"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Temperaturinställningar"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Importera..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Inställningar för fyll och sträck"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Sträck"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Centrera"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "Inom"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Fyll"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Filkvalitet"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr ""
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3297,12 +3356,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "Konfigurationen uppgraderad"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3330,142 +3389,148 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Ned"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Gå upp en katalog"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Upplösning"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Rättigheter:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Modifierad:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Du"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Skyddad"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Endast läsbar"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Förbjuden"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Batteriövervakningsinställningar"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Visa varning vid låg batteri nivå"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Kolla varje:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Viloläge"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Visa meddande vid låg batteritid"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Meddela vid:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sec"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Oklar"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Hårdvara"
 
@@ -3473,32 +3538,33 @@ msgstr "Hårdvara"
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Batterimätare"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Klocka"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Exekverbar fil"
@@ -3554,17 +3620,17 @@ msgstr "Konfigurationen uppgraderad"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr ""
 
@@ -3578,10 +3644,25 @@ msgid "Apps"
 msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Ny applikation"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Kör"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Applikationer"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Skrivbord"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr ""
 
@@ -3594,7 +3675,7 @@ msgid "Available Profiles"
 msgstr "Tillgängliga profiler"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
@@ -3632,9 +3713,9 @@ msgstr ""
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Allmänt"
 
@@ -3676,7 +3757,7 @@ msgstr ""
 msgid "Profiles"
 msgstr "Profiler"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3684,7 +3765,7 @@ msgid ""
 "will be restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3692,7 +3773,7 @@ msgid ""
 "restored in %d seconds."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3700,7 +3781,7 @@ msgid ""
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3708,47 +3789,47 @@ msgid ""
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Ändra upplösning"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Återställ vid inloggning"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Spegla"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3757,11 +3838,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3770,92 +3851,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Antal skrivbord"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Skrivbordsbyte med mus"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Byt skrivbord när objekt dras till kanten på skärmen"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Skrivbord"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-#, fuzzy
-msgid "Background panning"
-msgstr "Bakgrund"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Animationer"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr ""
 
@@ -3872,7 +3935,7 @@ msgid "Desktop Wallpaper"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 #, fuzzy
 msgid "Set"
 msgstr "Sträck"
@@ -3884,12 +3947,12 @@ msgstr "Sätt som bakgrund"
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Personlig"
 
@@ -3897,195 +3960,223 @@ msgstr "Personlig"
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Vänteläge"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Vänteläge"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Lås"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Visa på alla skärmområde"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Visa på aktuellt skärmområde"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Visa på skärmområde #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Inloggningsruta"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Tid innan X-skärmsläckare startar"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f sekunder"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f minuter"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Aktivera helskärmsläge"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Använd temats bakgrund"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Bakgrund"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Skärmsläckarinställningar"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Aktivera X-skärmsläckare"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Vänteläge"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Skärmsläckare"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Initialt tillstånd"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Blankning"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Tillåt"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Tillåt inte"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "Övrigt"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
+#: src/modules/conf_display/e_int_config_dpms.c:126
+msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
+#: src/modules/conf_display/e_int_config_dpms.c:238
+msgid "Enable Display Power Management"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
+#: src/modules/conf_display/e_int_config_dpms.c:244
+msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:112
-msgid "Display Power Management Settings"
+#: src/modules/conf_display/e_int_config_dpms.c:256
+msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
-msgid "Enable Display Power Management"
+#: src/modules/conf_display/e_int_config_dpms.c:268
+msgid "Off time"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
-msgid "Standby time"
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
-msgid "Suspend time"
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
-msgid "Off time"
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+#, fuzzy
+msgid "Fade Time"
+msgstr "Efter Ändringstid"
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:21
@@ -4132,102 +4223,102 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Inställningar för kortkommandon"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Ta bort alla"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Händelse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4373,34 +4464,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Språkinställningar"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Språkväljare"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr ""
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Språk"
 
@@ -4484,17 +4588,17 @@ msgid "Manager"
 msgstr "Hanterare"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Ingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr ""
 
@@ -4518,13 +4622,11 @@ msgid "Menu Settings"
 msgstr "Meny"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Personlig"
@@ -4535,7 +4637,7 @@ msgid "Main Menu"
 msgstr "Visa huvudmenyn"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr ""
 
@@ -4555,7 +4657,7 @@ msgid "Comments"
 msgstr "Kommentar"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4567,7 +4669,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Visa i menyer"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menyer"
 
@@ -4638,19 +4740,19 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Typsnitt"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Teman"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Ikoner"
 
@@ -4800,18 +4902,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Bakgrundsinställningar"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Använd temats bakgrund"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Bild..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -4831,43 +4933,48 @@ msgstr "Detta skrivbord"
 msgid "This Screen"
 msgstr "Denna skärm"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 #, fuzzy
 msgid "Wallpaper settings..."
 msgstr "Bakgrundsinställningar"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Sida vid sida"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Enkel"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Välj en bild..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4903,7 +5010,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr ""
 
@@ -4911,7 +5018,7 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Välj fönsterram"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Kom ihåg ramen för detta fönster nästa gång det används"
 
@@ -4944,7 +5051,7 @@ msgid "Menu Background Base"
 msgstr "Bakgrunder"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr ""
 
@@ -4953,7 +5060,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menyobjekt"
 
@@ -4967,12 +5074,12 @@ msgid "Menu Item Disabled"
 msgstr "Menyobjekt"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Flytta text"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr ""
 
@@ -4990,7 +5097,7 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Fönstertitel"
 
@@ -5009,385 +5116,395 @@ msgid "File Manager Background Base"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Listobjekt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Listobjekt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Bakgrund från tema"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 #, fuzzy
 msgid "Scroller Frame Background Base"
 msgstr "Bakgrund från tema"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Färg 1:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Skymt"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Fönsterhanterare"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Andra inställnigar"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Namnlist"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "Inställningspanel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Om titel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Om text"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Skrivbordslösenord"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Fel dialog"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Kör kommando"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Ram"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etikett"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Knappar"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Textlistobjekt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Listobjekt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Filhanterare"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Skrivbordsikon"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Små"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Stora"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normal stil"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Inställningar för typsnitt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Väldigt stor"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixelar"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Fontklasser"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Aktivera fontklass"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 #, fuzzy
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr ""
 
@@ -5395,11 +5512,16 @@ msgstr ""
 msgid "Icon Theme Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 msgid "Enable icon theme"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Lägg till applikation..."
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5465,11 +5587,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr ""
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5480,6 +5600,12 @@ msgstr ""
 msgid "Minimum"
 msgstr "Minimum"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Maximum"
@@ -5501,25 +5627,25 @@ msgstr ""
 msgid "Transition Settings"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Händelser"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Uppstart"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr ""
 
@@ -5535,15 +5661,15 @@ msgstr " Importera..."
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Temakategorier"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Tilldela"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Rensa alla"
 
@@ -5570,19 +5696,19 @@ msgstr ""
 msgid "Exchange themes"
 msgstr ""
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Ramar"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Ikon tema"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Muspekare"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr ""
 
@@ -5713,6 +5839,11 @@ msgstr "Applikationsprioritet"
 msgid "Border Icon"
 msgstr "Ram"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Smart placering"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Smart placering"
@@ -5744,24 +5875,47 @@ msgstr "Under fönster"
 msgid "Animate"
 msgstr "Animationer"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Linjär"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Mjuk acceleration och deacceleration"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Accelerera"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
-msgid "Decelerate"
-msgstr "Deacceleration"
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
+msgid "Decelerate"
+msgstr "Deacceleration"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Accelerera"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Deacceleration"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Mjuk acceleration och deacceleration"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Stapla"
@@ -5783,6 +5937,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Senaste fönster under musen"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Klocka"
@@ -5821,11 +5976,6 @@ msgstr "Bara nya dialoger får fokus"
 msgid "Only dialogs with focused parent"
 msgstr "Bara nya dialoger får fokus"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Fokus"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Andra inställnigar"
@@ -5936,13 +6086,13 @@ msgid "Fill available space"
 msgstr "Fyll allt tillgängligt utrymme"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Horisontalt"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Vertikalt"
@@ -6002,7 +6152,7 @@ msgid "Raise when clicking to focus"
 msgstr "Höj vid klick för fokus"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Fönsterfokus"
 
@@ -6258,33 +6408,33 @@ msgstr "Väldigt ljus"
 msgid "Dropshadow"
 msgstr ""
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Allt"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Allt"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "Pager konfiguration"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Alltid nederst"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Allt"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Allt"
@@ -6294,163 +6444,163 @@ msgstr "Allt"
 msgid "Everything Settings"
 msgstr "Inställningar för kortkommandon"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Tillgängliga profiler"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "Flytta upp"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Flytta upp"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Befintliga paneler"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Visa i menyer"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Visa i menyer"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Standardläge för dialoger"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Detaljer"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Standardläge för dialoger"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Rulla automatisk"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Fönsterlista"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Standardläge för dialoger"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Rulla automatisk"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Startar"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Startar"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 #, fuzzy
 msgid "By usage"
 msgstr "Efter Namn"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Senast modifierad:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Händelse"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Enkel"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Popup inställningar"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Popup inställningar"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6459,39 +6609,30 @@ msgstr "Popup inställningar"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Popup"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Fönster geometri"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Favoritprogram"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Händelse"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6513,166 +6654,68 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Kör kommando"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Öppna med..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Öppna med..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Lägg till applikation"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Ny applikation"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Öppna med..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Kör i terminal"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Exekverbar fil"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Favoritprogram"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Kommando"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Definierat kommando"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Allt"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Mer..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Sortera nu"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Byt namn"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Allt"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Visa dolda filer"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Sökvägar"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr ""
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Användardefinierade kataloger"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Rensa"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Skuggans avstånd"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Helskärm"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Skicka till skrivbord"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Filikoner"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Filtyper"
 
@@ -6719,19 +6762,19 @@ msgid "Select an image"
 msgstr "Välj en bild"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Hem"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6742,7 +6785,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6752,7 +6795,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr ""
 
@@ -6833,97 +6876,101 @@ msgstr ""
 msgid "Device"
 msgstr "Förhandsgranska"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 #, fuzzy
 msgid "Other application..."
 msgstr "Lägg till applikation..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Öppna"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Öppna med..."
+
+#: src/modules/fileman/e_fwin.c:2039
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applikationer"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Specifik applikation"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Välj en"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6960,7 +7007,7 @@ msgstr "Egenskaper"
 msgid "Filemanager is idle"
 msgstr "Filhanterare"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6972,37 +7019,42 @@ msgstr ""
 msgid "Available Gadgets"
 msgstr "Tillgängliga moduler"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Moduler"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Transparent"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Animationer"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Bakgrund"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Bakgrund"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Flytta/ändra storlek på moduler"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr ""
@@ -7249,16 +7301,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Är du säker på att du vill ta bort denna källa?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Skapa ny ikon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -7302,7 +7354,7 @@ msgstr "Visa fönster från alla skrivbord"
 msgid "Show windows from active desktop"
 msgstr "Visa fönster från aktivt skrivbord"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7422,31 +7474,31 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7466,130 +7518,93 @@ msgstr ""
 msgid "Temperature Settings"
 msgstr "Temperaturinställningar"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Sensorer"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Visa enhet"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Uppdateringsintervall"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Hög temperatur"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Låg temperatur"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Temperatur"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Nästa"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Välkommen till Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Välj en"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
-msgstr ""
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr ""
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr ""
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr ""
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr ""
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Välj källa"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Snabbstart"
-
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr ""
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Flytta"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7631,7 +7646,7 @@ msgstr "Vänster:"
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr ""
 
@@ -7655,38 +7670,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Ljudkort"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Mixerinställningar"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Starta mixer..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:127
-msgid "Mixer Settings Updated"
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Ändra upplösning"
+
+#: src/modules/mixer/e_mod_main.c:187
+msgid "Mixer Settings Updated"
 msgstr ""
 
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Visningsläge"
+
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7713,139 +7744,293 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Gör klibbig"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Kontroller"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Anslutningshanterare"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Skyddad"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Okänd volym"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Körfel"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Sida vid sida"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Position"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "Konfiguration"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Enkel"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Motor"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "Konfigurera"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Aktiverad"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Fyll allt tillgängligt utrymme"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Skyddad"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Motor"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "System"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 #, fuzzy
 msgid "Systray"
 msgstr "System"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment kan inte starta sitt tema system."
+#~ msgid "Acpi"
+#~ msgstr "Händelse"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Denna skärm"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Denna skärm"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Ändra storlek"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan inte initiera Ecore!\n"
+#~ "Ditt minne kanske är slut?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment kan inte initiera sin X kontakt!\n"
+#~ "har du ställt din DISPLAY variabel?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan inte initiera connections system!\n"
+#~ "Ditt minne kanske är slut?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan inte initiera IPC systemet!\n"
+#~ "Ditt minne kanske är slut?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan inte sätta igång xinerama wrapping.\"Detta borde inte "
+#~ "hända."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment kan inte sätta igång xinerama wrapping.\"Detta borde inte "
+#~ "hända."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan inte initiera Evas systemet!\n"
+#~ "Ditt minne kanske är slut?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment kan inte ställa in init screen!\n"
+#~ "Ditt minne kanske är slut?"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment kan inte starta sitt panel system."
+
+#~ msgid "New Application"
+#~ msgstr "Ny applikation"
+
+#, fuzzy
+#~ msgid "Background panning"
+#~ msgstr "Bakgrund"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Standardläge för dialoger"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Händelse"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Kör kommando"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Öppna med..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Öppna med..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Lägg till applikation"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Ny applikation"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Kör i terminal"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Exekverbar fil"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Mer..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Sortera nu"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Byt namn"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Skuggans avstånd"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Helskärm"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Skicka till skrivbord"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Snabbstart"
 
 #~ msgid "Add Application..."
 #~ msgstr "Lägg till applikation..."
@@ -8595,9 +8780,6 @@ msgstr "System"
 #~ msgid "Show windows from all zones"
 #~ msgstr "Visa fönster från alla zoner"
 
-#~ msgid "Stop editing"
-#~ msgstr "Sluta redigera"
-
 #~ msgid "Desktop Lock Settings"
 #~ msgstr "Skrivbordslås"
 
@@ -8677,9 +8859,6 @@ msgstr "System"
 #~ msgid "Everyone"
 #~ msgstr "Alla"
 
-#~ msgid "By Mod Time"
-#~ msgstr "Efter Ändringstid"
-
 #~ msgid "Toggle Edit Mode"
 #~ msgstr "Gå in i redigeringsläge"
 
@@ -8836,9 +9015,6 @@ msgstr "System"
 #~ msgid "Wait Exit"
 #~ msgstr "Vänta på avslut"
 
-#~ msgid "%3.0f"
-#~ msgstr "%3.0f"
-
 #~ msgid "Places"
 #~ msgstr "Platser"
 
index 1b19b1e..abf3f4c 100755 (executable)
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: E17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2010-02-18 15:21+0200\n"
 "Last-Translator: H. İbrahim Güngör <h.ibrahim.gungor@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -24,20 +24,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment Hakkında"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Kapat"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,18 +45,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Takım<title>"
 
 #: src/bin/e_actions.c:365
@@ -74,57 +74,57 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Bu pencereyi sonlandırmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Evet"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Hayır"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Çıkmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Enlightenment 'tan çıkmak istediniz.<br><br>Çıkmak istediğinizden emin "
 "misiniz?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Oturumu Kapatmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Oturumu kapatmak üzeresiniz<br><br>Bunu yapmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Kapatmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Bilgisayarınızı kapatmak istediniz.<br><br>Emin misiniz?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Yeniden başlatmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -132,7 +132,7 @@ msgstr ""
 "Bilgisayarınızı yeniden başlatmak istediniz.<br><br>Bilgisayarı yeniden "
 "başlatmak istediğinize emin misiniz?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -140,11 +140,11 @@ msgstr ""
 "Bilgisayarınızı askıya almak istediniz.<br><br>Askıya almak istediğinizden "
 "emin misiniz?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Uyku kipine geçmek istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,551 +152,575 @@ msgstr ""
 "Bilgisayarınızı uyku kipine almak istediniz<br><br>Diske askıya almak "
 "istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Pencere : Eylemler"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Taşı"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Boyutlandır"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Pencere Menüsü"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Üste Çıkar"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Alta Gönder"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Sonlandır"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Pencere : Durum"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Yapışkan Mod Değiştir"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Simgesel Kipi Değiştir"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Tam Ekran Kipi Değiştir"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Büyüt"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Dikey Büyüt"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Yatay Büyüt"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Tam Ekran Büyüt"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "Büyüt \"Smart\""
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Büyüt \"Expand\""
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Büyüt \"Fill\""
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Yukarı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Aşağı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Sola Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Sağa Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Gölgelendirme Kipi Değiştir"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Çerçevesiz Durum Değiştir"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Çerçeve"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "İğnelenmiş Durum Değiştir"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Masaüstünü Sola Çevir"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Masaüstünü Sağa Çevir"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Masaüstünü Yukarı Çevir"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Masaüstünü Aşağı Çevir"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Masaüstünü ...ile Çevir"
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Masaüstünü Göster"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Rafı Göster"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Masaüstünü ...'e çevir"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Masaüstünü Doğrusal Olarak Çevir"
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Masaüstü 0 'a geç"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Masaüstü 1 'e geç"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Masaüstü 2 'ye geç"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Masaüstü 3 'e geç"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Masaüstü 4 'e geç"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Masaüstü 5 'e geç"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Masaüstü 6 'ya geç"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Masaüstü 7 'ye geç"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Masaüstü 8 'e geç"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Masaüstü 9 'a geç"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Masaüstü 10 'a geç"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Masaüstü 11 'e geç"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Masaüstü ... geç"
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Masaüstünü Sola Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Masaüstünü Sağa Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Masaüstünü Yukarı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Masaüstünü Aşağı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Masaüstünü ... ile Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Masaüstünü ... 'e Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Masaüstünü Doğrusal Olarak Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Masaüstünü Çevir..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Masaüstü 0'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Masaüstü 1'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Masaüstü 2'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Masaüstü 3'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Masaüstü 4'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Masaüstü 5'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Masaüstü 6'ya geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Masaüstü 7'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Masaüstü 8'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Masaüstü 9'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Masaüstü 10'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Masaüstü 11'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Masaüstü...'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Fareyi Ekran 0'a Gönder"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Fareyi Ekran 1'e Gönder"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Fareyi ekran... Gönder"
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Fareyi 1 Ekran İleri Gönder"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Fareyi 1 Ekran Geri Gönder"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Fareyi Sonraki/Önceki Ekranlara Gönder..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "Kapat"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Metni Taşı"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Daha çok..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Daha çok..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Boyutlandır"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Masaüstünü Çevir..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Simge Yarat"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Pencere : Taşı"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "İleri Masaüstüne"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "Geri Masaüstüne"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Masaüstü ile #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "Masaüstüne..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Ana Menüyü Göster"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Favoriler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Tüm Uygulamalar Menüsünü Göster"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "İstemciler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Menüyü... Göster"
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Başlat"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komut"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Uygulama"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Yeniden Başlat"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Çık"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Şimdi Çık"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Mod"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Sunum Kipini Aç/Kapa"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Çevrimdışı Kipi  Aç/Kapa"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Sistem"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Çık"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Kapat"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Kapat"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Reboot"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Askıya Al"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Askıya Al"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Uykuya Al"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Kilitle"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Pencereleri Temizle"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Genel : Eylemler"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Ertelenmiş Eylem"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Eylem"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "Bu Ekran"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "Bu Ekran"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Masaüstü Arka Planı Yap"
 
@@ -704,18 +728,16 @@ msgstr "Masaüstü Arka Planı Yap"
 msgid "Color Selector"
 msgstr "Renk Seçici"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -723,20 +745,20 @@ msgstr "Renk Seçici"
 msgid "OK"
 msgstr "Tamam"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -747,7 +769,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -756,11 +778,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Ayarları Yazma Sorunları"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -768,96 +790,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Ayarlar Yükseltildi"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Uykuya alma başarısız."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Pencere Yok)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Askıya alma başarısız."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Askıya alma başarısız."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Enlightenment'a Hoş Geldiniz"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -865,69 +887,74 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Basit"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Uygula"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Eklentiler"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Modüller"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Simge Tercihleri"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Taşıyıcı %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Hata- PAM desteği yok"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "PAM desteği bulunamadı, <br>masaüstü kilitleme iptal edildi."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Kilitleme Başarısız Oldu"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Lütfen kilidi açma parolanızı giriniz"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Yetkilendirme Sistem Hatası"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -938,11 +965,11 @@ msgstr ""
 "Hata kodu <hilight>%i</hilight>.<br>Bu kötü oldu ve böyle olmamalıydı. "
 "Lütfen bu hatayı bildirin."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Sunum Kipi Etkinleştirilsin mi?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -952,11 +979,11 @@ msgstr ""
 "etkinleştirip, ekran koruyucu, kilit ve güç koruma kiplerinin geçici olarak "
 "etkisiz kılınmasını ister misiniz?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Hayır, fakat zaman aşımını arttır"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Hayır, tekrar sorma"
 
@@ -977,106 +1004,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Masaüstü Girdisi Düzenleyici"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "İsim"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Yorum"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Simge"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Genel Adı"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Pencere Sınıfı"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime Türleri"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Masaüstü dosyası"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Genel"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Açılışta Bildir"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Terminalde Çalıştır"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Menüde Göster"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Simge Seç"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Çalıştırılabilir Dosya Seç"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Sil"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Kes"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Tümünü Seç"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1115,316 +1141,316 @@ msgstr ""
 "Enlightenment uygulamayı çalıştıramadı:<br><br>%s<br><br>Uygulama "
 "çalıştırılamadı."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Uygulama Çalıştırma Hatası"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s beklenmedik şekilde çalışmayı durdurdu."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s 'den %1$i çıkış kodu geldi."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s Kesme Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s Çık Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s Durdur Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s Ondalıklı Sayı Hatası ile durduruldu."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s Durdurulamaz Sonlandırma Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s Bölümleme Hatası tarafından durduruldu."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s Hatalı İletici tarafından durduruldu."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s Bitirme Sinyali tarafından durduruldu."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s veri yolu Hatası tarafından durduruldu."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s %i sinyal numarası tarafından durduruldu."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Kalan çıktı kesilmiş. Çıktıyı görünüme kaydet.***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Hata Kayıtları"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Hata mesajı yoktu"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Mesajı Kaydet"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Bu hata kaydı %s/%s.log olarak kaydedildi."
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Hata Bilgisi"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Hata Sinyali Bilgisi"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Veri Çıktısı"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Çıktı yok."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Mevcut olmayan yol"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s mevcut değil."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Bağlama Hatası"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Aygıt Bağlanamıyor"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Çıkarma Hatası"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Aygıt Çıkarılamıyor"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Çıkarma Hatası"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Aygıt çıkarılamıyor"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosya"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Bağlantı"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Vazgeç"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Ana ayarları miras al"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Görünüm Kipi"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Görünümü Yenile"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Gizli Dosyaları Göster"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Sıralamayı Hatırla"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Şimdi Sırala"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Yeni Dizin"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Çıkarma"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Bağla"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Çıkarma"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Uygulamanın İkonunu Kullan "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Dosya Özellikleri"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Ön Tanımlıyı kullan"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Izgara Görünümü"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Özel Simgeler"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Listele"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Simge Boyutu (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Arka planı ayarla..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Katmanı ayarla..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Yeni Dizin Oluştur"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Yeni Dizin Adı:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s adını değiştir:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Dosyayı Yeniden Adlandır"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Hata"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Tümüne hayır"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Tümüne evet"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Dosya zaten mevcut, üzerine yazayım mı?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Görmezden gel"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Tümünü görmezden gel"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Bir işlem gerçekleştirilirken hata oluştu.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Silme İşlemini Onayla"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 "Şunu silmek istediğinden emin misin?\r\n"
 "<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1458,12 +1484,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Bilinmeyen Hacim"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Kaldırılabilir Aygıt"
 
@@ -1471,7 +1497,7 @@ msgstr "Kaldırılabilir Aygıt"
 msgid "File:"
 msgstr "Dosya:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Boyut:"
 
@@ -1487,7 +1513,7 @@ msgstr "Dosya Türü:"
 msgid "Permissions"
 msgstr "İzinler"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Sahip:"
 
@@ -1507,17 +1533,17 @@ msgstr "Sahip okuyabilir"
 msgid "Owner can write"
 msgstr "Sahip yazabilir"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Ön izleme"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Ön tanımlı"
 
@@ -1526,7 +1552,7 @@ msgid "Thumbnail"
 msgstr "Parçacık"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Özel"
 
@@ -1542,53 +1568,42 @@ msgstr "Bağlantı Bilgisi"
 msgid "Select an Image"
 msgstr "Resim Seç"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Metni Taşı"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Aracı oynat/yeniden boyutlandır"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Boyutlandır"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "İçeriği otomatik kaydır"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Düz"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Çerçeve"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Görünüm"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Kaldır"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Aracı taşımayı/boyutlandırmayı durdur"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1637,14 +1652,14 @@ msgstr "Konum"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Boyut"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Kümeleme"
@@ -1696,163 +1711,169 @@ msgstr "Bu pencere açıkken oturumumdan çıkılıyor"
 msgid "Remember these Locks"
 msgstr "Bu kilitlemeleri hatırla"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Pencereler"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Her zaman Üstte"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Yapışkan"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Ayarlar"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Dikey Büyüt"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Yatay Büyüt"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Tam Ekrandan Çık"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Simgeyi Düzelt"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Simge Yarat"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Favorilere Ekle"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Favorilere Ekle"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Klavye Kısayolu"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Akıllı Yerleşim"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Atla"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Çerçeve"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Kilitler"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Hatırla"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Yapışkan"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Atla"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Simgeleştir"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Gölgelenmiş"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Ekran"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Her zaman Üstte"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Her zaman Altta"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Masaüstüne Ekle"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Masaüstünden Çıkar"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Çerçeve Stilini Seç"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Ön Tanımlı E17 İkon Ayarlarını Kullan"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Uygulamanın İkonunu Kullan "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Kullanıcı Tanımlı İkonu Kullan"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Direnç"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Pencere Listesi"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Görev Çubuğu"
 
@@ -1873,7 +1894,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM Özellikleri"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Başlık"
 
@@ -2032,7 +2053,6 @@ msgid "Size, Position and Locks"
 msgstr "Boyut, Konum ve Kilitler"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "İzin Ver"
@@ -2110,15 +2130,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Dosyalar"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Başlat"
@@ -2133,20 +2151,6 @@ msgstr "Çekirdek"
 msgid "Mobile"
 msgstr "Modüller"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Ayarlar"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Modül Ayarları"
@@ -2187,7 +2191,7 @@ msgstr "Araç Ekle"
 msgid "Remove Gadget"
 msgstr "Aracı Kaldır"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Araç Çubuğu Ayarları"
 
@@ -2195,11 +2199,11 @@ msgstr "Araç Çubuğu Ayarları"
 msgid "Layout"
 msgstr "Yerleşim Planı"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Girdi Metodu Hatası"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2216,7 +2220,7 @@ msgstr "Ana"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Favori Uygulamalar"
 
@@ -2224,76 +2228,74 @@ msgstr "Favori Uygulamalar"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Uygulamalar"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Pencereler"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Kayıp Pencereler"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Hakkında"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Tema"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Sanal"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Raflar"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Tüm Pencereleri Göster/Gizle"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Uygulama Yok)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Sanal Masaüstlerini Ayarla"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Pencere Yok)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Ad yok!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Raf Yok)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Raf Ekle"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Rafı Sil"
 
@@ -2329,7 +2331,7 @@ msgid "Shrink to Content Width"
 msgstr "İçeriğin Boyutuna Göre Küçült"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Biçim"
 
@@ -2359,7 +2361,7 @@ msgid "Hide duration"
 msgstr "Gizli kalma süresi"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f saniye"
@@ -2376,7 +2378,7 @@ msgstr "Tüm masaüstlerinde göster"
 msgid "Show on specified Desktops"
 msgstr "Belirli masaüstlerinde göster"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2387,7 +2389,7 @@ msgid ""
 "%s/enlightenment-%s\n"
 msgstr ""
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2400,52 +2402,22 @@ msgstr ""
 "Lütfen kontrol edin:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment Ecore'u başlatamadı!\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment dosya sistemini başlatamadı.\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2453,7 +2425,7 @@ msgstr ""
 "Enlightenment çıkış sinyali işleyiciyi ayarlayamadı.\n"
 "Belleğiniz tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2461,7 +2433,7 @@ msgstr ""
 "Enlightenment HUP sinyali işleyiciyi ayarlayamadı.\n"
 "Belleğiniz tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2469,78 +2441,79 @@ msgstr ""
 "Enlightenment USER sinyali işleyiciyi ayarlayamadı.\n"
 "Belleğiniz tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment X bağlantısını kuramadı.\n"
-"DISPLAY değişkenini ayarladınız mı?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment acil durum uyarı sistemini başlatamadı.\n"
-"DISPLAY değişkenini ayarladınız mı?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment bağlantı sistemini başlatamadı.\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment IPC sistemini başlatamadı.\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment Xinerama paketleme işlemini ayarlayamadı.\n"
-"Bu olmamalıydı."
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment Xinerama paketleme işlemini ayarlayamadı.\n"
-"Bu olmamalıydı."
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment Evas sistemini başlatamadı.\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment acil durum uyarı sistemini başlatamadı.\n"
+"DISPLAY değişkenini ayarladınız mı?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2548,23 +2521,29 @@ msgstr ""
 "Enlightenment ev dizininizde yeni dizin oluşturamadı.\n"
 "Ev dizininiz olduğuna ve diskin dolu olmadığına emin misiniz?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment kendi dosya kayıt sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kendi yapılandırma sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment tema sistemini ayarlayamıyor."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment kendi ölçekleme sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment işaretçi sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2572,95 +2551,42 @@ msgstr ""
 "Enlightenment dosyaları bulmak için yolları ayarlayamıyor.\n"
 "Belleğini tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment yazı tipi sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment tema sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment açılış ekranını ayarlayamadı.\n"
-"Belleğiniz tükenmiş olabilir mi?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment kendi intl sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Uluslararasılaştırma Desteği Başlatılıyor"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kendi intl sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment FDO masaüstü sistemini başlatamadı.\n"
 "Belleğiniz tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Sınama Biçimi Desteği"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment Evas'ın tampon kanvası oluşturamadığını algıladı. Evas'ın\n"
-"Software Buffer motoru desteği olduğunu kontrol edin.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment Evas'ın PNG dosyalarını yükleyemediğini algıladı. Evas'ın PNG\n"
-"yükleme desteğini olduğunu kontrol edin.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment Evas'ın JPEG dosyalarını yükleyemediğini algıladı. Evas'ın "
-"JPEG\n"
-"yükleme desteğini olduğunu kontrol edin.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment Evas'ın EET dosyalarını yükleyemediğini algıladı. Evas'ın EET\n"
-"yükleme desteğini olduğunu kontrol edin.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment Evas'ın 'Sans' yazı tipini yükleyemediğini algıladı. Evas'ın "
-"fontconfig\n"
-"desteği olduğunu ve fontconfig'in 'Sans' yazı tipini tanımladığını kontrol "
-"edin.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Ekranları Ayarla"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2668,211 +2594,350 @@ msgstr ""
 "Enlightenment sisteminizdeki tüm ekranlardaki pencere yönetimini ayarlamada\n"
 "başarısız oldu. Başka bir pencere yöneticisi çalışıyor olabilir mi?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "DPMS Ayarla"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Kısayolları Ayarla"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment DPMS ayarlarını yapılandıramadı."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "DPMS Ayarla"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment DPMS ayarlarını yapılandıramadı."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Ekran Koruyucuyu Ayarla"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment X ekran koruyucuyu yapılandıramıyor."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Güç Koruma Kiplerini Ayarla"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment güç koruma kiplerini ayarlayamadı."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Masaüstü Kilidini Ayarla"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment kendi masaüstü kilitleme sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Açılır Pencereleri Ayarla"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment açılır pencere sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Mesaj Sistemini Ayarla"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Yollar Ayarlanıyor"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Sistem Kontrollerini Ayarla"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment Sistem Komutu sistemini başlatamadı.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Eylemleri Ayarla"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment eylem sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Çalıştırma Sistemini Ayarla"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kendi çalıştırma sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Dosya Yöneticisini Ayarla"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Dosya yöneticisi"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Mesaj Sistemini Ayarla"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kendi mesaj sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "DND Ayarla"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kendi dnd sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Girdi Yakalama İşleyiciyi Yapılandır"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment girdi yakalama işleyici sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Modülleri Ayarla"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment modül sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Hatırlamaları Ayarla"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment hatırlama ayarlarını ayarlayamadı."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Renk Sınıflarını Ayarla"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment renk sınıfı sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Gadcon Yapılandırma"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment araç kontrol sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "DPMS Ayarla"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "DPMS Ayarla"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment DPMS ayarlarını yapılandıramadı."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Güç Koruma Kiplerini Ayarla"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment güç koruma kiplerini ayarlayamadı."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Duvar Kağıdını Ayarla"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment masaüstü arka planı sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Fareyi Ayarla"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment fare ayarlarını yapılandıramadı."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Kısayolları Ayarla"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kısayol sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Rafları Ayarla"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment raf sistemini ayarlayamadı."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Ön İzlemeyi Ayarla"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ön izleme sistemini başlatamadı.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment Sistem Komutu sistemini başlatamadı.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment ön izleme sistemini başlatamadı.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment tema sistemini ayarlayamıyor."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Dosya Sıralamasını Ayarla"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment kendi sıralı dosya sistemini ayarlayamıyor."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Modülleri Yükle"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Rafları Yapılandır"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Neredeyse Bitti"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Sınama Biçimi Desteği"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment Evas'ın tampon kanvası oluşturamadığını algıladı. Evas'ın\n"
+"Software Buffer motoru desteği olduğunu kontrol edin.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment Evas'ın PNG dosyalarını yükleyemediğini algıladı. Evas'ın PNG\n"
+"yükleme desteğini olduğunu kontrol edin.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment Evas'ın JPEG dosyalarını yükleyemediğini algıladı. Evas'ın "
+"JPEG\n"
+"yükleme desteğini olduğunu kontrol edin.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment Evas'ın PNG dosyalarını yükleyemediğini algıladı. Evas'ın PNG\n"
+"yükleme desteğini olduğunu kontrol edin.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment Evas'ın EET dosyalarını yükleyemediğini algıladı. Evas'ın EET\n"
+"yükleme desteğini olduğunu kontrol edin.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment Evas'ın 'Sans' yazı tipini yükleyemediğini algıladı. Evas'ın "
+"fontconfig\n"
+"desteği olduğunu ve fontconfig'in 'Sans' yazı tipini tanımladığını kontrol "
+"edin.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment açılamadan çöktü ve yeniden başlatıldı"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2880,7 +2945,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2888,7 +2953,7 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2896,31 +2961,23 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Rafları Yapılandır"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Neredeyse Bitti"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Modülleri Yükle"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Modül yükleme hatası"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2929,11 +2986,11 @@ msgstr ""
 "Şu isimli modül yüklenirken hata oluştu: %s<br>Bu modülün tam yolu: <br>"
 "%s<br>Bildirilen hata şuydu:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Modül tüm gereken fonksiyonları içermiyor"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2943,16 +3000,16 @@ msgstr ""
 "Modül API hatası<br>Modül başlatılırken hata: %s<br>Asgari modül API sürümü "
 "gerekiyor: %i.<br>Enlightenment tarafından önerilen modül API sürümü: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modülü"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Bu modülü çıkarmak istiyor musunuz?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2966,28 +3023,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Raf #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Bu rafı silmek istediğinizden emin misiniz?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Bu rafı silmek istediniz.<br><..."
 
-#: src/bin/e_shelf.c:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Nesneleri Taşımayı/Boyutlandırmayı Durdur"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Nesneleri Taşımaya/Boyutlandırmaya Başla"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Yorum"
@@ -2996,16 +3053,16 @@ msgstr "Yorum"
 msgid "Starting"
 msgstr "Başlıyor"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Sistem İzinleri Kontrol Ediliyor"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Sistem Kontrolü Tamam"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3015,35 +3072,35 @@ msgstr ""
 "Oturumu kapatma çok uzun sürüyor. Bazı<br>uygulamalar kapanmayı reddediyor."
 "<br>Oturumu bu uygulamaları kapatmadan<br>bitirmeyi istiyor musunuz?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Oturum kapatma sorunları"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Oturumu kapat"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Biraz daha bekle"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Oturumu Kapatmayı İptal Et"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Oturum Kapatma İşlemi Sürüyor"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Çıkış işlemi sürüyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment başka bir istekle meşgul"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3051,7 +3108,7 @@ msgstr ""
 "Oturum kapatılıyor.<br>Oturum kapatma işlemi başladığında<br>sistem "
 "işlemlerini gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3059,7 +3116,7 @@ msgstr ""
 "Kapatılıyor.<br>Kapatma işlemi başladığında<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3067,7 +3124,7 @@ msgstr ""
 "Yeniden başlatılıyor.<br>Yeniden başlatma işlemi başladığında<br>sistem "
 "işlemlerini gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3075,63 +3132,64 @@ msgstr ""
 "Askıya alınıyor.<br>Askıya alma işlemi bitene kadar<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Uykuya alınıyor.<br>Uykuya alma işlemi bitene kadar<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "OYY! Bu olmamalıydı"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Kapatma başarısız."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Sıfırlama başarısız."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Askıya alma başarısız."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Uykuya alma başarısız."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Kapat"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kapatılıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Sıfırlıyor"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Sıfırlanıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Askıya Alınıyor"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Askıya alınıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Uykuya Alınıyor"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Uykuya alınıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
@@ -3139,33 +3197,33 @@ msgstr "Uykuya alınıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 msgid "About Theme"
 msgstr "Tema Hakkında"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Tema Olarak Ayarla"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Nesneleri Taşımayı/Boyutlandırmayı Durdur"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Nesneleri Taşımaya/Boyutlandırmaya Başla"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Araç Çubuğu İçeriğini Ayarla"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment alt işlem yaratamadı:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Çıkamıyor - Ölümsüz Pencereler."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3175,123 +3233,123 @@ msgstr ""
 "nedenle<br>Enlightenment bu pencereler<br>kapatılana ya da Lifespan lock "
 "kaldırılana kadar çıkmaya izin vermeyecek.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bayt"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "Gelecekte"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "Geçen dakika içinde"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Yıl önce"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Ay önce"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Hafta önce"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Gün önce"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Saat önce"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Dakika önce"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "Resim İçe Aktarma Ayarları"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "İçe aktar"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Doldurma ve Uzatma Seçenekleri"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Uzat"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "Ortala"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Doldur"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Dosya Kalitesi"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Özgün dosyayı kullan"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3302,12 +3360,12 @@ msgid ""
 "your<br>liking. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "yapılandırma"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3335,142 +3393,148 @@ msgstr "Yukarı"
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Favorilere Ekle"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Yukarı Çık"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Çözünürlük"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "İzinler:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Değiştirilme:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Kullanıcı"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Korunmuş"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Salt Okunur"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Yasaklı"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Oku-Yaz"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Pil İzleyici Ayarları"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Pil zayıf olduğunda uyar"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Kontrol et:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tik"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Uykuya Al"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Taranıyor"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Pil zayıfken uyarı göster"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Şunda olunca uyar:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f dk"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Otomatik kaybol..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sn"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Uyarı"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Otomatik Algıla"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Dahili"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Bulanık"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Donanım"
 
@@ -3478,32 +3542,33 @@ msgstr "Donanım"
 msgid "Battery"
 msgstr "Pil"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Pil zayıf!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "AC güce geçmeniz önerilir."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "HATA"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Pil Göstergesi"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Saat"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Araç Çubuğunu Göster"
@@ -3557,17 +3622,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar Uygulamaları"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Açılış Uygulamaları"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Uygulamaları Yeniden Başlat"
 
@@ -3581,10 +3646,25 @@ msgid "Apps"
 msgstr "Uygulamalar"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Yeni Uygulama"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Başlat"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Uygulama Seç"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Masaüstü Dosyaları"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar Diğerleri"
 
@@ -3597,7 +3677,7 @@ msgid "Available Profiles"
 msgstr "Mevcut Profiller"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Bir profil seç"
 
@@ -3635,9 +3715,9 @@ msgstr "Diyalog Ayarları"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Genel Ayarlar"
 
@@ -3679,7 +3759,7 @@ msgstr "Diyaloglar"
 msgid "Profiles"
 msgstr "Profiller"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3690,7 +3770,7 @@ msgstr ""
 "Yükle düğmesine basın.<br>Bir düğmeye basmazsanız, eski çözünürlük olan %dx"
 "%d %d Hz<br> %d saniye  sonran geri yüklenecek."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3701,7 +3781,7 @@ msgstr ""
 "Yükle düğmesine basın.<br>Bir düğmeye basmazsanız, eski çözünürlük olan %dx"
 "%d<br> %d saniye  sonran geri yüklenecek."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3712,7 +3792,7 @@ msgstr ""
 "Yükle düğmesine basın.<br>Bir düğmeye basmazsanız, eski çözünürlük olan %dx"
 "%d %d Hz <hilight>ANINDA</hilight> geri yüklenecek."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3723,47 +3803,47 @@ msgstr ""
 "Yükle düğmesine basın.<br>Bir düğmeye basmazsanız, eski çözünürlük olan %dx"
 "%d <hilight>ANINDA</hilight> geri yüklenecek."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Çözünürlük değişimi"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Kaydet"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Geri Yükle"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Ekran Çözünürlük Ayarları"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Açılışta Geri Yükle"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Rotasyon"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Ayna Etkisi"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Eksik Özellikler"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3772,11 +3852,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Yenileme Oranları Bulunamadı"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3785,93 +3865,74 @@ msgid ""
 "screen."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Sanal Masaüstü Ayarları"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Masaüstü Sayısı"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Fare ile Masaüstü Değişir"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Nesneleri ekranın kenarına sürükleyince masaüstünü değiştir"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Masaüstleri"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Kapalı"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Pencere Gözü"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Arka plan gezdirme"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Boşta"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f saniye"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f X-ekseni pan faktörü"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f Y-ekseni pan faktörü"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Değişim Canlandırması"
 
@@ -3888,7 +3949,7 @@ msgid "Desktop Wallpaper"
 msgstr "Masaüstü Duvar Kağıdı"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Ayarla"
 
@@ -3899,12 +3960,12 @@ msgstr "Arka planı ayarla..."
 
 #: 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Kişisel"
 
@@ -3912,160 +3973,174 @@ msgstr "Kişisel"
 msgid "Screen Lock Settings"
 msgstr "Ekran Kilidi Ayarları"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Askıya Al"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Askıya Al"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Özek Ekran Kilidi"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Kilitle"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Tüm ekranların bölgelerinde göster"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Mevcut ekranın bölgesinde göster"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "# Numaralı ekran bölgesinde göster:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Giriş Kutusu Ayarları"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "X ekran koruyucu etkinleşince kilitle"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f saniye"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Boşta zamanı aşıldığında kilitle"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f dakika"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Zamanlayıcılar"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Eğer daha önce etkinliği kaldırılmışsa"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Sunum Kipine Gir"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Tanımlı Tema"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Tema Duvar Kağıdı"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Masaüstü Duvar Kağıdı"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Duvar Kağıdı"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Ekran Koruyucu Ayarları"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "X ekran koruyucuyu etkinleştir"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Diske Askıya Al"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Ekran Koruyucu"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "İlk Durum"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Karartma"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Tercih edilmeyen"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "İzin Ver"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "İzin Verme"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4073,39 +4148,52 @@ msgstr "İzin Verme"
 msgid "Miscellaneous"
 msgstr "Çeşitli Seçenekler"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Güç Yönetimi Sinyallerini Göster"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Mevcut görüntü sunucusunun<br>DPMS yeteneği yok."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Mevcut görüntü sunucusunun<br>DPMS uzantısı yok."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Ekran Güç Yönetimi Ayarları"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ekran Güç Yönetimini Etkinleştir"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Bekleme süresi"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Uykuda kalma süresi"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Kapalı kalma süresi"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Sanal Masaüstleri"
@@ -4150,74 +4238,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Kenar Bağlayıcı Ayarları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Kısayol Ekle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Kısayolu Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Kısayolu Düzenle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tümünü Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Ön Tanımlı Bağlayıcıları Geri Yükle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Eylem"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Eylem Parametreleri"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Genel Seçenekler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Tam ekran pencerelerde kısayol etkinleştirimine izin ver"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Kenar Kısayol Dizisi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Tıklanabilir kenar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Kenar Kısayolu Hatası"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4226,28 +4314,28 @@ msgstr ""
 "Seçtiğiniz kısayol tuş dizisi, zaten <br><hilight>%s </hilight> eylemi "
 "tarafından kullanılıyor.<br>Lütfen farklı bir kısayol tuşu dizisi seçin."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4398,34 +4486,47 @@ msgstr ""
 "Enlightenment kopyalama hatası nedeniyle yapılandırma<br>dosyasını içe "
 "aktaramadı."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Dil Ayarları"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Dil Seçici"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Sistem Ön Tanımlı"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Yerel Seçildi"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Yerel"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Dil"
 
@@ -4513,17 +4614,17 @@ msgid "Manager"
 msgstr "Yönetici"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Yok"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Fare Bağlayıcı Dizisi"
 
@@ -4547,13 +4648,11 @@ msgid "Menu Settings"
 msgstr "Menü Ayarları"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Kişisel"
@@ -4564,7 +4663,7 @@ msgid "Main Menu"
 msgstr "Ana Menüyü Göster"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Sık kullanılanlar"
 
@@ -4584,7 +4683,7 @@ msgid "Comments"
 msgstr "Yorum"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4596,7 +4695,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Menüde Göster"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Menüler"
 
@@ -4667,19 +4766,19 @@ msgid "Images"
 msgstr "Resimler"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Temalar"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Simgeler"
 
@@ -4833,18 +4932,18 @@ msgstr ""
 msgid "Wallpaper Settings"
 msgstr "Duvar Kağıdı Ayarları"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Tema Duvar Kağıdını Kullan"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Resim..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "Çevrim içi..."
 
@@ -4864,44 +4963,49 @@ msgstr "Bu Masaüstü"
 msgid "This Screen"
 msgstr "Bu Ekran"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Duvar kağıdı ayarları..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Döşe"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Pencere Gözü"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Resim Seç..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Resim İçe Aktarma Hatası"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment çevrim hataları nedeniyle<br>resmi içe aktaramadı."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Duvar Kağıdı İçe Aktarma Hatası"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment bir kopyalama hatası nedeniyle<br>duvar kağıdını içe "
 "aktaramadı."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4939,7 +5043,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr " Kenarlık Biçemi"
 
@@ -4947,7 +5051,7 @@ msgstr " Kenarlık Biçemi"
 msgid "Window Border Selection"
 msgstr "Pencere Kenarlık Seçimi"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Bir sonraki açılışta bu kenarlığı hatırla"
 
@@ -4980,7 +5084,7 @@ msgid "Menu Background Base"
 msgstr "Arka Planlar"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Menü Başlığı"
 
@@ -4989,7 +5093,7 @@ msgid "Menu Title Active"
 msgstr "Menü Başlığı Etkin"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Menü Ögesi"
 
@@ -5003,12 +5107,12 @@ msgid "Menu Item Disabled"
 msgstr "Menü Ögesi Etkin"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Metni Taşı"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Metni Yeniden Boyutlandır"
 
@@ -5026,7 +5130,7 @@ msgid "Winlist Label"
 msgstr "Pencere Listesi Etiketi"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Pencere Listesi Başlığı"
 
@@ -5046,389 +5150,399 @@ msgid "File Manager Background Base"
 msgstr "Dosya Yöneticisi"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Odakla"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Düğme Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Düğme Metni Kapatıldı"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Kontrol Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Kontrol Metni Etkisiz"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Girdi Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Düğme Metni Kapatıldı"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Etiket Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Liste Ögesi Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Liste Ögesi Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Liste Ögesi Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Liste Başlığı"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Liste Başlığı"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Seçim Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Seçim Metni Etkisiz"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Kaydırıcı Metni"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Kaydırıcı Metni Etkisiz"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Arka Planlar"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Modül Etiketi"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Renk Sınıfları"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Renk Sınıflarını Ayarla"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Renk Sınıflarını Ayarla"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Renk Sınıflarını Ayarla"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Özel Renk"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Çıkarma"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Çevrimdışı"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Gölge Rengi"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Pencere Yöneticisi"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Programcıklar"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Diğer"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Başlık Çubuğu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Sade Yazı Bloku"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Açık Renk Yazı Bloku"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Büyük Yazı Bloku"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Hakkında Başlığı"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Sürüm Hakkında"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Hakkında Metni"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Masaüstü Kilidi Başlığı"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Masaüstü Kilidi Parolası"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Diyalog Hatası"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf Komutu"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Splash Başlığı"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Splash Metni"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Splash Sürümü"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Girdi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Çerçeve"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Etiket"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Kaydırıcı"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Seçim Düğmeleri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Kontrol Düğmeleri"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Metin Listesi Ögesi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Liste Ögesi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Liste Başlığı"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Dosya yöneticisi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Masaüstü Simgesi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Küçük"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Geniş"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Küçük Stil"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Normal Biçem"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Geniş Stil"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Yazı Tipi Ayarları"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Ufak"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Büyük"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Çok Büyük"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Kocaman"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d piksel"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Özel Yazı Tipi Sınıflarını Etkinleştir"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basit ön izleme metni: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Yazı Tipi Sınıfları"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Yazı Tipi Sınıflarını Etkinleştir"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Yazı tipi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Gelişmiş ön izleme Metni.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Font Fallback"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Fallback İsmi"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Fallback Etkinleştir"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Hinting / Fallback"
 
@@ -5436,12 +5550,17 @@ msgstr "Hinting / Fallback"
 msgid "Icon Theme Settings"
 msgstr "Simge Teması Ayarları"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Composite Etkinleştir"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Uygulama seç"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Simge teması genel temayı bastırır"
@@ -5508,11 +5627,9 @@ msgid "Custom scaling factor"
 msgstr "Özel ölçekleme çarpanı"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f kere"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5523,6 +5640,12 @@ msgstr "Politika"
 msgid "Minimum"
 msgstr "Asgari"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f kere"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Azami"
@@ -5543,25 +5666,25 @@ msgstr "Açılışta Splash Ekranını Göster"
 msgid "Transition Settings"
 msgstr "Geçiş Ayarları"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Olaylar"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Açılış"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Masaüstü Değişimi"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Arka Plan Değişimi"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Geçişler"
 
@@ -5577,15 +5700,15 @@ msgstr " İçe Aktar..."
 msgid " Online..."
 msgstr " Çevrim içi..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Tema Kategorileri"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Ata"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Tümünü Temizle"
 
@@ -5614,19 +5737,19 @@ msgstr "Enlightenment bir kopyalama hatası nedeniyle temayı<br>içe aktaramad
 msgid "Exchange themes"
 msgstr "Exchange temaları"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Kenarlıklar"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Simge Teması"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Fare İmleci"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Ölçekleme"
 
@@ -5757,6 +5880,11 @@ msgstr "Uygulamanın İkonunu Kullan "
 msgid "Border Icon"
 msgstr "Çerçeve"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Akıllı Yerleşim"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Akıllı Yerleşim"
@@ -5788,24 +5916,47 @@ msgstr "Pencerelerin Altında"
 msgid "Animate"
 msgstr "Boşta"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Doğrusal"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Düzgün hızlandırma ve yavaşlatma"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Hızlandır"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Yavaşlat"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Fare Hızlandırması"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Yavaşlat"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Düzgün hızlandırma ve yavaşlatma"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Ölçekleme"
@@ -5827,6 +5978,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Farenin altındaki en son pencere"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Saat"
@@ -5862,13 +6014,8 @@ msgstr "Diyaloglar"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:226
 #, fuzzy
-msgid "Only dialogs with focused parent"
-msgstr "Sadece yeni diyaloglar odaklanır"
-
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Odakla"
+msgid "Only dialogs with focused parent"
+msgstr "Sadece yeni diyaloglar odaklanır"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
@@ -5979,13 +6126,13 @@ msgid "Fill available space"
 msgstr "Mevcut boşluğu doldur"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Yatay"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Dikey"
@@ -6046,7 +6193,7 @@ msgid "Raise when clicking to focus"
 msgstr "Odaklamak için tıklandığında yükselt"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Pencere Odaklanması"
 
@@ -6299,33 +6446,33 @@ msgstr "Çok Açık"
 msgid "Dropshadow"
 msgstr "Gölge"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Her şey"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Her şey"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "yapılandırma"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Her şeyin Altında"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Her şey"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Her şey"
@@ -6335,165 +6482,165 @@ msgstr "Her şey"
 msgid "Everything Settings"
 msgstr "Uçbirim Ayarları"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Mevcut Profiller"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Taşı"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Taşı"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Rafları Yapılandır"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Aktif"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Menüde Göster"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Menüde Göster"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Ön Tanımlı Motor"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Ayrıntılar"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Ön Tanımlı Motor"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Hareketli değişim"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Gizlenme zaman aşımı"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Ön Tanımlı Motor"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Hareketli değişim"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Başlıyor"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Başlıyor"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "En son kullanılan"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Son Değiştirme:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Eylem Parametreleri"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Nesne Rengi"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Düz"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Açılır"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Açılır hızı"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Açılır Ayarları"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Açılır Ayarları"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6502,39 +6649,30 @@ msgstr "Açılır Ayarları"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Açılır"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Pencere Geometrisi"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Uygulamaları Yeniden Başlat"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Eylem"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6556,167 +6694,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Şununla Aç..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Şununla Aç..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Uygulama Ekle"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Yeni Uygulama"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Şununla Aç..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Terminalde Çalıştır"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Çalıştırılabilir"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Uygulamaları Yeniden Başlat"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Komut"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Tanımlanmış Komut"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Her şey"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Daha çok..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Şimdi Sırala"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Dosyayı Yeniden Adlandır"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Her şey"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Gizli Dosyaları Göster"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Arama Dizinleri"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Arama Yolu Ayarları"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Kullanıcı Tanımlı Dizinler"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Temizle"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Diyaloglar"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "Tam Ekran"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Masaüstüne Gönder"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Dosya Simgeleri"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Dosya Türleri"
 
@@ -6763,19 +6803,19 @@ msgid "Select an image"
 msgstr "Resim Seç"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Dosya Yöneticisi"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Ev"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Kök"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6786,7 +6826,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6796,7 +6836,7 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Dosya Yöneticisi Ayarları Güncellendi"
 
@@ -6876,95 +6916,99 @@ msgstr "Bağlandığında dosya yöneticisini aç"
 msgid "Device"
 msgstr "Ön izleme"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "Üst Dizine Git"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Dİğer uygulama..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Aç"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Şununla Aç..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Bilinen Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Belirli Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Tüm Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Özel Komut"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopyalama iptal edildi"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Taşıma iptal edildi"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Silme işlemi iptal edildi"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "%s kopyalandı"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopyalanıyor %s (kalan süre: %d sn)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "%s taşındı"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Taşınıyor  %s (kalan süre: %d sn)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Silme işlemi tamamlandı"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Dosyalar siliniyor..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6999,7 +7043,7 @@ msgstr ""
 msgid "Filemanager is idle"
 msgstr "Dosya yöneticisi boşta"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM İşlem Bilgisi"
 
@@ -7011,37 +7055,42 @@ msgstr "Araç Yöneticisi"
 msgid "Available Gadgets"
 msgstr "Mevcut Araçlar"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Kipler"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Özel Resim"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Özel Renk"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Şeffaf"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Boşta"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Arka plan"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Arka plan gezdirme"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Aracı oynat/yeniden boyutlandır"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Boş"
@@ -7286,16 +7335,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Bu çubuğu ve içeriğini silmek istediğinize emin misiniz?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Yeni Simge Oluştur"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Özellikler"
 
@@ -7339,7 +7388,7 @@ msgstr "Tüm masaüstlerindeki pencereleri göster"
 msgid "Show windows from active desktop"
 msgstr "Etkin masaüstündeki pencereleri göster"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7460,32 +7509,32 @@ msgid ""
 "works in the popup."
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Sayfalayıcı Açılır Penceresini Göster"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Açılır hızı"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr ""
 
@@ -7505,133 +7554,93 @@ msgstr "Sistem Kontrolleri"
 msgid "Temperature Settings"
 msgstr "Sıcaklık Ayarları"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Algılayıcılar"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Birimleri Göster"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Kontrol Sıklığı"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Yüksek Sıcaklık"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Düşük Sıcaklık"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Sıcaklık"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Sıcaklık"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Enlightenment'a Hoş Geldiniz"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Birini seç"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"Sisteminizde hiç<br>menü dosyası bulunamadı.<br>Uygulama menüsünün<br>nasıl "
-"çalışacağı hakkındaki<br> detayları öğrenmek için <br>www.enlightenment."
-"org<br>adresindeki belgeyi<br>okuyun."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Uygulama menüsü seç"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Başlatıcı Çubuğu"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Uygulama seç"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Masaüstü Dosyaları"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Masaüstünde simge gösterme"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Masaüstü simgelerini etkinleştir"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Odaklama kipi"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Pencereleri odaklamak için tıkla"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Fare üzerine geldiğinde pencereler odaklanır"
 
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Eklenecek Simge Seç"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Bir profil seç"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Hızlı Başlat"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Uygulama Seç"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "En son kullanılan"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7673,7 +7682,7 @@ msgstr "Sol:"
 msgid "Right:"
 msgstr "Sağ:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Sessiz"
 
@@ -7697,40 +7706,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Ses Kartları"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Karıştırıcı Ayarları"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Global eylemlerde kullanılacak karıştırıcı:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Karıştırıcıyı çalıştır..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Karıştırıcı Modülü Ayarları"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Çözünürlük değişimi"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Karıştırıcı Ayarları Güncellendi"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Karıştırıcı Modülü Ayarlarının verileri değişti.<br>Eski yapılandırmanız "
-"yenisiyle değiştirildi.<br>Rahatsızlık için özür dilerim."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Karıştırıcı Modülü Ayarları"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "Çevrim dışı kipe geçilemiyor."
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnMan sunucu çalışmıyor."
 
@@ -7758,129 +7781,352 @@ msgstr "Şifreyi düz metin olarak göster"
 msgid "Ok"
 msgstr "Tamam"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "Ağ servisinin bağlantısını kes."
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "Servis artık mevcut değil"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "Ağ servisine bağlan."
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "Servis şifresi ayarlanamadı"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "Çevrim Dışı Kipi"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Kontroller"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "ConnMan mevcut değil"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "ConnMan sunucusu bulunamadı."
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "Çevrim dışı kip: tüm kablosuz bağlantılar kapatıldı"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "Bağlantı Yok"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "bağlantıyı kes"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "Bilinmeyen İsim"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "Hata yok"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "boşta"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "ilişki"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "yapılandırma"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "hazır"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "oturum"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "çevrim içi"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "başarısız"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Aktif"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Mevcut boşluğu doldur"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Bağlı değil"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Çevrimdışı"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Başka bir sistem çekmecesi mevcut"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Sadece bir tane sistem çekmecesi aracı olabilir ve şu anda bir tanesi zaten "
 "mevcut."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Sistem Çekmecesi"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Sistem Çekmecesi"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment tema sistemini ayarlayamıyor."
+#~ msgid "Acpi"
+#~ msgstr "Eylem"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "Bu Ekran"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "Bu Ekran"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Boyutlandır"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Aracı taşımayı/boyutlandırmayı durdur"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment Ecore'u başlatamadı!\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment dosya sistemini başlatamadı.\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment X bağlantısını kuramadı.\n"
+#~ "DISPLAY değişkenini ayarladınız mı?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment bağlantı sistemini başlatamadı.\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment IPC sistemini başlatamadı.\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment Xinerama paketleme işlemini ayarlayamadı.\n"
+#~ "Bu olmamalıydı."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment Xinerama paketleme işlemini ayarlayamadı.\n"
+#~ "Bu olmamalıydı."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment Evas sistemini başlatamadı.\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment açılış ekranını ayarlayamadı.\n"
+#~ "Belleğiniz tükenmiş olabilir mi?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Dosya Yöneticisini Ayarla"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment raf sistemini ayarlayamadı."
+
+#~ msgid "New Application"
+#~ msgstr "Yeni Uygulama"
+
+#~ msgid "Background panning"
+#~ msgstr "Arka plan gezdirme"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f X-ekseni pan faktörü"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f Y-ekseni pan faktörü"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Güç Yönetimi Sinyallerini Göster"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Mevcut görüntü sunucusunun<br>DPMS yeteneği yok."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Mevcut görüntü sunucusunun<br>DPMS uzantısı yok."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Ön Tanımlı Motor"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Eylem"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Şununla Aç..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Şununla Aç..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Uygulama Ekle"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Yeni Uygulama"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Terminalde Çalıştır"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Çalıştırılabilir"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Daha çok..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Şimdi Sırala"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Dosyayı Yeniden Adlandır"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Diyaloglar"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Tam Ekran"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Masaüstüne Gönder"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "Sisteminizde hiç<br>menü dosyası bulunamadı.<br>Uygulama "
+#~ "menüsünün<br>nasıl çalışacağı hakkındaki<br> detayları öğrenmek için "
+#~ "<br>www.enlightenment.org<br>adresindeki belgeyi<br>okuyun."
+
+#~ msgid "Select application menu"
+#~ msgstr "Uygulama menüsü seç"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Başlatıcı Çubuğu"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Masaüstünde simge gösterme"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Masaüstü simgelerini etkinleştir"
+
+#~ msgid "Focus mode"
+#~ msgstr "Odaklama kipi"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Pencereleri odaklamak için tıkla"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Fare üzerine geldiğinde pencereler odaklanır"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Eklenecek Simge Seç"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Hızlı Başlat"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Karıştırıcı Modülü Ayarlarının verileri değişti.<br>Eski yapılandırmanız "
+#~ "yenisiyle değiştirildi.<br>Rahatsızlık için özür dilerim."
 
 #~ msgid "Add Application..."
 #~ msgstr "Uygulama Ekle"
@@ -8396,12 +8642,6 @@ msgstr "Sistem Çekmecesi"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "Hemen Kapat"
 
-#~ msgid "Shut Down"
-#~ msgstr "Kapat"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "Diske Askıya Al"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "Masaüstünü Kilitle"
 
index 9466b4b..7c213b9 100755 (executable)
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e.HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2009-12-13 21:16+0000\n"
 "Last-Translator: Sergio Gavrylov <sergiovana@bigmir.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -20,20 +20,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Про Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Закрити"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,14 +42,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>Ми "
 "сподіваємось Вам сподобаєтся користуватись цією програмою так само як нам "
@@ -62,8 +61,9 @@ msgstr ""
 "є неповними та можуть мати багато помилок. Ми Вас<hilight>ПОПЕРЕДИЛИ!</ "
 "Hilight>"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>Команда</title>"
 
 #: src/bin/e_actions.c:365
@@ -81,620 +81,643 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ви впевнені, що бажаєте примусово зачинити це вікно?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "Так"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "Ні"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "Ви впевнені? Вийти?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Ви запросили вихід з Enlightenment.<br><br>Ви впевнені. Вийти?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "Завершити сеанс?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Завершення сеансу.<br><br>Ви впевнені. Завершити?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "Ви впевнені. Вимкнути комп'ютер?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Вимкнення комп'ютера.<br><br>Ви впевнені? Вимкнути?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "Ви впевнені? Перезавантажити?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Перезавантаження комп'ютера.<br><br>Ви впевнені? Перезавантажити?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Ви запросили режим очікування.<br><br>Ви впевнені?Зробити це?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "Перейти в режим сну?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "Перехід в режим сну.<br><br>Ви дійсно цього хочете?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "Вікно: дії"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "Пересунути"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "Змінити розмір"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "Меню вікна"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "Підняти"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "Знизити"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "Вбити"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "Вікно: стан"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "Ввімкнути \"липкий\" режим вікна"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "Перемкнути режим піктограм"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "Перемкнути на повноекранний режим"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "Розгорнути"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "Збільшити по вертикалі"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "Збільшити по горизонталі"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "Збільшити на весь екран"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "\"Розумний\" режим збільшення"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим збільшення розтягуванням"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим збільшення заповненням"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "Ввімкнути режим згортання в заголовок"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "Ввімкнути режим згортання вниз"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "Ввімкнути режим згортання ліворуч"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "Ввімкнути режим згортання праворуч"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "Ввімкнути згорнутий режим"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "Ввімкнути стан без рамки"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "Рамка"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "Ввімкнути стан прикріплення"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "Стільниця"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "Перенести стільницю ліворуч"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "Перенести стільницю праворуч"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "Перенести стільницю догори"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "Перенести стільницю донизу"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "Перенести стільницю..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "Показати стільницю"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "Показати полицю"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "Перенести стільницю до..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "Перенести стільницю лінійно..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "Перейти на стільницю 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "Перейти на стільницю 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "Перейти на стільницю 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "Перейти на стільницю 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "Перейти на стільницю 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "Перейти на стільницю 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "Перейти на стільницю 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "Перейти на стільницю 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "Перейти на стільницю 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "Перейти на стільницю 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "Перейти на стільницю 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "Перейти на стільницю 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "Перейти на стільницю..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Перенести стільницю ліворуч (всі екрани)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Перенести стільницю праворуч (всі екрани)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Перенести стільницю догори (всі екрани)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Перенести стільницю донизу (всі екрани)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Перенести стільницю... (всі екрани)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Перенести стільницю до... (всі екрани)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Перенести стільницю лінійно... (всі екрани)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "Перенести стільницю в напрямку..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Перейти на стільницю 0 (всі екрани)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Перейти на стільницю 1 (всі екрани)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Перейти на стільницю 2 (всі екрани)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Перейти на стільницю 3 (всі екрани)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Перейти на стільницю 4 (всі екрани)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Перейти на стільницю 5 (всі екрани)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Перейти на стільницю 6 (всі екрани)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Перейти на стільницю 7 (всі екрани)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Перейти на стільницю 8 (всі екрани)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Перейти на стільницю 9 (всі екрани)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Перейти на стільницю 10 (всі екрани)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Перейти на стільницю 11 (всі екрани)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Перейти на стільницю... (всі екрани)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "Переслати мишу на екран 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "Переслати мишу на екран 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "Переслати мишу на екран..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Переслати мишу вперед на 1 екран"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "Переслати мишу назад на 1 екран"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Переслати мишу вперед/назад..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+msgid "Backlight Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "Рухати текст"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "Ще..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "Ще..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "Змінити розмір на:"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "Перенести стільницю в напрямку..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "Створити піктограму"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "Вікно: Переміщення"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "До наступної стільниці"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "До попередньої стільниці"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "Через стільницю №..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "До стільниці..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "Показати головне меню"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "Показати меню \"Улюблені\""
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "Показати меню \"Всі програми\""
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "Показати користувацьке меню"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "Показати меню..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "Запустити"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команду"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "Програму"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "Вийти"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "Вийти зараз"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Режим"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "Ввімкнути режим презентацій"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "Ввімкнути автономний режим"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "Система"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "Завершити сеанс"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "Вимкнути зараз"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "Вимкнути"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "Перезавантажити"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "Призупинити"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "Призупинити"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "Режим сну"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "Заблокувати"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "Розчистити вікна"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "Загальне: Дії"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "Затримка дії"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "Дія"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "На цьому екрані"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "На цьому екрані"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "Встановити як фон"
 
@@ -702,18 +725,16 @@ msgstr "Встановити як фон"
 msgid "Color Selector"
 msgstr "Вибір кольору"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -721,20 +742,20 @@ msgstr "Вибір кольору"
 msgid "OK"
 msgstr "Гаразд"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -752,7 +773,7 @@ msgstr ""
 "виправлений<br>шляхом додавання старих. Ви можете повторно налаштувати "
 "систему<br>за власним смаком. Вибачте за незручності<br>."
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -766,11 +787,11 @@ msgstr ""
 "версією Enlightenment.<br>Це неправильно, тому ваша конфігурація<br "
 ">відновлена до стандартної. Вибачте за незручності.<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Проблеми під час збереження параметрів Enlightenment"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -778,96 +799,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "Параметри оновлено"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "Помилка під час переходу в режим сну."
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(Немає вікон)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "Помилка під час переходу в режим очікування."
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "Помилка під час переходу в режим очікування."
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "Ласкаво просимо до Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -878,56 +899,61 @@ msgstr ""
 "ньому. Це дуже дивно.<br><br>Файл, в якому сталася помилка:<br>%s<br><br>Цей "
 "файл був вилучений, щоб уникнути недостовірних даних.<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "Базове"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "Застосувати"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "Розширення"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "Модулі"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "Перевага піктограми"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "Помилка - немає підтримки PAM"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Підтримка PAM не вбудована в Enlightenment, тому<br>блокування вимкнено."
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "Заблокувати не вдалось"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
@@ -935,15 +961,15 @@ msgstr ""
 "Блокування стільниці не вдалось, оскільки якась програма<br>утримує "
 "клавіатуру або мишу, або їх обох<br>і його не можливо порушити."
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "Будь ласка, введіть ваш пароль"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "Помилка системи аутентифікації"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -954,11 +980,11 @@ msgstr ""
 "сеансу. Код помилки <hilight>%i</hilight>.<br> Це погано і таке не має "
 "відбуватися. Будь ласка, повідомте про цю ваду."
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "Активувати режим презентації?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -968,11 +994,11 @@ msgstr ""
 "режим<b>презентації</b> та тимчасово вимкнути збереження екрана, блокування "
 "та енергозбереження?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "Ні, але збільшити затримку"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "Ні, і більше не запитувати"
 
@@ -998,106 +1024,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Редактор програм"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "Назва"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "Піктограма"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "Загальна назва"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Клас вікна"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "Категорії"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Типи MIME"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "Файл стільниці"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Загальні"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "Сповіщення про запуск"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "Запустити в Терміналі"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "Показувати в меню"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "Опції"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "Вибрати піктограму"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "Виберіть виконуваний файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Стерти"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "Вставити"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "Виділити все"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1137,314 +1162,314 @@ msgstr ""
 "Enlightenment не зміг запустити програму:<br><br>%s<br><br>Програма не може "
 "запуститися."
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "Помилка виконання програми"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s несподівано закінчив виконання."
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Код виходу %i був повернутий з %s."
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s перерваний сигналом переривання."
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s перерваний сигналом виходу."
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s перерваний сигналом аварійного припинення роботи."
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s перерваний помилкою плаваючої коми."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s перерваний сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s перерваний помилкою сегментації."
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s перерваний помилкою Broken Pipe."
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s перерваний сигналом завершення."
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s перерваний помилкою Bus Error."
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s перерваний сигналом номер %i."
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** Залишок виведення був обрізаний. Збережіть для перегляду. ***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "Журнали помилок"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "Не було повідомлення про помилку."
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "Зберегти це повідомлення"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Цей файл помилки буде збережений як %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "Інформація про помилку"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "Сигнал помилки інформації"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "Вихідні дані"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "Не було ніяких даних."
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "Неіснуючий шлях"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s не існує."
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "Помилка під'єднання"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "Не вдається під'єднати пристрій"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "Помилка демонтування"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "Не вдається демонтувати пристрій"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "Помилка витягування"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "Не вдається витягти пристрій"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i Файлів"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "Посилання"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "Відмінити"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "Успадковувати батьківські налаштування"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "Режим Відображення"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "Оновити вигляд"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "Показати приховані файли"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "Запам'ятати черговість"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "Сортуванти"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "Новий каталог"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "Розмонтувати"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "Змонтувати"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "Витягти"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "Піктограма від програми "
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "Властивості файла"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "Використовувати типові параметри"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "Сітка піктограм"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "Свої піктограми"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "Список"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Розмір піктограми (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "Встановити фон..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "Налаштувати накладання..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "Створити новий каталог"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "Назва нового каталогу:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "Перейменувати %s в:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "Перейменувати файл"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "Спробувати ще раз"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "Помилка"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "Ні для всього"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "Так для всього"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Файл вже існує, перезаписати?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "Пропустити це"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "Ігнорувати все"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "Сталася помилка під час виконання операції.<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "Підтвердіть вилучення"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ви впевнені, що хочете вилучити<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1478,12 +1503,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "Невідомий носій"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "Змінний пристрій"
 
@@ -1491,7 +1516,7 @@ msgstr "Змінний пристрій"
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "Розмір:"
 
@@ -1507,7 +1532,7 @@ msgstr "Тип файла:"
 msgid "Permissions"
 msgstr "Дозволи"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "Власник:"
 
@@ -1527,17 +1552,17 @@ msgstr "Власник може читати"
 msgid "Owner can write"
 msgstr "Власник може писати"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "Попередній перегляд"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "Типово"
 
@@ -1546,7 +1571,7 @@ msgid "Thumbnail"
 msgstr "Мініатюра"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "Власні"
 
@@ -1562,53 +1587,42 @@ msgstr "Інформація про посилання"
 msgid "Select an Image"
 msgstr "Вибрати зображення"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "Рухати текст"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "Почати рух/змінити розмір цього гаджету"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "Змінити розмір"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "Автоматична прокрутка вмісту"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "Вкладка"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "Перегляд"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "Вилучити"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "Завершити рух/зміну розміру цього ґаджета"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1656,14 +1670,14 @@ msgstr "Позицію"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "Кегль"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "Позиціювання"
@@ -1715,163 +1729,169 @@ msgstr "Вийти з сесії коли це вікно відкрите"
 msgid "Remember these Locks"
 msgstr "Запам'ятати ці замки"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 #, fuzzy
 msgid "Window"
 msgstr "Вікна"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "Завжди зверху"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "Липкий"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "Налаштування"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "На повний екран"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "Збільшити вертикально"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "Збільшити горизонтально"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "Звичайний розмір"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "Редагувати піктограму"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "Створити піктограму"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "Долучити до улюблених"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "Долучити до улюблених"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "Комбінація Клавіш"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "Розумне розташування"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "Пропустити"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "Рамка"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "Замки"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "Запам'ятати"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Липкий"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "Пропустити"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "Опустити"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "Згорнутий в заголовок"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "Екран"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "Завжди зверху"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "Нормально"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "Завжди знизу"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "Прикріпити до стільниці"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "Відкріпити від стільниці"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "Вибір стилю рамки"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "Піктограма від Е17"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "Піктограма від програми "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "Піктограма від користувача"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "Протидія"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "Перелік вікон"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "Пейджер"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "Панель завдань"
 
@@ -1892,7 +1912,7 @@ msgid "ICCCM Properties"
 msgstr "Властивості ICCCM"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "Заголовок"
 
@@ -2066,7 +2086,6 @@ msgid "Size, Position and Locks"
 msgstr "Розмір, позицію та замки"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "Дозволити"
@@ -2144,15 +2163,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "Файли"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "Запустити"
@@ -2167,20 +2184,6 @@ msgstr "Ядро"
 msgid "Mobile"
 msgstr "Модулі"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "Налаштування"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "Налаштування модулів"
@@ -2221,7 +2224,7 @@ msgstr "Додати ґаджет"
 msgid "Remove Gadget"
 msgstr "Прибрати ґаджет"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "Налаштування панелі інструментів"
 
@@ -2229,11 +2232,11 @@ msgstr "Налаштування панелі інструментів"
 msgid "Layout"
 msgstr "Компонування"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "Помилка методу введення"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2249,7 +2252,7 @@ msgstr "Головне"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "Улюблені програми"
 
@@ -2257,76 +2260,74 @@ msgstr "Улюблені програми"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "Програми"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Вікна"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "Загублені вікна"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "Про..."
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "Тема"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "Віртуальний"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "Полички"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "Показати/сховати всі вікна"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(Немає програм)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "Налаштувати віртуальні стільниці"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(Немає вікон)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "Немає назви!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(Немає поличок)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "Додати поличку"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "Вилучити поличку"
 
@@ -2362,7 +2363,7 @@ msgid "Shrink to Content Width"
 msgstr "Стискати до обсягу вмісту"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "Стиль"
 
@@ -2392,7 +2393,7 @@ msgid "Hide duration"
 msgstr "Тривалість приховування"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f секунд"
@@ -2409,7 +2410,7 @@ msgstr "Показувати на всіх стільницях"
 msgid "Show on specified Desktops"
 msgstr "Показувати на зазначених стільницях"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2426,7 +2427,7 @@ msgstr ""
 " належить Вам. Будь ласка, перевірте:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2439,76 +2440,22 @@ msgstr ""
 "Будь ласка, перевірте: \n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може ініціалізувати Ecore!\n"
-"Можливо, у вас недостатньо пам'яті?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може ініціалізувати файлову систему.\n"
-"Можливо, у вас недостатньо пам'яті?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2516,7 +2463,7 @@ msgstr ""
 "Enlightenment не може налаштувати вказівник сигналу виходу.\n"
 "Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2524,7 +2471,7 @@ msgstr ""
 "Enlightenment не може налаштувати вказівник сигналу HUP.\n"
 "Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2533,64 +2480,37 @@ msgstr ""
 "Enlightenment не може налаштувати вказівник сигналу HUP.\n"
 "Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не може ініціалізувати підключення до X.\n"
-"Ви налаштували перемінну DISPLAY?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment не може ініціалізувати аварійну систему повідомлень.\n"
-"Ви налаштували перемінну DISPLAY?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може ініціалізувати систему підключень.\n"
-"Можливо, у вас недостатньо пам'яті?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може ініціалізувати систему IPC.\n"
-"Можливо, у вас недостатньо пам'яті?"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не може налаштувати оболонку xinerama.\n"
-"Таке не має траплятися."
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:324
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment не може налаштувати оболонку xinerama.\n"
-"Таке не має траплятися."
-
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може ініціалізувати систему Evas.\n"
-"Можливо, у вас недостатньо пам'яті?"
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2600,7 +2520,7 @@ msgstr ""
 "надання в Evas. Будь ласка, перевірте вашу установку Evas і Ecore\n"
 "та переконайтеся, що вони підтримують надання Software X11."
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2610,7 +2530,35 @@ msgstr ""
 "надання в Evas. Будь ласка, перевірте вашу установку Evas та\n"
 "Ecore і переконайтеся, що вони підтримують надання Software Buffer."
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment не може ініціалізувати аварійну систему повідомлень.\n"
+"Ви налаштували перемінну DISPLAY?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2618,23 +2566,29 @@ msgstr ""
 "Enlightenment не може створити каталоги у вашому домашньому каталозі.\n"
 "Можливо, у вас немає домашнього каталогу або диск заповнений?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment не може налаштувати свою систему реєстру файлів."
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment не може налаштувати свою систему налаштувань."
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment не може налаштувати свою систему тем."
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment не може налаштувати свою систему числення."
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment не може налаштувати систему вказівників."
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2642,94 +2596,42 @@ msgstr ""
 "Enlightenment не може налаштувати шляхи для пошуку файлів.\n"
 "Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment не може налаштувати свою систему шрифтів."
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment не може налаштувати свою систему тем."
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment не може налаштувати екран ініціалізації.\n"
-"Можливо, у вас недостатньо пам'яті?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment не може налаштувати свою систему мов."
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "Запускається багатомовна підтримка"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment не може налаштувати свою систему мов."
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment не може ініціалізувати FDO систему столу.\n"
 "Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "Перевірка підтримки форматів"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment виявив, що Evas не може створити буферний шар. Будь ласка, "
-"перевірте,\n"
-"чи Evas підтримує рушій Software Buffer.\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment виявив, що Evas не може завантажувати файли PNG. Перевірте,\n"
-"чи Evas має підтримку завантажувача PNG.\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment виявив, що Evas не може завантажувати файли JPEG. Перевірте,\n"
-"чи Evas має підтримку завантажувача JPEG.\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment виявив, що Evas не може завантажувати файли EET. Перевірте,\n"
-"чи Evas має підтримку завантажувача EET.\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment виявив, що Evas не може завантажити шрифт 'Sans'. Перевірте,\n"
-"чи має Evas підтримку в fontconfig, та чи розпізнає fontconfig шрифт "
-"'Sans'.\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "Налаштування екранів"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2737,212 +2639,374 @@ msgstr ""
 "Налаштування керування вікнами для всіх екранів в системі, не вдалася.\n"
 "Можливо запущений інший менеджер вікон?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "Налаштування DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "Налаштування прив'язок"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment не може налаштувати DPMS."
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "Налаштування DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment не може налаштувати DPMS."
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "Налаштування збереження екрана"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment не може налаштувати збереження екрана."
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "Налаштувати режими енергозбереження"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment не може налаштувати режими енергозбереження."
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "Налаштування блокування стільниці"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment не може налаштувати свою систему блокування стільниці."
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "Налаштування підказок"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не може налаштувати свою систему підказок."
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "Налаштування системи повідомлень"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "Налаштування шляхів"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "Налаштування системи керування"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment не може налаштувати систему системних команд.\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "Налаштування дій"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не може налаштувати свою систему дій"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "Налаштування системи запуску"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не може налаштувати свою систему запуску."
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "Налаштування ФМ"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "Файловий менеджер"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "Налаштування системи повідомлень"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment не може налаштувати свою систему повідомлень."
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "Налаштування DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не може налаштувати свою систему DND."
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "Налаштування обробки перехоплення вводу"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr ""
 "Enlightenment не може налаштувати свою систему обробки перехоплення вводу."
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "Налаштування модулів"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не може налаштувати свою систему модулів."
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "Налаштування запам'ятовування"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment не може налаштувати запам'ятовування параметрів."
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "Налаштування класів кольорів"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не може налаштувати свою систему класів кольорів."
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "Налаштування контейнера Ґаджетів"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment не може налаштувати свою систему управління ґаджетами."
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "Налаштування DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "Налаштування DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment не може налаштувати DPMS."
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "Налаштувати режими енергозбереження"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment не може налаштувати режими енергозбереження."
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "Налаштування фону стільниці"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не може налаштувати свою систему фону стільниці."
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "Налаштування миші"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment не може налаштувати параметри миші."
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "Налаштування прив'язок"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment не може налаштувати свою систему прив'язок."
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "Налаштування поличок"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment не може налаштувати свою систему поличок."
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "Налаштування мініатюр"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment не може налаштувати систему мініатюр.\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment не може налаштувати систему системних команд.\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment не може налаштувати систему мініатюр.\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment не може налаштувати свою систему тем."
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "Налаштувати черговість файлів"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не може налаштувати свою систему черг."
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "Завантажити модулі"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "Параметри поличок"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "Майже готове"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "Перевірка підтримки форматів"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може створити буферний шар. Будь ласка, "
+"перевірте,\n"
+"чи Evas підтримує рушій Software Buffer.\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли PNG. Перевірте,\n"
+"чи Evas має підтримку завантажувача PNG.\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли JPEG. Перевірте,\n"
+"чи Evas має підтримку завантажувача JPEG.\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли PNG. Перевірте,\n"
+"чи Evas має підтримку завантажувача PNG.\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли EET. Перевірте,\n"
+"чи Evas має підтримку завантажувача EET.\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment виявив, що Evas не може завантажити шрифт 'Sans'. Перевірте,\n"
+"чи має Evas підтримку в fontconfig, та чи розпізнає fontconfig шрифт "
+"'Sans'.\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment дав збій на старті і був перезавантажений"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2950,7 +3014,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2962,7 +3026,7 @@ msgstr ""
 "будь-яку проблему з модулями у Вашій конфігурації.<br>Діалог конфігурації "
 "модулів дозволить Вам вибрати потрібні<br>модулі заново."
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2974,20 +3038,12 @@ msgstr ""
 "будь-яку проблему з модулями у Вашій конфігурації.<br>Діалог конфігурації "
 "модулів дозволить Вам вибрати потрібні<br>модулі заново."
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "Параметри поличок"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "Майже готове"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "Завантажити модулі"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2996,11 +3052,11 @@ msgstr ""
 "Виникла помилка завантаження модуля з ім'ям: %s<br>Модуль з ім'ям %s не був "
 "знайдений в<br>каталогах пошуку модулів<br>."
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "Помилка завантаження модуля"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3009,11 +3065,11 @@ msgstr ""
 "Виникла помилка завантаження модуля з ім'ям: %s<br>Повний шлях до цього "
 "модуля:<br>%s<br>Повідомлення про помилку було:<br>%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "Модуль не містить всіх необхідних функцій"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3024,16 +3080,16 @@ msgstr ""
 "мінімальну версію API модуля: %i.<br>Версія API модуля оголошена для "
 "Enlightenment є: %i.<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Модуль %s для Enlightenment"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "Хочете вивантажити цей модуль?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3047,28 +3103,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "Поличка №"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви дійсно хочете вилучити цю поличку?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "Закінчити переміщення/зміну розміру елементів"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "Почати переміщення/зміну розміру елементів"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "Коментар"
@@ -3077,16 +3133,16 @@ msgstr "Коментар"
 msgid "Starting"
 msgstr "Запускається"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "Перевірка системних дозволів"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "Перевірка системи завершена"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3096,35 +3152,35 @@ msgstr ""
 "Вихід триває занадто довго.<br>Деякі програми відмовляються закриватись."
 "<br>Ви хочете вийти так чи інакше, не закривши ці<br>програми спочатку?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "Проблеми виходу з сеансу"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "Вийти зараз"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "Чекайте"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "Скасувати вихід"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "Виконується вихід"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Завершення сеансу.<br><hilight>Будь ласка, зачекайте.</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment зайнятий іншим запитом"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3132,14 +3188,14 @@ msgstr ""
 "Завершення сеансу.<br>Ви не можете виконувати інші дії<br>після завершення "
 "сеансу."
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 "Вимкнення.<br>Ви не можете виконувати інші дії<br>під час початку вимкнення."
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3147,7 +3203,7 @@ msgstr ""
 "Перезавантаження.<br>Ви не можете виконувати інші дії<br>під час початку "
 "перезавантаження."
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3155,64 +3211,65 @@ msgstr ""
 "Перехід в режим очікування.<br>Доки перехід не завершиться ви не можете "
 "виконувати<br>будь-які інші дії."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Перехід в режим сну.<br>Ви не можете виконувати інші дії<br>доки перехід не "
 "завершиться."
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "Отакої! Такого не може бути!"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "Помилка під час виходу."
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "Помилка під час перезавантаження."
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "Помилка під час переходу в режим очікування."
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "Помилка під час переходу в режим сну."
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "Вимкнути комп'ютер"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Вимкнення.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "Перезавантаження"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Перезавантаження.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "Призупинка"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Перехід в режим очікування.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "Не активний"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Перехід в режим сну.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
@@ -3220,33 +3277,33 @@ msgstr "Перехід в режим сну.<br><hilight>Будь ласка, з
 msgid "About Theme"
 msgstr "Про тему"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "Встановити як тему"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "Закінчити переміщення/зміну розміру елементів"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "Почати переміщення/зміну розміру елементів"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "Налаштувати вміст панелі інструментів"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment не зміг запустити дочірній процес:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "Не можу вийти - безсмертні вікна."
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3256,125 +3313,125 @@ msgstr ""
 "означає,<br>що Enlightenment не дасть собі вийти, доки ці вікна не будуть "
 "закриті,<br>або Ви не знімете прапорці захисту.<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байт"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Кб"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Мб"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Гб"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "В майбутньому"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "В останню хвилину"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li років тому"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li місяців тому"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li тижнів тому"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li днів тому"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li годин тому"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li хвилин тому"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "Налаштування пейджера"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "Імпортувати..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "Опції наповнення та розтягування"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "Розтягнути"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "По центру"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "В межах"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "Заповнити"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "Якість файла"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "Використовувати початковий файл"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3393,12 +3450,12 @@ msgstr ""
 "типові<br>налаштування будуть додані і встановлені. Зараз можете встановити "
 "нову<br>конфігурацію за власним смаком. Пробачте за незручності.<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "(немає інформації)"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3432,142 +3489,148 @@ msgstr "Вверх"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "Долучити до улюблених"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "Каталогом вище"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "Роздільна здатність"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "Права доступу:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "Змінено:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "Ви"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "Захищено"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "Лише читання"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "Заборонено"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "Читання-запис"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "Параметри монітора батарей"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "Попереджати про низький заряд батареї"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "Перевіряти кожні:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f тактів"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "Режим сну"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "Опитування"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "Показувати попередження про низький заряд"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "Попереджати якщо:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f хв."
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "Авто-звільнення в..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f сек"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "Попередження"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "Автовизначення"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "Вбудований"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "Розмита"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "Обладнання"
 
@@ -3575,32 +3638,33 @@ msgstr "Обладнання"
 msgid "Battery"
 msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "Низький заряд батареї!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "Рекомендоване мережеве живлення."
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "ПОМИЛКА"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "Індикатор Батареї"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "Годинник"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "Показувати панель інструментів"
@@ -3668,17 +3732,17 @@ msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "Програми IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "Стартові програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "Рестарт-програми"
 
@@ -3692,10 +3756,25 @@ msgid "Apps"
 msgstr "Програми"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "Нова програма"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "Запустити"
+
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "Вибір програм"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "Файли стільниці"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "Інший IBar"
 
@@ -3708,7 +3787,7 @@ msgid "Available Profiles"
 msgstr "Доступні профілі"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Вибрати профіль"
 
@@ -3746,9 +3825,9 @@ msgstr "Налаштування діалогу"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "Загальні налаштування"
 
@@ -3790,7 +3869,7 @@ msgstr "Діалоги"
 msgid "Profiles"
 msgstr "Профілі"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3801,7 +3880,7 @@ msgstr ""
 "поверніть, якщо ні.<br>Якщо ви не натиснете кнопку, попередні параметри<br>"
 "%dx%d на %d Гц будуть повернуті через %d секунд."
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3812,7 +3891,7 @@ msgstr ""
 "поверніть, якщо ні.<br>Якщо ви не натиснете кнопку, попередні параметри<br>"
 "%dx%d будуть повернуті через %d секунд."
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3823,7 +3902,7 @@ msgstr ""
 "поверніть, якщо ні.<br>Якщо ви не натиснете кнопку, попередні параметри<br>"
 "%dx%d на %d Гц будуть повернуті<hilight>НЕГАЙНО</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3834,47 +3913,47 @@ msgstr ""
 "поверніть, якщо ні.<br>Якщо ви не натиснете кнопку, попередні параметри<br>"
 "%dx%d будуть повернуті <hilight>НЕГАЙНО</hilight>."
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "Зміна роздільної здатності"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "Відновити"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "Налаштування роздільної здатності екрана"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "Роздільна здатність"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "Відновлювати під час реєстрації"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "Частота кадрів"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "Обертання"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "Дзеркально"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "Відсутність функцій"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3887,11 +3966,11 @@ msgstr ""
 "екрана<br>без підтримки цього розширення. Також це може бути<br>тому що, під "
 "час побудови <hilight>ecore</hilight> не було<br>виявлено підтримки XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "Не знайдено частоти оновлення"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3904,93 +3983,74 @@ msgstr ""
 "чинна частота використовуватиметься під час<br>налаштування роздільності "
 "здатності, і це може <hilight>пошкодити</hilight> ваш екран."
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "Налаштування віртуальних стільниць"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "Кількість стільниць"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "Перехід до стільниці клацанням мишою"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Перехід під час перетягування об'єктів мишкою за край екрана"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "Безперервне обертання стільниць під час переходу"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "Стільниці"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "Вимкнути"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "Гладко"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "Збільшення"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "Панорамування фону"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "Анімація"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f сек"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-#, fuzzy
-msgid "X-Axis pan factor"
-msgstr "%.2f коефіцієнт панорамування по осі X"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-#, fuzzy
-msgid "Y-Axis pan factor"
-msgstr "%.2f коефіцієнт панорамування по осі Y"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "Анімація переходу"
 
@@ -4007,7 +4067,7 @@ msgid "Desktop Wallpaper"
 msgstr "Шпалери стільниці"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "Встановити"
 
@@ -4018,12 +4078,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "Особистий"
 
@@ -4031,160 +4091,174 @@ msgstr "Особистий"
 msgid "Screen Lock Settings"
 msgstr "Налаштування блокування екрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "Призупинити"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "Призупинити"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "Нетипове блокування екрана"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "Заблокувати"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "Показувати на всіх екранах"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "Показувати на чинному екрані"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "Показувати на екрані №:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "Параметри вікна реєстрації"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "Блокувати, якщо Х активує заставку"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f сек."
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "Блокувати, якщо час простою перевищений"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f хв."
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "Таймери"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 #, fuzzy
 msgid "Suggest if deactivated before"
 msgstr "Якщо вимкнено раніше"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "Ввімкнути режим презентації"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "Визначається темою"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "Шпалери з теми"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "Шпалери стільниці"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "Шпалери"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "Налаштування зберігача екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "Ввімкнути зберігач екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "Призупинити"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "Зберігач екрана"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "Початковий стан"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "Затемненя"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "Бажано"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "Не бажано"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Події експозиції"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "Дозволити"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "Не дозволяти"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4192,39 +4266,52 @@ msgstr "Не дозволяти"
 msgid "Miscellaneous"
 msgstr "Інші опції"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "Управління живленням екрана (DPMS)"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "Чинний дисплей-сервер не підтримує<br>DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Чинний дисплей-сервер<br>не має розширення DPMS."
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "Параметри керування живленням дисплея"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "Ввімкнути керування живленням дисплея"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "Час очікування"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "Час призупинки"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "Час перебування у вимкненому стані"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+msgid "Backlight"
+msgstr ""
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "Віртуальні стільниці"
@@ -4272,74 +4359,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "Налаштування прив'язок до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "Прив'язки до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "Додати прив'язку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "Вилучити прив'язку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "Змінити прив'язку"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Вилучити все"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "Повернути типові прив'язки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Дія"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Параметри дії"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "Загальні установки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Дозволити активувати прив'язки в вікнах на повний екран"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "Послідовність прив'язок до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "Край, який приймає кліки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "Помилка прив'язки до краю"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4349,28 +4436,28 @@ msgstr ""
 "<br><hilight>%s</hilight>.<br>Будь ласка, виберіть іншу послідовність "
 "прив'язок."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4520,34 +4607,47 @@ msgid ""
 msgstr ""
 "Enlightenment не зміг імпортувати конфігурацію<br>через помилку копіювання."
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "Налаштування мови"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "Вибір мови"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "Типово"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "Вибрана локаль"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Локаль"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "Мова"
 
@@ -4638,17 +4738,17 @@ msgid "Manager"
 msgstr "Менеджер"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "Жоден"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "Послідовність прив'язок миші"
 
@@ -4672,13 +4772,11 @@ msgid "Menu Settings"
 msgstr "Налаштування меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "Особистий"
@@ -4689,7 +4787,7 @@ msgid "Main Menu"
 msgstr "Показати головне меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "Улюблені"
 
@@ -4709,7 +4807,7 @@ msgid "Comments"
 msgstr "Коментар"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4721,7 +4819,7 @@ msgid "Show gadget settings in top-level"
 msgstr "Показувати в меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "Меню"
 
@@ -4792,19 +4890,19 @@ msgid "Images"
 msgstr "Зображення"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "Шрифти"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "Теми"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "Піктограми"
 
@@ -4955,18 +5053,18 @@ msgstr "Ви просите вилучити \"%s\".<br><br>Ви впевнен
 msgid "Wallpaper Settings"
 msgstr "Налаштування шпалер"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "Використовувати шпалери теми"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "Зображення..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "В мережі..."
 
@@ -4986,43 +5084,48 @@ msgstr "На цій стільниці"
 msgid "This Screen"
 msgstr "На цьому екрані"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "Параметри шпалер"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "Черепицею"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "Гладко"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "Вибрати зображення..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "Помилка імпорту зображення"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment не зміг імпортувати зображення<br>через помилки в конверсії."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "Помилка імпорту шпалер"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment не зміг імпортувати шпалери<br>через помилку копіювання."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5060,7 +5163,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "Стиль типової рамки"
 
@@ -5068,7 +5171,7 @@ msgstr "Стиль типової рамки"
 msgid "Window Border Selection"
 msgstr "Вибір рамки вікна"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запам'ятати рамку для цього вікна на майбутнє"
 
@@ -5101,7 +5204,7 @@ msgid "Menu Background Base"
 msgstr "Тло"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "Заголовок меню"
 
@@ -5110,7 +5213,7 @@ msgid "Menu Title Active"
 msgstr "Активний заголовок меню"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "Пункт меню"
 
@@ -5124,12 +5227,12 @@ msgid "Menu Item Disabled"
 msgstr "Активний пункт меню"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "Рухати текст"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "Текст під час зміни розміру"
 
@@ -5147,7 +5250,7 @@ msgid "Winlist Label"
 msgstr "Ярлик списку вікон"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "Заголовок списку вікон"
 
@@ -5167,389 +5270,399 @@ msgid "File Manager Background Base"
 msgstr "Файловий менеджер"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "Фокусування"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "Текст на кнопках"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "Текст на кнопках вимкнено"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "Текст прапорця"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "Текст прапорця вимкнено"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "Введення тексту"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "Текст на кнопках вимкнено"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "Текст ярлика"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "Текст пункту в списку"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "Текст пункту в списку"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "Текст пункту в списку"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "Заголовок списку"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "Заголовок списку"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "Радіо-текст"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "Радіо-текст вимкнено"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "Текст повзунка"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "Текст повзунка вимкнено"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "Тло"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "Ярлик модуля"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "Класи кольору"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "Налаштування класів кольорів"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "Налаштування класів кольорів"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "Налаштування класів кольорів"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "Власний колір"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "Витягти"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "Поза мережею"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "Колір тіні"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "Менеджер вікон"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Віджети"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "Інші"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "Заголовок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "Звичайний текстовий блок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "Малий текстовий блок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "Великий текстовий блок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "Налаштування заголовку"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "Заголовок в \"Про\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "Версія в \"Про\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "Текст в \"Про\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "Заголовок в \"Замкнути Екран\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "Пароль в \"Замкнути Екран\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "Діалог \"Помилка\""
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Команда Exebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Заголовок заставки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Текст заставки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Версія в заставці"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "Запис"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "Рамка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "Мітка"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "Повзунок"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "Радіо-кнопки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "Кнопка-прапорець"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "Текст пункту в списку"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "Пункт списку"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "Заголовок списку"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "Файловий менеджер"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "Піктограма стільниці"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "Маленький"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "Великий"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "Зменшений стиль"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "Звичайний стиль"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "Збільшений стиль"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "Налаштування шрифтів"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "Крихітний"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "Великий"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "Дуже великий"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "Величезний"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d пікселів"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Використовувати власні класи шрифтів"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Базовий тестовий рядок: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "Класи шрифтів"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "Ввімкнути класи шрифтів"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Розширений тестовий рядок.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Підказки"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "Резервні шрифти"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "Резервна назва"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "Ввімкнути резервні"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "Підказка / Резервні"
 
@@ -5557,12 +5670,17 @@ msgstr "Підказка / Резервні"
 msgid "Icon Theme Settings"
 msgstr "Налаштування теми піктограми"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "Ввімкнути композицію"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "Виберіть програму"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "Тема піктограм заміняє основну тему"
@@ -5629,11 +5747,9 @@ msgid "Custom scaling factor"
 msgstr "Масштабний коефіцієнт користувача"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.2f раз"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5644,6 +5760,12 @@ msgstr "Політика"
 msgid "Minimum"
 msgstr "Мінімум"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f раз"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "Максимум"
@@ -5664,25 +5786,25 @@ msgstr "Показати заставку під час реєстрації"
 msgid "Transition Settings"
 msgstr "Налаштування переходу"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "Події"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "Запуск"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "Зміна стільниці"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "Зміна фону"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "Переходи"
 
@@ -5698,15 +5820,15 @@ msgstr " Імпортувати..."
 msgid " Online..."
 msgstr " В мережі..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "Категорії Тем"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "Призначити"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "Очистити Все"
 
@@ -5735,19 +5857,19 @@ msgstr "Enlightenment не зміг імпортувати тему<br>чере
 msgid "Exchange themes"
 msgstr "Змінити теми"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "Рамки"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "Тема піктограми"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "Курсор миші"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "Масштаб"
 
@@ -5878,6 +6000,11 @@ msgstr "Піктограма від програми "
 msgid "Border Icon"
 msgstr "Рамка"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "Розумне розташування"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "Розумне розташування"
@@ -5909,24 +6036,47 @@ msgstr "Під вікнами"
 msgid "Animate"
 msgstr "Анімація"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "Лінійно"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "Гладенькі прискорення та уповільнення"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "Прискорювати"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "Сповільнювати"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "Прискорення мишки"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "Сповільнювати"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "Гладенькі прискорення та уповільнення"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "Масштаб"
@@ -5948,6 +6098,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "Найсвіжіше вікно під мишкою"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "Годинник"
@@ -5986,11 +6137,6 @@ msgstr "Діалоги"
 msgid "Only dialogs with focused parent"
 msgstr "Тільки нові діалоги отримують фокус"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "Фокусування"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "Інші опції"
@@ -6101,13 +6247,13 @@ msgid "Fill available space"
 msgstr "Заповнити доступне місце"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "Горизонтально"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "Вертикально"
@@ -6170,7 +6316,7 @@ msgid "Raise when clicking to focus"
 msgstr "Піднімати під час кліку для фокусу"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "Фокусування вікна"
 
@@ -6427,33 +6573,33 @@ msgstr "Дуже світла"
 msgid "Dropshadow"
 msgstr "Тінь"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "Все"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "Все"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "(немає інформації)"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "Під усім"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "Все"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "Все"
@@ -6463,165 +6609,165 @@ msgstr "Все"
 msgid "Everything Settings"
 msgstr "Налаштування терміналу"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "Доступні профілі"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "Пересунути"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "Пересунути"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "Параметри поличок"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "Увімкнений"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "Показувати в меню"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "Показувати в меню"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
-msgid "Plugin Trigger"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "Типовий рушій"
+#: src/modules/everything/evry_config.c:412
+msgid "Plugin Trigger"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "Подробиці"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "Типовий рушій"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "Анімація переходу"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "Час затримки до приховування"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
+#: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:491
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
-msgid "Default View"
-msgstr "Типовий рушій"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "Анімація переходу"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr ""
+msgid "Sorting"
+msgstr "Запускається"
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:505
 #, fuzzy
-msgid "Sorting"
+msgid "No Sorting"
 msgstr "Запускається"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "Використані нещодавно"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "Остання зміна:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "Параметри дії"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "Колір об'єкта"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "Гладко"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "Підказка"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "Швидкість підказки"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "Пересунути підказку праворуч"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "Налаштування підказок"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6630,39 +6776,30 @@ msgstr "Налаштування підказок"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "Підказка"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "Геометрія вікна"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "Рестарт-програми"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "Дія"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr ""
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6684,167 +6821,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "Typebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "Відкрити через..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "Відкрити через..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "Додати програму"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "Нова програма"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "Відкрити через..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "Запустити в Терміналі"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "Виконуваний"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "Рестарт-програми"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "Команду"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "Запуск команди"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "Все"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "Ще..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "Сортуванти"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "Перейменувати файл"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "Все"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "Показати приховані файли"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "Пошук в каталогах"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "Налаштування пошукового шляху"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "Каталоги визначені користувачем"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "Очистити"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "Діалоги"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "На повний екран"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "Переслати на стільницю"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "Піктограми файлів"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "Типи файлів"
 
@@ -6891,19 +6930,19 @@ msgid "Select an image"
 msgstr "Вибрати зображення"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "Файловий менеджер"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "Домівка"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Файлова система"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6921,7 +6960,7 @@ msgstr ""
 "типові<br>налаштування будуть додані і встановлені. Зараз можете встановити "
 "нову<br>конфігурацію за власним смаком. Пробачте за незручності.<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6936,7 +6975,7 @@ msgstr ""
 "Fileman.<br>Це погано, і тому ваша конфігурація відновлена до типової."
 "<br>Вибачте за незручності.<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Параметри Fileman оновлено"
 
@@ -7016,95 +7055,99 @@ msgstr "Відкривати менеджер файлів під час мон
 msgid "Device"
 msgstr "Попередній перегляд"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "До батьківського каталогу"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "Інша програма..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "Відкрити"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "Відкрити через..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "Відомі програми"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "Вказані програми"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "Всі програми"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "Власна команда"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "Копіювання скасоване"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "Переміщення скасоване"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Видалення скасоване"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Невідома операція від підлеглого скосована"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "Копіювання %s зроблено"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Копіювання %s (залишилось: %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "Переміщення %s завершено"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Переміщення %s (залишилось: %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "Вилучення зроблено"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "Вилучення файлів..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7139,7 +7182,7 @@ msgstr "Обробка %d операції(ій)"
 msgid "Filemanager is idle"
 msgstr "Файловий менеджер не діє"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "Оперативна інформація EFM"
 
@@ -7151,37 +7194,42 @@ msgstr "Менеджер Ґаджетів"
 msgid "Available Gadgets"
 msgstr "Доступні ґаджети"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "Режими"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "Власне зображення"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "Власний колір"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "Прозорий"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "Анімація"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "Фон"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "Панорамування фону"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "Почати рух/змінити розмір цього гаджету"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "Вільно"
@@ -7428,16 +7476,16 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ви дійсно хочете стерти джерело для цієї панелі?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "Створити нову піктограму"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "Властивості"
 
@@ -7481,7 +7529,7 @@ msgstr "Показувати вікна зі всіх стільниць"
 msgid "Show windows from active desktop"
 msgstr "Показувати вікна з чинної стільниці"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7610,32 +7658,32 @@ msgstr ""
 "тому що вона вже зайнята<br>внутрішнім кодом для контекстних меню.<br>Ця "
 "кнопка працює тільки в підказках"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "Показувати підказку пейджера"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "Пересунути підказку праворуч"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "Пересунути підказку ліворуч"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "Пересунути підказку вверх"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "Пересунути підказку вниз"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "Пересунути підказку ліворуч"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "Пересунути підказку ліворуч"
@@ -7656,133 +7704,93 @@ msgstr "Модулі керування системою"
 msgid "Temperature Settings"
 msgstr "Параметри температури"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "Датчики"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "Цельсієм"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "Фаренгейтом"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "Показувати градуси за"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "Проміжок перевірок"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "Висока температура"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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 ℉"
 
-#: src/modules/temperature/e_mod_config.c:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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 ℃"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "Низька температура"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "Температура"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "Далі"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "Ласкаво просимо до Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "Вибрати один"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "Профіль"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"У вашій системі не<br>знайдено файлів меню.<br>Будь ласка, зверніться<br>до "
-"документації<br>www.enlightenment.org<br>для уточнення<br>деталей про "
-"функціонування<br>ваших меню програм."
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "Виберіть меню програми"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "Панель швидкого запуску"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "Виберіть програму"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "Файли стільниці"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "Без піктограм на стільниці"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "Ввімкнути піктограми стільниці"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "Режим фокусування"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "Клацніть для фокусування вікон"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "Наведення мишки фокусує вікна"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "Виберіть піктограми для додавання"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "Вибрати профіль"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "Швидкий запуск"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "Вибір програм"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "Використані нещодавно"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7824,7 +7832,7 @@ msgstr "Лівий:"
 msgid "Right:"
 msgstr "Правий:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "Вимкнути звук"
 
@@ -7848,40 +7856,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "Звукові карти"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "Налаштування мікшера"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "Мікшер для глобальних дій:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "Запустити мікшер..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "Налаштування модулів мікшера"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "Зміна роздільної здатності"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "Налаштування мікшера оновлені"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"Налаштування модулів мікшера змінені.<br>Ваша стара конфігурація була "
-"замінена типовою.<br>Приносимо вибачення за незручності."
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "Налаштування модулів мікшера"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -7908,137 +7930,360 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "Поза мережею"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "Канали"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "Налаштування мережних з'єднань"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "Захищено"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Невідомий носій"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "Помилка під'єднання"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "Черепицею"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "Переходи"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "(немає інформації)"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Гладко"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "Рушій"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "Увімкнений"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "Заповнити доступне місце"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "Захищено"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "Поза мережею"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "Інший системний лоток вже існує"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Може бути тільки один системний лоток, і він вже існує."
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "Системний лоток"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "Системний лоток"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment не може налаштувати свою систему тем."
+#~ msgid "Acpi"
+#~ msgstr "Дія"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "На цьому екрані"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "На цьому екрані"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "Змінити розмір"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "Завершити рух/зміну розміру цього ґаджета"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати Ecore!\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати файлову систему.\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати підключення до X.\n"
+#~ "Ви налаштували перемінну DISPLAY?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати систему підключень.\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати систему IPC.\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не може налаштувати оболонку xinerama.\n"
+#~ "Таке не має траплятися."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment не може налаштувати оболонку xinerama.\n"
+#~ "Таке не має траплятися."
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може ініціалізувати систему Evas.\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment не може налаштувати екран ініціалізації.\n"
+#~ "Можливо, у вас недостатньо пам'яті?"
+
+#~ msgid "Setup FM"
+#~ msgstr "Налаштування ФМ"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment не може налаштувати свою систему поличок."
+
+#~ msgid "New Application"
+#~ msgstr "Нова програма"
+
+#~ msgid "Background panning"
+#~ msgstr "Панорамування фону"
+
+#, fuzzy
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f коефіцієнт панорамування по осі X"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#, fuzzy
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f коефіцієнт панорамування по осі Y"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "Управління живленням екрана (DPMS)"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "Чинний дисплей-сервер не підтримує<br>DPMS."
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "Чинний дисплей-сервер<br>не має розширення DPMS."
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "Типовий рушій"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Дія"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "Typebuf"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "Відкрити через..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "Відкрити через..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "Додати програму"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "Нова програма"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "Запустити в Терміналі"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "Виконуваний"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "Ще..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "Сортуванти"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Перейменувати файл"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "Діалоги"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "На повний екран"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Переслати на стільницю"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "У вашій системі не<br>знайдено файлів меню.<br>Будь ласка, "
+#~ "зверніться<br>до документації<br>www.enlightenment.org<br>для "
+#~ "уточнення<br>деталей про функціонування<br>ваших меню програм."
+
+#~ msgid "Select application menu"
+#~ msgstr "Виберіть меню програми"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "Панель швидкого запуску"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "Без піктограм на стільниці"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "Ввімкнути піктограми стільниці"
+
+#~ msgid "Focus mode"
+#~ msgstr "Режим фокусування"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "Клацніть для фокусування вікон"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "Наведення мишки фокусує вікна"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "Виберіть піктограми для додавання"
+
+#~ msgid "Quick Launch"
+#~ msgstr "Швидкий запуск"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "Налаштування модулів мікшера змінені.<br>Ваша стара конфігурація була "
+#~ "замінена типовою.<br>Приносимо вибачення за незручності."
 
 #~ msgid "Add Application..."
 #~ msgstr "Додати програму..."
index 37f02ec..a60650a 100755 (executable)
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2011-03-18 13:15+0800\n"
 "Last-Translator: TeliuTe <teliute@163.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -23,20 +23,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "关于 Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "关闭"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -46,14 +45,14 @@ msgstr "Enlightenment"
 #: src/bin/e_about.c:23
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 "版权所有 &copy; 1999-2010,  Enlightenment 开发团队。<br><br>我们希望您能像我"
 "们喜欢开发这款软件一样喜欢这款软件。<br><br>本软件不提供明确或隐含的保证。该"
@@ -62,8 +61,9 @@ msgstr ""
 "且并不稳定,很多功能尚未完成或并不存在,还有很多 bug。您已经被 <hilight>警告"
 "</hilight> 过了!"
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>开发组</title>"
 
 #: src/bin/e_actions.c:365
@@ -80,617 +80,644 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "确定要杀死这个窗口吗?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "您确定要退出吗?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "您请求退出 Enlightenment<br><br>确定要退出吗?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "您确定要退出吗?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "您正要退出 Enlightenment<br><br>确定要退出吗?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "您确定要关闭吗?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "您正要关闭计算机。<br><br>确定要关闭计算机吗?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "您确定要重启吗?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "您正要重启计算机。<br><br>确定要重新启动计算机吗?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "您正要挂起计算机。<br><br>确定要挂起计算机吗?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "您确定要休眠吗?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "您正要休眠计算机。<br><br>确定要休眠计算机吗?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "窗口:动作"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "改变大小"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "菜单"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "提升"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "降低"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "杀死"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "窗口:状态"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "粘滞模式切换"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "图标模式切换"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "全屏状态切换"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "全屏最大化"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化模式“智能”"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化模式“扩展”"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化模式“填充”"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "切换至上阴影模式"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "切换至下阴影模式"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "切换至左阴影模式"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "切换至右阴影模式"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "切换阴影模式"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "边框"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "切换粘附状态"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "向左翻转桌面"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "向右翻转桌面"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "向上翻转桌面"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "向下翻转桌面"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "翻转桌面,依据..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "显示桌面"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 msgid "Show The Shelf"
 msgstr "显示书架"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "翻转桌面到..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "线性翻转桌面到..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 msgid "Flip Desktop Left (All Screens)"
 msgstr "向左翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 msgid "Flip Desktop Right (All Screens)"
 msgstr "向右翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 msgid "Flip Desktop Up (All Screens)"
 msgstr "向上翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 msgid "Flip Desktop Down (All Screens)"
 msgstr "向下翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 msgid "Flip Desktop By... (All Screens)"
 msgstr "翻转桌面的方式...(全部屏幕)"
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 msgid "Flip Desktop To... (All Screens)"
 msgstr "翻转桌面到...(全部屏幕)"
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "线性翻转桌面...(全部屏幕)"
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 msgid "Flip Desktop In Direction..."
 msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切换到桌面 0(全部屏幕)"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切换到桌面 1(全部屏幕)"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切换到桌面 2(全部屏幕)"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切换到桌面 3(全部屏幕)"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切换到桌面 4(全部屏幕)"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切换到桌面 5(全部屏幕)"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切换到桌面 6(全部屏幕)"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切换到桌面 7(全部屏幕)"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切换到桌面 8(全部屏幕)"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切换到桌面 9(全部屏幕)"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切换到桌面 10(全部屏幕)"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切换到桌面 11(全部屏幕)"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切换到桌面 ...(全部屏幕)"
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "屏幕"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "发送鼠标到屏幕 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "发送鼠标到屏幕 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "发送鼠标到屏幕 ..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "发送鼠标到前1屏"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "发送鼠标到后1屏"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "发送鼠标到 前一个/后一个 屏幕..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "关机"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "移动文本"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "移到到..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "移到到..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "改变大小,按照"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "创建图标"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "窗口:移动"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "到下一个桌面"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "到前一桌面"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "按桌面号 #..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "到桌面..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "显示主窗口"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "显示“我的最爱”菜单"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "显示所有应用程序菜单"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "显示 客户端 菜单"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "显示菜单..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "启动"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "应用程序"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "重启"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 msgid "Exit Now"
 msgstr "现在退出"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment:模式"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 msgid "Presentation Mode Toggle"
 msgstr "锁定幻灯片模式"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 msgid "Offline Mode Toggle"
 msgstr "锁定脱机模式"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "系统"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "退出"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr "现在关闭电源"
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr "关闭电源"
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "重启"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 msgid "Lock"
 msgstr "锁定"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Generic : Actions"
 msgstr "常规:动作"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 msgid "Delayed Action"
 msgstr "延迟动作"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-msgid "Acpi"
-msgstr "Acpi"
-
-#: src/bin/e_actions.c:3081
-msgid "Dim Screen"
-msgstr "变暗屏幕"
-
-#: src/bin/e_actions.c:3085
-msgid "Undim Screen"
-msgstr "不变暗屏幕"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "设为背景"
 
@@ -698,18 +725,16 @@ msgstr "设为背景"
 msgid "Color Selector"
 msgstr "颜色选择器"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -717,20 +742,20 @@ msgstr "颜色选择器"
 msgid "OK"
 msgstr "确定"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 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 "
@@ -745,7 +770,7 @@ msgstr ""
 "Enlightenment 需要新的设置,来使用新增功能,<br>新的默认设置会增加进来。<br>"
 "您也可以现在就重新设置各项。<br>很抱歉要让您重新设置。"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -757,11 +782,11 @@ msgstr ""
 "Enlightenment,或者复制了一个新版的 Enlightenment。<br>这很糟糕,为了防止出"
 "错,已经恢复为初始值。<br>很抱歉不得不这样做。<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 设定的写入问题"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -769,96 +794,96 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 msgid "Settings Upgraded"
 msgstr "设定已经升级"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "休眠系统失败。"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "无窗口"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "挂起系统失败。"
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "挂起系统失败。"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "欢迎光临Enlightenment"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -868,69 +893,74 @@ msgstr ""
 "Enlightenment 碰到无法写入设置文件,<br>该文件已经关闭写入,这很不常见。<br>"
 "出现错误的文件是:<br>%s<br><br>为防止出错,该文件已被删除。"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "高级"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "基本"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "应用"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "扩展"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "模块"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "图标首选项"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "错误 - 无 PAM 支持"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "Enlightenment 中没有构建 PAM 支持,所以<br>桌面锁定已禁用。"
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "锁定失败"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr "桌面不能锁定,因为某些软件独占了键盘鼠标,并且不能解锁。"
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "请输入您的解锁密码"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "认证系统错误"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -939,11 +969,11 @@ msgid ""
 msgstr ""
 "PAM 认证出错,不能产生认证会话。错误代码是 %i。这是不正常的,请报告错误。"
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr "启用幻灯片模式?"
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -952,11 +982,11 @@ msgstr ""
 "您解锁桌面太快了。<br><br>您想要启动<b>简报</b>模式并临时禁止屏保、帐户锁定和"
 "电源管理?"
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr "否,继续延时"
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr "否,以后不再询问"
 
@@ -980,106 +1010,105 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "桌面条目编辑器"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "名称"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "评论"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "图标"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "常规名称"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "窗口类"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "分类"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 msgid "Mime Types"
 msgstr "Mime 类型"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "桌面文件"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "常规"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "启动时通知"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "在终端中运行"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "显示在菜单中"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 msgid "Options"
 msgstr "选项"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "选择一个图标"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "删除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "剪切"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "复制"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "全选"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1116,313 +1145,313 @@ msgid ""
 "application failed to start."
 msgstr "Enlightenment 未能运行程序:<br><br>%s<br><br>该程序启动失败。"
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "应用程序执行出错"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 意外终止。"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "退出代码 %i 从 %s 反馈回来。"
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被中断信号中断。"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被退出信号中断。"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被浮点错误中断。"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被不可捕获的“杀死信号”中断。"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被错误信号中断。"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被管道错误中断。"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被总线错误中断。"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被信号 %i 中断。"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***剩余输出已截断。请保存输出文件以查看全部内容。***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "错误日志"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "没有错误信息。"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "保存此信息"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "此错误日志将被保存为 %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "错误信息"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "错误信号信息"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "输出数据"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "没有输出。"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 msgid "Nonexistent path"
 msgstr "不存在路径"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s 不存在。"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Mount Error"
 msgstr "挂载错误"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr "无法挂载设备"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Unmount Error"
 msgstr "卸载错误"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr "无法卸载设备"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Eject Error"
 msgstr "弹出错误"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr "无法弹出设备"
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i 个文件"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 msgid "Link"
 msgstr "连接"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 msgid "Abort"
 msgstr "关于"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 msgid "Inherit parent settings"
 msgstr "继承上一级设定"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "显示模式"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "显示隐藏文件"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "现在排序"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "新目录"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "重命名"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr "卸载"
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 msgid "Mount"
 msgstr "挂载"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr "弹出"
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 msgid "Application Properties"
 msgstr "应用程序属性"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "文件属性"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 msgid "Use default"
 msgstr "使用默认"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "网格图标"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "自定义图标"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "图标大小  (%d)"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 msgid "Set background..."
 msgstr "设置背景..."
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 msgid "Set overlay..."
 msgstr "设定覆盖..."
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "清除"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "创建新文件夹"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "新文件夹名称:"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "重命名 %s 为:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 msgid "Retry"
 msgstr "重试"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 msgid "Error"
 msgstr "错误"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr "全部选否"
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr "全部选是"
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 msgid "Warning"
 msgstr "警告"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "文件已经存在,覆盖吗?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr "忽略"
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr "忽略所有"
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "执行操作时产生一个错误。<br>%s"
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您确定要删除 <br><hilight>%s</hilight> 吗?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1456,12 +1485,12 @@ msgstr "%llu KiB"
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知设备"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr "可移动设备"
 
@@ -1469,7 +1498,7 @@ msgstr "可移动设备"
 msgid "File:"
 msgstr "文件:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "大小:"
 
@@ -1485,7 +1514,7 @@ msgstr "文件类型:"
 msgid "Permissions"
 msgstr "权限"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "所有者:"
 
@@ -1505,17 +1534,17 @@ msgstr "所有者可读"
 msgid "Owner can write"
 msgstr "所有者可写"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "预览"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "默认"
 
@@ -1524,7 +1553,7 @@ msgid "Thumbnail"
 msgstr "缩略图"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "自定义"
 
@@ -1540,50 +1569,41 @@ msgstr "连接信息"
 msgid "Select an Image"
 msgstr "选择一个图像"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 msgid "Move to"
 msgstr "移动到"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-msgid "Begin move/resize"
-msgstr "开始移动/缩放"
-
-#: src/bin/e_gadcon.c:1408
-msgid "Resizeable"
-msgstr "可变大小"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "自动滚动"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "简易"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "插入"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
 msgstr "外观"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "删除"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "停止移动/缩放此组件"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1631,14 +1651,14 @@ msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "堆叠"
@@ -1690,161 +1710,168 @@ msgstr "退出登录,不管这个开着的窗口"
 msgid "Remember these Locks"
 msgstr "记住这些锁定"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "窗口"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
-#, fuzzy
-msgid "Always on Top"
-msgstr "总是在最前面"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "粘住"
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
+msgid "Settings"
+msgstr "设置"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "编辑图标"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "创建图标"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "添加到收藏"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "添加到收藏"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "快捷键"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-msgid "Placement"
-msgstr "放置"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "跳过"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "边框"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "锁定"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "记住"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "粘住"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "跳过"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "最小化"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "遮蔽的"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "屏幕"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "总是在最前面"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "置底"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "固定到桌面"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "解除固定"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "选择边框样式"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "使用 E17 默认图标选项"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "使用应用程序提供的图标 "
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "使用用户自定义图标"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "阻抗"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "分页器"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 msgid "Taskbar"
 msgstr "任务栏"
 
@@ -1865,7 +1892,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM 属性"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "标题"
 
@@ -2034,7 +2061,6 @@ msgid "Size, Position and Locks"
 msgstr "尺寸、位置和锁定"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 msgid "All"
 msgstr "全部"
 
@@ -2111,15 +2137,13 @@ msgid "Utilities"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "文件"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "启动"
@@ -2134,20 +2158,6 @@ msgstr "核心"
 msgid "Mobile"
 msgstr "模块"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-msgid "Settings"
-msgstr "设置"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "模块设置"
@@ -2185,7 +2195,7 @@ msgstr "添加组件"
 msgid "Remove Gadget"
 msgstr "移除组件"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 msgid "Toolbar Settings"
 msgstr "工具栏设定"
 
@@ -2193,11 +2203,11 @@ msgstr "工具栏设定"
 msgid "Layout"
 msgstr "布局"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "输入法错误"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2212,7 +2222,7 @@ msgstr "主要"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "最常用程序"
 
@@ -2220,76 +2230,74 @@ msgstr "最常用程序"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "应用程序"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "窗口"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "丢失的窗口"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "关于"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "主题"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "虚拟"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "书架"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "显示/隐藏所有窗口"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(无应用程序)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 msgid "Set Virtual Desktops"
 msgstr "设定虚拟桌面"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(无窗口)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "无名称!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(无书架)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "添加一个书架"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "删除一个书架"
 
@@ -2324,7 +2332,7 @@ msgid "Shrink to Content Width"
 msgstr "缩至内容宽度"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 msgid "Style"
 msgstr "风格"
 
@@ -2354,7 +2362,7 @@ msgid "Hide duration"
 msgstr "隐藏持续时间"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 秒"
@@ -2371,7 +2379,7 @@ msgstr "显示在所有桌面上"
 msgid "Show on specified Desktops"
 msgstr "在指定桌面显示"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2385,7 +2393,7 @@ msgstr ""
 "但是权限太宽松(应该只能由所有者可读写),\n"
 "或者所有者不是您。请检查:%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2398,75 +2406,22 @@ msgstr ""
 "请检查:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
-"选项:\n"
-"\t-display DISPLAY\n"
-"\t\t连接到名为 DISPLAY 的显示器。\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\t添加一个伪装的 xinerama 几何屏幕(而不是真实的那个)\n"
-"\t\t添加数量可意任意多。\n"
-"\t\t它们会替代真实的 xinerama 屏幕,如果有的话。\n"
-"\t\t它们可用来模拟 xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\t使用 CONF_PROFILE 配置文件,而不是使用选中的默认或者“默认”。\n"
-"\t-good\n"
-"\t\t做好。\n"
-"\t-evil\n"
-"\t\t没做好。\n"
-"\t-psychotic\n"
-"\t\t乱弄。\n"
-"\t-locked\n"
-"\t\t开启桌面锁,因而会询问密码。\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\t如果您需要此帮助,你不要这个选项。\n"
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法启动 Ecore!\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法启动文件系统。\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2474,7 +2429,7 @@ msgstr ""
 "Enlightenment 无法建立一个退出信号处理句柄。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2482,7 +2437,7 @@ msgstr ""
 "Enlightenment 无法建立一个HUP信号处理句柄。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2490,63 +2445,37 @@ msgstr ""
 "Enlightenment 无法建立一个 USER 信号处理句柄。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment 无法启动 X 连接。\n"
-"您设定了 DISPLAY 环境变量吗?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment 无法启动紧急警报系统。\n"
-"您设定了 DISPLAY 环境变量吗?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法启动连接系统。\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法启动 IPC 系统。\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment 无法建立 xinerama wrapping。\n"
-"这种情况不该发生。"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:518
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment 无法建立 randr wrapping。\n"
-"这种情况不该发生。"
+#: src/bin/e_main.c:313
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法启动 Evas 系统。\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2556,7 +2485,7 @@ msgstr ""
 "渲染。请检查您的 Evas 和 Ecore 安装并确认他们支持软\n"
 "件 X11 渲染。"
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2566,7 +2495,35 @@ msgstr ""
 "渲染。请检查您的 Evas 和 Ecore 安装并确认他们支持软\n"
 "件 X11 渲染。"
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
+
+#: src/bin/e_main.c:378
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment 无法启动紧急警报系统。\n"
+"您设定了 DISPLAY 环境变量吗?"
+
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment 无法启动文件管理器。\n"
+
+#: src/bin/e_main.c:415
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
@@ -2574,23 +2531,29 @@ msgstr ""
 "Enlightenment 无法在您的主目录创建目录。\n"
 "可能您没有主目录或者磁盘已满?"
 
-#: src/bin/e_main.c:582
+#: src/bin/e_main.c:425
 msgid "Enlightenment cannot set up its file registry system."
 msgstr "Enlightenment 无法建立它的文件注册系统。"
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment 无法建立它的配置系统。"
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment 无法建立它的主题系统。"
+
+#: src/bin/e_main.c:458
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment 无法建立它的刻度系统。"
 
-#: src/bin/e_main.c:615
-msgid "Enlightenment cannot set up the pointer system."
+#: src/bin/e_main.c:467
+#, fuzzy
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment 无法建立它的指针系统。"
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2598,92 +2561,42 @@ msgstr ""
 "Enlightenment 无法设置路径以打开文件。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment 无法建立它的字体系统。"
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment 无法建立它的主题系统。"
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 无法建立启动屏幕。\n"
-"可能您的内存用完了?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment 无法建立它的国际化系统。"
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "开启国际化支持"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment 无法建立它的国际化系统。"
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment 无法初始化 FDO 桌面系统。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "测试格式支持"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightenment 发现 Evas 不能创建画笔缓冲。\n"
-"请检查 Evas 是否支持软件缓冲。\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment 发现 Evas 不能加载 PNG 文件。\n"
-"请检查 Evas 是否支持加载 PNG。\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment 发现 Evas 不能加载 JPEG 文件。\n"
-"请检查 Evas 是否支持加载 JPEG。\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightenment 发现 Evas 不能加载 EET 文件。\n"
-"请检查 Evas 是否支持加载 EET。\n"
-
-#: src/bin/e_main.c:754
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightenment 发现 Evas 不能加载 Sans 字体。\n"
-"请检查 Evas 是否支持 fontconfig,而且系统定义了 Sans 字体。\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr "请检查 SVG 支持"
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "设置屏幕"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2691,195 +2604,355 @@ msgstr ""
 "Enlightenment 在您的所有的屏幕上建立窗口管理失败。\n"
 "可能有另外一个窗口管理器在运行?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+msgid "Setup ACPI"
+msgstr "设置 ACPI"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "设置绑定"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment 无法设定它的显示器电源管理设置。"
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "设置 DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment 无法设定它的显示器电源管理设置。"
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "设置屏幕保护程序"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment 无法配置 X 屏幕保护程序。"
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "设置省电模式"
+
+#: src/bin/e_main.c:633
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment 无法设置它的省电模式。"
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "设置桌面锁定"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment 无法建立它的桌面锁定系统。"
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "设置弹出"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment 无法建立它的弹出系统。"
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "设置消息系统"
+
+#: src/bin/e_main.c:672
 msgid "Setup Paths"
 msgstr "设置路径"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "设置系统控制"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment 无法初始化“系统命令”系统。\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "设置动作"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment 无法建立它的动作系统。"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "设置运行系统"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment 无法建立它的 exec 系统。"
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "设置 FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "文件管理器"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "设置消息系统"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment 无法建立它的消息系统。"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "设置 DND"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment 无法建立它的 DND 系统。"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 msgid "Setup Grab Input Handling"
 msgstr "设置捕捉输入处理"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment 无法建立它的输入捕获处理系统。"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "设置模块"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment 无法设置它的模块系统。"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "设定记忆"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment 无法设定它的记忆设置。"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "设定色彩类别"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment 无法建立它的颜色系统。"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "设定 Gadcon"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment 无法建立它的组件控制系统。"
 
-#: src/bin/e_main.c:982
-msgid "Setup ACPI"
-msgstr "设置 ACPI"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "设置 DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment 无法设定它的显示器电源管理设置。"
-
-#: src/bin/e_main.c:999
-msgid "Setup Powersave modes"
-msgstr "设置省电模式"
-
-#: src/bin/e_main.c:1003
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment 无法设置它的省电模式。"
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "设置壁纸"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment 无法设置它的桌面背景系统。"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "设置鼠标"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment 无法设定鼠标配置。"
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "设置绑定"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment 无法设定它的绑定系统。"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "设置书架"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment 无法设定它的书架系统。"
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "设置缩略图"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment 无法设定它的缩略图系统。\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment 无法初始化“系统命令”系统。\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment 无法设定它的缩略图系统。\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment 无法建立它的主题系统。"
+
+#: src/bin/e_main.c:889
 msgid "Setup File Ordering"
 msgstr "设置文件排列"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment 无法设定它的文件组织系统。"
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "载入模块"
 
-#: src/bin/e_main.c:1094
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "设置书架"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "接近完成"
+
+#: src/bin/e_main.c:1094
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"选项:\n"
+"\t-display DISPLAY\n"
+"\t\t连接到名为 DISPLAY 的显示器。\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\t添加一个伪装的 xinerama 几何屏幕(而不是真实的那个)\n"
+"\t\t添加数量可意任意多。\n"
+"\t\t它们会替代真实的 xinerama 屏幕,如果有的话。\n"
+"\t\t它们可用来模拟 xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\t使用 CONF_PROFILE 配置文件,而不是使用选中的默认或者“默认”。\n"
+"\t-good\n"
+"\t\t做好。\n"
+"\t-evil\n"
+"\t\t没做好。\n"
+"\t-psychotic\n"
+"\t\t乱弄。\n"
+"\t-locked\n"
+"\t\t开启桌面锁,因而会询问密码。\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\t如果您需要此帮助,你不要这个选项。\n"
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "测试格式支持"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能创建画笔缓冲。\n"
+"请检查 Evas 是否支持软件缓冲。\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能加载 PNG 文件。\n"
+"请检查 Evas 是否支持加载 PNG。\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能加载 JPEG 文件。\n"
+"请检查 Evas 是否支持加载 JPEG。\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能加载 PNG 文件。\n"
+"请检查 Evas 是否支持加载 PNG。\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能加载 EET 文件。\n"
+"请检查 Evas 是否支持加载 EET。\n"
+
+#: src/bin/e_main.c:1486
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment 发现 Evas 不能加载 Sans 字体。\n"
+"请检查 Evas 是否支持 fontconfig,而且系统定义了 Sans 字体。\n"
+
+#: src/bin/e_main.c:1677
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -2889,11 +2962,11 @@ msgstr ""
 "Enlightenment 在启动前崩溃<br>,已经重新启动。此前加载的模块是:%s。<br>该模"
 "块已被禁用<br>将不会被加载。"
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment 在启动前崩溃,现已重新启动。"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2903,7 +2976,7 @@ msgstr ""
 "Enlightenment 在启动前崩溃,现已重新启动。<br>此前加载的模块是:%s。<br><br>"
 "该模块已被禁用,将不会被加载。"
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2913,7 +2986,7 @@ msgstr ""
 "Enlightenment 在启动前崩溃,现已重新启动。<br>所有模块都被禁用,以便排除您配"
 "置中出错的模块。<br>模块配置对话框将会引导您重新选择模块。"
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2923,20 +2996,12 @@ msgstr ""
 "Enlightenment 在启动前崩溃,现已重新启动。<br>所有模块都被禁用,以便排除您配"
 "置中出错的模块。<br><br>模块配置对话框将会引导您重新选择模块。"
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "设置书架"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "接近完成"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, c-format
 msgid "Loading Module: %s"
 msgstr "载入模块:%s"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2944,11 +3009,11 @@ msgid ""
 msgstr ""
 "载入模块 %s 时发生错误。<br>在模块搜索路径中<br>没有找到名为 %s 的模块。<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "载入模块时出错"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2957,11 +3022,11 @@ msgstr ""
 "载入模块 %s 时发生错误。<br>该模块的全路径是:<br>%s<br>错误报告如下:<br>"
 "%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "模块没包括所有必需的功能"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2971,16 +3036,16 @@ msgstr ""
 "模块 API 错误<br>启动模块错误:%s<br>要求最小的模块 API 版本号:%i。"
 "<br>Enlightenment给的模块版本号:%i。<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模块"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸载这个模块?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -2993,26 +3058,26 @@ msgstr ""
 msgid "Shelf #"
 msgstr "书架 #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "确定要删除此书架?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "停止移动/缩放组件"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "开始移动/缩放组件"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 msgid "Contents"
 msgstr "内容"
 
@@ -3020,16 +3085,16 @@ msgstr "内容"
 msgid "Starting"
 msgstr "正在启动"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "检查系统权限"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "系统检查已完成"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3039,113 +3104,114 @@ msgstr ""
 "注销花费了太多的时间。一些<br>应用程序拒绝关闭。<br>您是否要强行注销而不关闭"
 "那些应用程序?<br><br>在 %d 秒后自动注销。"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "注销问题"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "现在注销"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "继续等待"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "取消注销"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "正在注销"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "正在注销,<br><hilight>请稍候。</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment 正忙于处理另一个请求"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr "注销。<br>一旦开始注销,您将不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr "关闭电源。<br>一旦开始关机,您将不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr "重新启动。<br>一旦开始重启动,您将不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr "挂起。<br>在挂起完成前,您将不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
+#, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr "休眠。<br>在休眠完成前,您将不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "哎呀!不会吧!"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr "关闭计算机失败。"
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 msgid "Reset failed."
 msgstr "重新启动失败。"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 msgid "Suspend failed."
 msgstr "挂起系统失败。"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 msgid "Hibernate failed."
 msgstr "休眠系统失败。"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr "关闭计算机"
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "正在关机。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 msgid "Resetting"
 msgstr "重启动"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "正在重启动。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "挂起"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "正在挂起。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "休眠"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "正在休眠。<br><hilight>请稍侯。</hilight>"
 
@@ -3153,33 +3219,33 @@ msgstr "正在休眠。<br><hilight>请稍侯。</hilight>"
 msgid "About Theme"
 msgstr "关于主题"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "设置为主题"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移动/缩放项目"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "开始移动/缩放项目"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 msgid "Set Toolbar Contents"
 msgstr "设置工具条内容"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment 无法创建子进程:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "无法退出--不死的窗口"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3188,123 +3254,123 @@ msgstr ""
 "一些窗口仍然处在被生命周期锁定之中。<br>这意味着 Enlightenment 不允许它自己退"
 "出,除非这些窗口已经被关闭,<br>或者被去除生命周期锁。<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 字节"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "将来"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "在最近一分钟"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 月前"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小时前"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分钟前"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "未知"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 msgid "Image Import Settings"
 msgstr "图像导入设定"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 msgid "Import"
 msgstr "导入"
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "填充拉伸选项"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "拉伸"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "居中"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "内部"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "填充"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "文件质量"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "使用源文件"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -3319,12 +3385,12 @@ msgstr ""
 "常工作,旧配置缺少了某些功能。<br>新配置增加了这些功能。现在您可以重新按照喜"
 "好修改您的设置了。<br>我们对此造成的打搅表示抱歉。"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, c-format
 msgid "%s Configuration Updated"
 msgstr "%s 配置已经更新"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
 "very<br>strange. This should not happen unless you downgraded<br>the module "
@@ -3356,140 +3422,146 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "添加到收藏"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "到上一级目录"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "分辨率"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "权限:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "已修改:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "您"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "受保护的"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "只读"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "禁用"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "读写"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 msgid "Battery Monitor Settings"
 msgstr "电池监示器设置"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "当电池电量低时显示警告"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 msgid "Check every:"
 msgstr "检查间隔:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f 刻度"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "休眠"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:223
 msgid "Polling"
 msgstr "查询"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 msgid "Show low battery alert"
 msgstr "显示低电量警报"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 msgid "Alert when at:"
 msgstr "以下情况报警:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分钟"
 
-#: src/modules/battery/e_mod_config.c:229
-#, c-format
-msgid "%1.0f %%"
-msgstr "%1.0f %%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr "自动解除..."
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f 秒"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 msgid "Alert"
 msgstr "警告"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "内部"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr "udev"
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 msgid "Fuzzy Mode"
 msgstr "模糊模式"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr "硬件"
 
@@ -3497,32 +3569,33 @@ msgstr "硬件"
 msgid "Battery"
 msgstr "电池"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 msgid "Your battery is low!"
 msgstr "电池电量低!"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr "建议使用外接交流电源。"
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr "错误"
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 msgid "Battery Meter"
 msgstr "电池标尺"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "时钟"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "显示工具栏"
@@ -3583,17 +3656,17 @@ msgstr "配置面板中的配置已更新"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar 应用程序"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "启动应用程序"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "重启应用程序"
 
@@ -3606,10 +3679,25 @@ msgid "Apps"
 msgstr "应用程序"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "新应用程序"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "启动"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "选择应用程序"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "桌面文件"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "IBar 其他项"
 
@@ -3622,7 +3710,7 @@ msgid "Available Profiles"
 msgstr "可用用户环境"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "选择一个配置文件"
 
@@ -3660,9 +3748,9 @@ msgstr "对话框设置"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "常规设置"
 
@@ -3704,7 +3792,7 @@ msgstr "对话框"
 msgid "Profiles"
 msgstr "用户环境"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3714,7 +3802,7 @@ msgstr ""
 "现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
 "如果您不按任何键,将在 %d 秒后恢复原来的分辨率 <br>%dx%d %d Hz。"
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3724,7 +3812,7 @@ msgstr ""
 "现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
 "如果您不按任何键,将在 %d 秒后恢复原来设置的 %dx%d 分辨率。"
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3734,7 +3822,7 @@ msgstr ""
 "现在这样正常吗?如果正常就<hilight>保存</hilight>,否则就恢复。<br>如果您不按"
 "任何键,<hilight>立即</hilight>恢复为原有分辨率<br>%dx%d at %d Hz。"
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3744,47 +3832,47 @@ msgstr ""
 "现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
 "如果您不按任何键,<hilight>立即</hilight>恢复原有 <br>%dx%d 分辨率。"
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "改变分辨率"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 msgid "Save"
 msgstr "保存"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 msgid "Restore"
 msgstr "恢复"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "屏幕分辨率设置"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "登录时恢复"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "旋转"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "镜像"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "缺失的特性"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3796,11 +3884,11 @@ msgstr ""
 "在此情况下修改屏幕分辨率。<br>也可能是在编译 <hilight>ecore</hilight> 时没有"
 "检测到 XRandR 支持。"
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "未找到刷新率"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3812,90 +3900,73 @@ msgstr ""
 "则,在您修改屏幕分辨率的时候,只能使用当前的屏幕刷新率,这可能导致您的屏幕损"
 "坏。"
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "虚拟桌面设置"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "桌面数目"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "桌面鼠标翻转"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "拖拽对象到屏幕边缘时翻转"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "翻转时反转桌面?"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "桌面"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "关"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "框"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "缩放"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-msgid "Background panning"
-msgstr "背景移动"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 msgid "Animation speed"
 msgstr "动画速度"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f 秒"
 
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr "%.2f X 轴移动系数"
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr "%.2f Y 轴移动系数"
-
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "翻转动画"
 
@@ -3912,7 +3983,7 @@ msgid "Desktop Wallpaper"
 msgstr "桌面壁纸"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 msgid "Set"
 msgstr "设定"
 
@@ -3922,12 +3993,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "个人"
 
@@ -3935,184 +4006,212 @@ msgstr "个人"
 msgid "Screen Lock Settings"
 msgstr "屏幕锁定设置"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 msgid "Lock on Startup"
 msgstr "启动时锁定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 msgid "Lock on Suspend"
 msgstr "挂起时锁定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 msgid "Custom Screenlock Command"
 msgstr "自定义屏幕锁定命令"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 msgid "Locking"
 msgstr "锁定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 msgid "Show on all screens"
 msgstr "显示到所有屏幕"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 msgid "Show on current screen"
 msgstr "显示在当前屏幕"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 msgid "Show on screen #:"
 msgstr "显示在屏幕 #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 msgid "Login Box"
 msgstr "登录框"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 msgid "Lock after X screensaver activates"
 msgstr "当屏幕保护程序运行时锁定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f 秒"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "超出空闲时间就锁定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f 分钟"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 msgid "Timers"
 msgstr "计时器"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr "在禁用前提示"
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 msgid "Presentation Mode"
 msgstr "显示模式"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "已定义主题"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "主题壁纸"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 msgid "Current Wallpaper"
 msgstr "当前壁纸"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "壁纸"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "屏幕保护程序设置"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 msgid "Enable X Screensaver"
 msgstr "启用屏幕保护程序"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "挂起到硬盘"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 msgid "Screensaver"
 msgstr "屏幕保护程序"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 msgid "Initial timeout"
 msgstr "初始化超时"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr "交互操作超时"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "空白"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "偏好的"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "不偏好"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "曝光事件"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "允许"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "不允许"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "显示电源管理信号"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "当前显示服务,不兼容 <br>DPMS 特性。"
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "当前显示服务,不支持 <br>DPMS 扩展特性。"
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "显示电源管理设置"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "启用显示电源管理"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "等待时间"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "挂起时间"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "关闭时间"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "后退"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "虚拟桌面"
@@ -4158,74 +4257,74 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "边缘绑定设置"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 msgid "Edge Bindings"
 msgstr "边缘绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "添加绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "删除绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "更改绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "全部删除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "恢复默认绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "动作"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "动作参数"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 msgid "General Options"
 msgstr "常规选项"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 msgid "Allow binding activation with fullscreen windows"
 msgstr "允许绑定以全屏窗口激活"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 msgid "Edge Binding Sequence"
 msgstr "边缘绑定顺序"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr "可点击的边"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 msgid "Binding Edge Error"
 msgstr "边缘绑定出错"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4234,28 +4333,28 @@ msgstr ""
 "您选择的绑定键序列已被 <br><hilight>%s</hilight> 使用。<br>请选择其他边缘绑定"
 "序列。"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4402,34 +4501,47 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr "Enlightenment 无法导入配置,<br>复制错误。"
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "语言设置"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "语言选择器"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 msgid "System Default"
 msgstr "系统默认"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "选定的本地语言"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "区域"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "语言"
 
@@ -4514,17 +4626,17 @@ msgid "Manager"
 msgstr "管理器"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "无"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "鼠标绑定顺序"
 
@@ -4548,13 +4660,11 @@ msgid "Menu Settings"
 msgstr "菜单设置"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "个人"
@@ -4564,7 +4674,7 @@ msgid "Main Menu"
 msgstr "主菜单"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 msgid "Favorites"
 msgstr "我的最爱"
 
@@ -4582,7 +4692,7 @@ msgid "Comments"
 msgstr "评论"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 msgid "Gadgets"
@@ -4594,7 +4704,7 @@ msgid "Show gadget settings in top-level"
 msgstr "显示在最上面一级"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "菜单"
 
@@ -4662,19 +4772,19 @@ msgid "Images"
 msgstr "图片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "字体"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "主题"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "图标"
 
@@ -4818,18 +4928,18 @@ msgstr "您正要删除“%s”。<br><br>您确定要删除这个书架?"
 msgid "Wallpaper Settings"
 msgstr "壁纸设置"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "使用主题墙纸"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "图片..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr "在线..."
 
@@ -4849,42 +4959,47 @@ msgstr "这个桌面"
 msgid "This Screen"
 msgstr "这个屏幕"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 msgid "Wallpaper settings..."
 msgstr "壁纸设定..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "平铺"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "框"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "选择图片..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "图片导入出错"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "由于转换出错,Enlightenment 未能导入图片。"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "壁纸导入出错"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment 未能导入壁纸,<br>复制出错。"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4919,7 +5034,7 @@ msgid "Error: can't start the request."
 msgstr "错误:不能启动请求。"
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "默认边框样式"
 
@@ -4927,7 +5042,7 @@ msgstr "默认边框样式"
 msgid "Window Border Selection"
 msgstr "窗口边框选择"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "为下次使用记住这个窗口边框"
 
@@ -4958,7 +5073,7 @@ msgid "Menu Background Base"
 msgstr "菜单背景"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "菜单标题"
 
@@ -4967,7 +5082,7 @@ msgid "Menu Title Active"
 msgstr "菜激活单标题"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "菜单项目"
 
@@ -4980,12 +5095,12 @@ msgid "Menu Item Disabled"
 msgstr "禁用菜单项"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "移动文本"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "缩放文本"
 
@@ -5002,7 +5117,7 @@ msgid "Winlist Label"
 msgstr "窗口列表标签"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "窗口列表标题"
 
@@ -5019,377 +5134,387 @@ msgid "File Manager Background Base"
 msgstr "文件管理器背景"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "焦点"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "按钮文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "禁用的按钮文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "复选框文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "禁用的复选框文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "输入文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 msgid "Entry Text Disabled"
 msgstr "禁用的文本输入项"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "标签文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 msgid "List Item Text Selected"
 msgstr "选中的列表项文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 msgid "List Item Text (Even)"
 msgstr "列表项文本(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr "列表项背景(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 msgid "List Item Text (Odd)"
 msgstr "列表项文本(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr "列表项背景(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 msgid "List Header Text (Even)"
 msgstr "列表头文本(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr "列表头背景(偶数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 msgid "List Header Text (Odd)"
 msgstr "列表头文本(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr "列表头背景(奇数)"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "单选按钮文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "禁用的单选按钮文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "滑块文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "禁用的滑块文本"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 msgid "Frame Background Base"
 msgstr "框架背景"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr "滚动框背景"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "模块标签"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr "逐渐清晰的颜色组成"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "颜色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, c-format
 msgid "Color class: %s"
 msgstr "颜色类别:%s"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "选中的 %u 混合色彩类别"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, c-format
 msgid "Selected %u unset colors classes"
 msgstr "选中的 %u 未设置色彩类别"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "选中的 %u 单一色彩类别"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr "没有选择色彩类别"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 msgid "Custom colors"
 msgstr "自定义颜色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 msgid "Object:"
 msgstr "对象"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 msgid "Outline:"
 msgstr "轮廓"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 msgid "Shadow:"
 msgstr "阴影:"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr "应用颜色的文本。"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr "颜色依赖于主题的设置。"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "窗口管理器"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "组件"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 msgid "Others"
 msgstr "其它"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "标题栏"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "文字块无格式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "文字块减小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "文字块增大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 msgid "Settings Heading"
 msgstr "设置标题"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "关于标题"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "关于版本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "关于文本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "桌面锁定标题"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "桌面锁定密码"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "错误对话框"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf 命令"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "Splash 标题"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "Splash 文本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "Splash 版本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "条目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "帧"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "标签"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "按钮"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "滚动条"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "单选按钮"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "复选按钮"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "文本列表项目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "列表项目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "列表头"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "文件管理器"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "类型缓冲"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 msgid "Desktop Icon"
 msgstr "桌面图标"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "微小样式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "正常样式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "巨大样式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "字体设置"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "微小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "很大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "巨大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d 像素"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "启用自定义字体类别"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basic preview text: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "字体类别"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "启用字体类别"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 msgid "Font"
 msgstr "字体"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Advanced Preview Text.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "微调"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "字节码"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "自动"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "字体回滚"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "回滚名称"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "启用回滚"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 msgid "Hinting / Fallbacks"
 msgstr "微调和回滚"
 
@@ -5397,12 +5522,17 @@ msgstr "微调和回滚"
 msgid "Icon Theme Settings"
 msgstr "图标主题设置"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "启用复合"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "选择应用程序"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 #, fuzzy
 msgid "Icons override general theme"
 msgstr "这将覆盖常规主题"
@@ -5468,11 +5598,9 @@ msgid "Custom scaling factor"
 msgstr "自定义缩放系数"
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
-#, c-format
-msgid "%1.2f times"
-msgstr "%1.0f 次"
+#, fuzzy, c-format
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5483,6 +5611,12 @@ msgstr "策略"
 msgid "Minimum"
 msgstr "最小"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.0f 次"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 msgid "Maximum"
 msgstr "最大"
@@ -5503,25 +5637,25 @@ msgstr "登录时显示 Splash 飞溅屏幕"
 msgid "Transition Settings"
 msgstr "转换设置"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "事件"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "启动"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "桌面更改"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "背景更改"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "变换"
 
@@ -5537,15 +5671,15 @@ msgstr " 导入..."
 msgid " Online..."
 msgstr " 在线..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "主题分类"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "指派"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "清除所有"
 
@@ -5572,19 +5706,19 @@ msgstr "Elightenment 无法导入该主题,复制错误。<br><br>"
 msgid "Exchange themes"
 msgstr "交换主题"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "边框"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "图标主题"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "鼠标指针"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 msgid "Scaling"
 msgstr "缩放"
 
@@ -5705,6 +5839,10 @@ msgstr "应用程序提供的 "
 msgid "Border Icon"
 msgstr "边框图标"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+msgid "Placement"
+msgstr "放置"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "智能放置"
@@ -5733,23 +5871,46 @@ msgstr "新窗口"
 msgid "Animate"
 msgstr "动画"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "线性"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 msgid "Accelerate, then decelerate"
 msgstr "加速后减速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "加速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "减速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "鼠标加速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "加速后减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Shading"
 msgstr "阴影"
 
@@ -5770,6 +5931,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "鼠标下的最近的窗口得到焦点"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 msgid "Click"
 msgstr "点击"
 
@@ -5801,11 +5963,6 @@ msgstr "仅对话框"
 msgid "Only dialogs with focused parent"
 msgstr "只有父窗口获得焦点的对话框"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "焦点"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "其它设置"
@@ -5903,13 +6060,13 @@ msgid "Fill available space"
 msgstr "填充可用区域"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "水平"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "垂直"
@@ -5966,7 +6123,7 @@ msgid "Raise when clicking to focus"
 msgstr "点击获得焦点时提升"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "窗口焦点"
 
@@ -6218,29 +6375,29 @@ msgstr "很亮"
 msgid "Dropshadow"
 msgstr "投影"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 msgid "Everything Launcher"
 msgstr "任务启动器"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "任务启动器"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 msgid "Everything Configuration"
 msgstr "配置任务中心"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 msgid "Show Everything Dialog"
 msgstr "显示任务中心对话框"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 msgid "Everything Module"
 msgstr "任务中心模块"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 msgid "Run Everything"
 msgstr "运行任务中心"
 
@@ -6248,144 +6405,145 @@ msgstr "运行任务中心"
 msgid "Everything Settings"
 msgstr "设置任务中心"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 msgid "Available Plugins"
 msgstr "可用的插件"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 msgid "Move Up"
 msgstr "上移"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 msgid "Move Down"
 msgstr "下移"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 msgid "Configure"
 msgstr "配置"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 msgid "Show in \"All\""
 msgstr "显示在“全部”"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 msgid "Show in top-level"
 msgstr "显示在最上面一级"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr "搜索的最少字符"
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr "插件激活"
 
-#: src/modules/everything/evry_config.c:415
-msgid "Default is plugin name"
-msgstr "默认插件名"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr "仅在触发时搜索"
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr "浏览插件"
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 msgid "Detailed"
 msgstr "详细信息"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+msgid "Default View"
+msgstr "默认查看器"
+
+#: src/modules/everything/evry_config.c:467
+msgid "Animate scrolling"
+msgstr "动画滚动"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr "在图标视图中按上/下选择相邻项"
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr "不活动时隐藏输入"
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 msgid "Hide list"
 msgstr "隐藏列表"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr "快速访问"
 
-#: src/modules/everything/evry_config.c:484
+#: 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)"
 
-#: src/modules/everything/evry_config.c:486
+#: src/modules/everything/evry_config.c:499
 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr "Vi 样式 (ALT + h,j,k,l,n,p,m,i)"
 
-#: src/modules/everything/evry_config.c:491
-msgid "Default View"
-msgstr "默认查看器"
-
-#: src/modules/everything/evry_config.c:500
-msgid "Animate scrolling"
-msgstr "动画滚动"
-
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
-msgstr "在图标视图中按上/下选择相邻项"
-
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 msgid "Sorting"
 msgstr "排序"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "排序"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr "按使用情况"
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 msgid "Most used"
 msgstr "最常用的"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 msgid "Last used"
 msgstr "最近使用的"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr "主题插件"
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 msgid "Action Plugins"
 msgstr "动作插件"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 msgid "Object Plugins"
 msgstr "对象插件"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 msgid "Plugins"
 msgstr "插件"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 msgid "Popup Size"
 msgstr "弹出尺寸"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 msgid "Popup Width"
 msgstr "弹出宽度"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 msgid "Popup Height"
 msgstr "弹出高度"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 msgid "Popup Align"
 msgstr "弹出对齐"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6394,35 +6552,27 @@ msgstr "弹出对齐"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 msgid "Edge Popup Size"
 msgstr "弹出尺寸边缘"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 msgid "Geometry"
 msgstr "几何形状"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 msgid "Everything Collection"
 msgstr "任务中心集合"
 
-#: src/modules/everything/evry_plug_actions.c:172
-msgid "Actions"
-msgstr "动作"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "项目"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr "没有载入插件"
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr "复制到剪贴板"
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6458,147 +6608,60 @@ msgstr ""
 "查看模式(退出此页)<br>   按 <hilight>&lt;ctrl+2&gt;</hilight> 切换列表显示模"
 "式<br> 按 <hilight>&lt;ctrl+3&gt;</hilight> 切换缩略图查看模式"
 
-#: src/modules/everything/evry_plug_apps.c:1038
-msgid "Exebuf"
-msgstr "Exebuf"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-msgid "Open With..."
-msgstr "打开方式..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-msgid "Open File..."
-msgstr "打开文件..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-msgid "Edit Application Entry"
-msgstr "编辑应用程序项"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-msgid "New Application Entry"
-msgstr "新应用程序"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr "用 Sudo 运行"
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "打开方式..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-msgid "Open Terminal here"
-msgstr "在当前打开终端"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "可执行"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 msgid "Everything Applications"
 msgstr "任务中心的应用程序"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 msgid "Commands"
 msgstr "命令"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 msgid "Terminal Command"
 msgstr "终端命令"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr "Sudo GUI 界面"
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "任何"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr "计算器"
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr "复制到..."
-
-#: src/modules/everything/evry_plug_files.c:1336
-msgid "Move To ..."
-msgstr "移到到..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr "移至回收站"
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr "打开文件夹(EFM)"
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr "按日期排列"
-
-#: src/modules/everything/evry_plug_files.c:1354
-msgid "Sort by Name"
-msgstr "按名称排列"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-msgid "Recent Files"
-msgstr "最近使用的文件"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 msgid "Everything Files"
 msgstr "任务中心文件"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 msgid "Show recent files"
 msgstr "显示最近使用的文件"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 msgid "Search recent files"
 msgstr "搜索最近使用的文件"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 msgid "Search cached files"
 msgstr "搜索缓存文件"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 msgid "Cache visited directories"
 msgstr "缓存访问过的文件夹"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 msgid "Clear cache"
 msgstr "清除缓存"
 
-#: src/modules/everything/evry_plug_settings.c:195
-msgid "Show Dialog"
-msgstr "显示对话框"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr "切换到窗口"
-
-#: src/modules/everything/evry_plug_windows.c:439
-msgid "Toggle Fullscreen"
-msgstr "切换到全屏"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "发送到桌面"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "文件图标"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "文件类型"
 
@@ -6643,19 +6706,19 @@ msgid "Select an image"
 msgstr "选择一个图像"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "文件管理器"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr "主目录"
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6670,7 +6733,7 @@ msgstr ""
 "初始配置来正常工作,旧配置缺少了某些功能。<br>新配置增加了这些功能。现在您可"
 "以重新按照喜好修改您的设置了。<br>我们对此造成的打搅表示抱歉。"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6684,7 +6747,7 @@ msgstr ""
 "不应该发生。这是不好的情况,为防万一您的配置文件已经被恢复到默认状态。<br>对"
 "任何因此造成的的不便表示歉意。<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 msgid "Fileman Settings Updated"
 msgstr "Fileman 设置已更新"
 
@@ -6763,95 +6826,99 @@ msgstr "挂载后,打开文件管理器"
 msgid "Device"
 msgstr "预览"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "回到上级目录"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 msgid "Other application..."
 msgstr "其他应用程序..."
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "打开"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "打开方式..."
+
+#: src/modules/fileman/e_fwin.c:2039
 msgid "Known Applications"
 msgstr "已知应用程序"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "指定应用程序"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "所有应用程序"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 msgid "Custom Command"
 msgstr "自定义命令"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr "复制操作被取消"
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr "移动操作被取消"
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr "删除操作被取消"
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "从设备的无效操作,已中止。"
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr "复制 %s 完成"
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "正在复制 %s (剩余时间:%d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr "移动 %s 完成"
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "正在移动 %s (剩余时间:%d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, c-format
 msgid "Delete done"
 msgstr "删除完成"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, c-format
 msgid "Deleting files..."
 msgstr "正在删除文件..."
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6886,7 +6953,7 @@ msgstr "正执行 %d 个操作"
 msgid "Filemanager is idle"
 msgstr "文件管理器空闲"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr "EFM 运行信息"
 
@@ -6898,35 +6965,39 @@ msgstr "组件管理器"
 msgid "Available Gadgets"
 msgstr "可用组件"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 msgid "Mode"
 msgstr "模式"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 msgid "Custom Image"
 msgstr "自定义图像"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 msgid "Custom Color"
 msgstr "自定义颜色"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr "透明"
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 msgid "Animations"
 msgstr "动画"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 msgid "Background"
 msgstr "背景"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 msgid "Background Options"
 msgstr "背景选项"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+msgid "Begin move/resize"
+msgstr "开始移动/缩放"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 msgid "Free"
 msgstr "空闲"
@@ -7148,15 +7219,15 @@ msgstr "您正要删除\"%s\"。<br><br>确定删除这个 bar 吗?"
 msgid "Are you sure you want to delete this bar source?"
 msgstr "确定要删除这个 bar 吗?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 msgid "Create new Icon"
 msgstr "创建新图标"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "属性"
 
@@ -7200,7 +7271,7 @@ msgstr "在所有桌面显示窗口"
 msgid "Show windows from active desktop"
 msgstr "在活动桌面显示窗口"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7322,31 +7393,31 @@ msgstr ""
 "您不能在书架上使用鼠标右键,<br>因为右键已经被指定到上下文菜单。<br>此按键只"
 "能在弹出菜单工作。"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 msgid "Show Pager Popup"
 msgstr "显示分页器弹出窗口"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 msgid "Popup Desk Right"
 msgstr "弹出桌面向右"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 msgid "Popup Desk Left"
 msgstr "弹出桌面向左"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 msgid "Popup Desk Up"
 msgstr "弹出桌面向上"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 msgid "Popup Desk Down"
 msgstr "弹出桌面向下"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 msgid "Popup Desk Next"
 msgstr "弹出桌面向下一个"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 msgid "Popup Desk Previous"
 msgstr "弹出桌面向上一个"
 
@@ -7366,130 +7437,91 @@ msgstr "系统控制"
 msgid "Temperature Settings"
 msgstr "温度设定"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "传感器"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Celsius"
 msgstr "摄氏"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "华氏"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "显示单位"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "检查间隔"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "低温"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 msgid "Temperatures"
 msgstr "温度"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "温度"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "下一步"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 msgid "Welcome to Enlightenment"
 msgstr "欢迎光临Enlightenment"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 msgid "Select one"
 msgstr "选择一个"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 msgid "Profile"
 msgstr "配置文件"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
-"您系统里没发现菜单文件。<br>详情请查阅:<br>www.enlightenment.org<br> <br>关"
-"于如何让系统菜单正常工作的文档说明。"
-
-#: src/modules/wizard/page_030.c:107
-msgid "Select application menu"
-msgstr "选择应用程序菜单"
-
-#: src/modules/wizard/page_040.c:22
-msgid "Launcher Bar"
-msgstr "启动器"
-
-#: src/modules/wizard/page_040.c:24
-msgid "Select applications"
-msgstr "选择应用程序"
-
-#: src/modules/wizard/page_050.c:25
-msgid "Desktop Files"
-msgstr "桌面文件"
-
-#: src/modules/wizard/page_050.c:29
-msgid "No icons on desktop"
-msgstr "桌面上不显示图标"
-
-#: src/modules/wizard/page_050.c:32
-msgid "Enable desktop icons"
-msgstr "启用桌面图标"
-
-#: src/modules/wizard/page_060.c:25
-msgid "Focus mode"
-msgstr "获得焦点模式"
 
-#: src/modules/wizard/page_060.c:29
-msgid "Click to focus windows"
-msgstr "点击窗口获得焦点"
-
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
-msgstr "鼠标所在的窗口获得焦点"
-
-#: src/modules/wizard/page_070.c:203
-msgid "Select Icons to Add"
-msgstr "选择要添加的图标"
+#: src/modules/wizard/page_050.c:130
+#, fuzzy
+msgid "Select preferred size"
+msgstr "选择一个配置文件"
 
-#: src/modules/wizard/page_080.c:59
-msgid "Quick Launch"
-msgstr "快速启动"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
+msgstr ""
 
-#: src/modules/wizard/page_080.c:61
-msgid "Select Applications"
-msgstr "选择应用程序"
+#: src/modules/wizard/page_060.c:37
+#, fuzzy
+msgid "Mouse Over"
+msgstr "最常用的"
 
 #: src/modules/mixer/app_mixer.c:161
 msgid "Capture"
@@ -7531,7 +7563,7 @@ msgstr "左:"
 msgid "Right:"
 msgstr "右:"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 msgid "Mute"
 msgstr "静音"
 
@@ -7555,39 +7587,54 @@ msgstr ""
 msgid "Sound Cards"
 msgstr "声卡"
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
 msgstr "混音器设置"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr "全局作用的混音器:"
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 msgid "Launch mixer..."
 msgstr "启动混音器..."
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 msgid "Mixer Module Settings"
 msgstr "混音器模块设定"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "改变分辨率"
+
+#: src/modules/mixer/e_mod_main.c:187
 msgid "Mixer Settings Updated"
 msgstr "混音器设定已经更新"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
-"混音模块设置已改变。<br>旧配置文件已被新的取代。<br>如有不便,敬请谅解。"
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "混音器模块设定"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr "不能切换到系统的脱机模式。"
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr "ConnMan 守护进程未运行。"
 
@@ -7614,123 +7661,350 @@ msgstr "明文显示密码"
 msgid "Ok"
 msgstr "确定"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr "从网络服务断开连接。"
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr "服务已不存在"
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr "连接到网络服务。"
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr "不能设定服务的密码"
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 msgid "Offline mode"
 msgstr "脱机模式"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 msgid "Controls"
 msgstr "控制"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr "没有 ConnMan"
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr "未找到 ConnMan 服务器。"
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr "脱机模式:所有通讯被关闭"
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 msgid "No Connection"
 msgstr "无连接"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 msgid "Not connected"
 msgstr "未连接"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr "断开连接"
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 msgid "Unknown Name"
 msgstr "未知名称"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 msgid "No error"
 msgstr "无错误"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 msgid "idle"
 msgstr "空闲"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 msgid "association"
 msgstr "关联"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 msgid "configuration"
 msgstr "配置"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 msgid "ready"
 msgstr "就绪"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 msgid "login"
 msgstr "登录"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 msgid "online"
 msgstr "在线"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 msgid "failure"
 msgstr "失败"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 msgid "enabled"
 msgstr "已启用"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 msgid "available"
 msgstr "可用的"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 msgid "connected"
 msgstr "已连接"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 msgid "offline"
 msgstr "脱机"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr "有另一个系统托盘存在"
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "只允许一个系统托盘的组件,目前已经有了一个。"
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "系统托盘"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 msgid "Systray"
 msgstr "系统托盘"
 
+#~ msgid "Acpi"
+#~ msgstr "Acpi"
+
+#~ msgid "Dim Screen"
+#~ msgstr "变暗屏幕"
+
+#~ msgid "Undim Screen"
+#~ msgstr "不变暗屏幕"
+
+#~ msgid "Resizeable"
+#~ msgstr "可变大小"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "停止移动/缩放此组件"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动 Ecore!\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动文件系统。\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动 X 连接。\n"
+#~ "您设定了 DISPLAY 环境变量吗?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动连接系统。\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动 IPC 系统。\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment 无法建立 xinerama wrapping。\n"
+#~ "这种情况不该发生。"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment 无法建立 randr wrapping。\n"
+#~ "这种情况不该发生。"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法启动 Evas 系统。\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 无法建立启动屏幕。\n"
+#~ "可能您的内存用完了?"
+
+#~ msgid "Check SVG Support"
+#~ msgstr "请检查 SVG 支持"
+
+#~ msgid "Setup FM"
+#~ msgstr "设置 FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment 无法设定它的书架系统。"
+
+#~ msgid "New Application"
+#~ msgstr "新应用程序"
+
+#~ msgid "Background panning"
+#~ msgstr "背景移动"
+
+#~ msgid "X-Axis pan factor"
+#~ msgstr "%.2f X 轴移动系数"
+
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Y-Axis pan factor"
+#~ msgstr "%.2f Y 轴移动系数"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "显示电源管理信号"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "当前显示服务,不兼容 <br>DPMS 特性。"
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "当前显示服务,不支持 <br>DPMS 扩展特性。"
+
+#~ msgid "Default is plugin name"
+#~ msgstr "默认插件名"
+
+#~ msgid "Actions"
+#~ msgstr "动作"
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "复制到剪贴板"
+
+#~ msgid "Exebuf"
+#~ msgstr "Exebuf"
+
+#~ msgid "Open With..."
+#~ msgstr "打开方式..."
+
+#~ msgid "Open File..."
+#~ msgstr "打开文件..."
+
+#~ msgid "Edit Application Entry"
+#~ msgstr "编辑应用程序项"
+
+#~ msgid "New Application Entry"
+#~ msgstr "新应用程序"
+
+#~ msgid "Run with Sudo"
+#~ msgstr "用 Sudo 运行"
+
+#~ msgid "Open Terminal here"
+#~ msgstr "在当前打开终端"
+
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment 无法建立它的主题系统。"
+#~ msgid "Run Executable"
+#~ msgstr "可执行"
+
+#~ msgid "Calculator"
+#~ msgstr "计算器"
+
+#~ msgid "Copy To ..."
+#~ msgstr "复制到..."
+
+#~ msgid "Move To ..."
+#~ msgstr "移到到..."
+
+#~ msgid "Move to Trash"
+#~ msgstr "移至回收站"
+
+#~ msgid "Open Folder (EFM)"
+#~ msgstr "打开文件夹(EFM)"
+
+#~ msgid "Sort by Date"
+#~ msgstr "按日期排列"
+
+#~ msgid "Sort by Name"
+#~ msgstr "按名称排列"
+
+#~ msgid "Recent Files"
+#~ msgstr "最近使用的文件"
+
+#~ msgid "Show Dialog"
+#~ msgstr "显示对话框"
+
+#~ msgid "Switch to Window"
+#~ msgstr "切换到窗口"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "切换到全屏"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "发送到桌面"
+
+#~ msgid ""
+#~ "No menu files were<br>found on your system.<br>Please see "
+#~ "the<br>documentation on<br>www.enlightenment.org<br>for more details "
+#~ "on<br>how to get your<br>application menus<br>working."
+#~ msgstr ""
+#~ "您系统里没发现菜单文件。<br>详情请查阅:<br>www.enlightenment.org<br> <br>"
+#~ "关于如何让系统菜单正常工作的文档说明。"
+
+#~ msgid "Select application menu"
+#~ msgstr "选择应用程序菜单"
+
+#~ msgid "Launcher Bar"
+#~ msgstr "启动器"
+
+#~ msgid "No icons on desktop"
+#~ msgstr "桌面上不显示图标"
+
+#~ msgid "Enable desktop icons"
+#~ msgstr "启用桌面图标"
+
+#~ msgid "Focus mode"
+#~ msgstr "获得焦点模式"
+
+#~ msgid "Click to focus windows"
+#~ msgstr "点击窗口获得焦点"
+
+#~ msgid "Mouse over focuses windows"
+#~ msgstr "鼠标所在的窗口获得焦点"
+
+#~ msgid "Select Icons to Add"
+#~ msgstr "选择要添加的图标"
+
+#~ msgid "Quick Launch"
+#~ msgstr "快速启动"
+
+#~ msgid ""
+#~ "Mixer Module Settings data changed.<br>Your old configuration has been "
+#~ "replaced with new default.<br>Sorry for the inconvenience."
+#~ msgstr ""
+#~ "混音模块设置已改变。<br>旧配置文件已被新的取代。<br>如有不便,敬请谅解。"
 
 #~ msgid ""
 #~ "An error occurred while saving Enlightenment's<br>settings to disk. The "
@@ -8326,12 +8600,6 @@ msgstr "系统托盘"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "立即关闭"
 
-#~ msgid "Shut Down"
-#~ msgstr "关机"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "挂起到硬盘"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "桌面锁"
 
@@ -8873,9 +9141,6 @@ msgstr "系统托盘"
 #~ msgid "1 hour"
 #~ msgstr "一小时"
 
-#~ msgid "Back"
-#~ msgstr "后退"
-
 #~ msgid "Choose Language"
 #~ msgstr "选择语言"
 
index 6e877c9..f176b56 100755 (executable)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-12 17:20+0900\n"
+"POT-Creation-Date: 2011-11-29 09:56+0900\n"
 "PO-Revision-Date: 2007-11-06 20:25+0800\n"
 "Last-Translator: Chia-I Wu <olv@openmoko.com>\n"
 "Language-Team: none\n"
@@ -21,20 +21,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "關於 Enlightenment"
 
-#: src/bin/e_about.c:17 src/bin/e_actions.c:2701 src/bin/e_config_dialog.c:272
-#: src/bin/e_fm.c:967 src/bin/e_int_border_menu.c:135
+#: src/bin/e_about.c:17 src/bin/e_actions.c:2728 src/bin/e_config_dialog.c:272
+#: src/bin/e_fm.c:974 src/bin/e_int_border_menu.c:151
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:17
-#: src/modules/conf/e_conf.c:183
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+#: src/modules/conf/e_conf.c:163
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:843
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything/evry_plug_windows.c:446
-#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
+#: src/modules/fileman/e_fwin.c:2023 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "關閉"
 
-#: src/bin/e_about.c:18 src/bin/e_actions.c:3010 src/bin/e_actions.c:3014
-#: src/bin/e_actions.c:3018 src/bin/e_int_menus.c:178 src/bin/e_main.c:674
+#: src/bin/e_about.c:18 src/bin/e_actions.c:3060 src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3068 src/bin/e_int_menus.c:182 src/bin/e_main.c:534
 #: src/modules/conf_theme/e_int_config_cursor.c:155
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:219
 #: src/modules/wizard/page_000.c:29
@@ -43,18 +42,19 @@ msgstr "Enlightenment"
 
 #: src/bin/e_about.c:23
 msgid ""
-"Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br><br>We "
-"hope you enjoy using this software as much as we enjoyed writing it."
-"<br><br>This software is provided as-is with no explicit or implied "
+"<title>Copyright &copy; 1999-2011, by the Enlightenment Development Team</"
+"><br><br>We hope you enjoy using this software as much as we enjoyed writing "
+"it.<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
 "the COPYING and COPYING-PLAIN licence files installed on your system."
-"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
-"is not stable. Many features are incomplete or even non-existent yet and may "
-"have many bugs. You have been <hilight>WARNED!</hilight>"
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it is not "
+"stable. Many features are incomplete or even non-existent yet and may have "
+"many bugs. You have been <hilight>WARNED!</>"
 msgstr ""
 
-#: src/bin/e_about.c:47
-msgid "<title>The Team</title>"
+#: src/bin/e_about.c:48
+#, fuzzy
+msgid "<title>The Team</><br><br>"
 msgstr "<title>開發團隊</title>"
 
 #: src/bin/e_actions.c:365
@@ -71,649 +71,673 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "您是否確定強制結束此視窗?"
 
-#: src/bin/e_actions.c:380 src/bin/e_actions.c:1918 src/bin/e_actions.c:2015
-#: src/bin/e_actions.c:2078 src/bin/e_actions.c:2141 src/bin/e_actions.c:2209
-#: src/bin/e_actions.c:2272 src/bin/e_confirm_dialog.c:44
-#: src/bin/e_desklock.c:998 src/bin/e_fm.c:9176 src/bin/e_fm.c:9430
-#: src/bin/e_module.c:524 src/bin/e_screensaver.c:141
+#: src/bin/e_actions.c:380 src/bin/e_actions.c:1917 src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2077 src/bin/e_actions.c:2140 src/bin/e_actions.c:2208
+#: src/bin/e_actions.c:2271 src/bin/e_confirm_dialog.c:44
+#: src/bin/e_desklock.c:1050 src/bin/e_fm.c:9205 src/bin/e_fm.c:9459
+#: src/bin/e_module.c:518 src/bin/e_screensaver.c:145
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:382 src/bin/e_actions.c:1920 src/bin/e_actions.c:2017
-#: src/bin/e_actions.c:2080 src/bin/e_actions.c:2143 src/bin/e_actions.c:2211
-#: src/bin/e_actions.c:2274 src/bin/e_confirm_dialog.c:45
-#: src/bin/e_desklock.c:1000 src/bin/e_fm.c:9174 src/bin/e_fm.c:9431
-#: src/bin/e_module.c:525 src/bin/e_screensaver.c:143
+#: src/bin/e_actions.c:382 src/bin/e_actions.c:1919 src/bin/e_actions.c:2016
+#: src/bin/e_actions.c:2079 src/bin/e_actions.c:2142 src/bin/e_actions.c:2210
+#: src/bin/e_actions.c:2273 src/bin/e_confirm_dialog.c:45
+#: src/bin/e_desklock.c:1052 src/bin/e_fm.c:9203 src/bin/e_fm.c:9460
+#: src/bin/e_module.c:519 src/bin/e_screensaver.c:147
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1912
+#: src/bin/e_actions.c:1911
 msgid "Are you sure you want to exit?"
 msgstr "您是否確定退出?"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:1913
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "您要求退出 Enlightenment。<br><br>您是否確定退出?"
 
-#: src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2008
 msgid "Are you sure you want to log out?"
 msgstr "您是否確定登出?"
 
-#: src/bin/e_actions.c:2011
+#: src/bin/e_actions.c:2010
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "您即將登出系統。<br><br>您是否確定登出系統?"
 
-#: src/bin/e_actions.c:2072 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2071 src/bin/e_actions.c:2202
 msgid "Are you sure you want to turn off?"
 msgstr "您是否確定關機?"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2073
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "您要求關閉您的電腦。<br><br>您是否確定關機?"
 
-#: src/bin/e_actions.c:2135
+#: src/bin/e_actions.c:2134
 msgid "Are you sure you want to reboot?"
 msgstr "您是否確定重新開機?"
 
-#: src/bin/e_actions.c:2137
+#: src/bin/e_actions.c:2136
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "您要求重新啟動您的電腦。<br><br>您是否確定重新開機?"
 
-#: src/bin/e_actions.c:2205
+#: src/bin/e_actions.c:2204
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "您要求進入待機狀態。<br><br>您是否確定待機?"
 
-#: src/bin/e_actions.c:2266
+#: src/bin/e_actions.c:2265
 msgid "Are you sure you want to hibernate?"
 msgstr "您是否確定休眠?"
 
-#: src/bin/e_actions.c:2268
+#: src/bin/e_actions.c:2267
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "您要求進入休眠狀態。<br><br>您是否確定休眠?"
 
-#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2672 src/bin/e_actions.c:2691
-#: src/bin/e_actions.c:2696 src/bin/e_actions.c:2701 src/bin/e_actions.c:2706
-#: src/bin/e_actions.c:2938 src/bin/e_actions.c:2942 src/bin/e_actions.c:2947
-#: src/bin/e_actions.c:2953 src/bin/e_actions.c:2959 src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:2688 src/bin/e_actions.c:2699 src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2728 src/bin/e_actions.c:2733
+#: src/bin/e_actions.c:2988 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
+#: src/bin/e_actions.c:3003 src/bin/e_actions.c:3009 src/bin/e_actions.c:3015
 msgid "Window : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:2661 src/bin/e_fm.c:6153
-#: src/bin/e_int_border_menu.c:654
+#: src/bin/e_actions.c:2688 src/bin/e_fm.c:6168 src/bin/e_gadcon.c:1410
+#: src/bin/e_int_border_menu.c:592
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2672 src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2699 src/bin/e_int_border_menu.c:606
 msgid "Resize"
 msgstr "改變大小"
 
-#: src/bin/e_actions.c:2683 src/bin/e_actions.c:2986 src/bin/e_actions.c:2988
-#: src/bin/e_actions.c:2990 src/bin/e_actions.c:2992 src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:2710 src/bin/e_actions.c:3036 src/bin/e_actions.c:3038
+#: src/bin/e_actions.c:3040 src/bin/e_actions.c:3042 src/bin/e_actions.c:3044
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "選單"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2710
 msgid "Window Menu"
 msgstr "視窗選單"
 
-#: src/bin/e_actions.c:2691 src/bin/e_int_border_menu.c:983
+#: src/bin/e_actions.c:2718 src/bin/e_int_border_menu.c:949
 #: src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "上移"
 
-#: src/bin/e_actions.c:2696 src/bin/e_int_border_menu.c:991
+#: src/bin/e_actions.c:2723 src/bin/e_int_border_menu.c:957
 msgid "Lower"
 msgstr "下移"
 
-#: src/bin/e_actions.c:2706 src/bin/e_int_border_menu.c:562
+#: src/bin/e_actions.c:2733 src/bin/e_int_border_menu.c:648
 msgid "Kill"
 msgstr "強制結束"
 
-#: src/bin/e_actions.c:2711 src/bin/e_actions.c:2718 src/bin/e_actions.c:2725
-#: src/bin/e_actions.c:2732 src/bin/e_actions.c:2734 src/bin/e_actions.c:2737
-#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
-#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2753 src/bin/e_actions.c:2755
-#: src/bin/e_actions.c:2757 src/bin/e_actions.c:2759 src/bin/e_actions.c:2761
-#: src/bin/e_actions.c:2768 src/bin/e_actions.c:2773 src/bin/e_actions.c:2779
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2745 src/bin/e_actions.c:2752
+#: src/bin/e_actions.c:2759 src/bin/e_actions.c:2761 src/bin/e_actions.c:2764
+#: src/bin/e_actions.c:2767 src/bin/e_actions.c:2769 src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2773 src/bin/e_actions.c:2780 src/bin/e_actions.c:2782
+#: src/bin/e_actions.c:2784 src/bin/e_actions.c:2786 src/bin/e_actions.c:2788
+#: src/bin/e_actions.c:2795 src/bin/e_actions.c:2800 src/bin/e_actions.c:2806
+#: src/bin/e_actions.c:2812
 msgid "Window : State"
 msgstr "視窗: 狀態"
 
-#: src/bin/e_actions.c:2711
+#: src/bin/e_actions.c:2738
 msgid "Sticky Mode Toggle"
 msgstr "切換相黏模式"
 
-#: src/bin/e_actions.c:2718
+#: src/bin/e_actions.c:2745
 msgid "Iconic Mode Toggle"
 msgstr "切換圖示化"
 
-#: src/bin/e_actions.c:2725
+#: src/bin/e_actions.c:2752
 msgid "Fullscreen Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:2732 src/bin/e_int_border_menu.c:304
-#: src/bin/e_int_border_menu.c:629
+#: src/bin/e_actions.c:2759 src/bin/e_int_border_menu.c:105
+#: src/bin/e_int_border_menu.c:320
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2734
+#: src/bin/e_actions.c:2761
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2737
+#: src/bin/e_actions.c:2764
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2740
+#: src/bin/e_actions.c:2767
 msgid "Maximize Fullscreen"
 msgstr "全螢幕最大化"
 
-#: src/bin/e_actions.c:2742
+#: src/bin/e_actions.c:2769
 msgid "Maximize Mode \"Smart\""
 msgstr "「智慧型」最大化模式"
 
-#: src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2771
 msgid "Maximize Mode \"Expand\""
 msgstr "「展開」最大化模式"
 
-#: src/bin/e_actions.c:2746
+#: src/bin/e_actions.c:2773
 msgid "Maximize Mode \"Fill\""
 msgstr "「填滿」最大化模式"
 
-#: src/bin/e_actions.c:2753
+#: src/bin/e_actions.c:2780
 msgid "Shade Up Mode Toggle"
 msgstr "切換上捲模式"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2782
 msgid "Shade Down Mode Toggle"
 msgstr "切換下捲模式"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2784
 msgid "Shade Left Mode Toggle"
 msgstr "切換左捲模式"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2786
 msgid "Shade Right Mode Toggle"
 msgstr "切換右捲模式"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2788
 msgid "Shade Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:2768
+#: src/bin/e_actions.c:2795
 msgid "Toggle Borderless State"
 msgstr "切換無邊框狀態"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2800
 #, fuzzy
 msgid "Set Border"
 msgstr "邊框"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2806
 msgid "Cycle between Borders"
 msgstr ""
 
-#: src/bin/e_actions.c:2785
+#: src/bin/e_actions.c:2812
 msgid "Toggle Pinned State"
 msgstr "切換固定於桌面狀態"
 
-#: src/bin/e_actions.c:2790 src/bin/e_actions.c:2792 src/bin/e_actions.c:2794
-#: src/bin/e_actions.c:2796 src/bin/e_actions.c:2798 src/bin/e_actions.c:2804
-#: src/bin/e_actions.c:2810 src/bin/e_actions.c:2815 src/bin/e_actions.c:2821
-#: src/bin/e_actions.c:2827 src/bin/e_actions.c:2829 src/bin/e_actions.c:2831
-#: src/bin/e_actions.c:2833 src/bin/e_actions.c:2835 src/bin/e_actions.c:2837
-#: src/bin/e_actions.c:2839 src/bin/e_actions.c:2841 src/bin/e_actions.c:2843
-#: src/bin/e_actions.c:2845 src/bin/e_actions.c:2847 src/bin/e_actions.c:2849
-#: src/bin/e_actions.c:2851 src/bin/e_actions.c:2857 src/bin/e_actions.c:2859
-#: src/bin/e_actions.c:2861 src/bin/e_actions.c:2863 src/bin/e_actions.c:2865
-#: src/bin/e_actions.c:2871 src/bin/e_actions.c:2877 src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2819 src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2823 src/bin/e_actions.c:2825 src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2837 src/bin/e_actions.c:2842 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2854 src/bin/e_actions.c:2856 src/bin/e_actions.c:2858
+#: src/bin/e_actions.c:2860 src/bin/e_actions.c:2862 src/bin/e_actions.c:2864
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2868 src/bin/e_actions.c:2870
+#: src/bin/e_actions.c:2872 src/bin/e_actions.c:2874 src/bin/e_actions.c:2876
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2884 src/bin/e_actions.c:2886
 #: src/bin/e_actions.c:2888 src/bin/e_actions.c:2890 src/bin/e_actions.c:2892
-#: src/bin/e_actions.c:2894 src/bin/e_actions.c:2896 src/bin/e_actions.c:2898
-#: src/bin/e_actions.c:2900 src/bin/e_actions.c:2902 src/bin/e_actions.c:2904
-#: src/bin/e_actions.c:2906 src/bin/e_actions.c:2908 src/bin/e_actions.c:2910
-#: src/bin/e_actions.c:2912 src/bin/e_actions.c:3064 src/bin/e_actions.c:3069
-#: src/bin/e_fm.c:3255 src/bin/e_fm.c:3260 src/bin/e_fm.c:9957
-#: src/bin/e_fm_device.c:332 src/bin/e_fm_device.c:356
-#: src/bin/e_fm_device.c:635 src/bin/e_fm_device.c:662
+#: src/bin/e_actions.c:2898 src/bin/e_actions.c:2904 src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2915 src/bin/e_actions.c:2917 src/bin/e_actions.c:2919
+#: src/bin/e_actions.c:2921 src/bin/e_actions.c:2923 src/bin/e_actions.c:2925
+#: src/bin/e_actions.c:2927 src/bin/e_actions.c:2929 src/bin/e_actions.c:2931
+#: src/bin/e_actions.c:2933 src/bin/e_actions.c:2935 src/bin/e_actions.c:2937
+#: src/bin/e_actions.c:2939 src/bin/e_actions.c:3114 src/bin/e_actions.c:3119
+#: src/bin/e_fm.c:3267 src/bin/e_fm.c:3273 src/bin/e_fm.c:9986
+#: src/bin/e_fm_device.c:334 src/bin/e_fm_device.c:358
+#: src/bin/e_fm_device.c:637 src/bin/e_fm_device.c:664
 #: src/bin/e_int_menus.c:144 src/bin/e_int_shelf_config.c:247
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: src/modules/fileman/e_mod_main.c:354 src/modules/ibox/e_mod_config.c:162
+#: src/modules/fileman/e_mod_main.c:358 src/modules/ibox/e_mod_config.c:162
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2790
+#: src/bin/e_actions.c:2817
 msgid "Flip Desktop Left"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2792
+#: src/bin/e_actions.c:2819
 msgid "Flip Desktop Right"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2794
+#: src/bin/e_actions.c:2821
 msgid "Flip Desktop Up"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2796
+#: src/bin/e_actions.c:2823
 msgid "Flip Desktop Down"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2798
+#: src/bin/e_actions.c:2825
 msgid "Flip Desktop By..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2804
+#: src/bin/e_actions.c:2831
 msgid "Show The Desktop"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2810
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2815
+#: src/bin/e_actions.c:2842
 msgid "Flip Desktop To..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2848
 msgid "Flip Desktop Linearly..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2827
+#: src/bin/e_actions.c:2854
 msgid "Switch To Desktop 0"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2856
 msgid "Switch To Desktop 1"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2858
 msgid "Switch To Desktop 2"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2860
 msgid "Switch To Desktop 3"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2835
+#: src/bin/e_actions.c:2862
 msgid "Switch To Desktop 4"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2864
 msgid "Switch To Desktop 5"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2839
+#: src/bin/e_actions.c:2866
 msgid "Switch To Desktop 6"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2841
+#: src/bin/e_actions.c:2868
 msgid "Switch To Desktop 7"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2843
+#: src/bin/e_actions.c:2870
 msgid "Switch To Desktop 8"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2872
 msgid "Switch To Desktop 9"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2847
+#: src/bin/e_actions.c:2874
 msgid "Switch To Desktop 10"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2849
+#: src/bin/e_actions.c:2876
 msgid "Switch To Desktop 11"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2851
+#: src/bin/e_actions.c:2878
 msgid "Switch To Desktop..."
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2857
+#: src/bin/e_actions.c:2884
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2859
+#: src/bin/e_actions.c:2886
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2861
+#: src/bin/e_actions.c:2888
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2863
+#: src/bin/e_actions.c:2890
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2865
+#: src/bin/e_actions.c:2892
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2871
+#: src/bin/e_actions.c:2898
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2877
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2883
+#: src/bin/e_actions.c:2910
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2888
+#: src/bin/e_actions.c:2915
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2890
+#: src/bin/e_actions.c:2917
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2892
+#: src/bin/e_actions.c:2919
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2894
+#: src/bin/e_actions.c:2921
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2896
+#: src/bin/e_actions.c:2923
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2898
+#: src/bin/e_actions.c:2925
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2900
+#: src/bin/e_actions.c:2927
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2902
+#: src/bin/e_actions.c:2929
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2904
+#: src/bin/e_actions.c:2931
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2906
+#: src/bin/e_actions.c:2933
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2908
+#: src/bin/e_actions.c:2935
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2910
+#: src/bin/e_actions.c:2937
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2912
+#: src/bin/e_actions.c:2939
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2918 src/bin/e_actions.c:2920 src/bin/e_actions.c:2922
-#: src/bin/e_actions.c:2928 src/bin/e_actions.c:2930 src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2945 src/bin/e_actions.c:2947 src/bin/e_actions.c:2949
+#: src/bin/e_actions.c:2955 src/bin/e_actions.c:2957 src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:2964 src/bin/e_actions.c:2967 src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:2974 src/bin/e_actions.c:2976
+#: src/bin/e_actions.c:2979 src/bin/e_actions.c:2981 src/bin/e_actions.c:2983
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/ibox/e_mod_config.c:131
 msgid "Screen"
 msgstr "螢幕"
 
-#: src/bin/e_actions.c:2918
+#: src/bin/e_actions.c:2945
 msgid "Send Mouse To Screen 0"
 msgstr "將滑鼠送到螢幕 0"
 
-#: src/bin/e_actions.c:2920
+#: src/bin/e_actions.c:2947
 msgid "Send Mouse To Screen 1"
 msgstr "將滑鼠送到螢幕 1"
 
-#: src/bin/e_actions.c:2922
+#: src/bin/e_actions.c:2949
 msgid "Send Mouse To Screen..."
 msgstr "將滑鼠送到其它螢幕..."
 
-#: src/bin/e_actions.c:2928
+#: src/bin/e_actions.c:2955
 msgid "Send Mouse Forward 1 Screen"
 msgstr "將滑鼠送到下一螢幕"
 
-#: src/bin/e_actions.c:2930
+#: src/bin/e_actions.c:2957
 msgid "Send Mouse Back 1 Screen"
 msgstr "將滑鼠送到上一螢幕"
 
-#: src/bin/e_actions.c:2932
+#: src/bin/e_actions.c:2959
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "將滑鼠送到目前螢幕之..."
 
-#: src/bin/e_actions.c:2938
+#: src/bin/e_actions.c:2964
+msgid "Dim"
+msgstr ""
+
+#: src/bin/e_actions.c:2967
+msgid "Undim"
+msgstr ""
+
+#: src/bin/e_actions.c:2970
+msgid "Backlight Set"
+msgstr ""
+
+#: src/bin/e_actions.c:2972
+msgid "Backlight Min"
+msgstr ""
+
+#: src/bin/e_actions.c:2974
+msgid "Backlight Mid"
+msgstr ""
+
+#: src/bin/e_actions.c:2976
+msgid "Backlight Max"
+msgstr ""
+
+#: src/bin/e_actions.c:2979
+msgid "Backlight Adjust"
+msgstr ""
+
+#: src/bin/e_actions.c:2981
+msgid "Backlight Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2983
+#, fuzzy
+msgid "Backlight Down"
+msgstr "關機"
+
+#: src/bin/e_actions.c:2988
 #, fuzzy
 msgid "Move To Center"
 msgstr "移動文字"
 
-#: src/bin/e_actions.c:2942
+#: src/bin/e_actions.c:2992
 #, fuzzy
 msgid "Move To..."
 msgstr "匯入..."
 
-#: src/bin/e_actions.c:2947
+#: src/bin/e_actions.c:2997
 #, fuzzy
 msgid "Move By..."
 msgstr "匯入..."
 
-#: src/bin/e_actions.c:2953
+#: src/bin/e_actions.c:3003
 #, fuzzy
 msgid "Resize By..."
 msgstr "改變大小"
 
-#: src/bin/e_actions.c:2959
+#: src/bin/e_actions.c:3009
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2965
+#: src/bin/e_actions.c:3015
 #, fuzzy
 msgid "Drag Icon..."
 msgstr "建立圖示"
 
-#: src/bin/e_actions.c:2970 src/bin/e_actions.c:2972 src/bin/e_actions.c:2974
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3020 src/bin/e_actions.c:3022 src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3030
 msgid "Window : Moving"
 msgstr "視窗: 移動"
 
-#: src/bin/e_actions.c:2970
+#: src/bin/e_actions.c:3020
 msgid "To Next Desktop"
 msgstr "送到下一桌面"
 
-#: src/bin/e_actions.c:2972
+#: src/bin/e_actions.c:3022
 msgid "To Previous Desktop"
 msgstr "送到上一桌面"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:3024
 msgid "By Desktop #..."
 msgstr "目前桌面之..."
 
-#: src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:3030
 msgid "To Desktop..."
 msgstr "送到桌面..."
 
-#: src/bin/e_actions.c:2986
+#: src/bin/e_actions.c:3036
 msgid "Show Main Menu"
 msgstr "顯示主選單"
 
-#: src/bin/e_actions.c:2988
+#: src/bin/e_actions.c:3038
 msgid "Show Favorites Menu"
 msgstr "顯示「我的最愛」選單"
 
-#: src/bin/e_actions.c:2990
+#: src/bin/e_actions.c:3040
 msgid "Show All Applications Menu"
 msgstr "顯示「應用程式」選單"
 
-#: src/bin/e_actions.c:2992
+#: src/bin/e_actions.c:3042
 msgid "Show Clients Menu"
 msgstr "顯示「視窗列表」選單"
 
-#: src/bin/e_actions.c:2994
+#: src/bin/e_actions.c:3044
 msgid "Show Menu..."
 msgstr "顯示選單..."
 
-#: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3051 src/bin/e_actions.c:3056
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything/evry_plug_apps.c:1062
-#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
+#: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:160
 msgid "Launch"
 msgstr "啟動"
 
-#: src/bin/e_actions.c:3001 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:3051 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:3006 src/bin/e_eap_editor.c:695
+#: src/bin/e_actions.c:3056 src/bin/e_eap_editor.c:692
 #: src/bin/e_int_border_menu.c:73
 #, c-format
 msgid "Application"
 msgstr "應用程式"
 
-#: src/bin/e_actions.c:3010 src/bin/e_int_menus.c:202
+#: src/bin/e_actions.c:3060 src/bin/e_int_menus.c:206
 msgid "Restart"
 msgstr "重新啟動"
 
-#: src/bin/e_actions.c:3014 src/bin/e_int_menus.c:207
+#: src/bin/e_actions.c:3064 src/bin/e_int_menus.c:211
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:3018
+#: src/bin/e_actions.c:3068
 #, fuzzy
 msgid "Exit Now"
 msgstr "退出"
 
-#: src/bin/e_actions.c:3022 src/bin/e_actions.c:3027
+#: src/bin/e_actions.c:3072 src/bin/e_actions.c:3077
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s 模組"
 
-#: src/bin/e_actions.c:3023
+#: src/bin/e_actions.c:3073
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:3028
+#: src/bin/e_actions.c:3078
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:3032 src/bin/e_actions.c:3036 src/bin/e_actions.c:3040
-#: src/bin/e_actions.c:3044 src/bin/e_actions.c:3048 src/bin/e_actions.c:3052
-#: src/bin/e_actions.c:3056 src/bin/e_configure.c:357
+#: src/bin/e_actions.c:3082 src/bin/e_actions.c:3086 src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3094 src/bin/e_actions.c:3098 src/bin/e_actions.c:3102
+#: src/bin/e_actions.c:3106 src/bin/e_configure.c:372
 #: src/bin/e_int_config_modules.c:53
 #: src/modules/conf_applications/e_int_config_apps.c:244
 #: 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:453
-#: src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: src/modules/conf_theme/e_int_config_wallpaper.c:466
+#: src/modules/conf_theme/e_int_config_wallpaper.c:588
 #: src/modules/conf_theme/e_int_config_startup.c:258
 #: src/modules/conf_theme/e_int_config_theme.c:396
-#: src/modules/conf_theme/e_int_config_theme.c:795
-#: src/modules/gadman/e_mod_config.c:183 src/modules/syscon/e_mod_main.c:31
+#: src/modules/conf_theme/e_int_config_theme.c:796
+#: src/modules/gadman/e_mod_config.c:182 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:52
 #: src/modules/syscon/e_mod_main.c:119
 msgid "System"
 msgstr "系統"
 
-#: src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3082
 msgid "Log Out"
 msgstr "登入"
 
-#: src/bin/e_actions.c:3036
+#: src/bin/e_actions.c:3086
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:3040
+#: src/bin/e_actions.c:3090
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:3044
+#: src/bin/e_actions.c:3094
 msgid "Reboot"
 msgstr "重新開機"
 
-#: src/bin/e_actions.c:3048
+#: src/bin/e_actions.c:3098
 #, fuzzy
 msgid "Suspend Now"
 msgstr "待機"
 
-#: src/bin/e_actions.c:3052
+#: src/bin/e_actions.c:3102
 msgid "Suspend"
 msgstr "待機"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3106
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3114
 #, fuzzy
 msgid "Lock"
 msgstr "鎖定值"
 
-#: src/bin/e_actions.c:3069 src/bin/e_int_menus.c:1160
+#: src/bin/e_actions.c:3119 src/bin/e_int_menus.c:1167
 msgid "Cleanup Windows"
 msgstr "排列視窗"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:3074
+#: src/bin/e_actions.c:3124
 #, fuzzy
 msgid "Delayed Action"
 msgstr "特定應用程式"
 
-#: src/bin/e_actions.c:3081 src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Acpi"
-msgstr "動作"
-
-#: src/bin/e_actions.c:3081
-#, fuzzy
-msgid "Dim Screen"
-msgstr "此螢幕"
-
-#: src/bin/e_actions.c:3085
-#, fuzzy
-msgid "Undim Screen"
-msgstr "此螢幕"
-
-#: src/bin/e_bg.c:50
+#: src/bin/e_bg.c:34
 msgid "Set As Background"
 msgstr "設定為桌布"
 
@@ -722,18 +746,16 @@ msgstr "設定為桌布"
 msgid "Color Selector"
 msgstr "Profile 選擇器"
 
-#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1602 src/bin/e_config.c:2196
-#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:857
-#: src/bin/e_eap_editor.c:921 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
-#: src/bin/e_fm.c:8688 src/bin/e_fm.c:9332 src/bin/e_fm_prop.c:507
+#: src/bin/e_color_dialog.c:46 src/bin/e_config.c:1611 src/bin/e_config.c:2229
+#: src/bin/e_config_dialog.c:262 src/bin/e_eap_editor.c:854
+#: src/bin/e_eap_editor.c:918 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:398
+#: src/bin/e_fm.c:8717 src/bin/e_fm.c:9361 src/bin/e_fm_prop.c:507
 #: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:525
-#: src/bin/e_module.c:421 src/bin/e_sys.c:484 src/bin/e_sys.c:530
-#: src/bin/e_utils.c:712 src/modules/conf_dialogs/e_int_config_profiles.c:387
-#: src/modules/conf_display/e_int_config_dpms.c:64
-#: src/modules/conf_display/e_int_config_dpms.c:85
+#: src/bin/e_module.c:415 src/bin/e_sys.c:487 src/bin/e_sys.c:524
+#: src/bin/e_utils.c:707 src/modules/conf_dialogs/e_int_config_profiles.c:387
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:215
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:345
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:222
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:352
 #: src/modules/conf_theme/e_int_config_theme_import.c:120
 #: src/modules/cpufreq/e_mod_main.c:415 src/modules/cpufreq/e_mod_main.c:444
 #: src/modules/cpufreq/e_mod_main.c:469
@@ -741,20 +763,20 @@ msgstr "Profile 選擇器"
 msgid "OK"
 msgstr "確定"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:859
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8690
-#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1167
+#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:856
+#: src/bin/e_eap_editor.c:920 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8719
+#: src/bin/e_fm_prop.c:508 src/bin/e_utils.c:1162
 #: src/modules/conf_dialogs/e_int_config_profiles.c:388
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:219
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:349
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:226
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:356
 #: src/modules/conf_theme/e_int_config_theme_import.c:124
 #: src/modules/fileman/e_int_config_mime_edit.c:304
-#: src/modules/syscon/e_syscon.c:94 src/modules/connman/e_mod_main.c:300
+#: src/modules/syscon/e_syscon.c:120 src/modules/connman/e_mod_main.c:300
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:963 src/bin/e_config.c:996
+#: src/bin/e_config.c:972 src/bin/e_config.c:1005
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -770,7 +792,7 @@ msgstr ""
 "資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新配置您的桌面設"
 "定。<br>抱歉打斷您的配置。<br>"
 
-#: src/bin/e_config.c:980
+#: src/bin/e_config.c:989
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -783,12 +805,12 @@ msgstr ""
 "Enlightenment 或是從其它地方複製了新版的組態檔<br>否則這不應該發生。這是不好"
 "的,所以為防萬一,您的組態檔已被<br>恢復成預設值。很抱歉為您帶來不便。<br>"
 
-#: src/bin/e_config.c:1589 src/bin/e_config.c:2183
+#: src/bin/e_config.c:1598 src/bin/e_config.c:2216
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 組態寫入發生問題"
 
-#: src/bin/e_config.c:1592
+#: src/bin/e_config.c:1601
 #, c-format
 msgid ""
 "Enlightenment has an error while moving config files<br>from:<br>"
@@ -796,97 +818,97 @@ msgid ""
 "<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2094
+#: src/bin/e_config.c:2126
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "桌面設定"
 
-#: src/bin/e_config.c:2111
+#: src/bin/e_config.c:2143
 msgid "The EET file handle is bad."
 msgstr ""
 
-#: src/bin/e_config.c:2114
+#: src/bin/e_config.c:2146
 msgid "The file data is empty."
 msgstr ""
 
-#: src/bin/e_config.c:2117
+#: src/bin/e_config.c:2149
 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:2120
+#: src/bin/e_config.c:2152
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr ""
 
-#: src/bin/e_config.c:2123
+#: src/bin/e_config.c:2155
 msgid "This is a generic error."
 msgstr ""
 
-#: src/bin/e_config.c:2125
+#: src/bin/e_config.c:2158
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr ""
 
-#: src/bin/e_config.c:2128
+#: src/bin/e_config.c:2161
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr ""
 
-#: src/bin/e_config.c:2131
+#: src/bin/e_config.c:2164
 msgid "You ran out of space while writing the file"
 msgstr ""
 
-#: src/bin/e_config.c:2134
+#: src/bin/e_config.c:2167
 msgid "The file was closed on it while writing."
 msgstr ""
 
-#: src/bin/e_config.c:2137
+#: src/bin/e_config.c:2170
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr ""
 
-#: src/bin/e_config.c:2140
+#: src/bin/e_config.c:2173
 msgid "X509 Encoding failed."
 msgstr ""
 
-#: src/bin/e_config.c:2143
+#: src/bin/e_config.c:2176
 #, fuzzy
 msgid "Signature failed."
 msgstr "無法休眠"
 
-#: src/bin/e_config.c:2146
+#: src/bin/e_config.c:2179
 msgid "The signature was invalid."
 msgstr ""
 
-#: src/bin/e_config.c:2149
+#: src/bin/e_config.c:2182
 #, fuzzy
 msgid "Not signed."
 msgstr "(無任何視窗)"
 
-#: src/bin/e_config.c:2152
+#: src/bin/e_config.c:2185
 msgid "Feature not implemented."
 msgstr ""
 
-#: src/bin/e_config.c:2155
+#: src/bin/e_config.c:2188
 msgid "PRNG was not seeded."
 msgstr ""
 
-#: src/bin/e_config.c:2158
+#: src/bin/e_config.c:2191
 #, fuzzy
 msgid "Encryption failed."
 msgstr "待機時間"
 
-#: src/bin/e_config.c:2161
+#: src/bin/e_config.c:2194
 #, fuzzy
-msgid "Decruption failed."
+msgid "Decryption failed."
 msgstr "待機時間"
 
-#: src/bin/e_config.c:2164
+#: src/bin/e_config.c:2197
 #, fuzzy
 msgid "The error is unknown to Enlightenment."
 msgstr "歡迎來到 Enlightenment 東京"
 
-#: src/bin/e_config.c:2186
+#: src/bin/e_config.c:2219
 #, fuzzy, c-format
 msgid ""
 "Enlightenment has an error while writing<br>its config file.<br>"
@@ -896,70 +918,75 @@ msgstr ""
 "Enlightment 要寫入的設定檔未預期的被關閉了。<br>這很不尋常。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:710
+#: src/bin/e_config_dialog.c:210 src/modules/battery/e_mod_main.c:721
 #: src/modules/conf/e_mod_main.c:275 src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:716
+#: src/bin/e_config_dialog.c:239 src/bin/e_eap_editor.c:713
 msgid "Basic"
 msgstr "基本設定"
 
 #: src/bin/e_config_dialog.c:264
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:844
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:236
 msgid "Apply"
 msgstr "套用"
 
 #: src/bin/e_configure.c:28 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1098
-#: src/modules/connman/e_mod_main.c:1806
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1261
+#: src/modules/connman/e_mod_main.c:1844
 msgid "Extensions"
 msgstr "擴充套件"
 
 #: src/bin/e_configure.c:29 src/bin/e_configure.c:32 src/bin/e_configure.c:242
 #: src/modules/conf_paths/e_int_config_paths.c:80
-#: src/modules/conf_theme/e_int_config_color_classes.c:846
-#: src/modules/conf_theme/e_int_config_fonts.c:96
+#: src/modules/conf_theme/e_int_config_color_classes.c:847
+#: src/modules/conf_theme/e_int_config_fonts.c:98
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:234
 msgid "Modules"
 msgstr "模組"
 
-#: src/bin/e_container.c:134
+#: src/bin/e_configure.c:364
+#, fuzzy
+msgid "Preferences"
+msgstr "圖示偏好"
+
+#: src/bin/e_container.c:132
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:170
+#: src/bin/e_desklock.c:171
 msgid "Error - no PAM support"
 msgstr "錯誤 - 沒有 PAM 支援"
 
-#: src/bin/e_desklock.c:171
+#: src/bin/e_desklock.c:172
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "PAM 支援並沒有被編譯進 Enlightment,<br>所以桌面鎖定功能被停用了。"
 
-#: src/bin/e_desklock.c:235
+#: src/bin/e_desklock.c:236
 msgid "Lock Failed"
 msgstr "無法鎖定"
 
-#: src/bin/e_desklock.c:236
+#: src/bin/e_desklock.c:237
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 "鎖定桌面失敗,因為有些應用程式正在使用鍵盤或<br>滑鼠,而他們的聯結無法打斷。"
 
-#: src/bin/e_desklock.c:321
+#: src/bin/e_desklock.c:322
 msgid "Please enter your unlock password"
 msgstr "請輸入您的解鎖密碼"
 
-#: src/bin/e_desklock.c:660
+#: src/bin/e_desklock.c:712
 msgid "Authentication System Error"
 msgstr "認證系統錯誤"
 
-#: src/bin/e_desklock.c:661
+#: src/bin/e_desklock.c:713
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -969,22 +996,22 @@ msgstr ""
 "PAM 認證階段設定失敗。<br>錯誤代碼為 <hilight>%i</hilight>。<br>這很糟糕而且"
 "不應該發生,請回報這個錯誤。"
 
-#: src/bin/e_desklock.c:989 src/bin/e_screensaver.c:132
+#: src/bin/e_desklock.c:1041 src/bin/e_screensaver.c:136
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:992
+#: src/bin/e_desklock.c:1044
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1002 src/bin/e_screensaver.c:145
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:149
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1004 src/bin/e_screensaver.c:147
+#: src/bin/e_desklock.c:1056 src/bin/e_screensaver.c:151
 msgid "No, and stop asking"
 msgstr ""
 
@@ -1008,108 +1035,107 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry 編輯器"
 
-#: src/bin/e_eap_editor.c:674 src/bin/e_int_border_prop.c:420
+#: src/bin/e_eap_editor.c:671 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467
 #: src/modules/conf_intl/e_int_config_imc.c:891
 #: src/modules/conf_menus/e_int_config_menus.c:265
 msgid "Name"
 msgstr "名稱"
 
-#: src/bin/e_eap_editor.c:685
+#: src/bin/e_eap_editor.c:682
 msgid "Comment"
 msgstr "註解"
 
-#: src/bin/e_eap_editor.c:707
+#: src/bin/e_eap_editor.c:704
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:729 src/bin/e_eap_editor.c:738
-#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:93
+#: src/bin/e_eap_editor.c:726 src/bin/e_eap_editor.c:735
+#: src/bin/e_fm_prop.c:394 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:147
 msgid "Icon"
 msgstr "圖示"
 
-#: src/bin/e_eap_editor.c:742
+#: src/bin/e_eap_editor.c:739
 msgid "Generic Name"
 msgstr "通用名稱"
 
-#: src/bin/e_eap_editor.c:748
+#: src/bin/e_eap_editor.c:745
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "視窗類別"
 
-#: src/bin/e_eap_editor.c:754 src/modules/fileman/e_int_config_mime.c:176
+#: src/bin/e_eap_editor.c:751 src/modules/fileman/e_int_config_mime.c:169
 msgid "Categories"
 msgstr "類別"
 
-#: src/bin/e_eap_editor.c:761
+#: src/bin/e_eap_editor.c:758
 #, fuzzy
 msgid "Mime Types"
 msgstr "檔案類型"
 
-#: src/bin/e_eap_editor.c:768
+#: src/bin/e_eap_editor.c:765
 msgid "Desktop file"
 msgstr "desktop 檔"
 
-#: src/bin/e_eap_editor.c:778
+#: src/bin/e_eap_editor.c:775
 #: src/modules/conf_performance/e_int_config_performance.c:115
-#: src/modules/everything/evry_config.c:379
-#: src/modules/everything/evry_config.c:463
-#: src/modules/everything/evry_plug_files.c:1492
+#: src/modules/everything/evry_config.c:378
+#: src/modules/everything/evry_plug_files.c:1491
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "一般資訊"
 
-#: src/bin/e_eap_editor.c:782
+#: src/bin/e_eap_editor.c:779
 msgid "Startup Notify"
 msgstr "啟動通知"
 
-#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
+#: src/bin/e_eap_editor.c:781
 msgid "Run in Terminal"
 msgstr "執行於終端機"
 
-#: src/bin/e_eap_editor.c:786
+#: src/bin/e_eap_editor.c:783
 msgid "Show in Menus"
 msgstr "在選單中顯示"
 
-#: src/bin/e_eap_editor.c:789 src/bin/e_int_border_remember.c:757
+#: src/bin/e_eap_editor.c:786 src/bin/e_int_border_remember.c:757
 #, fuzzy
 msgid "Options"
 msgstr "填滿選項"
 
-#: src/bin/e_eap_editor.c:820
+#: src/bin/e_eap_editor.c:817
 msgid "Select an Icon"
 msgstr "選擇圖示"
 
-#: src/bin/e_eap_editor.c:886
+#: src/bin/e_eap_editor.c:883
 msgid "Select an Executable"
 msgstr "選擇一個執行檔"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8180 src/bin/e_shelf.c:1697
+#: src/bin/e_entry.c:496 src/bin/e_fm.c:8208 src/bin/e_shelf.c:1703
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "刪除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:8088
+#: src/bin/e_entry.c:506 src/bin/e_fm.c:8116
 msgid "Cut"
 msgstr "剪下"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6148 src/bin/e_fm.c:8102
+#: src/bin/e_entry.c:514 src/bin/e_fm.c:6163 src/bin/e_fm.c:8130
 msgid "Copy"
 msgstr "複製"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7926 src/bin/e_fm.c:8115
+#: src/bin/e_entry.c:522 src/bin/e_fm.c:7954 src/bin/e_fm.c:8143
 msgid "Paste"
 msgstr "貼上"
 
-#: src/bin/e_entry.c:529
+#: src/bin/e_entry.c:532
 msgid "Select All"
 msgstr "全選"
 
 #: src/bin/e_exec.c:217 src/bin/e_exec.c:224 src/bin/e_exec.c:236
-#: src/bin/e_exec.c:260 src/bin/e_utils.c:235
+#: src/bin/e_exec.c:260 src/bin/e_utils.c:230
 #: src/modules/conf_intl/e_int_config_imc.c:265
 #: src/modules/conf_intl/e_int_config_imc.c:513
 msgid "Run Error"
@@ -1146,328 +1172,328 @@ msgid ""
 "application failed to start."
 msgstr "Enlightment 無法執行應用程式:<br><br>%s<br><br>此程式無法啟動。"
 
-#: src/bin/e_exec.c:495
+#: src/bin/e_exec.c:491
 msgid "Application Execution Error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:507
+#: src/bin/e_exec.c:503
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 無預警地停止執行。"
 
-#: src/bin/e_exec.c:513
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "錯誤代碼 %i 被 %s 傳回。"
 
-#: src/bin/e_exec.c:521
+#: src/bin/e_exec.c:517
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被 Interrupt Signal 中斷。"
 
-#: src/bin/e_exec.c:524
+#: src/bin/e_exec.c:520
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被 Quit Signal 中斷。"
 
-#: src/bin/e_exec.c:528
+#: src/bin/e_exec.c:524
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被 Abort Signal 中斷。"
 
-#: src/bin/e_exec.c:531
+#: src/bin/e_exec.c:527
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被 FPE Signal 中斷。"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:531
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被 Kill Signal 中斷。"
 
-#: src/bin/e_exec.c:539
+#: src/bin/e_exec.c:535
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被 Segmentation Fault 中斷。"
 
-#: src/bin/e_exec.c:543
+#: src/bin/e_exec.c:539
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被 Broken Pipe 中斷。"
 
-#: src/bin/e_exec.c:546
+#: src/bin/e_exec.c:542
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被 Terminal Signal 中斷。"
 
-#: src/bin/e_exec.c:550
+#: src/bin/e_exec.c:546
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被 Bus Error 中斷。"
 
-#: src/bin/e_exec.c:553
+#: src/bin/e_exec.c:549
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被 Signal %i 中斷。"
 
-#: src/bin/e_exec.c:609
+#: src/bin/e_exec.c:605
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** 剩下的輸出被刪節了。儲存輸出以供檢視。***\n"
 
-#: src/bin/e_exec.c:671 src/bin/e_exec.c:745 src/bin/e_exec.c:752
+#: src/bin/e_exec.c:667 src/bin/e_exec.c:741 src/bin/e_exec.c:748
 msgid "Error Logs"
 msgstr "錯誤紀錄檔"
 
-#: src/bin/e_exec.c:677 src/bin/e_exec.c:753
+#: src/bin/e_exec.c:673 src/bin/e_exec.c:749
 msgid "There was no error message."
 msgstr "沒有錯誤訊息。"
 
-#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
+#: src/bin/e_exec.c:677 src/bin/e_exec.c:756
 msgid "Save This Message"
 msgstr "儲存訊息"
 
-#: src/bin/e_exec.c:685 src/bin/e_exec.c:764
+#: src/bin/e_exec.c:681 src/bin/e_exec.c:760
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "錯誤紀錄檔已被儲存到 %s/%s.log"
 
-#: src/bin/e_exec.c:711
+#: src/bin/e_exec.c:707
 msgid "Error Information"
 msgstr "錯誤資訊"
 
-#: src/bin/e_exec.c:719
+#: src/bin/e_exec.c:715
 msgid "Error Signal Information"
 msgstr "錯誤 Signal 資訊"
 
-#: src/bin/e_exec.c:729 src/bin/e_exec.c:736
+#: src/bin/e_exec.c:725 src/bin/e_exec.c:732
 msgid "Output Data"
 msgstr "輸出資料"
 
-#: src/bin/e_exec.c:737
+#: src/bin/e_exec.c:733
 msgid "There was no output."
 msgstr "沒有輸入。"
 
-#: src/bin/e_fm.c:969
+#: src/bin/e_fm.c:976
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "不存在的路徑"
 
-#: src/bin/e_fm.c:972
+#: src/bin/e_fm.c:979
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "不存在 %s"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 #, fuzzy
 msgid "Mount Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_fm.c:3064
+#: src/bin/e_fm.c:3045
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 #, fuzzy
 msgid "Unmount Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_fm.c:3080
+#: src/bin/e_fm.c:3061
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 #, fuzzy
 msgid "Eject Error"
 msgstr "執行時錯誤"
 
-#: src/bin/e_fm.c:3095
+#: src/bin/e_fm.c:3076
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3733
+#: src/bin/e_fm.c:3748
 #, c-format
 msgid "%i Files"
 msgstr "%i 筆檔案"
 
-#: src/bin/e_fm.c:6161 src/bin/e_fm.c:7934 src/bin/e_fm.c:8123
+#: src/bin/e_fm.c:6176 src/bin/e_fm.c:7962 src/bin/e_fm.c:8151
 #, fuzzy
 msgid "Link"
 msgstr "線性"
 
-#: src/bin/e_fm.c:6169 src/bin/e_fm.c:9114 src/bin/e_fm.c:9255
+#: src/bin/e_fm.c:6184 src/bin/e_fm.c:9143 src/bin/e_fm.c:9284
 #, fuzzy
 msgid "Abort"
 msgstr "關於"
 
-#: src/bin/e_fm.c:7853 src/bin/e_fm.c:8013
+#: src/bin/e_fm.c:7881 src/bin/e_fm.c:8041
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "選取設定"
 
-#: src/bin/e_fm.c:7862 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:7890 src/bin/e_fm.c:8050
 #: src/modules/fileman/e_mod_config.c:219
 msgid "View Mode"
 msgstr "顯式模式"
 
-#: src/bin/e_fm.c:7869 src/bin/e_fm.c:8029
+#: src/bin/e_fm.c:7897 src/bin/e_fm.c:8057
 msgid "Refresh View"
 msgstr "重新整理"
 
-#: src/bin/e_fm.c:7877 src/bin/e_fm.c:8037
+#: src/bin/e_fm.c:7905 src/bin/e_fm.c:8065
 msgid "Show Hidden Files"
 msgstr "顯示隱藏的檔案"
 
-#: src/bin/e_fm.c:7889 src/bin/e_fm.c:8049
+#: src/bin/e_fm.c:7917 src/bin/e_fm.c:8077
 msgid "Remember Ordering"
 msgstr "記住順序"
 
-#: src/bin/e_fm.c:7898 src/bin/e_fm.c:8058
+#: src/bin/e_fm.c:7926 src/bin/e_fm.c:8086
 msgid "Sort Now"
 msgstr "排列檔案"
 
-#: src/bin/e_fm.c:7910 src/bin/e_fm.c:8073
+#: src/bin/e_fm.c:7938 src/bin/e_fm.c:8101
 #: src/modules/conf_paths/e_int_config_paths.c:205
 msgid "New Directory"
 msgstr "新目錄"
 
-#: src/bin/e_fm.c:8188
+#: src/bin/e_fm.c:8216
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/bin/e_fm.c:8207
+#: src/bin/e_fm.c:8235
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8212
+#: src/bin/e_fm.c:8240
 #, fuzzy
 msgid "Mount"
 msgstr "選單項目"
 
-#: src/bin/e_fm.c:8217
+#: src/bin/e_fm.c:8245
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8229
+#: src/bin/e_fm.c:8257
 #, fuzzy
 msgid "Application Properties"
 msgstr "應用程式類別"
 
-#: src/bin/e_fm.c:8235 src/bin/e_fm_prop.c:105
+#: src/bin/e_fm.c:8263 src/bin/e_fm_prop.c:105
 msgid "File Properties"
 msgstr "檔案屬性"
 
-#: src/bin/e_fm.c:8472 src/bin/e_fm.c:8525
+#: src/bin/e_fm.c:8500 src/bin/e_fm.c:8553
 #, fuzzy
 msgid "Use default"
 msgstr "使用預設值"
 
-#: src/bin/e_fm.c:8498 src/modules/fileman/e_mod_config.c:224
+#: src/bin/e_fm.c:8526 src/modules/fileman/e_mod_config.c:224
 msgid "Grid Icons"
 msgstr "對齊圖示"
 
-#: src/bin/e_fm.c:8506 src/modules/fileman/e_mod_config.c:226
+#: src/bin/e_fm.c:8534 src/modules/fileman/e_mod_config.c:226
 msgid "Custom Icons"
 msgstr "自訂圖示"
 
-#: src/bin/e_fm.c:8514 src/modules/everything/evry_config.c:435
-#: src/modules/everything/evry_config.c:493
+#: src/bin/e_fm.c:8542 src/modules/everything/evry_config.c:430
+#: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:234
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8539
+#: src/bin/e_fm.c:8568
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "圖示大小"
 
-#: src/bin/e_fm.c:8585 src/bin/e_fm.c:8791
+#: src/bin/e_fm.c:8614 src/bin/e_fm.c:8820
 #, fuzzy
 msgid "Set background..."
 msgstr "設定為桌布"
 
-#: src/bin/e_fm.c:8590 src/bin/e_fm.c:8835
+#: src/bin/e_fm.c:8619 src/bin/e_fm.c:8864
 #, fuzzy
 msgid "Set overlay..."
 msgstr "置物架內容物"
 
-#: src/bin/e_fm.c:8689 src/modules/conf_theme/e_int_config_theme.c:1031
+#: src/bin/e_fm.c:8718 src/modules/conf_theme/e_int_config_theme.c:1032
 msgid "Clear"
 msgstr "清除"
 
-#: src/bin/e_fm.c:8915
+#: src/bin/e_fm.c:8944
 msgid "Create a new Directory"
 msgstr "建立新目錄"
 
-#: src/bin/e_fm.c:8916
+#: src/bin/e_fm.c:8945
 msgid "New Directory Name:"
 msgstr "新目錄名稱"
 
-#: src/bin/e_fm.c:8970
+#: src/bin/e_fm.c:8999
 #, c-format
 msgid "Rename %s to:"
 msgstr "重新命名 %s 成:"
 
-#: src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:9001
 msgid "Rename File"
 msgstr "重新命名檔案"
 
-#: src/bin/e_fm.c:9113 src/bin/e_fm.c:9254
+#: src/bin/e_fm.c:9142 src/bin/e_fm.c:9283
 #, fuzzy
 msgid "Retry"
 msgstr "重新啟動"
 
-#: src/bin/e_fm.c:9117 src/bin/e_fm.c:9260 src/modules/wizard/page_030.c:85
+#: src/bin/e_fm.c:9146 src/bin/e_fm.c:9289
 #, fuzzy
 msgid "Error"
 msgstr "執行時錯誤"
 
-#: src/bin/e_fm.c:9120
+#: src/bin/e_fm.c:9149
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9175
+#: src/bin/e_fm.c:9204
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9177
+#: src/bin/e_fm.c:9206
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9180
+#: src/bin/e_fm.c:9209
 #, fuzzy
 msgid "Warning"
 msgstr "正在啟動"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9212
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9256
+#: src/bin/e_fm.c:9285
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9257
+#: src/bin/e_fm.c:9286
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9262
+#: src/bin/e_fm.c:9291
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9433
+#: src/bin/e_fm.c:9462
 msgid "Confirm Delete"
 msgstr "確定刪除"
 
-#: src/bin/e_fm.c:9438
+#: src/bin/e_fm.c:9467
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9444
+#: src/bin/e_fm.c:9473
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1500,12 +1526,12 @@ msgstr ""
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_device.c:72
+#: src/bin/e_fm_device.c:74
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "末知"
 
-#: src/bin/e_fm_device.c:324
+#: src/bin/e_fm_device.c:326
 msgid "Removable Device"
 msgstr ""
 
@@ -1513,7 +1539,7 @@ msgstr ""
 msgid "File:"
 msgstr "檔案:"
 
-#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:348
+#: src/bin/e_fm_prop.c:339 src/bin/e_widget_fsel.c:347
 msgid "Size:"
 msgstr "大小:"
 
@@ -1529,7 +1555,7 @@ msgstr "檔案類型:"
 msgid "Permissions"
 msgstr "權限"
 
-#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:364
+#: src/bin/e_fm_prop.c:361 src/bin/e_widget_fsel.c:363
 msgid "Owner:"
 msgstr "擁有者:"
 
@@ -1549,17 +1575,17 @@ msgstr "擁有者可以讀取"
 msgid "Owner can write"
 msgstr "擁有者可以寫入"
 
-#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:311
-#: src/modules/conf_theme/e_int_config_icon_themes.c:258
-#: src/modules/conf_theme/e_int_config_transitions.c:167
-#: src/modules/conf_theme/e_int_config_theme.c:1039
+#: src/bin/e_fm_prop.c:379 src/bin/e_widget_fsel.c:310
+#: src/modules/conf_theme/e_int_config_icon_themes.c:263
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_theme.c:1040
 msgid "Preview"
 msgstr "預覽"
 
 #: src/bin/e_fm_prop.c:426
-#: src/modules/conf_display/e_int_config_screensaver.c:180
-#: src/modules/conf_display/e_int_config_screensaver.c:193
-#: src/modules/everything/evry_config.c:431
+#: src/modules/conf_display/e_int_config_screensaver.c:208
+#: src/modules/conf_display/e_int_config_screensaver.c:221
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "預設值"
 
@@ -1568,7 +1594,7 @@ msgid "Thumbnail"
 msgstr "縮圖"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_desklock.c:298
 msgid "Custom"
 msgstr "自訂"
 
@@ -1584,54 +1610,43 @@ msgstr "Link 資訊"
 msgid "Select an Image"
 msgstr "選擇一張圖片"
 
-#: src/bin/e_gadcon.c:1370 src/bin/e_int_border_menu.c:95
-#: src/bin/e_int_border_menu.c:595
+#: src/bin/e_gadcon.c:1378 src/bin/e_int_border_menu.c:118
 #, fuzzy
 msgid "Move to"
 msgstr "移動文字"
 
-#: src/bin/e_gadcon.c:1402 src/modules/gadman/e_mod_gadman.c:720
-#, fuzzy
-msgid "Begin move/resize"
-msgstr "開始移動或改變這個小工具大小"
-
-#: src/bin/e_gadcon.c:1408
-#, fuzzy
-msgid "Resizeable"
-msgstr "改變大小"
-
-#: src/bin/e_gadcon.c:1415
+#: src/bin/e_gadcon.c:1423
 msgid "Automatically scroll contents"
 msgstr "自動捲動內容"
 
-#: src/bin/e_gadcon.c:1426 src/modules/gadman/e_mod_gadman.c:731
+#: src/bin/e_gadcon.c:1434 src/modules/gadman/e_mod_gadman.c:731
 msgid "Plain"
 msgstr "一般"
 
-#: src/bin/e_gadcon.c:1435 src/modules/gadman/e_mod_gadman.c:739
+#: src/bin/e_gadcon.c:1443 src/modules/gadman/e_mod_gadman.c:739
 msgid "Inset"
 msgstr "嵌入"
 
-#: src/bin/e_gadcon.c:1444 src/bin/e_int_config_modules.c:54
+#: src/bin/e_gadcon.c:1452 src/bin/e_int_config_modules.c:54
 #: src/modules/conf_theme/e_mod_main.c:30
 #: src/modules/dropshadow/e_mod_main.c:89
 #, fuzzy
 msgid "Look"
 msgstr "鎖定值"
 
-#: src/bin/e_gadcon.c:1455 src/bin/e_widget_config_list.c:66
+#: src/bin/e_gadcon.c:1463 src/bin/e_widget_config_list.c:66
 #: src/modules/conf_applications/e_int_config_apps.c:239
 #: src/modules/conf_applications/e_int_config_apps.c:260
 #: src/modules/conf_applications/e_int_config_apps.c:280
-#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:821
+#: src/modules/gadman/e_mod_gadman.c:815 src/modules/ibar/e_mod_main.c:801
 msgid "Remove"
 msgstr "移除"
 
-#: src/bin/e_gadcon.c:1969
-msgid "Stop move/resize this gadget"
-msgstr "停止移動或改變這個小工具大小"
+#: src/bin/e_gadcon.c:1991
+msgid "Stop moving"
+msgstr ""
 
-#: src/bin/e_hints.c:150
+#: src/bin/e_hints.c:152
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1677,14 +1692,14 @@ msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327
 #: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:185
-#: src/modules/conf_theme/e_int_config_fonts.c:439
-#: src/modules/conf_theme/e_int_config_fonts.c:634
+#: src/modules/conf_theme/e_int_config_fonts.c:442
+#: src/modules/conf_theme/e_int_config_fonts.c:639
 #: src/modules/conf_theme/e_int_config_cursor.c:137
 msgid "Size"
 msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:310 src/bin/e_int_border_locks.c:329
-#: src/bin/e_int_border_menu.c:507 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_menu.c:87 src/bin/e_int_border_prop.c:469
 #: src/bin/e_int_border_remember.c:711 src/bin/e_int_shelf_config.c:132
 msgid "Stacking"
 msgstr "堆疊"
@@ -1736,162 +1751,169 @@ msgstr "登出系統直到這個視窗被關閉"
 msgid "Remember these Locks"
 msgstr "記住這些鎖定值"
 
-#: src/bin/e_int_border_menu.c:82
+#: src/bin/e_int_border_menu.c:127
 msgid "Window"
 msgstr "視窗"
 
-#: src/bin/e_int_border_menu.c:104 src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:138 src/bin/e_int_config_modules.c:59
+#: src/bin/e_int_menus.c:230 src/bin/e_shelf.c:1695
+#: src/modules/battery/e_mod_main.c:183 src/modules/clock/e_mod_main.c:296
+#: src/modules/clock/e_mod_main.c:540 src/modules/conf/e_conf.c:124
+#: src/modules/conf/e_conf.c:134 src/modules/conf/e_mod_main.c:102
+#: src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/conf_theme/e_int_config_cursor.c:133
+#: src/modules/ibar/e_mod_main.c:307 src/modules/ibar/e_mod_main.c:787
+#: src/modules/ibox/e_mod_main.c:299 src/modules/ibox/e_mod_main.c:690
+#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:233
+#: src/modules/mixer/e_mod_main.c:789 src/modules/connman/e_mod_main.c:1315
 #, fuzzy
-msgid "Always on Top"
-msgstr "最上層顯示"
-
-#: src/bin/e_int_border_menu.c:119 src/bin/e_int_border_menu.c:606
-#: src/bin/e_int_border_prop.c:472
-msgid "Sticky"
-msgstr "相黏"
+msgid "Settings"
+msgstr "桌面設定"
 
-#: src/bin/e_int_border_menu.c:291 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:307 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:145
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: src/bin/e_int_border_menu.c:315
+#: src/bin/e_int_border_menu.c:331
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:326
+#: src/bin/e_int_border_menu.c:342
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:337
+#: src/bin/e_int_border_menu.c:353
 msgid "Unmaximize"
 msgstr "解除最大化"
 
-#: src/bin/e_int_border_menu.c:448
+#: src/bin/e_int_border_menu.c:464
 msgid "Edit Icon"
 msgstr "編輯圖示"
 
-#: src/bin/e_int_border_menu.c:456
+#: src/bin/e_int_border_menu.c:472
 msgid "Create Icon"
 msgstr "建立圖示"
 
-#: src/bin/e_int_border_menu.c:464
+#: src/bin/e_int_border_menu.c:480
 #, fuzzy
 msgid "Add to Favorites Menu"
 msgstr "加入到「我的最愛」選單"
 
-#: src/bin/e_int_border_menu.c:469
+#: src/bin/e_int_border_menu.c:485
 #, fuzzy
 msgid "Add to IBar"
 msgstr "加入「我的最愛」選單"
 
-#: src/bin/e_int_border_menu.c:477
+#: src/bin/e_int_border_menu.c:493
 #, fuzzy
 msgid "Create Keyboard Shortcut"
 msgstr "新增鍵盤快速鍵"
 
-#: src/bin/e_int_border_menu.c:497
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
-#, fuzzy
-msgid "Placement"
-msgstr "智慧型擺設"
-
-#: src/bin/e_int_border_menu.c:519
-msgid "Skip"
-msgstr "略過"
-
-#: src/bin/e_int_border_menu.c:529
+#: src/bin/e_int_border_menu.c:515
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:321
 #: src/modules/conf_theme/e_mod_main.c:27
 msgid "Border"
 msgstr "邊框"
 
-#: src/bin/e_int_border_menu.c:541 src/bin/e_int_border_remember.c:621
+#: src/bin/e_int_border_menu.c:524 src/bin/e_int_border_remember.c:621
 #: src/bin/e_int_border_remember.c:714
 msgid "Locks"
 msgstr "鎖定值"
 
-#: src/bin/e_int_border_menu.c:549
+#: src/bin/e_int_border_menu.c:532
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "記住"
 
-#: src/bin/e_int_border_menu.c:571
+#: src/bin/e_int_border_menu.c:543
 #, fuzzy
 msgid "ICCCM/NetWM"
 msgstr "NetWM"
 
-#: src/bin/e_int_border_menu.c:641
-#: src/modules/everything/evry_plug_windows.c:432
+#: src/bin/e_int_border_menu.c:567 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "相黏"
+
+#: src/bin/e_int_border_menu.c:578
+msgid "Skip"
+msgstr "略過"
+
+#: src/bin/e_int_border_menu.c:620
 msgid "Iconify"
 msgstr "圖示化"
 
-#: src/bin/e_int_border_menu.c:680
+#: src/bin/e_int_border_menu.c:632
 #, fuzzy
 msgid "Shade"
 msgstr "捲起"
 
-#: src/bin/e_int_border_menu.c:864
+#: src/bin/e_int_border_menu.c:830
 #, fuzzy, c-format
 msgid "Screen %d"
 msgstr "螢幕"
 
-#: src/bin/e_int_border_menu.c:954
-#: src/modules/conf_theme/e_int_config_fonts.c:98
-#: src/modules/conf_theme/e_int_config_fonts.c:262
+#: src/bin/e_int_border_menu.c:909
+#, fuzzy
+msgid "Always on Top"
+msgstr "最上層顯示"
+
+#: src/bin/e_int_border_menu.c:920
+#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:264
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:965
+#: src/bin/e_int_border_menu.c:931
 msgid "Always Below"
 msgstr "最下層顯示"
 
-#: src/bin/e_int_border_menu.c:1009
+#: src/bin/e_int_border_menu.c:975
 msgid "Pin to Desktop"
 msgstr "固定於桌面"
 
-#: src/bin/e_int_border_menu.c:1020
+#: src/bin/e_int_border_menu.c:986
 msgid "Unpin from Desktop"
 msgstr "解除固定於桌面"
 
-#: src/bin/e_int_border_menu.c:1110
+#: src/bin/e_int_border_menu.c:1076
 msgid "Select Border Style"
 msgstr "選擇邊框樣式"
 
-#: src/bin/e_int_border_menu.c:1122
+#: src/bin/e_int_border_menu.c:1088
 msgid "Use E17 Default Icon Preference"
 msgstr "使用 E17 預設圖示偏好"
 
-#: src/bin/e_int_border_menu.c:1130
+#: src/bin/e_int_border_menu.c:1096
 msgid "Use Application Provided Icon "
 msgstr "使用應用程式圖示"
 
-#: src/bin/e_int_border_menu.c:1138
+#: src/bin/e_int_border_menu.c:1104
 msgid "Use User Defined Icon"
 msgstr "使用使用者自訂圖示"
 
-#: src/bin/e_int_border_menu.c:1147 src/bin/e_int_border_remember.c:747
+#: src/bin/e_int_border_menu.c:1113 src/bin/e_int_border_remember.c:747
 #, fuzzy
 msgid "Offer Resistance"
 msgstr "阻力"
 
-#: src/bin/e_int_border_menu.c:1207 src/modules/winlist/e_mod_main.c:26
+#: src/bin/e_int_border_menu.c:1173 src/modules/winlist/e_mod_main.c:26
 msgid "Window List"
 msgstr "視窗列表"
 
-#: src/bin/e_int_border_menu.c:1217 src/modules/pager/e_mod_main.c:257
-#: src/modules/pager/e_mod_main.c:2797 src/modules/pager/e_mod_main.c:2804
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2813
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2821
-#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2855
-#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2858 src/modules/pager/e_mod_main.c:2859
+#: src/bin/e_int_border_menu.c:1183 src/modules/pager/e_mod_main.c:257
+#: src/modules/pager/e_mod_main.c:2796 src/modules/pager/e_mod_main.c:2803
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2812
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2816
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2820
+#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2858
 msgid "Pager"
 msgstr "桌面切換器"
 
-#: src/bin/e_int_border_menu.c:1227
+#: src/bin/e_int_border_menu.c:1193
 #, fuzzy
 msgid "Taskbar"
 msgstr "略過工作列"
@@ -1913,7 +1935,7 @@ msgid "ICCCM Properties"
 msgstr "ICCCM 屬性"
 
 #: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:665
-#: src/bin/e_utils.c:1192
+#: src/bin/e_utils.c:1187 src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "標題"
 
@@ -2081,7 +2103,6 @@ msgid "Size, Position and Locks"
 msgstr "大小、位置與鎖定值"
 
 #: src/bin/e_int_border_remember.c:625 src/modules/conf/e_mod_main.c:245
-#: src/modules/everything/evry_plug_aggregator.c:334
 #, fuzzy
 msgid "All"
 msgstr "允許"
@@ -2164,15 +2185,13 @@ msgid "Utilities"
 msgstr "菲律賓"
 
 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything/evry_plug_files.c:1369
-#: src/modules/everything/evry_plug_files.c:1378
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_files.c:1601
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
-#: src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420
 msgid "Files"
 msgstr "檔案"
 
-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:69
 #, fuzzy
 msgid "Launcher"
 msgstr "啟動"
@@ -2187,21 +2206,6 @@ msgstr "核心"
 msgid "Mobile"
 msgstr "莫三比克"
 
-#: src/bin/e_int_config_modules.c:59 src/bin/e_int_menus.c:223
-#: src/bin/e_shelf.c:1689 src/modules/battery/e_mod_main.c:183
-#: src/modules/clock/e_mod_main.c:283 src/modules/clock/e_mod_main.c:406
-#: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
-#: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
-#: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything/evry_plug_settings.c:189
-#: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
-#: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
-#: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
-#: src/modules/mixer/e_mod_main.c:676 src/modules/connman/e_mod_main.c:1277
-#, fuzzy
-msgid "Settings"
-msgstr "桌面設定"
-
 #: src/bin/e_int_config_modules.c:98
 msgid "Module Settings"
 msgstr "設定模組"
@@ -2243,7 +2247,7 @@ msgstr "新增小工具"
 msgid "Remove Gadget"
 msgstr "移除小工具"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:339
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "限制設定"
@@ -2252,11 +2256,11 @@ msgstr "限制設定"
 msgid "Layout"
 msgstr "版面配置"
 
-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:352
 msgid "Input Method Error"
 msgstr "輸入法錯誤"
 
-#: src/bin/e_intl.c:343
+#: src/bin/e_intl.c:353
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@@ -2271,7 +2275,7 @@ msgstr "主選單"
 
 #: src/bin/e_int_menus.c:116
 #: src/modules/conf_applications/e_int_config_apps.c:69
-#: src/modules/conf_applications/e_mod_main.c:25
+#: src/modules/conf_applications/e_mod_main.c:29
 msgid "Favorite Applications"
 msgstr "我的最愛"
 
@@ -2279,77 +2283,75 @@ msgstr "我的最愛"
 #: src/modules/conf_applications/e_int_config_apps.c:264
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
+#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_mod_main.c:38
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything/evry_plug_apps.c:1029
-#: src/modules/everything/evry_plug_apps.c:1047
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/wizard/page_070.c:201
+#: src/modules/everything/evry_plug_apps.c:1367
 msgid "Applications"
 msgstr "應用程式"
 
-#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
+#: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1126
 #: 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:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "視窗"
 
-#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1173
+#: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:1180
 msgid "Lost Windows"
 msgstr "迷路的視窗"
 
-#: src/bin/e_int_menus.c:183
+#: src/bin/e_int_menus.c:187
 msgid "About"
 msgstr "關於"
 
-#: src/bin/e_int_menus.c:188 src/modules/conf_theme/e_int_config_cursor.c:146
+#: src/bin/e_int_menus.c:192 src/modules/conf_theme/e_int_config_cursor.c:146
 #: src/modules/conf_theme/e_mod_main.c:35
-#: src/modules/conf_theme/e_mod_main.c:67
-#: src/modules/conf_theme/e_mod_main.c:173
+#: src/modules/conf_theme/e_mod_main.c:70
+#: src/modules/conf_theme/e_mod_main.c:179
 msgid "Theme"
 msgstr "佈景主題"
 
-#: src/bin/e_int_menus.c:275
+#: src/bin/e_int_menus.c:282
 msgid "Virtual"
 msgstr "虛擬桌面"
 
-#: src/bin/e_int_menus.c:282 src/modules/conf_shelves/e_mod_main.c:23
+#: src/bin/e_int_menus.c:289 src/modules/conf_shelves/e_mod_main.c:23
 #: src/modules/conf_shelves/e_mod_main.c:27
 #: src/modules/conf_shelves/e_mod_main.c:74
 msgid "Shelves"
 msgstr "置物架"
 
-#: src/bin/e_int_menus.c:291
+#: src/bin/e_int_menus.c:298
 msgid "Show/Hide All Windows"
 msgstr "顯示/隱藏所有視窗"
 
-#: src/bin/e_int_menus.c:604
+#: src/bin/e_int_menus.c:611
 msgid "(No Applications)"
 msgstr "(無任何應用程式)"
 
-#: src/bin/e_int_menus.c:750
+#: src/bin/e_int_menus.c:757
 #, fuzzy
 msgid "Set Virtual Desktops"
 msgstr "虛擬桌面"
 
-#: src/bin/e_int_menus.c:1125 src/bin/e_int_menus.c:1309
+#: src/bin/e_int_menus.c:1132 src/bin/e_int_menus.c:1316
 msgid "(No Windows)"
 msgstr "(無任何視窗)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1321
+#: src/bin/e_int_menus.c:1226 src/bin/e_int_menus.c:1328
 msgid "No name!!"
 msgstr "無名稱!!"
 
-#: src/bin/e_int_menus.c:1412
+#: src/bin/e_int_menus.c:1419
 msgid "(No Shelves)"
 msgstr "(無任何置物架)"
 
-#: src/bin/e_int_menus.c:1476
+#: src/bin/e_int_menus.c:1483
 msgid "Add A Shelf"
 msgstr "新增置物架"
 
-#: src/bin/e_int_menus.c:1483
+#: src/bin/e_int_menus.c:1490
 msgid "Delete A Shelf"
 msgstr "移除置物架"
 
@@ -2385,7 +2387,7 @@ msgid "Shrink to Content Width"
 msgstr "縮小到內容物大小"
 
 #: src/bin/e_int_shelf_config.c:193
-#: src/modules/conf_theme/e_int_config_fonts.c:625
+#: src/modules/conf_theme/e_int_config_fonts.c:630
 #, fuzzy
 msgid "Style"
 msgstr "樣式"
@@ -2416,7 +2418,7 @@ msgid "Hide duration"
 msgstr "隱藏持續時間"
 
 #: src/bin/e_int_shelf_config.c:227
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:854
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:852
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f 秒"
@@ -2433,7 +2435,7 @@ msgstr "顯示於全部桌面"
 msgid "Show on specified Desktops"
 msgstr "顯示於指定桌面"
 
-#: src/bin/e_ipc.c:47
+#: src/bin/e_ipc.c:46
 #, c-format
 msgid ""
 "Possible IPC Hack Attempt. The IPC socket\n"
@@ -2448,7 +2450,7 @@ msgstr ""
 "或並不被您擁有。請檢查:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_ipc.c:57
+#: src/bin/e_ipc.c:56
 #, c-format
 msgid ""
 "The IPC socket directory cannot be created or\n"
@@ -2460,52 +2462,22 @@ msgstr ""
 "請檢查:\n"
 "%s/enlightenment-%s\n"
 
-#: src/bin/e_main.c:338
-#, c-format
-msgid ""
-"Options:\n"
-"\t-display DISPLAY\n"
-"\t\tConnect to display named DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-"\t\tgiven the geometry. Add as many as you like. They all\n"
-"\t\treplace the real xinerama screens, if any. This can\n"
-"\t\tbe used to simulate xinerama.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
-"800x600+800+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
-"default or just \"default\".\n"
-"\t-good\n"
-"\t\tBe good.\n"
-"\t-evil\n"
-"\t\tBe evil.\n"
-"\t-psychotic\n"
-"\t\tBe psychotic.\n"
-"\t-locked\n"
-"\t\tStart with desklock on, so password will be asked.\n"
-"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-"\t\tIf you need this help, you don't need this option.\n"
-msgstr ""
+#: src/bin/e_main.c:190
+#, fuzzy
+msgid "Enlightenment cannot initialize Eina!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:400
-msgid ""
-"Enlightenment cannot Initialize Ecore!\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法初始化 Ecore!\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:229
+#, fuzzy
+msgid "Enlightenment cannot initialize Eet!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:424
-msgid ""
-"Enlightenment cannot initialize the File system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法初始化檔案系統。\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:238
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:437
+#: src/bin/e_main.c:250
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2513,7 +2485,7 @@ msgstr ""
 "Enlightenment 無法建立 exit signal handler。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:443
+#: src/bin/e_main.c:257
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
@@ -2521,7 +2493,7 @@ msgstr ""
 "Enlightenment 無法建立 HUP signal handler。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:449
+#: src/bin/e_main.c:264
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up a USER signal handler.\n"
@@ -2530,64 +2502,37 @@ msgstr ""
 "Enlightenment 無法建立 HUP signal handler。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:461
-msgid ""
-"Enlightenment cannot initialize its X connection.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment 無法初始化 X 連結。\n"
-"您是否已設定 DISPLAY 環境變數?"
-
-#: src/bin/e_main.c:469
-msgid ""
-"Enlightenment cannot initialize its emergency alert system.\n"
-"Have you set your DISPLAY variable?"
-msgstr ""
-"Enlightenment 無法初始化緊急警報系統。\n"
-"您是否已設定 DISPLAY 環境變數?"
+#: src/bin/e_main.c:274
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_IMF!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:492
-msgid ""
-"Enlightenment cannot initialize the connections system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法初始化連結系統。\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:284
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_File!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:500
-msgid ""
-"Enlightenment cannot initialize the IPC system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法初始化 IPC 系統。\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:293
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Con!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:509
-msgid ""
-"Enlightenment cannot setup xinerama wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment 無法設定 xinerama wrapping。\n"
-"這種情況不應該發生。"
+#: src/bin/e_main.c:302
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Ipc!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:518
+#: src/bin/e_main.c:313
 #, fuzzy
-msgid ""
-"Enlightenment cannot setup randr wrapping.\n"
-"This should not happen."
-msgstr ""
-"Enlightenment 無法設定 xinerama wrapping。\n"
-"這種情況不應該發生。"
+msgid "Enlightenment cannot initialize Ecore_X!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:539
-msgid ""
-"Enlightenment cannot initialize the Evas system.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法初始化 Evas 系統。\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:324
+#, fuzzy
+msgid "Enlightenment cannot initialize Ecore_Evas!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:546
+#: src/bin/e_main.c:338
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2596,7 +2541,7 @@ msgstr ""
 "Enlightenment 發現 ecore_evas 不支援 Evas Software X11 繪圖。\n"
 "請檢查您的 Evas 和 Ecore 是否正確安裝且支援 Software X11 繪圖引擎。"
 
-#: src/bin/e_main.c:553
+#: src/bin/e_main.c:346
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
@@ -2605,33 +2550,66 @@ msgstr ""
 "Enlightenment 發現 ecore_evas 不支援 Evas Software Buffer 繪圖。\n"
 "請檢查您的 Evas 和 Ecore 是否正確安裝且支援 Software Buffer 繪圖引擎。"
 
-#: src/bin/e_main.c:572
+#: src/bin/e_main.c:356
+#, fuzzy
+msgid "Enlightenment cannot initialize Edje!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
+
+#: src/bin/e_main.c:368
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Intl!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
+
+#: src/bin/e_main.c:378
 msgid ""
-"Enlightenment cannot create directories in your home directory.\n"
-"Perhaps you have no home directory or the disk is full?"
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
 msgstr ""
-"Enlightenment ç\84¡æ³\95å\9c¨ä½ ç\9a\84家ç\9b®é\8c\84建ç«\8bç\9b®é\8c\84。\n"
-"可能你沒有家目錄或是磁碟已滿?"
+"Enlightenment ç\84¡æ³\95å\88\9då§\8bå\8c\96ç·\8aæ\80¥è­¦å ±ç³»çµ±。\n"
+"您是否已設定 DISPLAY 環境變數?"
 
-#: src/bin/e_main.c:582
-msgid "Enlightenment cannot set up its file registry system."
-msgstr "Enlightenment 無法設定他的登錄系統。"
+#: src/bin/e_main.c:388
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Xinerama!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
+
+#: src/bin/e_main.c:397
+#, fuzzy
+msgid "Enlightenment cannot initialize E_Randr!\n"
+msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:591
+#: src/bin/e_main.c:415
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+"Enlightenment 無法在你的家目錄建立目錄。\n"
+"可能你沒有家目錄或是磁碟已滿?"
+
+#: src/bin/e_main.c:425
+msgid "Enlightenment cannot set up its file registry system."
+msgstr "Enlightenment 無法設定他的登錄系統。"
+
+#: src/bin/e_main.c:434
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment 無法設定他的配置系統。"
 
-#: src/bin/e_main.c:607
+#: src/bin/e_main.c:445
+#, fuzzy
+msgid "Enlightenment cannot set up its environment."
+msgstr "Enlightenment 無法建立他的主題系統。"
+
+#: src/bin/e_main.c:458
 #, fuzzy
 msgid "Enlightenment cannot set up its scale system."
 msgstr "Enlightenment 無法建立他的置物架系統。"
 
-#: src/bin/e_main.c:615
+#: src/bin/e_main.c:467
 #, fuzzy
-msgid "Enlightenment cannot set up the pointer system."
+msgid "Enlightenment cannot set up its pointer system."
 msgstr "Enlightenment 無法建立他的字形系統。"
 
-#: src/bin/e_main.c:624
+#: src/bin/e_main.c:476
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -2639,93 +2617,42 @@ msgstr ""
 "Enlightenment 無法為找到的文件建立路徑。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:642
+#: src/bin/e_main.c:493
 msgid "Enlightenment cannot set up its font system."
 msgstr "Enlightenment 無法建立他的字形系統。"
 
-#: src/bin/e_main.c:653
+#: src/bin/e_main.c:510
 msgid "Enlightenment cannot set up its theme system."
 msgstr "Enlightenment 無法建立他的主題系統。"
 
-#: src/bin/e_main.c:667
-msgid ""
-"Enlightenment cannot set up init screen.\n"
-"Perhaps you are out of memory?"
-msgstr ""
-"Enlightenment 無法建立初始螢幕。\n"
-"可能是記憶體不足?"
+#: src/bin/e_main.c:526
+#, fuzzy
+msgid "Enlightenment cannot set up its init screen."
+msgstr "Enlightenment 無法建立國際化系統。"
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:541
 msgid "Starting International Support"
 msgstr "開始國際化支援"
 
-#: src/bin/e_main.c:685
+#: src/bin/e_main.c:545
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment 無法建立國際化系統。"
 
-#: src/bin/e_main.c:694
+#: src/bin/e_main.c:554
+#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
-"Perhaps you are out of memory?"
+"Perhaps you lack permissions on ~/.cache/efreet or are\n"
+"out of memory or disk space?"
 msgstr ""
 "Enlightenment 無法初始化 FDO desktop 系統。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:703
-msgid "Testing Format Support"
-msgstr "測試格式支援"
-
-#: src/bin/e_main.c:714 src/bin/e_main.c:774
-msgid ""
-"Enlightenment found Evas can't create a buffer canvas. Please check\n"
-"Evas has Software Buffer engine support.\n"
-msgstr ""
-"Enlightment 發現 Evas 無法創造緩衝畫面。請確認\n"
-"Evas 支援軟體緩衝引擎。\n"
-
-#: src/bin/e_main.c:725
-msgid ""
-"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-"loader support.\n"
-msgstr ""
-"Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
-"Evas 支援 PNG 檔讀取。\n"
-
-#: src/bin/e_main.c:734
-msgid ""
-"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-"loader support.\n"
-msgstr ""
-"Enlightment 發現 Evas 無法讀入 JPEG 檔案。請確認\n"
-"Evas 支援 JPEG 檔案讀取。\n"
-
-#: src/bin/e_main.c:743
-msgid ""
-"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-"loader support.\n"
-msgstr ""
-"Enlightment 發現 Evas 無法讀入 EET 檔案。請確認\n"
-"Evas 支援 EET 檔案讀取。\n"
-
-#: src/bin/e_main.c:754
-#, fuzzy
-msgid ""
-"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
-"fontconfig\n"
-"support and system fontconfig defines a 'Sans' font.\n"
-msgstr ""
-"Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
-"Evas 支援 PNG 檔讀取。\n"
-
-#: src/bin/e_main.c:764
-msgid "Check SVG Support"
-msgstr ""
-
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:577
 msgid "Setup Screens"
 msgstr "設定螢幕"
 
-#: src/bin/e_main.c:799
+#: src/bin/e_main.c:581
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2733,214 +2660,351 @@ msgstr ""
 "Enlightenment 在你所有的screen上建立視窗管理都失敗。\n"
 "可能有另一個視窗管理程式正在執行?\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:589
+#, fuzzy
+msgid "Setup ACPI"
+msgstr "設定 DPMS"
+
+#: src/bin/e_main.c:596
+#, fuzzy
+msgid "Setup Backlight"
+msgstr "設定快速鍵"
+
+#: src/bin/e_main.c:600
+#, fuzzy
+msgid "Enlightenment cannot configure the backlight."
+msgstr "Enlightenment 無法設定 DPMS 設定。"
+
+#: src/bin/e_main.c:607
+msgid "Setup DPMS"
+msgstr "設定 DPMS"
+
+#: src/bin/e_main.c:611
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment 無法設定 DPMS 設定。"
+
+#: src/bin/e_main.c:618
 msgid "Setup Screensaver"
 msgstr "設定螢幕保護程式"
 
-#: src/bin/e_main.c:810
+#: src/bin/e_main.c:622
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment 無法設定 X 螢幕保護程式。"
 
-#: src/bin/e_main.c:815
+#: src/bin/e_main.c:629
+#, fuzzy
+msgid "Setup Powersave Modes"
+msgstr "設定 CPU 電源管理原則"
+
+#: src/bin/e_main.c:633
+#, fuzzy
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment 無法建立他的彈出系統。"
+
+#: src/bin/e_main.c:640
 msgid "Setup Desklock"
 msgstr "設定桌面鎖定"
 
-#: src/bin/e_main.c:820
+#: src/bin/e_main.c:644
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment 無法建立他的桌面鎖定系統。"
 
-#: src/bin/e_main.c:825
+#: src/bin/e_main.c:651
 msgid "Setup Popups"
 msgstr "設定彈出視窗"
 
-#: src/bin/e_main.c:830
+#: src/bin/e_main.c:655
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment 無法建立他的彈出系統。"
 
-#: src/bin/e_main.c:843
+#: src/bin/e_main.c:665
+#, fuzzy
+msgid "Setup Message Bus"
+msgstr "設定訊息系統"
+
+#: src/bin/e_main.c:672
 #, fuzzy
 msgid "Setup Paths"
 msgstr "設定路徑"
 
-#: src/bin/e_main.c:860
+#: src/bin/e_main.c:678
 msgid "Setup System Controls"
 msgstr "設定系統控制"
 
-#: src/bin/e_main.c:865
+#: src/bin/e_main.c:682
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment 無法初始化系統命令系統。\n"
 
-#: src/bin/e_main.c:870
+#: src/bin/e_main.c:689
 msgid "Setup Actions"
 msgstr "設定行動"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:693
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment 無法建立他的動作系統。"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:700
 msgid "Setup Execution System"
 msgstr "設定執行系統"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:704
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment 無法建立他的執行系統。"
 
-#: src/bin/e_main.c:892
-msgid "Setup FM"
-msgstr "設定 FM"
+#: src/bin/e_main.c:715
+#, fuzzy
+msgid "Setup Filemanager"
+msgstr "檔案管理員"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:719
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:726
 msgid "Setup Message System"
 msgstr "設定訊息系統"
 
-#: src/bin/e_main.c:917
+#: src/bin/e_main.c:730
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment 無法建立他的訊息系統。"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:737
 msgid "Setup DND"
 msgstr "設定拖放"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:741
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment 無法建立他的拖放系統。"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "設定輸入攫取處理系統"
 
-#: src/bin/e_main.c:937
-msgid "Enlightenment cannot set up its input grab handling system."
+#: src/bin/e_main.c:752
+#, fuzzy
+msgid "Enlightenment cannot set up its grab input handling system."
 msgstr "Enlightenment 無法建立他的輸入擷取處理系統。"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:759
 msgid "Setup Modules"
 msgstr "設定模組"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:763 src/bin/e_main.c:839
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment 無法建立他的模組系統。"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:770
 msgid "Setup Remembers"
 msgstr "設定記憶值"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:774
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment 無法設定他的設定記憶系統。"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:781
 msgid "Setup Color Classes"
 msgstr "設定顏色類別"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:785
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment 無法建立他的顏色類別系統。"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:792
 msgid "Setup Gadcon"
 msgstr "設定小工具控制"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment 無法建立他的小工具控制系統。"
 
-#: src/bin/e_main.c:982
-#, fuzzy
-msgid "Setup ACPI"
-msgstr "設定 DPMS"
-
-#: src/bin/e_main.c:989
-msgid "Setup DPMS"
-msgstr "設定 DPMS"
-
-#: src/bin/e_main.c:994
-msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment 無法設定 DPMS 設定。"
-
-#: src/bin/e_main.c:999
-#, fuzzy
-msgid "Setup Powersave modes"
-msgstr "設定 CPU 電源管理原則"
-
-#: src/bin/e_main.c:1003
-#, fuzzy
-msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment 無法建立他的彈出系統。"
-
-#: src/bin/e_main.c:1008
+#: src/bin/e_main.c:803
 msgid "Setup Wallpaper"
 msgstr "設定桌布"
 
-#: src/bin/e_main.c:1013
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment 無法建立桌面背景系統。"
 
-#: src/bin/e_main.c:1018
+#: src/bin/e_main.c:814
 msgid "Setup Mouse"
 msgstr "設定滑鼠"
 
-#: src/bin/e_main.c:1023
+#: src/bin/e_main.c:818
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment 無法設定 DPMS 設定。"
 
-#: src/bin/e_main.c:1028
+#: src/bin/e_main.c:824
 msgid "Setup Bindings"
 msgstr "設定快速鍵"
 
-#: src/bin/e_main.c:1033
+#: src/bin/e_main.c:828
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment 無法建立他的連接系統。"
 
-#: src/bin/e_main.c:1038
+#: src/bin/e_main.c:835
 msgid "Setup Shelves"
 msgstr "設定置物架"
 
-#: src/bin/e_main.c:1043
-msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment 無法建立他的置物架系統。"
-
-#: src/bin/e_main.c:1048
+#: src/bin/e_main.c:846
 msgid "Setup Thumbnailer"
 msgstr "設定縮圖"
 
-#: src/bin/e_main.c:1053
+#: src/bin/e_main.c:850
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment 無法初始化縮圖系統。\n"
 
-#: src/bin/e_main.c:1058
+#: src/bin/e_main.c:859
+#, fuzzy
+msgid "Enlightenment cannot initialize the Icon Cache system.\n"
+msgstr "Enlightenment 無法初始化系統命令系統。\n"
+
+#: src/bin/e_main.c:868
+#, fuzzy
+msgid "Enlightenment cannot initialize the XSettings system.\n"
+msgstr "Enlightenment 無法初始化縮圖系統。\n"
+
+#: src/bin/e_main.c:877
+msgid "Setup Desktop Environment"
+msgstr ""
+
+#: src/bin/e_main.c:881
+#, fuzzy
+msgid "Enlightenment cannot initialize its desktop environment.\n"
+msgstr "Enlightenment 無法建立他的主題系統。"
+
+#: src/bin/e_main.c:889
 #, fuzzy
 msgid "Setup File Ordering"
 msgstr "設定檔案排序"
 
-#: src/bin/e_main.c:1062
+#: src/bin/e_main.c:893
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment 無法建立他的有序檔案系統。"
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:908
 msgid "Load Modules"
 msgstr "載入模組"
 
+#: src/bin/e_main.c:938
+msgid "Configure Shelves"
+msgstr "設定置物架"
+
+#: src/bin/e_main.c:949
+msgid "Almost Done"
+msgstr "快好了"
+
 #: src/bin/e_main.c:1094
 #, c-format
 msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
+"800x600+800+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1147
+msgid ""
+"You are executing enlightenment directly. This is\n"
+"bad. Please do not execute the \"enlightenment\"\n"
+"binary. Use the \"enlightenment_start\" launcher. It\n"
+"will handle setting up environment variables, paths,\n"
+"and launching any other required services etc.\n"
+"before enlightenment itself begins running.\n"
+msgstr ""
+
+#: src/bin/e_main.c:1426
+msgid "Testing Format Support"
+msgstr "測試格式支援"
+
+#: src/bin/e_main.c:1430
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法創造緩衝畫面。請確認\n"
+"Evas 支援軟體緩衝引擎。\n"
+
+#: src/bin/e_main.c:1442
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
+"support.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
+"Evas 支援 PNG 檔讀取。\n"
+
+#: src/bin/e_main.c:1452
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
+"support.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法讀入 JPEG 檔案。請確認\n"
+"Evas 支援 JPEG 檔案讀取。\n"
+
+#: src/bin/e_main.c:1462
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
+"support.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
+"Evas 支援 PNG 檔讀取。\n"
+
+#: src/bin/e_main.c:1472
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET loader "
+"support.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法讀入 EET 檔案。請確認\n"
+"Evas 支援 EET 檔案讀取。\n"
+
+#: src/bin/e_main.c:1486
+#, fuzzy
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
+"Evas 支援 PNG 檔讀取。\n"
+
+#: src/bin/e_main.c:1677
+#, c-format
+msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
 "error loading<br>module named: %s. This module has been disabled<br>and will "
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1099 src/bin/e_main.c:1116
+#: src/bin/e_main.c:1682 src/bin/e_main.c:1699
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightment 在啟動途中當機,已經重新啟動。"
 
-#: src/bin/e_main.c:1100
+#: src/bin/e_main.c:1683
 #, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -2948,7 +3012,7 @@ msgid ""
 "not be loaded."
 msgstr ""
 
-#: src/bin/e_main.c:1109
+#: src/bin/e_main.c:1692
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2959,7 +3023,7 @@ msgstr ""
 "您<br>\n"
 "從設定檔中移除任何問題模組。<br>模組設定對話框應可讓您重新選擇模組。"
 
-#: src/bin/e_main.c:1117
+#: src/bin/e_main.c:1700
 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 "
@@ -2970,20 +3034,12 @@ msgstr ""
 "您<br>\n"
 "從設定檔中移除任何問題模組。<br><br>模組設定對話框應可讓您重新選擇模組。"
 
-#: src/bin/e_main.c:1146
-msgid "Configure Shelves"
-msgstr "設定置物架"
-
-#: src/bin/e_main.c:1157
-msgid "Almost Done"
-msgstr "快好了"
-
-#: src/bin/e_module.c:102
+#: src/bin/e_module.c:96
 #, fuzzy, c-format
 msgid "Loading Module: %s"
 msgstr "載入模組"
 
-#: src/bin/e_module.c:140
+#: src/bin/e_module.c:134
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2991,11 +3047,11 @@ msgid ""
 msgstr ""
 "載入模組 %s 時發生錯誤。<br>在模組的搜尋路徑<br>沒有找到名為 %s 的模組。<br>"
 
-#: src/bin/e_module.c:143 src/bin/e_module.c:156 src/bin/e_module.c:174
+#: src/bin/e_module.c:137 src/bin/e_module.c:150 src/bin/e_module.c:168
 msgid "Error loading Module"
 msgstr "載入模組時發生錯誤"
 
-#: src/bin/e_module.c:151 src/bin/e_module.c:168
+#: src/bin/e_module.c:145 src/bin/e_module.c:162
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -3004,11 +3060,11 @@ msgstr ""
 "載入模組 %s 時發生錯誤。<br>該模組的完整路徑是:<br>%s<br>錯誤報告如下:<br>"
 "%s<br>"
 
-#: src/bin/e_module.c:173
+#: src/bin/e_module.c:167
 msgid "Module does not contain all needed functions"
 msgstr "模組並末包含所有必需之功能"
 
-#: src/bin/e_module.c:188
+#: src/bin/e_module.c:182
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3018,16 +3074,16 @@ msgstr ""
 "模組 API 錯誤<br>模組初始化錯誤: %s<br>要求最小的模組 API 版本號: %i。"
 "<br>Enlightenment給的模組版本化: %i。<br>"
 
-#: src/bin/e_module.c:193
+#: src/bin/e_module.c:187
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模組"
 
-#: src/bin/e_module.c:519
+#: src/bin/e_module.c:513
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸除這個模組?<br>"
 
-#: src/bin/e_screensaver.c:135
+#: src/bin/e_screensaver.c:139
 msgid ""
 "You disabled screensaver too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -3038,28 +3094,28 @@ msgstr ""
 msgid "Shelf #"
 msgstr "置物架 #"
 
-#: src/bin/e_shelf.c:1298 src/modules/conf_shelves/e_int_config_shelf.c:291
+#: src/bin/e_shelf.c:1304 src/modules/conf_shelves/e_int_config_shelf.c:291
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您是否確定移除這個置物架?"
 
-#: src/bin/e_shelf.c:1299
+#: src/bin/e_shelf.c:1305
 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:1674
+#: src/bin/e_shelf.c:1680
 #, fuzzy
 msgid "Stop Moving/Resizing Gadgets"
 msgstr "停止移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1676
+#: src/bin/e_shelf.c:1682
 #, fuzzy
 msgid "Begin Moving/Resizing Gadgets"
 msgstr "開始移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1684 src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_main.c:801
+#: src/bin/e_shelf.c:1690 src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_main.c:781
 #, fuzzy
 msgid "Contents"
 msgstr "註解"
@@ -3068,16 +3124,16 @@ msgstr "註解"
 msgid "Starting"
 msgstr "正在啟動"
 
-#: src/bin/e_sys.c:171
+#: src/bin/e_sys.c:175
 msgid "Checking System Permissions"
 msgstr "檢查系統權限"
 
-#: src/bin/e_sys.c:209 src/bin/e_sys.c:220 src/bin/e_sys.c:229
-#: src/bin/e_sys.c:238
+#: src/bin/e_sys.c:221 src/bin/e_sys.c:232 src/bin/e_sys.c:241
+#: src/bin/e_sys.c:250
 msgid "System Check Done"
 msgstr "完成系統權限檢查"
 
-#: src/bin/e_sys.c:305
+#: src/bin/e_sys.c:317
 #, fuzzy, c-format
 msgid ""
 "Logout is taking too long.<br>Some applications refuse to close.<br>Do you "
@@ -3087,36 +3143,36 @@ msgstr ""
 "登出花了過長時間。<br>有些應用程式拒絕關閉。<br>您是否仍要在不先關閉<br>這些"
 "程式的情況下登出?"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:377
 msgid "Logout problems"
 msgstr "登出時發生問題"
 
-#: src/bin/e_sys.c:368
+#: src/bin/e_sys.c:379
 msgid "Logout now"
 msgstr "立刻登出"
 
-#: src/bin/e_sys.c:369
+#: src/bin/e_sys.c:381
 msgid "Wait longer"
 msgstr "等待登出"
 
-#: src/bin/e_sys.c:370
+#: src/bin/e_sys.c:383
 msgid "Cancel Logout"
 msgstr "取消登出"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:423
 msgid "Logout in progress"
 msgstr "登出中"
 
-#: src/bin/e_sys.c:412
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "登出中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:438 src/bin/e_sys.c:499
+#: src/bin/e_sys.c:453 src/bin/e_sys.c:503
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment 仍在處理其它請求。"
 
-#: src/bin/e_sys.c:444
+#: src/bin/e_sys.c:458
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -3124,7 +3180,7 @@ msgid ""
 msgstr ""
 "Enlightment 正在登出中。<br>一旦開始登出,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:452
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -3132,7 +3188,7 @@ msgid ""
 msgstr ""
 "Enlightment 正在關機中。<br>一旦開始關機,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:459
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -3141,7 +3197,7 @@ msgstr ""
 "Enlightment 正在重新開機中。<br>一旦開始重新開機,<br>您就不能執行任何系統動"
 "作。"
 
-#: src/bin/e_sys.c:466
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -3149,70 +3205,70 @@ msgid ""
 msgstr ""
 "Enlightment 正在待機中。<br>一旦開始待機,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:479
 #, fuzzy
 msgid ""
-"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"Hibernating.<br>You cannot perform any other system actions<br>until this is "
 "complete."
 msgstr ""
 "Enlightment 正在休眠中。<br>一旦開始休眠,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:480 src/bin/e_sys.c:526
+#: src/bin/e_sys.c:484 src/bin/e_sys.c:521
 msgid "EEK! This should not happen"
 msgstr "哎呀!怎麼會發生這種事"
 
-#: src/bin/e_sys.c:506
+#: src/bin/e_sys.c:509
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:511
+#: src/bin/e_sys.c:512
 #, fuzzy
 msgid "Reset failed."
 msgstr "desktop 檔"
 
-#: src/bin/e_sys.c:516
+#: src/bin/e_sys.c:515
 #, fuzzy
 msgid "Suspend failed."
 msgstr "待機時間"
 
-#: src/bin/e_sys.c:521
+#: src/bin/e_sys.c:518
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "無法休眠"
 
-#: src/bin/e_sys.c:578
+#: src/bin/e_sys.c:581
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:581
+#: src/bin/e_sys.c:584
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "重新開機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:605
+#: src/bin/e_sys.c:611
 #, fuzzy
 msgid "Resetting"
 msgstr "桌面設定"
 
-#: src/bin/e_sys.c:608
+#: src/bin/e_sys.c:614
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "重新開機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:633
+#: src/bin/e_sys.c:642
 msgid "Suspending"
 msgstr "待機中"
 
-#: src/bin/e_sys.c:636
+#: src/bin/e_sys.c:645
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "待機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:661
+#: src/bin/e_sys.c:673
 msgid "Hibernating"
 msgstr "休眠中"
 
-#: src/bin/e_sys.c:664
+#: src/bin/e_sys.c:676
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "休眠中。<br><hilight>請稍候。</hilight>"
@@ -3222,34 +3278,34 @@ msgstr "休眠中。<br><hilight>請稍候。</hilight>"
 msgid "About Theme"
 msgstr "關於此佈景主題"
 
-#: src/bin/e_theme.c:40
+#: src/bin/e_theme.c:36
 msgid "Set As Theme"
 msgstr "設定為佈景主題"
 
-#: src/bin/e_toolbar.c:325
+#: src/bin/e_toolbar.c:329
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移動或改變項目大小"
 
-#: src/bin/e_toolbar.c:327
+#: src/bin/e_toolbar.c:331
 msgid "Begin Moving/Resizing Items"
 msgstr "開始移動或改變項目大小"
 
-#: src/bin/e_toolbar.c:340
+#: src/bin/e_toolbar.c:344
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "設定置物架內容物"
 
-#: src/bin/e_utils.c:236 src/modules/conf_intl/e_int_config_imc.c:266
+#: src/bin/e_utils.c:231 src/modules/conf_intl/e_int_config_imc.c:266
 #: src/modules/conf_intl/e_int_config_imc.c:514
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment 無法建立一個子程序:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:280
+#: src/bin/e_utils.c:275
 msgid "Cannot exit - immortal windows."
 msgstr "無法退出 - 不朽之視窗。"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:276
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3258,125 +3314,125 @@ msgstr ""
 "部份視窗仍處於生命周期鎖定中。這意味著 Enlightenment 不允許自己退出,<br>除非"
 "這些視窗被關閉,或者移除生命周期鎖定。<br>"
 
-#: src/bin/e_utils.c:876
+#: src/bin/e_utils.c:871
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 位元組"
 
-#: src/bin/e_utils.c:880
+#: src/bin/e_utils.c:875
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:884
+#: src/bin/e_utils.c:879
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:888
+#: src/bin/e_utils.c:883
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:907
+#: src/bin/e_utils.c:902
 #, c-format
 msgid "In the Future"
 msgstr "末來"
 
-#: src/bin/e_utils.c:911
+#: src/bin/e_utils.c:906
 #, c-format
 msgid "In the last Minute"
 msgstr "一分鐘內"
 
-#: src/bin/e_utils.c:913
+#: src/bin/e_utils.c:908
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:915
+#: src/bin/e_utils.c:910
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 個月前"
 
-#: src/bin/e_utils.c:917
+#: src/bin/e_utils.c:912
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:919
+#: src/bin/e_utils.c:914
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:921
+#: src/bin/e_utils.c:916
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小時前"
 
-#: src/bin/e_utils.c:923
+#: src/bin/e_utils.c:918
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分鐘前"
 
-#: src/bin/e_utils.c:929 src/modules/conf_dialogs/e_int_config_profiles.c:274
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1179
+#: src/bin/e_utils.c:924 src/modules/conf_dialogs/e_int_config_profiles.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1177
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1179
-#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:27
+#: src/modules/wizard/page_020.c:19 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "末知"
 
-#: src/bin/e_utils.c:1161
+#: src/bin/e_utils.c:1156
 #, fuzzy
 msgid "Image Import Settings"
 msgstr "桌面切換器設定"
 
-#: src/bin/e_utils.c:1165
+#: src/bin/e_utils.c:1160
 #, fuzzy
 msgid "Import"
 msgstr "匯入..."
 
-#: src/bin/e_utils.c:1182
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:167
+#: src/bin/e_utils.c:1177
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:169
 msgid "Fill and Stretch Options"
 msgstr "填滿與延展選項"
 
-#: src/bin/e_utils.c:1190
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:170
+#: src/bin/e_utils.c:1185
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:172
 msgid "Stretch"
 msgstr "延展"
 
-#: src/bin/e_utils.c:1191
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:175
+#: src/bin/e_utils.c:1186
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:177
 msgid "Center"
 msgstr "置中"
 
-#: src/bin/e_utils.c:1193
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:185
+#: src/bin/e_utils.c:1188
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:187
 msgid "Within"
 msgstr "在內"
 
-#: src/bin/e_utils.c:1194
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:190
+#: src/bin/e_utils.c:1189
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:192
 msgid "Fill"
 msgstr "填滿"
 
-#: src/bin/e_utils.c:1199
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#: src/bin/e_utils.c:1194
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:204
 msgid "File Quality"
 msgstr "檔案品質"
 
-#: src/bin/e_utils.c:1201
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:199
+#: src/bin/e_utils.c:1196
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:206
 msgid "Use original file"
 msgstr "使用原始檔案"
 
-#: src/bin/e_utils.c:1205
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:202
+#: src/bin/e_utils.c:1200
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:209
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_utils.c:1534
+#: src/bin/e_utils.c:1529
 #, fuzzy
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br> has been "
@@ -3392,12 +3448,12 @@ msgstr ""
 "需要部份舊組態資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新"
 "配置您設定。<br>抱歉打斷您的配置。<br>"
 
-#: src/bin/e_utils.c:1547 src/bin/e_utils.c:1571
+#: src/bin/e_utils.c:1542 src/bin/e_utils.c:1566
 #, fuzzy, c-format
 msgid "%s Configuration Updated"
 msgstr "檔案管理員組態已經更新"
 
-#: src/bin/e_utils.c:1560
+#: src/bin/e_utils.c:1555
 #, fuzzy
 msgid ""
 "Your module configuration is NEWER than the module version. This is "
@@ -3430,149 +3486,155 @@ msgstr "往上"
 msgid "Down"
 msgstr "往下"
 
-#: src/bin/e_widget_fsel.c:297
+#: src/bin/e_widget_fsel.c:296
 msgid "Add to Favorites"
 msgstr "加入「我的最愛」選單"
 
-#: src/bin/e_widget_fsel.c:303
+#: src/bin/e_widget_fsel.c:302
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:91
 #: src/modules/conf_intl/e_int_config_imc.c:815
-#: src/modules/conf_theme/e_int_config_wallpaper.c:459
-#: src/modules/conf_theme/e_int_config_wallpaper.c:589
+#: src/modules/conf_theme/e_int_config_wallpaper.c:472
+#: src/modules/conf_theme/e_int_config_wallpaper.c:594
 #: src/modules/conf_theme/e_int_config_startup.c:266
 #: src/modules/conf_theme/e_int_config_theme.c:403
-#: src/modules/gadman/e_mod_config.c:187
+#: src/modules/gadman/e_mod_config.c:186
 msgid "Go up a Directory"
 msgstr "到上一層目錄"
 
-#: src/bin/e_widget_fsel.c:332
+#: src/bin/e_widget_fsel.c:331
 #, fuzzy
 msgid "Resolution:"
 msgstr "解析度"
 
-#: src/bin/e_widget_fsel.c:380
+#: src/bin/e_widget_fsel.c:379
 msgid "Permissions:"
 msgstr "權限:"
 
-#: src/bin/e_widget_fsel.c:396
+#: src/bin/e_widget_fsel.c:395
 msgid "Modified:"
 msgstr "修改日期:"
 
-#: src/bin/e_widget_fsel.c:654
+#: src/bin/e_widget_fsel.c:664
 #, c-format
 msgid "You"
 msgstr "您"
 
-#: src/bin/e_widget_fsel.c:703
+#: src/bin/e_widget_fsel.c:713
 #, c-format
 msgid "Protected"
 msgstr "受保護的"
 
-#: src/bin/e_widget_fsel.c:705 src/bin/e_widget_fsel.c:714
-#: src/bin/e_widget_fsel.c:723
+#: src/bin/e_widget_fsel.c:715 src/bin/e_widget_fsel.c:724
+#: src/bin/e_widget_fsel.c:733
 #, c-format
 msgid "Read Only"
 msgstr "唯讀"
 
-#: src/bin/e_widget_fsel.c:712 src/bin/e_widget_fsel.c:721
+#: src/bin/e_widget_fsel.c:722 src/bin/e_widget_fsel.c:731
 #, c-format
 msgid "Forbidden"
 msgstr "禁止讀寫"
 
-#: src/bin/e_widget_fsel.c:730
+#: src/bin/e_widget_fsel.c:740
 msgid "Read-Write"
 msgstr "讀寫"
 
-#: src/modules/battery/e_mod_config.c:59
+#: src/modules/battery/e_mod_config.c:60
 #, fuzzy
 msgid "Battery Monitor Settings"
 msgstr "電池監控組態"
 
-#: src/modules/battery/e_mod_config.c:124
+#: src/modules/battery/e_mod_config.c:126
 msgid "Show alert when battery is low"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_config.c:209
+#: src/modules/battery/e_mod_config.c:211
 #, fuzzy
 msgid "Check every:"
 msgstr "電量檢查間隔:"
 
-#: src/modules/battery/e_mod_config.c:211
+#: src/modules/battery/e_mod_config.c:213
 #: src/modules/conf_performance/e_int_config_performance.c:121
-#: src/modules/temperature/e_mod_config.c:210
+#: src/modules/temperature/e_mod_config.c:233
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f 筆"
 
-#: src/modules/battery/e_mod_config.c:214
+#: src/modules/battery/e_mod_config.c:217
+#, fuzzy
+msgid "Hibernate when below:"
+msgstr "休眠"
+
+#: src/modules/battery/e_mod_config.c:219
+#: src/modules/battery/e_mod_config.c:238
+#, fuzzy, c-format
+msgid "%1.0f %%"
+msgstr "%3.0f%%"
+
+#: src/modules/battery/e_mod_config.c:223
 #, fuzzy
 msgid "Polling"
 msgstr "一般"
 
-#: src/modules/battery/e_mod_config.c:218
+#: src/modules/battery/e_mod_config.c:227
 #, fuzzy
 msgid "Show low battery alert"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_config.c:222
+#: src/modules/battery/e_mod_config.c:231
 #, fuzzy
 msgid "Alert when at:"
 msgstr "可用電量低於此時間時發出警告:"
 
-#: src/modules/battery/e_mod_config.c:225
+#: src/modules/battery/e_mod_config.c:234
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分鐘"
 
-#: src/modules/battery/e_mod_config.c:229
-#, fuzzy, c-format
-msgid "%1.0f %%"
-msgstr "%3.0f%%"
-
-#: src/modules/battery/e_mod_config.c:233
+#: src/modules/battery/e_mod_config.c:242
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:238
+#: src/modules/battery/e_mod_config.c:247
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f 秒"
 
-#: src/modules/battery/e_mod_config.c:245
+#: src/modules/battery/e_mod_config.c:254
 #, fuzzy
 msgid "Alert"
 msgstr "加速"
 
-#: src/modules/battery/e_mod_config.c:251
+#: src/modules/battery/e_mod_config.c:260
 #, fuzzy
 msgid "Auto Detect"
 msgstr "自動隱藏"
 
-#: src/modules/battery/e_mod_config.c:254
-#: src/modules/conf_applications/e_mod_main.c:39
+#: src/modules/battery/e_mod_config.c:263
+#: src/modules/conf_applications/e_mod_main.c:52
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:23
-#: src/modules/temperature/e_mod_config.c:246
+#: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "內部"
 
-#: src/modules/battery/e_mod_config.c:258
-#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/battery/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:271
 msgid "udev"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:261
+#: src/modules/battery/e_mod_config.c:270
 #, fuzzy
 msgid "Fuzzy Mode"
 msgstr "模糊"
 
-#: src/modules/battery/e_mod_config.c:265
+#: src/modules/battery/e_mod_config.c:274
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:270
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/battery/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:273
 msgid "Hardware"
 msgstr ""
 
@@ -3580,34 +3642,35 @@ msgstr ""
 msgid "Battery"
 msgstr "電池"
 
-#: src/modules/battery/e_mod_main.c:453
+#: src/modules/battery/e_mod_main.c:455
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_main.c:455
+#: src/modules/battery/e_mod_main.c:457
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:530
+#: src/modules/battery/e_mod_main.c:532
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:604 src/modules/battery/e_mod_main.c:606
-#: src/modules/battery/e_mod_main.c:613 src/modules/battery/e_mod_main.c:615
+#: src/modules/battery/e_mod_main.c:612 src/modules/battery/e_mod_main.c:614
+#: src/modules/battery/e_mod_main.c:621 src/modules/battery/e_mod_main.c:623
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:712
+#: src/modules/battery/e_mod_main.c:723
 #, fuzzy
 msgid "Battery Meter"
 msgstr "電池"
 
-#: src/modules/clock/e_mod_main.c:520 src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:652 src/modules/clock/e_mod_main.c:783
+#: src/modules/clock/e_mod_main.c:797
 msgid "Clock"
 msgstr "時鐘"
 
-#: src/modules/clock/e_mod_main.c:631
+#: src/modules/clock/e_mod_main.c:783 src/modules/clock/e_mod_main.c:797
 #, fuzzy
 msgid "Show calendar"
 msgstr "陰影顏色"
@@ -3675,17 +3738,17 @@ msgstr "檔案管理員組態已經更新"
 
 #: src/modules/conf_applications/e_int_config_apps.c:84
 #: src/modules/conf_applications/e_int_config_apps.c:98
-#: src/modules/conf_applications/e_mod_main.c:28
+#: src/modules/conf_applications/e_mod_main.c:33
 msgid "IBar Applications"
 msgstr "IBar 應用程式"
 
 #: src/modules/conf_applications/e_int_config_apps.c:113
-#: src/modules/conf_applications/e_mod_main.c:36
+#: src/modules/conf_applications/e_mod_main.c:41
 msgid "Startup Applications"
 msgstr "自動啟動之應用程式"
 
 #: src/modules/conf_applications/e_int_config_apps.c:129
-#: src/modules/conf_applications/e_mod_main.c:32
+#: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
 msgstr "自動重新啟動之應用程式"
 
@@ -3700,10 +3763,25 @@ msgid "Apps"
 msgstr "套用"
 
 #: src/modules/conf_applications/e_mod_main.c:21
-msgid "New Application"
-msgstr "新的應用程式"
+#, fuzzy
+msgid "Create Launcher"
+msgstr "啟動"
 
-#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_applications/e_mod_main.c:25
+msgid "Delete Personal Launchers"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:45
+#, fuzzy
+msgid "Default Applications"
+msgstr "特定應用程式"
+
+#: src/modules/conf_applications/e_mod_main.c:49
+#, fuzzy
+msgid "Desktop Environments"
+msgstr "desktop 檔"
+
+#: src/modules/conf_applications/e_mod_main.c:54
 msgid "IBar Other"
 msgstr "其它 IBar 應用程式"
 
@@ -3716,7 +3794,7 @@ msgid "Available Profiles"
 msgstr "可用 Profile"
 
 #: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:118
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "選擇 Edj 檔"
@@ -3757,9 +3835,9 @@ msgstr "對話框設定"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:109
 #: src/modules/conf_performance/e_int_config_engine.c:95
-#: src/modules/conf_theme/e_int_config_fonts.c:646
-#: src/modules/everything/evry_config.c:527 src/modules/ibox/e_mod_config.c:96
-#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:651
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:96
+#: src/modules/mixer/conf_gadget.c:191 src/modules/mixer/conf_module.c:91
 msgid "General Settings"
 msgstr "一般設定"
 
@@ -3803,7 +3881,7 @@ msgstr "對話框"
 msgid "Profiles"
 msgstr "Profiles"
 
-#: src/modules/conf_display/e_int_config_display.c:136
+#: src/modules/conf_display/e_int_config_display.c:127
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3814,7 +3892,7 @@ msgstr ""
 "先的解晰度為<br>%dx%d @ %dHz。如果您在 %d 秒內末按下任何按鈕,系統<br>將自動"
 "還原成原先的解晰度。"
 
-#: src/modules/conf_display/e_int_config_display.c:143
+#: src/modules/conf_display/e_int_config_display.c:134
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3825,7 +3903,7 @@ msgstr ""
 "先的解晰度為<br>%dx%d。如果您在 %d 秒內末按下任何按鈕,系統<br>將自動還原成原"
 "先的解晰度。"
 
-#: src/modules/conf_display/e_int_config_display.c:153
+#: src/modules/conf_display/e_int_config_display.c:144
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3836,7 +3914,7 @@ msgstr ""
 "先的解晰度為<br>%dx%d @ %d Hz。如果您沒有按下任何按鈕,系統<br>將馬上還原成原"
 "先的解晰度。"
 
-#: src/modules/conf_display/e_int_config_display.c:160
+#: src/modules/conf_display/e_int_config_display.c:151
 #, fuzzy, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
@@ -3847,49 +3925,49 @@ msgstr ""
 "先的解晰度為<br>%dx%d。如果您沒有按下任何按鈕,系統<br>將馬上還原成原先的解晰"
 "度。"
 
-#: src/modules/conf_display/e_int_config_display.c:197
+#: src/modules/conf_display/e_int_config_display.c:188
 msgid "Resolution change"
 msgstr "改變解析度"
 
-#: src/modules/conf_display/e_int_config_display.c:201
+#: src/modules/conf_display/e_int_config_display.c:192
 #, fuzzy
 msgid "Save"
 msgstr "狀態"
 
-#: src/modules/conf_display/e_int_config_display.c:202
+#: src/modules/conf_display/e_int_config_display.c:193
 #, fuzzy
 msgid "Restore"
 msgstr "重新啟動"
 
-#: src/modules/conf_display/e_int_config_display.c:235
+#: src/modules/conf_display/e_int_config_display.c:226
 msgid "Screen Resolution Settings"
 msgstr "螢幕解析度設定"
 
-#: src/modules/conf_display/e_int_config_display.c:440
+#: src/modules/conf_display/e_int_config_display.c:391
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/modules/conf_display/e_int_config_display.c:447
+#: src/modules/conf_display/e_int_config_display.c:398
 msgid "Restore on login"
 msgstr "登入時復原"
 
-#: src/modules/conf_display/e_int_config_display.c:451
+#: src/modules/conf_display/e_int_config_display.c:402
 msgid "Refresh"
 msgstr "更新頻率"
 
-#: src/modules/conf_display/e_int_config_display.c:511
+#: src/modules/conf_display/e_int_config_display.c:462
 msgid "Rotation"
 msgstr "旋轉"
 
-#: src/modules/conf_display/e_int_config_display.c:530
+#: src/modules/conf_display/e_int_config_display.c:481
 msgid "Mirroring"
 msgstr "鏡射"
 
-#: src/modules/conf_display/e_int_config_display.c:676
+#: src/modules/conf_display/e_int_config_display.c:627
 msgid "Missing Features"
 msgstr "缺少的功能"
 
-#: src/modules/conf_display/e_int_config_display.c:677
+#: src/modules/conf_display/e_int_config_display.c:628
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -3902,11 +3980,11 @@ msgstr ""
 "援。<br>在這個情況下您無法改變您的螢幕解晰度。這也有可能是因為 "
 "<hilight>ecore</hilight><br>在編譯時沒有偵測到 XRandR。"
 
-#: src/modules/conf_display/e_int_config_display.c:689
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "No Refresh Rates Found"
 msgstr "找不到可用之更新頻率"
 
-#: src/modules/conf_display/e_int_config_display.c:690
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3918,92 +3996,74 @@ msgstr ""
 "期的結果。<br>若不是,下次更新解晰度時將使用目前的更新頻率。<br>這可能會對您"
 "的螢幕造成<hilight>傷害</hilight>。"
 
-#: src/modules/conf_display/e_int_config_desks.c:52
+#: src/modules/conf_display/e_int_config_desks.c:49
 #: src/modules/pager/e_mod_main.c:801
 msgid "Virtual Desktops Settings"
 msgstr "虛擬桌面設定"
 
-#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desks.c:150
 msgid "Number of Desktops"
 msgstr "桌面數目"
 
-#: src/modules/conf_display/e_int_config_desks.c:169
-#: src/modules/conf_display/e_int_config_desks.c:174
-#: src/modules/conf_display/e_int_config_desklock.c:239
+#: src/modules/conf_display/e_int_config_desks.c:157
+#: src/modules/conf_display/e_int_config_desks.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:237
 #: src/modules/conf_interaction/e_int_config_mouse.c:114
 #: src/modules/conf_interaction/e_int_config_mouse.c:120
-#: src/modules/everything/evry_config.c:407
-#: src/modules/everything/evry_config.c:555
-#: src/modules/everything/evry_config.c:562
+#: 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/everything/evry_config.c:594
 #: src/modules/fileman/e_mod_config.c:240
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/modules/conf_display/e_int_config_desks.c:181
+#: src/modules/conf_display/e_int_config_desks.c:169
 #, fuzzy
 msgid "Desktop Flip"
 msgstr "滑鼠切換"
 
-#: src/modules/conf_display/e_int_config_desks.c:182
+#: src/modules/conf_display/e_int_config_desks.c:170
 msgid "Flip when dragging objects to the screen edge"
 msgstr "當滑鼠拖曳物件至螢幕邊緣時切換桌面"
 
-#: src/modules/conf_display/e_int_config_desks.c:185
+#: src/modules/conf_display/e_int_config_desks.c:173
 msgid "Wrap desktops around when flipping"
 msgstr "循環切換"
 
-#: src/modules/conf_display/e_int_config_desks.c:191
+#: src/modules/conf_display/e_int_config_desks.c:179
 msgid "Desktops"
 msgstr "桌面"
 
-#: src/modules/conf_display/e_int_config_desks.c:196
-#: src/modules/everything/evry_config.c:482
+#: src/modules/conf_display/e_int_config_desks.c:184
+#: src/modules/everything/evry_config.c:495
 msgid "Off"
 msgstr "關閉"
 
-#: src/modules/conf_display/e_int_config_desks.c:199
+#: src/modules/conf_display/e_int_config_desks.c:187
 msgid "Pane"
 msgstr "窗格"
 
-#: src/modules/conf_display/e_int_config_desks.c:202
+#: src/modules/conf_display/e_int_config_desks.c:190
 msgid "Zoom"
 msgstr "縮放"
 
-#: src/modules/conf_display/e_int_config_desks.c:206
-#, fuzzy
-msgid "Background panning"
-msgstr "背景改變"
-
-#: src/modules/conf_display/e_int_config_desks.c:212
+#: src/modules/conf_display/e_int_config_desks.c:194
 #, fuzzy
 msgid "Animation speed"
 msgstr "切換動畫"
 
-#: src/modules/conf_display/e_int_config_desks.c:215
+#: src/modules/conf_display/e_int_config_desks.c:197
+#: src/modules/conf_display/e_int_config_dpms.c:306
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:168
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:151
 #, c-format
 msgid "%1.1f sec"
-msgstr "%1.1f 秒"
-
-#: src/modules/conf_display/e_int_config_desks.c:221
-msgid "X-Axis pan factor"
-msgstr ""
-
-#: src/modules/conf_display/e_int_config_desks.c:224
-#: src/modules/conf_display/e_int_config_desks.c:233
-#, fuzzy, c-format
-msgid "%.2f"
-msgstr "%1.2f"
-
-#: src/modules/conf_display/e_int_config_desks.c:230
-msgid "Y-Axis pan factor"
-msgstr ""
+msgstr "%1.1f 秒"
 
-#: src/modules/conf_display/e_int_config_desks.c:239
+#: src/modules/conf_display/e_int_config_desks.c:202
 msgid "Flip Animation"
 msgstr "切換動畫"
 
@@ -4020,7 +4080,7 @@ msgid "Desktop Wallpaper"
 msgstr "桌布"
 
 #: src/modules/conf_display/e_int_config_desk.c:166
-#: src/modules/fileman/e_int_config_mime.c:190
+#: src/modules/fileman/e_int_config_mime.c:183
 #, fuzzy
 msgid "Set"
 msgstr "選取"
@@ -4032,12 +4092,12 @@ 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:449
-#: src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: src/modules/conf_theme/e_int_config_wallpaper.c:462
+#: src/modules/conf_theme/e_int_config_wallpaper.c:584
 #: src/modules/conf_theme/e_int_config_startup.c:253
 #: src/modules/conf_theme/e_int_config_theme.c:392
-#: src/modules/conf_theme/e_int_config_theme.c:791
-#: src/modules/gadman/e_mod_config.c:179
+#: src/modules/conf_theme/e_int_config_theme.c:792
+#: src/modules/gadman/e_mod_config.c:178
 msgid "Personal"
 msgstr "個人"
 
@@ -4045,160 +4105,174 @@ msgstr "個人"
 msgid "Screen Lock Settings"
 msgstr "螢幕鎖定設定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:206
+#: src/modules/conf_display/e_int_config_desklock.c:204
 #, fuzzy
 msgid "Lock on Startup"
 msgstr "待機"
 
-#: src/modules/conf_display/e_int_config_desklock.c:209
+#: src/modules/conf_display/e_int_config_desklock.c:207
 #, fuzzy
 msgid "Lock on Suspend"
 msgstr "待機"
 
-#: src/modules/conf_display/e_int_config_desklock.c:213
+#: src/modules/conf_display/e_int_config_desklock.c:211
 #, fuzzy
 msgid "Custom Screenlock Command"
 msgstr "自訂螢幕鎖定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:217
+#: src/modules/conf_display/e_int_config_desklock.c:215
 #, fuzzy
 msgid "Locking"
 msgstr "鎖定值"
 
-#: src/modules/conf_display/e_int_config_desklock.c:223
+#: src/modules/conf_display/e_int_config_desklock.c:221
 #, fuzzy
 msgid "Show on all screens"
 msgstr "顯示於全部螢幕區域"
 
-#: src/modules/conf_display/e_int_config_desklock.c:228
+#: src/modules/conf_display/e_int_config_desklock.c:226
 #, fuzzy
 msgid "Show on current screen"
 msgstr "顯示於目前螢幕區域"
 
-#: src/modules/conf_display/e_int_config_desklock.c:233
+#: src/modules/conf_display/e_int_config_desklock.c:231
 #, fuzzy
 msgid "Show on screen #:"
 msgstr "顯示於螢幕區域 #:"
 
-#: src/modules/conf_display/e_int_config_desklock.c:243
+#: src/modules/conf_display/e_int_config_desklock.c:241
 #, fuzzy
 msgid "Login Box"
 msgstr "登入方塊設定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:248
+#: src/modules/conf_display/e_int_config_desklock.c:246
 #, fuzzy
 msgid "Lock after X screensaver activates"
 msgstr "當 X 螢幕保護程式啟動時鎖定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:254
-#: src/modules/conf_display/e_int_config_desklock.c:279
-#: src/modules/conf_display/e_int_config_screensaver.c:153
-#: src/modules/conf_display/e_int_config_screensaver.c:167
+#: src/modules/conf_display/e_int_config_desklock.c:252
+#: src/modules/conf_display/e_int_config_desklock.c:277
+#: src/modules/conf_display/e_int_config_screensaver.c:161
+#: src/modules/conf_display/e_int_config_screensaver.c:181
+#: src/modules/conf_display/e_int_config_screensaver.c:195
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f 秒"
 
-#: src/modules/conf_display/e_int_config_desklock.c:260
+#: src/modules/conf_display/e_int_config_desklock.c:258
 msgid "Lock when idle time exceeded"
 msgstr "當超過閒置時間時鎖定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:265
-#: src/modules/conf_display/e_int_config_screensaver.c:146
-#: src/modules/conf_display/e_int_config_dpms.c:218
-#: src/modules/conf_display/e_int_config_dpms.c:230
-#: src/modules/conf_display/e_int_config_dpms.c:242
+#: src/modules/conf_display/e_int_config_desklock.c:263
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_dpms.c:248
+#: src/modules/conf_display/e_int_config_dpms.c:260
+#: src/modules/conf_display/e_int_config_dpms.c:272
 #, c-format
 msgid "%1.0f minutes"
 msgstr "%1.0f 分鐘"
 
-#: src/modules/conf_display/e_int_config_desklock.c:270
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#: src/modules/conf_display/e_int_config_dpms.c:212
+#: src/modules/conf_display/e_int_config_desklock.c:268
+#: src/modules/conf_display/e_int_config_screensaver.c:185
+#: src/modules/conf_display/e_int_config_dpms.c:242
 #, fuzzy
 msgid "Timers"
 msgstr "計時器"
 
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_display/e_int_config_screensaver.c:162
+#: src/modules/conf_display/e_int_config_desklock.c:273
+#: src/modules/conf_display/e_int_config_screensaver.c:190
 msgid "Suggest if deactivated before"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_desklock.c:284
-#: src/modules/conf_display/e_int_config_screensaver.c:173
+#: src/modules/conf_display/e_int_config_desklock.c:282
+#: src/modules/conf_display/e_int_config_screensaver.c:201
 #, fuzzy
 msgid "Presentation Mode"
 msgstr "切換全螢幕模式"
 
-#: src/modules/conf_display/e_int_config_desklock.c:291
-#: src/modules/gadman/e_mod_config.c:141
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/gadman/e_mod_config.c:140
 msgid "Theme Defined"
 msgstr "依佈景主題"
 
-#: src/modules/conf_display/e_int_config_desklock.c:294
+#: src/modules/conf_display/e_int_config_desklock.c:292
 msgid "Theme Wallpaper"
 msgstr "佈景主題桌布"
 
-#: src/modules/conf_display/e_int_config_desklock.c:297
+#: src/modules/conf_display/e_int_config_desklock.c:295
 #, fuzzy
 msgid "Current Wallpaper"
 msgstr "桌布"
 
-#: src/modules/conf_display/e_int_config_desklock.c:311
+#: src/modules/conf_display/e_int_config_desklock.c:309
 #: src/modules/conf_theme/e_mod_main.c:25
 #: src/modules/conf_theme/e_mod_main.c:32
-#: src/modules/conf_theme/e_mod_main.c:64
-#: src/modules/conf_theme/e_mod_main.c:156
+#: src/modules/conf_theme/e_mod_main.c:67
+#: src/modules/conf_theme/e_mod_main.c:162
 msgid "Wallpaper"
 msgstr "桌布"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:56
+#: src/modules/conf_display/e_int_config_screensaver.c:60
 msgid "Screen Saver Settings"
 msgstr "螢幕保護程式設定"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:134
+#: src/modules/conf_display/e_int_config_screensaver.c:145
 #, fuzzy
 msgid "Enable X Screensaver"
 msgstr "啟用 X 螢幕保護程式"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:138
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+#, fuzzy
+msgid "Suspend on blank"
+msgstr "休眠"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+msgid "Even if on power"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:158
+msgid "Delay until suspend"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
 #, fuzzy
 msgid "Screensaver"
 msgstr "螢幕保護程式"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:143
+#: src/modules/conf_display/e_int_config_screensaver.c:171
 #, fuzzy
 msgid "Initial timeout"
 msgstr "初始狀態"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
+#: src/modules/conf_display/e_int_config_screensaver.c:178
 msgid "Alternation timeout"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_screensaver.c:178
+#: src/modules/conf_display/e_int_config_screensaver.c:206
 msgid "Blanking"
 msgstr "空白"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:183
+#: src/modules/conf_display/e_int_config_screensaver.c:211
 msgid "Preferred"
 msgstr "偏好的"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:186
+#: src/modules/conf_display/e_int_config_screensaver.c:214
 msgid "Not Preferred"
 msgstr "非偏好的"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:191
+#: src/modules/conf_display/e_int_config_screensaver.c:219
 msgid "Exposure Events"
 msgstr "Exposure 事件"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:196
+#: src/modules/conf_display/e_int_config_screensaver.c:224
 msgid "Allow"
 msgstr "允許"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:199
+#: src/modules/conf_display/e_int_config_screensaver.c:227
 msgid "Don't Allow"
 msgstr "不允許"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:204
+#: src/modules/conf_display/e_int_config_screensaver.c:232
 #: src/modules/conf_menus/e_int_config_menus.c:316
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:186
@@ -4206,39 +4280,53 @@ msgstr "不允許"
 msgid "Miscellaneous"
 msgstr "雜項選項"
 
-#: src/modules/conf_display/e_int_config_dpms.c:60
-#: src/modules/conf_display/e_int_config_dpms.c:81
-msgid "Display Power Management Signaling"
-msgstr "顯示器電源管理通知"
-
-#: src/modules/conf_display/e_int_config_dpms.c:61
-msgid "The current display server is not <br>DPMS capable."
-msgstr "目前的顯示伺服器<br>不支援 DPMS。"
-
-#: src/modules/conf_display/e_int_config_dpms.c:82
-msgid "The current display server does not <br>have the DPMS extension."
-msgstr "目前的顯示伺服器<br>沒有 DPMS extension。"
-
-#: src/modules/conf_display/e_int_config_dpms.c:112
+#: src/modules/conf_display/e_int_config_dpms.c:126
 msgid "Display Power Management Settings"
 msgstr "顯示器電源管理設定"
 
-#: src/modules/conf_display/e_int_config_dpms.c:208
+#: src/modules/conf_display/e_int_config_dpms.c:238
 msgid "Enable Display Power Management"
 msgstr "啟用顯示器電源管理"
 
-#: src/modules/conf_display/e_int_config_dpms.c:214
+#: src/modules/conf_display/e_int_config_dpms.c:244
 msgid "Standby time"
 msgstr "待命時間"
 
-#: src/modules/conf_display/e_int_config_dpms.c:226
+#: src/modules/conf_display/e_int_config_dpms.c:256
 msgid "Suspend time"
 msgstr "待機時間"
 
-#: src/modules/conf_display/e_int_config_dpms.c:238
+#: src/modules/conf_display/e_int_config_dpms.c:268
 msgid "Off time"
 msgstr "關機時間"
 
+#: src/modules/conf_display/e_int_config_dpms.c:287
+msgid "DPMS"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:292
+msgid "Normal Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:294
+#: src/modules/conf_display/e_int_config_dpms.c:300
+#, fuzzy, c-format
+msgid "%3.0f"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_display/e_int_config_dpms.c:298
+msgid "Dim Backlight"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:304
+msgid "Fade Time"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_dpms.c:310
+#, fuzzy
+msgid "Backlight"
+msgstr "上一步"
+
 #: src/modules/conf_display/e_mod_main.c:21
 msgid "Virtual Desktops"
 msgstr "虛擬桌面"
@@ -4283,79 +4371,79 @@ msgstr ""
 msgid "Edge Bindings Settings"
 msgstr "快速鍵設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:255
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:253
 #: src/modules/conf_edgebindings/e_mod_main.c:20
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:260
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:249
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
 msgstr "新增快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:261
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
 msgstr "刪除快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:267
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:265
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:256
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
 msgstr "修改快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:271
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:260
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "全部刪除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:273
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:264
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:295
 msgid "Restore Default Bindings"
 msgstr "回復成預設快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:280
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:269
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "動作"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:287
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:285
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:276
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "動作參數"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:297
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:295
 #, fuzzy
 msgid "General Options"
 msgstr "一般設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:298
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "允許上移到全螢幕視窗上層"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:842
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:840
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "快速鍵序列"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1174
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1172
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "設定快速鍵時發生錯誤"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1173
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -4364,28 +4452,28 @@ msgstr ""
 "您選擇的快速鍵序列已被 <br><hilight>%s</hilight> 動作使用。<br>請選擇其它快速"
 "鍵序列"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1312
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1310
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1334
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1366
 #: src/modules/gadman/e_mod_gadman.c:839
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1317
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1315
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1339
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1371
 #: src/modules/gadman/e_mod_gadman.c:844
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1323
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1321
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1345
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1377
 #: src/modules/gadman/e_mod_gadman.c:850
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1329
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1327
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1351
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1383
 #: src/modules/gadman/e_mod_gadman.c:856
@@ -4538,35 +4626,48 @@ msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr "複製檔案時發生錯誤,Enlightenment 無法匯入組態。"
 
-#: src/modules/conf_intl/e_int_config_intl.c:579
+#: src/modules/conf_intl/e_int_config_intl.c:593
 #: src/modules/conf_intl/e_mod_main.c:20
 msgid "Language Settings"
 msgstr "語言設定"
 
-#: src/modules/conf_intl/e_int_config_intl.c:900
-#: src/modules/conf_intl/e_int_config_intl.c:983
+#: src/modules/conf_intl/e_int_config_intl.c:893
+msgid "Possible Locale problems"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#, c-format
+msgid ""
+"You have some extra locale environment<br>variables set that may interfere "
+"with<br>correct display of your chosen language.<br>If you don't want these "
+"affected, use the<br>Environment variable settings to unset them.<br>The "
+"variables that may affect you are<br>as follows:<br>%s"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:949
+#: src/modules/conf_intl/e_int_config_intl.c:1041
 msgid "Language Selector"
 msgstr "語言選擇器"
 
-#: src/modules/conf_intl/e_int_config_intl.c:929
-#: src/modules/conf_intl/e_int_config_intl.c:1365
+#: src/modules/conf_intl/e_int_config_intl.c:980
+#: src/modules/conf_intl/e_int_config_intl.c:1431
 #: src/modules/conf_menus/e_int_config_menus.c:169
-#: src/modules/wizard/page_010.c:146 src/modules/wizard/page_030.c:129
+#: src/modules/wizard/page_010.c:155
 #, fuzzy
 msgid "System Default"
 msgstr "使用預設值"
 
-#: src/modules/conf_intl/e_int_config_intl.c:956
-#: src/modules/conf_intl/e_int_config_intl.c:1034
+#: src/modules/conf_intl/e_int_config_intl.c:1014
+#: src/modules/conf_intl/e_int_config_intl.c:1092
 msgid "Locale Selected"
 msgstr "選取的 Locale"
 
-#: src/modules/conf_intl/e_int_config_intl.c:957
-#: src/modules/conf_intl/e_int_config_intl.c:1035
+#: src/modules/conf_intl/e_int_config_intl.c:1015
+#: src/modules/conf_intl/e_int_config_intl.c:1093
 msgid "Locale"
 msgstr "Locale"
 
-#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:139
+#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:146
 msgid "Language"
 msgstr "語言"
 
@@ -4654,17 +4755,17 @@ msgid "Manager"
 msgstr "管理員"
 
 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:349
-#: src/modules/conf_theme/e_int_config_fonts.c:661
-#: src/modules/conf_theme/e_int_config_transitions.c:153
-#: src/modules/conf_theme/e_int_config_transitions.c:204
-#: src/modules/conf_theme/e_int_config_transitions.c:236
+#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_transitions.c:180
+#: src/modules/conf_theme/e_int_config_transitions.c:237
+#: src/modules/conf_theme/e_int_config_transitions.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126
 msgid "None"
 msgstr "無"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1272
+#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1273
 msgid "Mouse Binding Sequence"
 msgstr "滑鼠快速鍵序列"
 
@@ -4688,13 +4789,11 @@ msgid "Menu Settings"
 msgstr "選單設定"
 
 #: src/modules/conf_menus/e_int_config_menus.c:174
-#: src/modules/wizard/page_030.c:134
 #, fuzzy
 msgid "Enlightenment Default"
 msgstr "Enlightenment"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#: src/modules/wizard/page_030.c:139
 #, fuzzy
 msgid "Personal Default"
 msgstr "個人"
@@ -4705,7 +4804,7 @@ msgid "Main Menu"
 msgstr "顯示主選單"
 
 #: src/modules/conf_menus/e_int_config_menus.c:258
-#: src/modules/fileman/e_mod_main.c:360
+#: src/modules/fileman/e_mod_main.c:364
 #, fuzzy
 msgid "Favorites"
 msgstr "「我的最愛」選單"
@@ -4726,7 +4825,7 @@ msgid "Comments"
 msgstr "註解"
 
 #: src/modules/conf_menus/e_int_config_menus.c:273
-#: src/modules/gadman/e_mod_config.c:163 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_config.c:162 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:150
 #, fuzzy
@@ -4739,7 +4838,7 @@ msgid "Show gadget settings in top-level"
 msgstr "在選單中顯示"
 
 #: src/modules/conf_menus/e_int_config_menus.c:277
-#: src/modules/conf_menus/e_mod_main.c:17 src/modules/wizard/page_030.c:81
+#: src/modules/conf_menus/e_mod_main.c:17
 msgid "Menus"
 msgstr "選單"
 
@@ -4811,19 +4910,19 @@ msgid "Images"
 msgstr "圖片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:74
-#: src/modules/conf_theme/e_int_config_fonts.c:431
-#: src/modules/conf_theme/e_mod_main.c:41
+#: src/modules/conf_theme/e_int_config_fonts.c:434
+#: src/modules/conf_theme/e_mod_main.c:44
 msgid "Fonts"
 msgstr "字型"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
-#: src/modules/conf_theme/e_int_config_theme.c:1019
+#: src/modules/conf_theme/e_int_config_theme.c:1020
 msgid "Themes"
 msgstr "佈景主題"
 
 #: src/modules/conf_paths/e_int_config_paths.c:78
-#: src/modules/everything/evry_config.c:443
-#: src/modules/everything/evry_config.c:497
+#: src/modules/everything/evry_config.c:438
+#: src/modules/everything/evry_config.c:464
 msgid "Icons"
 msgstr "圖示"
 
@@ -4973,18 +5072,18 @@ msgstr "您要求刪除「%s」。<br><br>您是否確定刪除此置物架?"
 msgid "Wallpaper Settings"
 msgstr "桌布設定"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:486
-#: src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: src/modules/conf_theme/e_int_config_wallpaper.c:499
+#: src/modules/conf_theme/e_int_config_wallpaper.c:619
 msgid "Use Theme Wallpaper"
 msgstr "使用佈景主題桌布"
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:491
-#: src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: src/modules/conf_theme/e_int_config_wallpaper.c:504
+#: src/modules/conf_theme/e_int_config_wallpaper.c:624
 msgid "Picture..."
 msgstr "圖片..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper.c:498
-#: src/modules/conf_theme/e_int_config_wallpaper.c:626
+#: src/modules/conf_theme/e_int_config_wallpaper.c:511
+#: src/modules/conf_theme/e_int_config_wallpaper.c:631
 msgid "Online..."
 msgstr ""
 
@@ -5004,43 +5103,48 @@ msgstr "此桌面"
 msgid "This Screen"
 msgstr "此螢幕"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:124
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:126
 #, fuzzy
 msgid "Wallpaper settings..."
 msgstr "桌布設定"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:180
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:182
 msgid "Tile"
 msgstr "並排"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:279
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:197
+#, fuzzy
+msgid "Pan"
+msgstr "窗格"
+
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:286
 msgid "Select a Picture..."
 msgstr "選擇圖片..."
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:628
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:696
 msgid "Picture Import Error"
 msgstr "圖片匯入時發生錯誤"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:629
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:697
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "轉檔時發生錯誤,Enlightenment 無法匯入此圖片。"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:716
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:726
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:818
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:784
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:876
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:886
 msgid "Wallpaper Import Error"
 msgstr "匯入桌布時發生錯誤"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:717
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:809
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:785
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:877
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "複製檔案時發生錯誤,Enlightenment 無法匯入此桌布。"
 
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:727
-#: src/modules/conf_theme/e_int_config_wallpaper_import.c:819
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_theme/e_int_config_wallpaper_import.c:887
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5077,7 +5181,7 @@ msgid "Error: can't start the request."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_borders.c:30
-#: src/modules/conf_theme/e_int_config_borders.c:200
+#: src/modules/conf_theme/e_int_config_borders.c:201
 msgid "Default Border Style"
 msgstr "預設邊框樣式"
 
@@ -5085,7 +5189,7 @@ msgstr "預設邊框樣式"
 msgid "Window Border Selection"
 msgstr "選擇視窗邊框"
 
-#: src/modules/conf_theme/e_int_config_borders.c:246
+#: src/modules/conf_theme/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "記住這個視窗的邊框樣式"
 
@@ -5118,7 +5222,7 @@ msgid "Menu Background Base"
 msgstr "背景"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:81
-#: src/modules/conf_theme/e_int_config_fonts.c:60
+#: src/modules/conf_theme/e_int_config_fonts.c:61
 msgid "Menu Title"
 msgstr "選單標題"
 
@@ -5127,7 +5231,7 @@ msgid "Menu Title Active"
 msgstr "作用中選單標題"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:83
-#: src/modules/conf_theme/e_int_config_fonts.c:59
+#: src/modules/conf_theme/e_int_config_fonts.c:60
 msgid "Menu Item"
 msgstr "選單項目"
 
@@ -5141,12 +5245,12 @@ msgid "Menu Item Disabled"
 msgstr "作用中選單項目"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:64
+#: src/modules/conf_theme/e_int_config_fonts.c:65
 msgid "Move Text"
 msgstr "移動文字"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:87
-#: src/modules/conf_theme/e_int_config_fonts.c:65
+#: src/modules/conf_theme/e_int_config_fonts.c:66
 msgid "Resize Text"
 msgstr "改變大小文字"
 
@@ -5164,7 +5268,7 @@ msgid "Winlist Label"
 msgstr "視窗列表標籤"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:91
-#: src/modules/conf_theme/e_int_config_fonts.c:66
+#: src/modules/conf_theme/e_int_config_fonts.c:67
 msgid "Winlist Title"
 msgstr "視窗列表標題"
 
@@ -5184,392 +5288,402 @@ msgid "File Manager Background Base"
 msgstr "檔案管理員"
 
 #: src/modules/conf_theme/e_int_config_color_classes.c:99
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
+#: src/modules/winlist/e_int_config_winlist.c:214
+msgid "Focus"
+msgstr "焦點"
+
+#: src/modules/conf_theme/e_int_config_color_classes.c:100
 msgid "Button Text"
 msgstr "按鈕文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:100
+#: src/modules/conf_theme/e_int_config_color_classes.c:101
 msgid "Button Text Disabled"
 msgstr "停用按鈕文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:101
+#: src/modules/conf_theme/e_int_config_color_classes.c:102
 msgid "Check Text"
 msgstr "核取方塊文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:102
+#: src/modules/conf_theme/e_int_config_color_classes.c:103
 msgid "Check Text Disabled"
 msgstr "停用核取方塊文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:103
+#: src/modules/conf_theme/e_int_config_color_classes.c:104
 msgid "Entry Text"
 msgstr "輸入欄文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:104
+#: src/modules/conf_theme/e_int_config_color_classes.c:105
 #, fuzzy
 msgid "Entry Text Disabled"
 msgstr "停用按鈕文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:105
+#: src/modules/conf_theme/e_int_config_color_classes.c:106
 msgid "Label Text"
 msgstr "標籤文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:106
+#: src/modules/conf_theme/e_int_config_color_classes.c:107
 #, fuzzy
 msgid "List Item Text Selected"
 msgstr "列表項目文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:107
+#: src/modules/conf_theme/e_int_config_color_classes.c:108
 #, fuzzy
 msgid "List Item Text (Even)"
 msgstr "列表項目文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:108
+#: src/modules/conf_theme/e_int_config_color_classes.c:109
 msgid "List Item Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:109
+#: src/modules/conf_theme/e_int_config_color_classes.c:110
 #, fuzzy
 msgid "List Item Text (Odd)"
 msgstr "列表項目文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:110
+#: src/modules/conf_theme/e_int_config_color_classes.c:111
 msgid "List Item Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:111
+#: src/modules/conf_theme/e_int_config_color_classes.c:112
 #, fuzzy
 msgid "List Header Text (Even)"
 msgstr "列表標頭"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:112
+#: src/modules/conf_theme/e_int_config_color_classes.c:113
 msgid "List Header Background Base (Even)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:113
+#: src/modules/conf_theme/e_int_config_color_classes.c:114
 #, fuzzy
 msgid "List Header Text (Odd)"
 msgstr "列表標頭"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:115
+#: src/modules/conf_theme/e_int_config_color_classes.c:116
 msgid "List Header Background Base (Odd)"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:116
+#: src/modules/conf_theme/e_int_config_color_classes.c:117
 msgid "Radio Text"
 msgstr "單選按鈕文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:117
+#: src/modules/conf_theme/e_int_config_color_classes.c:118
 msgid "Radio Text Disabled"
 msgstr "停用單選按鈕文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:118
+#: src/modules/conf_theme/e_int_config_color_classes.c:119
 msgid "Slider Text"
 msgstr "滑尺文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:119
+#: src/modules/conf_theme/e_int_config_color_classes.c:120
 msgid "Slider Text Disabled"
 msgstr "停用滑尺文字"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:120
+#: src/modules/conf_theme/e_int_config_color_classes.c:121
 #, fuzzy
 msgid "Frame Background Base"
 msgstr "背景"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:121
+#: src/modules/conf_theme/e_int_config_color_classes.c:122
 msgid "Scroller Frame Background Base"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:126
+#: src/modules/conf_theme/e_int_config_color_classes.c:127
 msgid "Module Label"
 msgstr "模組標籤"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:127
+#: src/modules/conf_theme/e_int_config_color_classes.c:128
 msgid "Composite Focus-out Color"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:160
-#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_theme/e_int_config_color_classes.c:161
+#: src/modules/conf_theme/e_mod_main.c:41
 msgid "Colors"
 msgstr "顏色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:268
+#: src/modules/conf_theme/e_int_config_color_classes.c:269
 #, fuzzy, c-format
 msgid "Color class: %s"
 msgstr "顏色類別"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:275
+#: src/modules/conf_theme/e_int_config_color_classes.c:276
 #, fuzzy, c-format
 msgid "Selected %u mixed colors classes"
 msgstr "設定顏色類別"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:278
+#: src/modules/conf_theme/e_int_config_color_classes.c:279
 #, fuzzy, c-format
 msgid "Selected %u unset colors classes"
 msgstr "設定顏色類別"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:281
+#: src/modules/conf_theme/e_int_config_color_classes.c:282
 #, fuzzy, c-format
 msgid "Selected %u uniform colors classes"
 msgstr "設定顏色類別"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:285
-#: src/modules/conf_theme/e_int_config_color_classes.c:544
+#: src/modules/conf_theme/e_int_config_color_classes.c:286
+#: src/modules/conf_theme/e_int_config_color_classes.c:545
 msgid "No selected color class"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:547
+#: src/modules/conf_theme/e_int_config_color_classes.c:548
 #, fuzzy
 msgid "Custom colors"
 msgstr "執行指令"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:553
+#: src/modules/conf_theme/e_int_config_color_classes.c:554
 #, fuzzy
 msgid "Object:"
 msgstr "物件顏色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:559
+#: src/modules/conf_theme/e_int_config_color_classes.c:560
 #, fuzzy
 msgid "Outline:"
 msgstr "關機時間"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:565
+#: src/modules/conf_theme/e_int_config_color_classes.c:566
 #, fuzzy
 msgid "Shadow:"
 msgstr "陰影顏色"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:597
+#: src/modules/conf_theme/e_int_config_color_classes.c:598
 msgid "Text with applied colors."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:603
+#: src/modules/conf_theme/e_int_config_color_classes.c:604
 msgid "Colors depend on theme capabilities."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:842
+#: src/modules/conf_theme/e_int_config_color_classes.c:843
 msgid "Window Manager"
 msgstr "視窗管理員"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:844
-#: src/modules/conf_theme/e_int_config_fonts.c:79
+#: src/modules/conf_theme/e_int_config_color_classes.c:845
+#: src/modules/conf_theme/e_int_config_fonts.c:81
 msgid "Widgets"
 msgstr "Widgets"
 
-#: src/modules/conf_theme/e_int_config_color_classes.c:850
+#: src/modules/conf_theme/e_int_config_color_classes.c:851
 #, fuzzy
 msgid "Others"
 msgstr "其它 IBar 應用程式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:58
+#: src/modules/conf_theme/e_int_config_fonts.c:59
 msgid "Title Bar"
 msgstr "標題列"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:61
+#: src/modules/conf_theme/e_int_config_fonts.c:62
 msgid "Textblock Plain"
 msgstr "文字區塊 (一般)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:62
+#: src/modules/conf_theme/e_int_config_fonts.c:63
 msgid "Textblock Light"
 msgstr "文字區塊 (淡)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:63
+#: src/modules/conf_theme/e_int_config_fonts.c:64
 msgid "Textblock Big"
 msgstr "文字區塊 (大)"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:67
+#: src/modules/conf_theme/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Settings Heading"
 msgstr "桌面設定"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:68
+#: src/modules/conf_theme/e_int_config_fonts.c:69
 msgid "About Title"
 msgstr "「關於」標題"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:69
+#: src/modules/conf_theme/e_int_config_fonts.c:70
 msgid "About Version"
 msgstr "「關於」版本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:70
+#: src/modules/conf_theme/e_int_config_fonts.c:71
 msgid "About Text"
 msgstr "「關於」文字"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:71
+#: src/modules/conf_theme/e_int_config_fonts.c:72
 msgid "Desklock Title"
 msgstr "「桌面鎖定」標題"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:72
+#: src/modules/conf_theme/e_int_config_fonts.c:73
 msgid "Desklock Password"
 msgstr "「桌面鎖定」密碼"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:73
+#: src/modules/conf_theme/e_int_config_fonts.c:74
 msgid "Dialog Error"
 msgstr "對話方塊錯誤"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:74
+#: src/modules/conf_theme/e_int_config_fonts.c:75
 msgid "Exebuf Command"
 msgstr "Exebuf 命令"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:75
+#: src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
 msgstr "啟動畫面標題"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:76
+#: src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
 msgstr "啟動畫面文字"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:77
+#: src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
 msgstr "啟動畫面版本"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:80
+#: src/modules/conf_theme/e_int_config_fonts.c:79
+msgid "Digital Clock"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_fonts.c:82
 msgid "Entry"
 msgstr "輸入欄"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:81
+#: src/modules/conf_theme/e_int_config_fonts.c:83
 msgid "Frame"
 msgstr "框架"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:82
+#: src/modules/conf_theme/e_int_config_fonts.c:84
 msgid "Label"
 msgstr "標籤"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:83
+#: src/modules/conf_theme/e_int_config_fonts.c:85
 msgid "Buttons"
 msgstr "按鈕"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:84
+#: src/modules/conf_theme/e_int_config_fonts.c:86
 msgid "Slider"
 msgstr "滑尺"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:85
+#: src/modules/conf_theme/e_int_config_fonts.c:87
 msgid "Radio Buttons"
 msgstr "單選按鈕"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:88
 msgid "Check Buttons"
 msgstr "核取方塊"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:87
+#: src/modules/conf_theme/e_int_config_fonts.c:89
 msgid "Text List Item"
 msgstr "文字列表項目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:88
+#: src/modules/conf_theme/e_int_config_fonts.c:90
 msgid "List Item"
 msgstr "列表項目"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:89
+#: src/modules/conf_theme/e_int_config_fonts.c:91
 msgid "List Header"
 msgstr "列表標頭"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:91
+#: src/modules/conf_theme/e_int_config_fonts.c:93
 msgid "Filemanager"
 msgstr "檔案管理員"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:92
+#: src/modules/conf_theme/e_int_config_fonts.c:94
 msgid "Typebuf"
 msgstr "類型緩衝"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:94
+#: src/modules/conf_theme/e_int_config_fonts.c:96
 #, fuzzy
 msgid "Desktop Icon"
 msgstr "顯示桌面圖示"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:97
-#: src/modules/conf_theme/e_int_config_fonts.c:256
+#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:258
 msgid "Small"
 msgstr "小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:99
+#: src/modules/conf_theme/e_int_config_fonts.c:101
 msgid "Large"
 msgstr "大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:100
+#: src/modules/conf_theme/e_int_config_fonts.c:102
 msgid "Small Styled"
 msgstr "「小」樣式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:101
+#: src/modules/conf_theme/e_int_config_fonts.c:103
 msgid "Normal Styled"
 msgstr "「正常」樣式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:102
+#: src/modules/conf_theme/e_int_config_fonts.c:104
 msgid "Large Styled"
 msgstr "「大」樣式"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:165
+#: src/modules/conf_theme/e_int_config_fonts.c:167
 msgid "Font Settings"
 msgstr "字型設定"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:250
+#: src/modules/conf_theme/e_int_config_fonts.c:252
 msgid "Tiny"
 msgstr "微小"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:268
+#: src/modules/conf_theme/e_int_config_fonts.c:270
 msgid "Big"
 msgstr "大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:274
+#: src/modules/conf_theme/e_int_config_fonts.c:276
 msgid "Really Big"
 msgstr "真的很大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:280
+#: src/modules/conf_theme/e_int_config_fonts.c:282
 msgid "Huge"
 msgstr "巨大"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:289
+#: src/modules/conf_theme/e_int_config_fonts.c:291
 #, c-format
 msgid "%d pixels"
 msgstr "%d 像素"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:424
+#: src/modules/conf_theme/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "啟用自訂字型類別"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:448
+#: src/modules/conf_theme/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basic preview text: 123: 我的天空!"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:601
+#: src/modules/conf_theme/e_int_config_fonts.c:606
 msgid "Font Classes"
 msgstr "字型類別"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:609
+#: src/modules/conf_theme/e_int_config_fonts.c:614
 msgid "Enable Font Class"
 msgstr "啟用字型類別"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:616
+#: src/modules/conf_theme/e_int_config_fonts.c:621
 #, fuzzy
 msgid "Font"
 msgstr "字型"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:642
+#: src/modules/conf_theme/e_int_config_fonts.c:647
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Advanced Preview Text.. 我真的会写中文"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:650
+#: src/modules/conf_theme/e_int_config_fonts.c:655
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:653
+#: src/modules/conf_theme/e_int_config_fonts.c:658
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:657
+#: src/modules/conf_theme/e_int_config_fonts.c:662
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:193
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:259
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:666
+#: src/modules/conf_theme/e_int_config_fonts.c:671
 msgid "Font Fallbacks"
 msgstr "備用字型"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:667
+#: src/modules/conf_theme/e_int_config_fonts.c:672
 msgid "Fallback Name"
 msgstr "備用字型名稱"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:679
+#: src/modules/conf_theme/e_int_config_fonts.c:684
 msgid "Enable Fallbacks"
 msgstr "啟用備用字型"
 
-#: src/modules/conf_theme/e_int_config_fonts.c:688
+#: src/modules/conf_theme/e_int_config_fonts.c:693
 #, fuzzy
 msgid "Hinting / Fallbacks"
 msgstr "備用字型"
@@ -5578,12 +5692,17 @@ msgstr "備用字型"
 msgid "Icon Theme Settings"
 msgstr "圖示主題設定"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:271
+#: src/modules/conf_theme/e_int_config_icon_themes.c:276
 #, fuzzy
 msgid "Enable icon theme"
 msgstr "啟用 Composite"
 
-#: src/modules/conf_theme/e_int_config_icon_themes.c:276
+#: src/modules/conf_theme/e_int_config_icon_themes.c:281
+#, fuzzy
+msgid "Use icon theme for applications"
+msgstr "特定應用程式"
+
+#: src/modules/conf_theme/e_int_config_icon_themes.c:285
 msgid "Icons override general theme"
 msgstr ""
 
@@ -5652,11 +5771,9 @@ msgid "Custom scaling factor"
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_scale.c:189
-#: src/modules/conf_theme/e_int_config_scale.c:202
-#: src/modules/conf_theme/e_int_config_scale.c:209
 #, fuzzy, c-format
-msgid "%1.2f times"
-msgstr "%1.0f 筆"
+msgid "%1.2f x"
+msgstr "%1.2f"
 
 #: src/modules/conf_theme/e_int_config_scale.c:193
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
@@ -5669,6 +5786,12 @@ msgstr "波蘭文"
 msgid "Minimum"
 msgstr "最小大小"
 
+#: src/modules/conf_theme/e_int_config_scale.c:202
+#: src/modules/conf_theme/e_int_config_scale.c:209
+#, fuzzy, c-format
+msgid "%1.2f times"
+msgstr "%1.0f 筆"
+
 #: src/modules/conf_theme/e_int_config_scale.c:206
 #, fuzzy
 msgid "Maximum"
@@ -5691,25 +5814,25 @@ msgstr "登入時顯示啟動畫面"
 msgid "Transition Settings"
 msgstr "轉換設定"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:127
+#: src/modules/conf_theme/e_int_config_transitions.c:154
 msgid "Events"
 msgstr "事件"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:135
-#: src/modules/conf_theme/e_mod_main.c:59
+#: src/modules/conf_theme/e_int_config_transitions.c:162
+#: src/modules/conf_theme/e_mod_main.c:62
 msgid "Startup"
 msgstr "啟動"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:136
+#: src/modules/conf_theme/e_int_config_transitions.c:163
 msgid "Desk Change"
 msgstr "桌面改變"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:137
+#: src/modules/conf_theme/e_int_config_transitions.c:164
 msgid "Background Change"
 msgstr "背景改變"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:145
-#: src/modules/conf_theme/e_mod_main.c:53
+#: src/modules/conf_theme/e_int_config_transitions.c:172
+#: src/modules/conf_theme/e_mod_main.c:56
 msgid "Transitions"
 msgstr "轉換"
 
@@ -5726,15 +5849,15 @@ msgstr "匯入..."
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1010
+#: src/modules/conf_theme/e_int_config_theme.c:1011
 msgid "Theme Categories"
 msgstr "佈景主題分類"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1029
 msgid "Assign"
 msgstr "指定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1034
+#: src/modules/conf_theme/e_int_config_theme.c:1035
 msgid "Clear All"
 msgstr "全部清除"
 
@@ -5763,19 +5886,19 @@ msgstr "複製檔案時發生錯誤,Enlightenment 無法匯入此佈景主題
 msgid "Exchange themes"
 msgstr "圖示主題"
 
-#: src/modules/conf_theme/e_mod_main.c:44
+#: src/modules/conf_theme/e_mod_main.c:47
 msgid "Borders"
 msgstr "邊框"
 
-#: src/modules/conf_theme/e_mod_main.c:47
+#: src/modules/conf_theme/e_mod_main.c:50
 msgid "Icon Theme"
 msgstr "圖示主題"
 
-#: src/modules/conf_theme/e_mod_main.c:50
+#: src/modules/conf_theme/e_mod_main.c:53
 msgid "Mouse Cursor"
 msgstr "滑鼠游標"
 
-#: src/modules/conf_theme/e_mod_main.c:56
+#: src/modules/conf_theme/e_mod_main.c:59
 #, fuzzy
 msgid "Scaling"
 msgstr "堆疊"
@@ -5907,6 +6030,11 @@ msgstr "使用應用程式圖示"
 msgid "Border Icon"
 msgstr "邊框"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:161
+#, fuzzy
+msgid "Placement"
+msgstr "智慧型擺設"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:163
 msgid "Smart Placement"
 msgstr "智慧型擺設"
@@ -5938,24 +6066,47 @@ msgstr "視窗下層顯示"
 msgid "Animate"
 msgstr "切換動畫"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:195
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:196
 msgid "Linear"
 msgstr "線性"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:199
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
 #, fuzzy
 msgid "Accelerate, then decelerate"
 msgstr "平滑加速與減速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:204
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206
 msgid "Accelerate"
 msgstr "加速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:208
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211
 msgid "Decelerate"
 msgstr "減速"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:212
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216
+#, fuzzy
+msgid "Pronounced Accelerate"
+msgstr "滑鼠加速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+#, fuzzy
+msgid "Pronounced Decelerate"
+msgstr "減速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226
+#, fuzzy
+msgid "Pronounced Acceleratem then decelerate"
+msgstr "平滑加速與減速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 #, fuzzy
 msgid "Shading"
 msgstr "堆疊"
@@ -5977,6 +6128,7 @@ msgid "Most recent Window under the Mouse"
 msgstr "滑鼠所在的最新視窗自動取得焦點"
 
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:211
+#: src/modules/wizard/page_060.c:34
 #, fuzzy
 msgid "Click"
 msgstr "時鐘"
@@ -6015,11 +6167,6 @@ msgstr "對話框"
 msgid "Only dialogs with focused parent"
 msgstr "只有新對話框自動取得焦點"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:230
-#: src/modules/winlist/e_int_config_winlist.c:214
-msgid "Focus"
-msgstr "焦點"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:235
 msgid "Other Settings"
 msgstr "其它設定"
@@ -6133,13 +6280,13 @@ msgid "Fill available space"
 msgstr "填滿可用空間"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#: src/modules/everything/evry_config.c:576
+#: src/modules/everything/evry_config.c:568
 #: src/modules/gadman/e_mod_gadman.c:759
 msgid "Horizontal"
 msgstr "水平"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#: src/modules/everything/evry_config.c:569
+#: src/modules/everything/evry_config.c:561
 #: src/modules/gadman/e_mod_gadman.c:767
 msgid "Vertical"
 msgstr "垂直"
@@ -6201,7 +6348,7 @@ msgid "Raise when clicking to focus"
 msgstr "點擊取得焦點時自動上移"
 
 #: src/modules/conf_window_manipulation/e_mod_main.c:19
-#: src/modules/wizard/page_060.c:23
+#: src/modules/wizard/page_060.c:28
 msgid "Window Focus"
 msgstr "視窗焦點"
 
@@ -6472,33 +6619,33 @@ msgstr "很亮"
 msgid "Dropshadow"
 msgstr "視窗陰影"
 
-#: src/modules/everything/e_mod_main.c:59
-#: src/modules/everything/e_mod_main.c:207
+#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:210
 #, fuzzy
 msgid "Everything Launcher"
 msgstr "全部"
 
-#: src/modules/everything/e_mod_main.c:60
+#: src/modules/everything/e_mod_main.c:61
 #, fuzzy
 msgid "Show Everything Launcher"
 msgstr "全部"
 
-#: src/modules/everything/e_mod_main.c:74
+#: src/modules/everything/e_mod_main.c:75
 #, fuzzy
 msgid "Everything Configuration"
 msgstr "桌面切換器組態"
 
-#: src/modules/everything/e_mod_main.c:208
+#: src/modules/everything/e_mod_main.c:211
 #, fuzzy
 msgid "Show Everything Dialog"
 msgstr "最下層顯示"
 
-#: src/modules/everything/e_mod_main.c:409
+#: src/modules/everything/e_mod_main.c:422
 #, fuzzy
 msgid "Everything Module"
 msgstr "全部"
 
-#: src/modules/everything/e_mod_main.c:591
+#: src/modules/everything/e_mod_main.c:611
 #, fuzzy
 msgid "Run Everything"
 msgstr "全部"
@@ -6508,165 +6655,165 @@ msgstr "全部"
 msgid "Everything Settings"
 msgstr "終端機設定"
 
-#: src/modules/everything/evry_config.c:361
+#: src/modules/everything/evry_config.c:364
 #, fuzzy
 msgid "Available Plugins"
 msgstr "可用 Profile"
 
-#: src/modules/everything/evry_config.c:367
+#: src/modules/everything/evry_config.c:370
 #, fuzzy
 msgid "Move Up"
 msgstr "移動"
 
-#: src/modules/everything/evry_config.c:372
+#: src/modules/everything/evry_config.c:373
 #, fuzzy
 msgid "Move Down"
 msgstr "移動"
 
-#: src/modules/everything/evry_config.c:380
+#: src/modules/everything/evry_config.c:379
 #, fuzzy
 msgid "Configure"
 msgstr "設定置物架"
 
-#: src/modules/everything/evry_config.c:387
+#: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/modules/everything/evry_config.c:393
+#: src/modules/everything/evry_config.c:391
 #, fuzzy
 msgid "Show in \"All\""
 msgstr "在選單中顯示"
 
-#: src/modules/everything/evry_config.c:399
+#: src/modules/everything/evry_config.c:397
 #, fuzzy
 msgid "Show in top-level"
 msgstr "在選單中顯示"
 
-#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:403
 msgid "Minimum characters for search"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:414
+#: src/modules/everything/evry_config.c:412
 msgid "Plugin Trigger"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:415
-#, fuzzy
-msgid "Default is plugin name"
-msgstr "預設引擎"
-
-#: src/modules/everything/evry_config.c:422
+#: src/modules/everything/evry_config.c:417
 msgid "Search only when triggered"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:429
+#: src/modules/everything/evry_config.c:424
 msgid "Plugin View"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:439
-#: src/modules/everything/evry_config.c:495
+#: src/modules/everything/evry_config.c:434
+#: src/modules/everything/evry_config.c:462
 #, fuzzy
 msgid "Detailed"
 msgstr "預設值"
 
-#: src/modules/everything/evry_config.c:468
+#: src/modules/everything/evry_config.c:458
+#, fuzzy
+msgid "Default View"
+msgstr "預設引擎"
+
+#: src/modules/everything/evry_config.c:467
+#, fuzzy
+msgid "Animate scrolling"
+msgstr "切換時以動畫方式進行"
+
+#: src/modules/everything/evry_config.c:474
+msgid "Up/Down select next item in icon view"
+msgstr ""
+
+#: src/modules/everything/evry_config.c:483
 msgid "Hide input when inactive"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:473
+#: src/modules/everything/evry_config.c:488
 #, fuzzy
 msgid "Hide list"
 msgstr "隱藏逾時"
 
-#: src/modules/everything/evry_config.c:478
+#: src/modules/everything/evry_config.c:493
 msgid "Quick Navigation"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:484
-msgid "Emacs style (ALT + n,p,f,b,m,i)"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:486
-msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
-msgstr ""
-
-#: src/modules/everything/evry_config.c:491
-#, fuzzy
-msgid "Default View"
-msgstr "預設引擎"
-
-#: src/modules/everything/evry_config.c:500
-#, fuzzy
-msgid "Animate scrolling"
-msgstr "切換時以動畫方式進行"
+#: src/modules/everything/evry_config.c:497
+msgid "Emacs style (ALT + n,p,f,b,m,i)"
+msgstr ""
 
-#: src/modules/everything/evry_config.c:507
-msgid "Up/Down select next item in icon view"
+#: src/modules/everything/evry_config.c:499
+msgid "Vi style (ALT + h,j,k,l,n,p,m,i)"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:512
+#: src/modules/everything/evry_config.c:503
 #, fuzzy
 msgid "Sorting"
 msgstr "正在啟動"
 
-#: src/modules/everything/evry_config.c:514
+#: src/modules/everything/evry_config.c:505
+#, fuzzy
+msgid "No Sorting"
+msgstr "正在啟動"
+
+#: src/modules/everything/evry_config.c:508
 msgid "By usage"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:517
+#: src/modules/everything/evry_config.c:511
 #, fuzzy
 msgid "Most used"
 msgstr "使用順序"
 
-#: src/modules/everything/evry_config.c:520
+#: src/modules/everything/evry_config.c:514
 #, fuzzy
 msgid "Last used"
 msgstr "修改日期:"
 
-#: src/modules/everything/evry_config.c:534
+#: src/modules/everything/evry_config.c:526
 msgid "Subject Plugins"
 msgstr ""
 
-#: src/modules/everything/evry_config.c:538
+#: src/modules/everything/evry_config.c:530
 #, fuzzy
 msgid "Action Plugins"
 msgstr "動作參數"
 
-#: src/modules/everything/evry_config.c:542
+#: src/modules/everything/evry_config.c:534
 #, fuzzy
 msgid "Object Plugins"
 msgstr "物件顏色"
 
-#: src/modules/everything/evry_config.c:545
-#: src/modules/everything/evry_config.c:747
+#: src/modules/everything/evry_config.c:537
+#: src/modules/everything/evry_config.c:738
 #, fuzzy
 msgid "Plugins"
 msgstr "一般"
 
-#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:544
 #, fuzzy
 msgid "Popup Size"
 msgstr "彈出式選單"
 
-#: src/modules/everything/evry_config.c:553
-#: src/modules/everything/evry_config.c:585
+#: src/modules/everything/evry_config.c:545
+#: src/modules/everything/evry_config.c:578
 #, fuzzy
 msgid "Popup Width"
 msgstr "彈出訊息速度"
 
-#: src/modules/everything/evry_config.c:560
-#: src/modules/everything/evry_config.c:592
+#: src/modules/everything/evry_config.c:552
+#: src/modules/everything/evry_config.c:585
 #, fuzzy
 msgid "Popup Height"
 msgstr "切換到右方桌面"
 
-#: src/modules/everything/evry_config.c:568
+#: src/modules/everything/evry_config.c:560
 #, fuzzy
 msgid "Popup Align"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/everything/evry_config.c:571
-#: src/modules/everything/evry_config.c:578
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
 #: src/modules/winlist/e_int_config_winlist.c:238
 #: src/modules/winlist/e_int_config_winlist.c:251
 #: src/modules/winlist/e_int_config_winlist.c:292
@@ -6675,39 +6822,30 @@ msgstr "桌面切換器彈出訊息設定"
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/modules/everything/evry_config.c:584
+#: src/modules/everything/evry_config.c:577
 #, fuzzy
 msgid "Edge Popup Size"
 msgstr "彈出式選單"
 
-#: src/modules/everything/evry_config.c:601
+#: src/modules/everything/evry_config.c:594
 #: src/modules/winlist/e_int_config_winlist.c:286
 #, fuzzy
 msgid "Geometry"
 msgstr "視窗移動幾何"
 
-#: src/modules/everything/evry_config.c:642
+#: src/modules/everything/evry_config.c:633
 #, fuzzy
 msgid "Everything Collection"
 msgstr "自動重新啟動之應用程式"
 
-#: src/modules/everything/evry_plug_actions.c:172
-#, fuzzy
-msgid "Actions"
-msgstr "動作"
-
-#: src/modules/everything/evry_plug_aggregator.c:119
+#: src/modules/everything/evry_plug_aggregator.c:121
 msgid "Items"
 msgstr "項目"
 
-#: src/modules/everything/evry_plug_aggregator.c:346
+#: src/modules/everything/evry_plug_aggregator.c:330
 msgid "No plugins loaded"
 msgstr ""
 
-#: src/modules/everything/evry_plug_clipboard.c:33
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/modules/everything/evry_view_help.c:67
 msgid ""
 "  Ok, here comes the explanation of <hilight>everything</hilight>...<br>  "
@@ -6729,167 +6867,69 @@ msgid ""
 "toggle thumb view modes"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1038
-#, fuzzy
-msgid "Exebuf"
-msgstr "類型緩衝"
-
-#: src/modules/everything/evry_plug_apps.c:1055
-#, fuzzy
-msgid "Open With..."
-msgstr "以特定程式開啟..."
-
-#: src/modules/everything/evry_plug_apps.c:1069
-#, fuzzy
-msgid "Open File..."
-msgstr "以特定程式開啟..."
-
-#: src/modules/everything/evry_plug_apps.c:1083
-#, fuzzy
-msgid "Edit Application Entry"
-msgstr "應用程式"
-
-#: src/modules/everything/evry_plug_apps.c:1090
-#, fuzzy
-msgid "New Application Entry"
-msgstr "新的應用程式"
-
-#: src/modules/everything/evry_plug_apps.c:1097
-msgid "Run with Sudo"
-msgstr ""
-
-#: src/modules/everything/evry_plug_apps.c:1103
-#: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
-msgid "Open with..."
-msgstr "以特定程式開啟..."
-
-#: src/modules/everything/evry_plug_apps.c:1110
-#, fuzzy
-msgid "Open Terminal here"
-msgstr "執行於終端機"
-
-#: src/modules/everything/evry_plug_apps.c:1116
-#, fuzzy
-msgid "Run Executable"
-msgstr "執行檔"
-
-#: src/modules/everything/evry_plug_apps.c:1191
-#: src/modules/everything/evry_plug_apps.c:1330
+#: src/modules/everything/evry_plug_apps.c:1250
+#: src/modules/everything/evry_plug_apps.c:1387
 #, fuzzy
 msgid "Everything Applications"
 msgstr "自動重新啟動之應用程式"
 
-#: src/modules/everything/evry_plug_apps.c:1224
+#: src/modules/everything/evry_plug_apps.c:1282
 #, fuzzy
 msgid "Commands"
 msgstr "命令"
 
-#: src/modules/everything/evry_plug_apps.c:1225
+#: src/modules/everything/evry_plug_apps.c:1283
 #, fuzzy
 msgid "Terminal Command"
 msgstr "執行指令"
 
-#: src/modules/everything/evry_plug_apps.c:1230
+#: src/modules/everything/evry_plug_apps.c:1288
 msgid "Sudo GUI"
 msgstr ""
 
-#: src/modules/everything/evry_plug_apps.c:1309
-#: src/modules/everything/evry_plug_files.c:1602
+#: src/modules/everything/evry_plug_apps.c:1367
+#: src/modules/everything/evry_plug_files.c:1601
 #, fuzzy
 msgid "Everything Plugin"
 msgstr "全部"
 
-#: src/modules/everything/evry_plug_calc.c:254
-msgid "Calculator"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1331
-msgid "Copy To ..."
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1336
-#, fuzzy
-msgid "Move To ..."
-msgstr "匯入..."
-
-#: src/modules/everything/evry_plug_files.c:1341
-msgid "Move to Trash"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1345
-msgid "Open Folder (EFM)"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1349
-msgid "Sort by Date"
-msgstr ""
-
-#: src/modules/everything/evry_plug_files.c:1354
-#, fuzzy
-msgid "Sort by Name"
-msgstr "由名稱匹配"
-
-#: src/modules/everything/evry_plug_files.c:1386
-#: src/modules/everything/evry_plug_files.c:1395
-#, fuzzy
-msgid "Recent Files"
-msgstr "重新命名檔案"
-
-#: src/modules/everything/evry_plug_files.c:1472
-#: src/modules/everything/evry_plug_files.c:1625
+#: src/modules/everything/evry_plug_files.c:1471
+#: src/modules/everything/evry_plug_files.c:1623
 #, fuzzy
 msgid "Everything Files"
 msgstr "全部"
 
-#: src/modules/everything/evry_plug_files.c:1499
+#: src/modules/everything/evry_plug_files.c:1498
 #, fuzzy
 msgid "Show recent files"
 msgstr "顯示隱藏的檔案"
 
-#: src/modules/everything/evry_plug_files.c:1503
+#: src/modules/everything/evry_plug_files.c:1502
 #, fuzzy
 msgid "Search recent files"
 msgstr "搜尋目錄"
 
-#: src/modules/everything/evry_plug_files.c:1507
+#: src/modules/everything/evry_plug_files.c:1506
 #, fuzzy
 msgid "Search cached files"
 msgstr "啟動設定"
 
-#: src/modules/everything/evry_plug_files.c:1511
+#: src/modules/everything/evry_plug_files.c:1510
 #, fuzzy
 msgid "Cache visited directories"
 msgstr "使用者自訂目錄"
 
-#: src/modules/everything/evry_plug_files.c:1515
+#: src/modules/everything/evry_plug_files.c:1514
 #, fuzzy
 msgid "Clear cache"
 msgstr "清除"
 
-#: src/modules/everything/evry_plug_settings.c:195
-#, fuzzy
-msgid "Show Dialog"
-msgstr "對話框"
-
-#: src/modules/everything/evry_plug_windows.c:424
-msgid "Switch to Window"
-msgstr ""
-
-#: src/modules/everything/evry_plug_windows.c:439
-#, fuzzy
-msgid "Toggle Fullscreen"
-msgstr "全螢幕"
-
-#: src/modules/everything/evry_plug_windows.c:453
-msgid "Send to Desktop"
-msgstr "送到桌面"
-
 #: src/modules/fileman/e_int_config_mime.c:61
 #: src/modules/fileman/e_mod_main.c:61
 msgid "File Icons"
 msgstr "檔案圖示"
 
-#: src/modules/fileman/e_int_config_mime.c:183
+#: src/modules/fileman/e_int_config_mime.c:176
 msgid "File Types"
 msgstr "檔案類型"
 
@@ -6936,20 +6976,20 @@ msgid "Select an image"
 msgstr "選擇一張圖片"
 
 #: src/modules/fileman/e_mod_main.c:58 src/modules/fileman/e_mod_main.c:72
-#: src/modules/fileman/e_mod_main.c:156 src/modules/wizard/page_050.c:23
+#: src/modules/fileman/e_mod_main.c:160
 msgid "File Manager"
 msgstr "檔案管理員"
 
-#: src/modules/fileman/e_mod_main.c:348
+#: src/modules/fileman/e_mod_main.c:352
 msgid "Home"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:372
+#: src/modules/fileman/e_mod_main.c:376
 #, fuzzy
 msgid "Root"
 msgstr "重新開機"
 
-#: src/modules/fileman/e_mod_main.c:470
+#: src/modules/fileman/e_mod_main.c:474
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6965,7 +7005,7 @@ msgstr ""
 "需要部份舊組態資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新"
 "配置您設定。<br>抱歉打斷您的配置。<br>"
 
-#: src/modules/fileman/e_mod_main.c:483
+#: src/modules/fileman/e_mod_main.c:487
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
 "is very<br>strange. This should not happen unless you downgraded<br>the "
@@ -6979,7 +7019,7 @@ msgstr ""
 "這是不好的,所以為防萬一,您的組態檔已被<br>恢復成預設值。很抱歉為您帶來不"
 "便。<br>"
 
-#: src/modules/fileman/e_mod_main.c:552
+#: src/modules/fileman/e_mod_main.c:557
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "檔案管理員設定"
@@ -7063,98 +7103,102 @@ msgstr ""
 msgid "Device"
 msgstr "預覽"
 
-#: src/modules/fileman/e_fwin.c:1588
+#: src/modules/fileman/e_fwin.c:1601
 msgid "Go to Parent Directory"
 msgstr "到上一層目錄"
 
-#: src/modules/fileman/e_fwin.c:1655
+#: src/modules/fileman/e_fwin.c:1668
 #, fuzzy
 msgid "Other application..."
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:1677 src/modules/fileman/e_fwin.c:2009
+#: src/modules/fileman/e_fwin.c:1690 src/modules/fileman/e_fwin.c:2021
 msgid "Open"
 msgstr "開啟"
 
-#: src/modules/fileman/e_fwin.c:2027
+#: src/modules/fileman/e_fwin.c:1695 src/modules/fileman/e_fwin.c:2019
+msgid "Open with..."
+msgstr "以特定程式開啟..."
+
+#: src/modules/fileman/e_fwin.c:2039
 #, fuzzy
 msgid "Known Applications"
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:2037
+#: src/modules/fileman/e_fwin.c:2049
 msgid "Specific Applications"
 msgstr "特定應用程式"
 
-#: src/modules/fileman/e_fwin.c:2062
+#: src/modules/fileman/e_fwin.c:2074
 msgid "All Applications"
 msgstr "全部應用程式"
 
-#: src/modules/fileman/e_fwin.c:2085
+#: src/modules/fileman/e_fwin.c:2097
 #, fuzzy
 msgid "Custom Command"
 msgstr "執行指令"
 
-#: src/modules/fileman/e_fwin.c:2370
+#: src/modules/fileman/e_fwin.c:2382
 #: src/modules/fileman_opinfo/e_mod_main.c:89
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2374
+#: src/modules/fileman/e_fwin.c:2386
 #: src/modules/fileman_opinfo/e_mod_main.c:92
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2378
+#: src/modules/fileman/e_fwin.c:2390
 #: src/modules/fileman_opinfo/e_mod_main.c:95
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2382
+#: src/modules/fileman/e_fwin.c:2394
 #: src/modules/fileman_opinfo/e_mod_main.c:98
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2392
+#: src/modules/fileman/e_fwin.c:2404
 #: src/modules/fileman_opinfo/e_mod_main.c:108
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2394
+#: src/modules/fileman/e_fwin.c:2406
 #: src/modules/fileman_opinfo/e_mod_main.c:110
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2399
+#: src/modules/fileman/e_fwin.c:2411
 #: src/modules/fileman_opinfo/e_mod_main.c:114
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2401
+#: src/modules/fileman/e_fwin.c:2413
 #: src/modules/fileman_opinfo/e_mod_main.c:116
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2406
+#: src/modules/fileman/e_fwin.c:2418
 #: src/modules/fileman_opinfo/e_mod_main.c:120
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "刪除按鍵"
 
-#: src/modules/fileman/e_fwin.c:2408
+#: src/modules/fileman/e_fwin.c:2420
 #: src/modules/fileman_opinfo/e_mod_main.c:122
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "desktop 檔"
 
-#: src/modules/fileman/e_fwin.c:2412
+#: src/modules/fileman/e_fwin.c:2424
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -7191,7 +7235,7 @@ msgstr "隱藏持續時間"
 msgid "Filemanager is idle"
 msgstr "檔案管理員"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:409
+#: src/modules/fileman_opinfo/e_mod_main.c:415
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -7204,41 +7248,46 @@ msgstr "檔案管理員"
 msgid "Available Gadgets"
 msgstr "可用小工具"
 
-#: src/modules/gadman/e_mod_config.c:139
+#: src/modules/gadman/e_mod_config.c:138
 #, fuzzy
 msgid "Mode"
 msgstr "模組"
 
-#: src/modules/gadman/e_mod_config.c:144 src/modules/gadman/e_mod_config.c:176
+#: src/modules/gadman/e_mod_config.c:143 src/modules/gadman/e_mod_config.c:175
 #, fuzzy
 msgid "Custom Image"
 msgstr "執行指令"
 
-#: src/modules/gadman/e_mod_config.c:148 src/modules/gadman/e_mod_config.c:169
+#: src/modules/gadman/e_mod_config.c:147 src/modules/gadman/e_mod_config.c:168
 #, fuzzy
 msgid "Custom Color"
 msgstr "執行指令"
 
-#: src/modules/gadman/e_mod_config.c:152
+#: src/modules/gadman/e_mod_config.c:151
 msgid "Transparent"
 msgstr ""
 
-#: src/modules/gadman/e_mod_config.c:159
+#: src/modules/gadman/e_mod_config.c:158
 #: src/modules/winlist/e_int_config_winlist.c:256
 #, fuzzy
 msgid "Animations"
 msgstr "切換動畫"
 
-#: src/modules/gadman/e_mod_config.c:160
+#: src/modules/gadman/e_mod_config.c:159
 #, fuzzy
 msgid "Background"
 msgstr "背景"
 
-#: src/modules/gadman/e_mod_config.c:235
+#: src/modules/gadman/e_mod_config.c:234
 #, fuzzy
 msgid "Background Options"
 msgstr "背景改變"
 
+#: src/modules/gadman/e_mod_gadman.c:720
+#, fuzzy
+msgid "Begin move/resize"
+msgstr "開始移動或改變這個小工具大小"
+
 #: src/modules/gadman/e_mod_gadman.c:751
 #, fuzzy
 msgid "Free"
@@ -7490,16 +7539,16 @@ msgstr "您要求刪除「%s」。<br><br>您是否確定刪除此 bar source?
 msgid "Are you sure you want to delete this bar source?"
 msgstr "您是否確定刪除此 bar source?"
 
-#: src/modules/ibar/e_mod_main.c:213
+#: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:790
+#: src/modules/ibar/e_mod_main.c:770
 #, fuzzy
 msgid "Create new Icon"
 msgstr "建立圖示"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Properties"
 msgstr "屬性"
 
@@ -7545,7 +7594,7 @@ msgstr "顯示所有桌面上的視窗"
 msgid "Show windows from active desktop"
 msgstr "顯示目前桌面上的視窗"
 
-#: src/modules/ibox/e_mod_main.c:218
+#: src/modules/ibox/e_mod_main.c:216
 msgid "IBox"
 msgstr "IBox"
 
@@ -7678,37 +7727,37 @@ msgid ""
 "works in the popup."
 msgstr "您不能使用滑鼠右鍵。<br>本程式內部已將滑鼠右鍵用於彈出式選單。"
 
-#: src/modules/pager/e_mod_main.c:2804
+#: src/modules/pager/e_mod_main.c:2803
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/pager/e_mod_main.c:2811 src/modules/pager/e_mod_main.c:2854
+#: src/modules/pager/e_mod_main.c:2810 src/modules/pager/e_mod_main.c:2853
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "切換到右方桌面"
 
-#: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2855
+#: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2854
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "切換到左方桌面"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2855
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "切換到上方桌面"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2857
+#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2856
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "切換到下方桌面"
 
-#: src/modules/pager/e_mod_main.c:2819 src/modules/pager/e_mod_main.c:2858
+#: src/modules/pager/e_mod_main.c:2818 src/modules/pager/e_mod_main.c:2857
 #, fuzzy
 msgid "Popup Desk Next"
 msgstr "切換到左方桌面"
 
-#: src/modules/pager/e_mod_main.c:2821 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2820 src/modules/pager/e_mod_main.c:2858
 #, fuzzy
 msgid "Popup Desk Previous"
 msgstr "切換到左方桌面"
@@ -7732,144 +7781,96 @@ msgstr "設定系統控制"
 msgid "Temperature Settings"
 msgstr "一般設定"
 
-#: src/modules/temperature/e_mod_config.c:194
+#: src/modules/temperature/e_mod_config.c:217
 msgid "Sensors"
 msgstr "感應器"
 
-#: src/modules/temperature/e_mod_config.c:200
+#: src/modules/temperature/e_mod_config.c:223
 #, fuzzy
 msgid "Celsius"
 msgstr "攝氏"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:226
 msgid "Fahrenheit"
 msgstr "華氏"
 
-#: src/modules/temperature/e_mod_config.c:206
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Display Units"
 msgstr "顯示單位"
 
-#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:236
 msgid "Check Interval"
 msgstr "檢查間隔"
 
-#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:240
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:233
-#: src/modules/temperature/e_mod_config.c:291
-#: src/modules/temperature/e_mod_config.c:292
+#: 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:225
-#: src/modules/temperature/e_mod_config.c:237
-#: src/modules/temperature/e_mod_config.c:302
-#: src/modules/temperature/e_mod_config.c:303
+#: 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:229
+#: src/modules/temperature/e_mod_config.c:252
 msgid "Low Temperature"
 msgstr "低溫"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:264
 #, fuzzy
 msgid "Temperatures"
 msgstr "温度"
 
-#: src/modules/temperature/e_mod_main.c:169
+#: src/modules/temperature/e_mod_main.c:176
 msgid "Temperature"
 msgstr "温度"
 
-#: src/modules/wizard/e_wizard.c:218
+#: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr "下一步"
 
-#: src/modules/wizard/e_wizard.c:277
+#: src/modules/wizard/e_wizard.c:286
 #, fuzzy
 msgid "Welcome to Enlightenment"
 msgstr "歡迎來到 Enlightenment 東京"
 
-#: src/modules/wizard/page_010.c:140 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:147 src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Select one"
 msgstr "選擇圖示"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:57
 #, fuzzy
 msgid "Profile"
 msgstr "Profiles"
 
-#: src/modules/wizard/page_030.c:91
-msgid ""
-"No menu files were<br>found on your system.<br>Please see "
-"the<br>documentation on<br>www.enlightenment.org<br>for more details "
-"on<br>how to get your<br>application menus<br>working."
+#: src/modules/wizard/page_050.c:128
+msgid "Sizing"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:107
-#, fuzzy
-msgid "Select application menu"
-msgstr "特定應用程式"
-
-#: src/modules/wizard/page_040.c:22
-#, fuzzy
-msgid "Launcher Bar"
-msgstr "加入到 IBar"
-
-#: src/modules/wizard/page_040.c:24
+#: src/modules/wizard/page_050.c:130
 #, fuzzy
-msgid "Select applications"
-msgstr "特定應用程式"
-
-#: src/modules/wizard/page_050.c:25
-#, fuzzy
-msgid "Desktop Files"
-msgstr "desktop 檔"
-
-#: src/modules/wizard/page_050.c:29
-#, fuzzy
-msgid "No icons on desktop"
-msgstr "顯示於全部桌面"
-
-#: src/modules/wizard/page_050.c:32
-#, fuzzy
-msgid "Enable desktop icons"
-msgstr "顯示桌面圖示"
-
-#: src/modules/wizard/page_060.c:25
-#, fuzzy
-msgid "Focus mode"
-msgstr "焦點"
-
-#: src/modules/wizard/page_060.c:29
-#, fuzzy
-msgid "Click to focus windows"
-msgstr "點擊以取得焦點 "
+msgid "Select preferred size"
+msgstr "選擇 Edj 檔"
 
-#: src/modules/wizard/page_060.c:32
-msgid "Mouse over focuses windows"
+#: src/modules/wizard/page_060.c:30
+msgid "Focus by ..."
 msgstr ""
 
-#: src/modules/wizard/page_070.c:203
-#, fuzzy
-msgid "Select Icons to Add"
-msgstr "選擇圖示"
-
-#: src/modules/wizard/page_080.c:59
+#: src/modules/wizard/page_060.c:37
 #, fuzzy
-msgid "Quick Launch"
-msgstr "啟動"
-
-#: src/modules/wizard/page_080.c:61
-#, fuzzy
-msgid "Select Applications"
-msgstr "特定應用程式"
+msgid "Mouse Over"
+msgstr "使用順序"
 
 #: src/modules/mixer/app_mixer.c:161
 #, fuzzy
@@ -7919,7 +7920,7 @@ msgstr ""
 msgid "Right:"
 msgstr "亮"
 
-#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:583
+#: src/modules/mixer/app_mixer.c:401 src/modules/mixer/e_mod_main.c:696
 #, fuzzy
 msgid "Mute"
 msgstr "選單項目"
@@ -7946,42 +7947,58 @@ msgstr ""
 msgid "Sound Cards"
 msgstr ""
 
-#: src/modules/mixer/conf_gadget.c:371
+#: src/modules/mixer/conf_gadget.c:377
 #, fuzzy
 msgid "Mixer Settings"
 msgstr "大小設定"
 
-#: src/modules/mixer/conf_module.c:91
+#: src/modules/mixer/conf_module.c:93
 msgid "Mixer to use for global actions:"
 msgstr ""
 
-#: src/modules/mixer/conf_module.c:145
+#: src/modules/mixer/conf_module.c:118
+msgid "Diplay desktop notifications on volume change"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:154
 #, fuzzy
 msgid "Launch mixer..."
 msgstr "加入到 IBar"
 
-#: src/modules/mixer/conf_module.c:180
+#: src/modules/mixer/conf_module.c:189
 #, fuzzy
 msgid "Mixer Module Settings"
 msgstr "設定模組"
 
-#: src/modules/mixer/e_mod_main.c:127
+#: src/modules/mixer/e_mod_main.c:54
+msgid "New volume"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+msgid "Mixer"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:67
+#, fuzzy
+msgid "Volume changed"
+msgstr "改變解析度"
+
+#: src/modules/mixer/e_mod_main.c:187
 #, fuzzy
 msgid "Mixer Settings Updated"
 msgstr "檔案管理員組態已經更新"
 
-#: src/modules/mixer/e_mod_main.c:1177
-msgid ""
-"Mixer Module Settings data changed.<br>Your old configuration has been "
-"replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+#: src/modules/mixer/e_mod_main.c:1334
+#, fuzzy
+msgid "Mixer Module"
+msgstr "設定模組"
 
 #: src/modules/connman/e_mod_main.c:85 src/modules/connman/e_mod_main.c:112
-#: src/modules/connman/e_mod_main.c:1019 src/modules/connman/e_mod_main.c:1773
+#: src/modules/connman/e_mod_main.c:1057 src/modules/connman/e_mod_main.c:1811
 msgid "Cannot toggle system's offline mode."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1011
+#: src/modules/connman/e_mod_main.c:96 src/modules/connman/e_mod_main.c:1049
 msgid "ConnMan Daemon is not running."
 msgstr ""
 
@@ -8008,141 +8025,346 @@ msgstr ""
 msgid "Ok"
 msgstr "OK"
 
-#: src/modules/connman/e_mod_main.c:559 src/modules/connman/e_mod_main.c:572
+#: src/modules/connman/e_mod_main.c:576 src/modules/connman/e_mod_main.c:589
 msgid "Disconnect from network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:604 src/modules/connman/e_mod_main.c:665
-#: src/modules/connman/e_mod_main.c:691
+#: src/modules/connman/e_mod_main.c:634 src/modules/connman/e_mod_main.c:703
+#: src/modules/connman/e_mod_main.c:729
 msgid "Service does not exist anymore"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:612 src/modules/connman/e_mod_main.c:617
-#: src/modules/connman/e_mod_main.c:644
+#: src/modules/connman/e_mod_main.c:642 src/modules/connman/e_mod_main.c:654
+#: src/modules/connman/e_mod_main.c:682
 msgid "Connect to network service."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:713
+#: src/modules/connman/e_mod_main.c:751
 msgid "Could not set service's passphrase"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1207
+#: src/modules/connman/e_mod_main.c:1245
 #, fuzzy
 msgid "Offline mode"
 msgstr "關機時間"
 
-#: src/modules/connman/e_mod_main.c:1216
+#: src/modules/connman/e_mod_main.c:1254
 #, fuzzy
 msgid "Controls"
 msgstr "設定系統控制"
 
-#: src/modules/connman/e_mod_main.c:1387
+#: src/modules/connman/e_mod_main.c:1425
 msgid "No ConnMan"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1389
+#: src/modules/connman/e_mod_main.c:1427
 msgid "No ConnMan server found."
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1402
+#: src/modules/connman/e_mod_main.c:1440
 msgid "Offline mode: all radios are turned off"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1427
+#: src/modules/connman/e_mod_main.c:1465
 #, fuzzy
 msgid "No Connection"
 msgstr "選取設定"
 
-#: src/modules/connman/e_mod_main.c:1431
+#: src/modules/connman/e_mod_main.c:1469
 #, fuzzy
 msgid "Not connected"
 msgstr "受保護的"
 
-#: src/modules/connman/e_mod_main.c:1434 src/modules/connman/e_mod_main.c:1851
+#: src/modules/connman/e_mod_main.c:1472 src/modules/connman/e_mod_main.c:1889
 msgid "disconnect"
 msgstr ""
 
-#: src/modules/connman/e_mod_main.c:1457
+#: src/modules/connman/e_mod_main.c:1495
 #, fuzzy
 msgid "Unknown Name"
 msgstr "末知"
 
-#: src/modules/connman/e_mod_main.c:1466
+#: src/modules/connman/e_mod_main.c:1504
 #, fuzzy
 msgid "No error"
 msgstr "執行錯誤"
 
-#: src/modules/connman/e_mod_main.c:1845
+#: src/modules/connman/e_mod_main.c:1883
 #, fuzzy
 msgid "idle"
 msgstr "並排"
 
-#: src/modules/connman/e_mod_main.c:1846
+#: src/modules/connman/e_mod_main.c:1884
 #, fuzzy
 msgid "association"
 msgstr "轉換"
 
-#: src/modules/connman/e_mod_main.c:1847
+#: src/modules/connman/e_mod_main.c:1885
 #, fuzzy
 msgid "configuration"
 msgstr "組態"
 
-#: src/modules/connman/e_mod_main.c:1848
+#: src/modules/connman/e_mod_main.c:1886
 #, fuzzy
 msgid "ready"
 msgstr "格瑞那達"
 
-#: src/modules/connman/e_mod_main.c:1849
+#: src/modules/connman/e_mod_main.c:1887
 #, fuzzy
 msgid "login"
 msgstr "Blin"
 
-#: src/modules/connman/e_mod_main.c:1850
+#: src/modules/connman/e_mod_main.c:1888
 #, fuzzy
 msgid "online"
 msgstr "引擎"
 
-#: src/modules/connman/e_mod_main.c:1852
+#: src/modules/connman/e_mod_main.c:1890
 #, fuzzy
 msgid "failure"
 msgstr "設定"
 
-#: src/modules/connman/e_mod_main.c:1853
+#: src/modules/connman/e_mod_main.c:1891
 #, fuzzy
 msgid "enabled"
 msgstr "啟用"
 
-#: src/modules/connman/e_mod_main.c:1854
+#: src/modules/connman/e_mod_main.c:1892
 #, fuzzy
 msgid "available"
 msgstr "填滿可用空間"
 
-#: src/modules/connman/e_mod_main.c:1855
+#: src/modules/connman/e_mod_main.c:1893
 #, fuzzy
 msgid "connected"
 msgstr "受保護的"
 
-#: src/modules/connman/e_mod_main.c:1856
+#: src/modules/connman/e_mod_main.c:1894
 #, fuzzy
 msgid "offline"
 msgstr "關機時間"
 
-#: src/modules/systray/e_mod_main.c:888
+#: src/modules/systray/e_mod_main.c:896
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:889
+#: src/modules/systray/e_mod_main.c:897
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1092
+#: src/modules/systray/e_mod_main.c:905
+#, fuzzy
+msgid "Systray Error"
+msgstr "系統"
+
+#: src/modules/systray/e_mod_main.c:906
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1108
 #, fuzzy
 msgid "Systray"
 msgstr "系統"
 
 #, fuzzy
-#~ msgid "Enlightenment cannot set up its environment."
-#~ msgstr "Enlightenment 無法建立他的主題系統。"
+#~ msgid "Acpi"
+#~ msgstr "動作"
+
+#, fuzzy
+#~ msgid "Dim Screen"
+#~ msgstr "此螢幕"
+
+#, fuzzy
+#~ msgid "Undim Screen"
+#~ msgstr "此螢幕"
+
+#, fuzzy
+#~ msgid "Resizeable"
+#~ msgstr "改變大小"
+
+#~ msgid "Stop move/resize this gadget"
+#~ msgstr "停止移動或改變這個小工具大小"
+
+#~ msgid ""
+#~ "Enlightenment cannot Initialize Ecore!\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化 Ecore!\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the File system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化檔案系統。\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize its X connection.\n"
+#~ "Have you set your DISPLAY variable?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化 X 連結。\n"
+#~ "您是否已設定 DISPLAY 環境變數?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the connections system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化連結系統。\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the IPC system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化 IPC 系統。\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid ""
+#~ "Enlightenment cannot setup xinerama wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment 無法設定 xinerama wrapping。\n"
+#~ "這種情況不應該發生。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enlightenment cannot setup randr wrapping.\n"
+#~ "This should not happen."
+#~ msgstr ""
+#~ "Enlightenment 無法設定 xinerama wrapping。\n"
+#~ "這種情況不應該發生。"
+
+#~ msgid ""
+#~ "Enlightenment cannot initialize the Evas system.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法初始化 Evas 系統。\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid ""
+#~ "Enlightenment cannot set up init screen.\n"
+#~ "Perhaps you are out of memory?"
+#~ msgstr ""
+#~ "Enlightenment 無法建立初始螢幕。\n"
+#~ "可能是記憶體不足?"
+
+#~ msgid "Setup FM"
+#~ msgstr "設定 FM"
+
+#~ msgid "Enlightenment cannot set up its shelf system."
+#~ msgstr "Enlightenment 無法建立他的置物架系統。"
+
+#~ msgid "New Application"
+#~ msgstr "新的應用程式"
+
+#, fuzzy
+#~ msgid "Background panning"
+#~ msgstr "背景改變"
+
+#, fuzzy
+#~ msgid "%.2f"
+#~ msgstr "%1.2f"
+
+#~ msgid "Display Power Management Signaling"
+#~ msgstr "顯示器電源管理通知"
+
+#~ msgid "The current display server is not <br>DPMS capable."
+#~ msgstr "目前的顯示伺服器<br>不支援 DPMS。"
+
+#~ msgid "The current display server does not <br>have the DPMS extension."
+#~ msgstr "目前的顯示伺服器<br>沒有 DPMS extension。"
+
+#, fuzzy
+#~ msgid "Default is plugin name"
+#~ msgstr "預設引擎"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "動作"
+
+#, fuzzy
+#~ msgid "Exebuf"
+#~ msgstr "類型緩衝"
+
+#, fuzzy
+#~ msgid "Open With..."
+#~ msgstr "以特定程式開啟..."
+
+#, fuzzy
+#~ msgid "Open File..."
+#~ msgstr "以特定程式開啟..."
+
+#, fuzzy
+#~ msgid "Edit Application Entry"
+#~ msgstr "應用程式"
+
+#, fuzzy
+#~ msgid "New Application Entry"
+#~ msgstr "新的應用程式"
+
+#, fuzzy
+#~ msgid "Open Terminal here"
+#~ msgstr "執行於終端機"
+
+#, fuzzy
+#~ msgid "Run Executable"
+#~ msgstr "執行檔"
+
+#, fuzzy
+#~ msgid "Move To ..."
+#~ msgstr "匯入..."
+
+#, fuzzy
+#~ msgid "Sort by Name"
+#~ msgstr "由名稱匹配"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "重新命名檔案"
+
+#, fuzzy
+#~ msgid "Show Dialog"
+#~ msgstr "對話框"
+
+#, fuzzy
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "全螢幕"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "送到桌面"
+
+#, fuzzy
+#~ msgid "Select application menu"
+#~ msgstr "特定應用程式"
+
+#, fuzzy
+#~ msgid "Launcher Bar"
+#~ msgstr "加入到 IBar"
+
+#, fuzzy
+#~ msgid "No icons on desktop"
+#~ msgstr "顯示於全部桌面"
+
+#, fuzzy
+#~ msgid "Enable desktop icons"
+#~ msgstr "顯示桌面圖示"
+
+#, fuzzy
+#~ msgid "Focus mode"
+#~ msgstr "焦點"
+
+#, fuzzy
+#~ msgid "Click to focus windows"
+#~ msgstr "點擊以取得焦點 "
+
+#, fuzzy
+#~ msgid "Select Icons to Add"
+#~ msgstr "選擇圖示"
+
+#, fuzzy
+#~ msgid "Quick Launch"
+#~ msgstr "啟動"
 
 #, fuzzy
 #~ msgid ""
@@ -8772,12 +8994,6 @@ msgstr "系統"
 #~ msgid "Shut Down Immediately"
 #~ msgstr "立即退出"
 
-#~ msgid "Shut Down"
-#~ msgstr "關機"
-
-#~ msgid "Suspend to Disk"
-#~ msgstr "休眠"
-
 #~ msgid "Desktop Lock"
 #~ msgstr "鎖定桌面"
 
@@ -8876,9 +9092,6 @@ msgstr "系統"
 #~ msgid "Mixer Module Configuration"
 #~ msgstr "置物架組態"
 
-#~ msgid "Back"
-#~ msgstr "上一步"
-
 #, fuzzy
 #~ msgid "Choose Language"
 #~ msgstr "語言"
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/bin/.cvsignore b/src/bin/.cvsignore
deleted file mode 100644 (file)
index d47df47..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-enlightenment
-enlightenment_eapp
-enlightenment_eapp_cache_gen
-enlightenment_remote
-enlightenment_imc
-enlightenment_start
-enlightenment_sys
-enlightenment_thumb
-enlightenment_fm
-enlightenment_init
-enlightenment_fm_op
index 872792b..ac5f390 100644 (file)
@@ -9,7 +9,6 @@ INCLUDES = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
 @e_cflags@ \
-@x_cflags@ \
 @cf_cflags@ \
 @VALGRIND_CFLAGS@ \
 @EDJE_DEF@ \
@@ -29,7 +28,11 @@ internal_bin_PROGRAMS = \
 enlightenment_fm_op \
 enlightenment_init \
 enlightenment_sys \
-enlightenment_thumb
+enlightenment_thumb 
+
+if HAVE_EEZE
+internal_bin_PROGRAMS += enlightenment_backlight
+endif
 
 ENLIGHTENMENTHEADERS = \
 e_about.h \
@@ -37,6 +40,7 @@ e_acpi.h \
 e_actions.h \
 e_alert.h \
 e_atoms.h \
+e_backlight.h \
 e_bg.h \
 e_bindings.h \
 e_border.h \
@@ -53,6 +57,7 @@ e_confirm_dialog.h \
 e_container.h \
 e_datastore.h \
 e_desk.h \
+e_deskenv.h \
 e_desklock.h \
 e_dialog.h \
 e_dnd.h \
@@ -176,14 +181,17 @@ e_widget_toolbar.h \
 e_widget_toolbook.h \
 e_win.h \
 e_xinerama.h \
+e_xsettings.h \
 e_zone.h
 
+
 enlightenment_src = \
 e_about.c \
 e_acpi.c \
-e_actions.c \
 e_alert.c \
+e_actions.c \
 e_atoms.c \
+e_backlight.c \
 e_bg.c \
 e_bindings.c \
 e_border.c \
@@ -200,6 +208,7 @@ e_confirm_dialog.c \
 e_container.c \
 e_datastore.c \
 e_desk.c \
+e_deskenv.c \
 e_desklock.c \
 e_dialog.c \
 e_dnd.c \
@@ -318,6 +327,7 @@ e_widget_toolbar.c \
 e_widget_toolbook.c \
 e_win.c \
 e_xinerama.c \
+e_xsettings.c \
 e_zone.c \
 $(ENLIGHTENMENTHEADERS)
 
@@ -326,7 +336,7 @@ e_main.c \
 $(enlightenment_src)
 
 enlightenment_LDFLAGS = -export-dynamic
-enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ -lm
+enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ -lm
 
 enlightenment_imc_SOURCES = \
 e.h \
@@ -338,8 +348,8 @@ enlightenment_imc_LDADD = @E_IMC_LIBS@
 
 enlightenment_start_SOURCES = \
 e_start_main.c
-
-enlightenment_start_LDADD = @dlopen_libs@
+enlightenment_start_CFLAGS = $(INCLUDES) @E_START_CFLAGS@
+enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@
 
 enlightenment_thumb_SOURCES = \
 e_sha1.c \
@@ -359,18 +369,37 @@ e_sys_main.c
 
 enlightenment_sys_LDADD = @E_SYS_LIBS@
 
+if HAVE_EEZE
+enlightenment_backlight_SOURCES = \
+e_backlight_main.c
+
+enlightenment_backlight_CFLAGS = @EEZE_CFLAGS@
+enlightenment_backlight_LDADD = @EEZE_LIBS@
+endif
+
 enlightenment_init_SOURCES = \
 e_init_main.c \
 e_xinerama.c
 
 enlightenment_init_LDADD = @E_INIT_LIBS@
 
+#enlightenment_alert_SOURCES = \
+#e_alert_main.c
+
+#enlightenment_alert_LDADD = @E_ALERT_LIBS@
+#enlightenment_alert_CFLAGS = @E_ALERT_CFLAGS@
+
 # HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS
 # and before internal_bin_PROGRAMS are installed. install-data-hook is
 # run after both
 setuid_root_mode = a=rx,u+xs
+if HAVE_EEZE
 install-data-hook:
        @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
-
+       @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
+else
+install-data-hook:
+       @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
+endif
 installed_headersdir = $(prefix)/include/enlightenment
 installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
index 222d0a5..f7b07f6 100644 (file)
 #ifndef E_H
-#define E_H
+# define E_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 
-#define USE_IPC
-#if 0
-#define OBJECT_PARANOIA_CHECK
-#define OBJECT_CHECK
-#endif
+# define USE_IPC
+# if 0
+#  define OBJECT_PARANOIA_CHECK
+#  define OBJECT_CHECK
+# endif
 
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS  64
-#endif
+# ifndef _FILE_OFFSET_BITS
+#  define _FILE_OFFSET_BITS  64
+# endif
 
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# elif defined __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  include <stddef.h>
+#  ifdef  __cplusplus
 extern "C"
-# endif
+#  endif
 void *alloca (size_t);
-#endif
+# endif
 
+# ifdef __linux__
+#  include <features.h>
+# endif
 
-#ifdef __linux__
-#include <features.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <utime.h>
-#include <dlfcn.h>
-#include <math.h>
-#include <fnmatch.h>
-#include <limits.h>
-#include <ctype.h>
-#include <time.h>
-#include <dirent.h>
-#include <pwd.h>
-#include <grp.h>
-#include <glob.h>
-#include <locale.h>
-#include <errno.h>
-#include <signal.h>
-#include <inttypes.h>
-
-#ifdef HAVE_GETTEXT
-# include <libintl.h>
-#endif
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <sys/param.h>
+# include <sys/resource.h>
+# include <utime.h>
+# include <dlfcn.h>
+# include <math.h>
+# include <fcntl.h>
+# include <fnmatch.h>
+# include <limits.h>
+# include <ctype.h>
+# include <time.h>
+# include <dirent.h>
+# include <pwd.h>
+# include <grp.h>
+# include <glob.h>
+# include <locale.h>
+# include <errno.h>
+# include <signal.h>
+# include <inttypes.h>
+
+# ifdef HAVE_GETTEXT
+#  include <libintl.h>
+# endif
 
-#ifndef _POSIX_HOST_NAME_MAX
-#define _POSIX_HOST_NAME_MAX 255
-#endif
+# ifndef _POSIX_HOST_NAME_MAX
+#  define _POSIX_HOST_NAME_MAX 255
+# endif
 
-#ifdef HAVE_VALGRIND
-# include <memcheck.h>
-#endif
+# ifdef HAVE_VALGRIND
+#  include <memcheck.h>
+# endif
 
-#ifdef __GLIBC__
-#include <execinfo.h>
-#include <setjmp.h>
-#endif
+# ifdef __GLIBC__
+#  include <execinfo.h>
+# endif
 
-#include <Eina.h>
-#include <Evas.h>
-#include <Evas_Engine_Buffer.h>
-#include <Ecore.h>
-#include <Ecore_X.h>
-#include <Ecore_Evas.h>
-#include <Ecore_Input.h>
-#include <Ecore_Input_Evas.h>
-#include <Ecore_Con.h>
-#include <Ecore_Ipc.h>
-#include <Ecore_File.h>
-#include <Eet.h>
-#include <Edje.h>
-#include <Efreet.h>
-#include <Efreet_Mime.h>
-#include <E_DBus.h>
-
-#ifdef EAPI
-#undef EAPI
-#endif
-#ifdef WIN32
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
-# else
-#  define EAPI __declspec(dllimport)
+# include <setjmp.h>
+# include <Eina.h>
+# include <Eet.h>
+# include <Evas.h>
+# include <Evas_Engine_Buffer.h>
+# include <Ecore.h>
+# include <Ecore_X.h>
+# include <Ecore_Evas.h>
+# include <Ecore_Input.h>
+# include <Ecore_Input_Evas.h>
+# include <Ecore_Con.h>
+# include <Ecore_Ipc.h>
+# include <Ecore_File.h>
+# include <Efreet.h>
+# include <Efreet_Mime.h>
+# include <Edje.h>
+# include <E_DBus.h>
+
+# ifdef HAVE_HAL
+#  include <E_Hal.h>
 # endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
+
+# ifdef EAPI
+#  undef EAPI
+# endif
+# ifdef WIN32
+#  ifdef BUILDING_DLL
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI __declspec(dllimport)
+#  endif
+# else
+#  ifdef __GNUC__
+#   if __GNUC__ >= 4
 /* BROKEN in gcc 4 on amd64 */
-#if 0
-#   pragma GCC visibility push(hidden)
-#endif
-#   define EAPI __attribute__ ((visibility("default")))
+#    if 0
+#     pragma GCC visibility push(hidden)
+#    endif
+#    define EAPI __attribute__ ((visibility("default")))
+#   else
+#    define EAPI
+#   endif
 #  else
 #   define EAPI
 #  endif
-# else
-#  define EAPI
 # endif
-#endif
 
-#ifdef EINTERN
-#undef EINTERN
-#endif
-#ifdef __GNUC__
-# if __GNUC__ >= 4
-#  define EINTERN __attribute__ ((visibility("hidden")))
+# ifdef EINTERN
+#  undef EINTERN
+# endif
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EINTERN __attribute__ ((visibility("hidden")))
+#  else
+#   define EINTERN
+#  endif
 # else
 #  define EINTERN
 # endif
-#else
-# define EINTERN
-#endif
 
 typedef struct _E_Before_Idler E_Before_Idler;
 typedef struct _E_Rect E_Rect;
 
 /* convenience macro to compress code and avoid typos */
-#define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; }
-#define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
-#define E_INSIDE(x, y, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && ((x) >= (xx)) && ((y) >= (yy)))
-#define E_CONTAINS(x, y, w, h, xx, yy, ww, hh) (((xx) >= (x)) && (((x) + (w)) >= ((xx) + (ww))) && ((yy) >= (y)) && (((y) + (h)) >= ((yy) + (hh))))
-#define E_SPANS_COMMON(x1, w1, x2, w2) (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
-#define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n)
-#define E_NEW(s, n) (s *)calloc(n, sizeof(s))
-#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s))
-#define E_FREE(p) do { if (p) {free(p); p = NULL;} } while (0)
-#define E_FREE_LIST(list, free) \
-  do \
-    { \
-       if (list) \
-        { \
-           void *data; \
-           EINA_LIST_FREE(list, data) \
-             { \
-                free(data); \
-             } \
-           list = NULL; \
-        } \
-    } \
-  while (0)
-
-#define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
-#define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
+# define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; }
+# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
+   (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
+# define E_INSIDE(x, y, xx, yy, ww, hh) \
+   (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && ((x) >= (xx)) && ((y) >= (yy)))
+# define E_CONTAINS(x, y, w, h, xx, yy, ww, hh) \
+   (((xx) >= (x)) && (((x) + (w)) >= ((xx) + (ww))) && ((yy) >= (y)) && (((y) + (h)) >= ((yy) + (hh))))
+# define E_SPANS_COMMON(x1, w1, x2, w2) \
+   (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
+# define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n)
+# define E_NEW(s, n) (s *)calloc(n, sizeof(s))
+# define E_NEW_RAW(s, n) (s *)malloc(n * sizeof(s))
+# define E_FREE(p) do { free(p); p = NULL; } while (0)
+# define E_FREE_LIST(list, free) \
+   do \
+   { \
+      if (list) \
+        { \
+           void *data; \
+           EINA_LIST_FREE(list, data) \
+             { \
+                free(data); \
+             } \
+           list = NULL; \
+        } \
+   } \
+   while (0)
+
+# define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
+# define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
    { \
       if (E_INTERSECTS(_x, _y, _w, _h, _cx, _cy, _cw, _ch)) \
        { \
@@ -169,7 +179,7 @@ typedef struct _E_Rect E_Rect;
             { \
                _w += _x - (_cx); \
                _x = (_cx); \
-               if (_w < 0) _w = 0; \
+               if ((int)_w < 0) _w = 0; \
             } \
           if ((_x + _w) > ((_cx) + (_cw))) \
             _w = (_cx) + (_cw) - _x; \
@@ -177,7 +187,7 @@ typedef struct _E_Rect E_Rect;
             { \
                _h += _y - (_cy); \
                _y = (_cy); \
-               if (_h < 0) _h = 0; \
+               if ((int)_h < 0) _h = 0; \
             } \
           if ((_y + _h) > ((_cy) + (_ch))) \
             _h = (_cy) + (_ch) - _y; \
@@ -188,28 +198,27 @@ typedef struct _E_Rect E_Rect;
        } \
    }
 
-#define E_REMOTE_OPTIONS 1
-#define E_REMOTE_OUT     2
-#define E_WM_IN          3
-#define E_REMOTE_IN      4
-#define E_ENUM           5
-#define E_LIB_IN         6
+# define E_REMOTE_OPTIONS 1
+# define E_REMOTE_OUT 2
+# define E_WM_IN 3
+# define E_REMOTE_IN 4
+# define E_ENUM 5
+# define E_LIB_IN 6
 
-#define E_TYPEDEFS 1
-#include "e_includes.h"
-#undef E_TYPEDEFS
-#include "e_includes.h"
+# define E_TYPEDEFS 1
+# include "e_includes.h"
+# undef E_TYPEDEFS
+# include "e_includes.h"
 
 EAPI E_Before_Idler *e_main_idler_before_add(int (*func) (void *data), void *data, int once);
-EAPI void            e_main_idler_before_del(E_Before_Idler *eb);
-
+EAPI void  e_main_idler_before_del(E_Before_Idler *eb);
 
 struct _E_Before_Idler
 {
-   int          (*func) (void *data);
-   void          *data;
-   unsigned char  once : 1;
-   unsigned char  delete_me : 1;
+   int (*func) (void *data);
+   void *data;
+   Eina_Bool once : 1;
+   Eina_Bool delete_me : 1;
 };
 
 struct _E_Rect
@@ -225,12 +234,13 @@ extern EAPI E_Path *path_icons;
 extern EAPI E_Path *path_modules;
 extern EAPI E_Path *path_backgrounds;
 extern EAPI E_Path *path_messages;
-extern EAPI int     restart;
-extern EAPI int     good;
-extern EAPI int     evil;
-extern EAPI int     starting;
-extern EAPI int     stopping;
+extern EAPI Eina_Bool good;
+extern EAPI Eina_Bool evil;
+extern EAPI Eina_Bool starting;
+extern EAPI Eina_Bool stopping;
+extern EAPI Eina_Bool restart;
 
+extern EAPI Eina_Bool e_precache_end;
 extern EAPI Eina_Bool x_fatal;
 
 extern EAPI unsigned long e_alert_composite_win;
index a5d10c2..94eb569 100644 (file)
@@ -20,7 +20,8 @@ e_about_new(E_Container *con)
    e_obj_dialog_obj_part_text_set
      (od, "e.textblock.about",
       _(
-       "Copyright &copy; 1999-2011, by the Enlightenment Development Team.<br>"
+       "<title>Copyright &copy; 1999-2011, by the Enlightenment "
+       "Development Team</><br>"
        "<br>"
        "We hope you enjoy using this software as much as we enjoyed "
        "writing it.<br>"
@@ -30,9 +31,9 @@ e_about_new(E_Container *con)
        "so please see the COPYING and COPYING-PLAIN licence files "
        "installed on your system.<br>"
        "<br>"
-       "Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+       "Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it "
        "is not stable. Many features are incomplete or even non-existent "
-       "yet and may have many bugs. You have been <hilight>WARNED!</hilight>"
+       "yet and may have many bugs. You have been <hilight>WARNED!</>"
        )
       );
    
@@ -44,7 +45,7 @@ e_about_new(E_Container *con)
        f = fopen(buf, "r");
        if (f)
          {
-            tbuf = strdup(_("<title>The Team</title>"));
+            tbuf = strdup(_("<title>The Team</><br><br>"));
             while (fgets(buf, sizeof(buf), f))
               {
                  int len;
index 1a5eced..b958150 100644 (file)
@@ -1237,14 +1237,13 @@ _e_actions_zone_get(E_Object *obj)
 {
    if (obj)
      {
-       if (obj->type == E_MANAGER_TYPE)
-         return e_util_zone_current_get((E_Manager *)obj);
-       else if (obj->type == E_CONTAINER_TYPE)
-         return e_util_zone_current_get(((E_Container *)obj)->manager);
-       else if (obj->type == E_ZONE_TYPE)
-         return e_util_zone_current_get(((E_Zone *)obj)->container->manager);
-       else
-         return e_util_zone_current_get(e_manager_current_get());
+       if      (obj->type == (int)E_MANAGER_TYPE)   return e_util_zone_current_get((E_Manager *)obj);
+       else if (obj->type == (int)E_CONTAINER_TYPE) return e_util_zone_current_get(((E_Container *)obj)->manager);
+       else if (obj->type == (int)E_ZONE_TYPE)      return (E_Zone *)obj;
+       else if (obj->type == (int)E_BORDER_TYPE)    return ((E_Border *)obj)->zone;
+       else if (obj->type == (int)E_SHELF_TYPE)     return ((E_Shelf *)obj)->zone;
+       else if (obj->type == (int)E_POPUP_TYPE)     return ((E_Popup *)obj)->zone;
+       else if (obj->type == (int)E_WIN_TYPE)       return ((E_Win *)obj)->border->zone;
      }
    return e_util_zone_current_get(e_manager_current_get());
 }
@@ -1319,7 +1318,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
        if (ACT_FLIP_LEFT(zone))
          {
             e_zone_desk_flip_by(zone, -1, 0);
-            ecore_x_pointer_warp(zone->container->win, zone->w - offset, y);
+            ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, y);
             wev->curr.y = y;
             wev->curr.x = zone->w - offset;
          }
@@ -1328,7 +1327,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, 0);
-             ecore_x_pointer_warp(zone->container->win, offset, y);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, y);
              wev->curr.y = y;
              wev->curr.x = offset;
           }
@@ -1337,7 +1336,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP(zone))
           {
              e_zone_desk_flip_by(zone, 0, -1);
-             ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, x, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = x;
              wev->curr.y = zone->h - offset;
           }
@@ -1346,7 +1345,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
        if (ACT_FLIP_DOWN(zone))
          {
             e_zone_desk_flip_by(zone, 0, 1);
-            ecore_x_pointer_warp(zone->container->win, x, offset);
+            ecore_x_pointer_warp(zone->container->win, x, zone->container->y + zone->y + offset);
             wev->curr.x = x;
             wev->curr.y = offset;
          }
@@ -1355,7 +1354,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP_LEFT(zone))
           {
              e_zone_desk_flip_by(zone, -1, -1);
-             ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = zone->w - offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1364,7 +1363,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, -1);
-             ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1373,7 +1372,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
        if (ACT_FLIP_DOWN_LEFT(zone))
          {
             e_zone_desk_flip_by(zone, -1, 1);
-            ecore_x_pointer_warp(zone->container->win, zone->w - offset, offset);
+            ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, zone->container->y + zone->y + offset);
             wev->curr.y = offset;
             wev->curr.x = zone->w - offset;
          }
@@ -1382,7 +1381,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
        if (ACT_FLIP_DOWN_RIGHT(zone))
          {
             e_zone_desk_flip_by(zone, 1, 1);
-            ecore_x_pointer_warp(zone->container->win, offset, offset);
+            ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, zone->container->y + zone->y + offset);
             wev->curr.y = offset;
             wev->curr.x = offset;
          }
@@ -2635,12 +2634,40 @@ ACT_FN_END_MOUSE(delayed_action, )
 
 ACT_FN_GO_ACPI(dim_screen, __UNUSED__)
 {
-   printf("Dim Screen\n");
+   E_Zone *zone = _e_actions_zone_get(obj);
+   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_DIM);
 }
 
 ACT_FN_GO_ACPI(undim_screen, __UNUSED__)
 {
-   printf("Undim Screen\n");
+   E_Zone *zone = _e_actions_zone_get(obj);
+   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
+}
+
+ACT_FN_GO(backlight_set, )
+{
+   E_Zone *zone = _e_actions_zone_get(obj);
+   int v;
+   if (params)
+      v = atoi(params);
+   else
+     {
+        v = e_backlight_level_get(zone) * 100.0;
+        if (v == 0) v = 100;
+        else v = 0;
+     }
+   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
+   e_backlight_level_set(zone, ((double)v / 100.0), -1.0);
+}
+
+ACT_FN_GO(backlight_adjust, )
+{
+   E_Zone *zone = _e_actions_zone_get(obj);
+   int v;
+   if (!params) return;
+   v = atoi(params);
+   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
+   e_backlight_level_set(zone, e_backlight_level_get(zone) + ((double)v / 100.0), -1.0);
 }
 
 /* local subsystem globals */
@@ -2933,6 +2960,29 @@ e_actions_init(void)
                            "screen_send_by", NULL,
                            "syntax: N-offset, example: -2", 1);
 
+   ACT_GO_ACPI(dim_screen);
+   e_action_predef_name_set(N_("Screen"), N_("Dim"), "dim_screen",
+                           NULL, NULL, 0);
+   ACT_GO_ACPI(undim_screen);
+   e_action_predef_name_set(N_("Screen"), N_("Undim"), "undim_screen",
+                           NULL, NULL, 0);
+   ACT_GO(backlight_set);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Set"), "backlight_set",
+                           NULL, "syntax: brightness(0 - 100), example: 50", 1);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Min"), "backlight_set",
+                           "0", NULL, 0);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Mid"), "backlight_set",
+                           "50", NULL, 0);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Max"), "backlight_set",
+                           "100", NULL, 0);
+   ACT_GO(backlight_adjust);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Adjust"), "backlight_adjust",
+                           NULL, "syntax: brightness(-100 - 100), example: -20", 1);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Up"), "backlight_adjust",
+                           "10", NULL, 0);
+   e_action_predef_name_set(N_("Screen"), N_("Backlight Down"), "backlight_adjust",
+                           "-10", NULL, 0);
+
    /* window_move_to_center */
    ACT_GO(window_move_to_center);
    e_action_predef_name_set(N_("Window : Actions"), N_("Move To Center"),
@@ -3077,14 +3127,6 @@ e_actions_init(void)
    ACT_END_KEY(delayed_action);
    ACT_END_MOUSE(delayed_action);
 
-   ACT_GO_ACPI(dim_screen);
-   e_action_predef_name_set(N_("Acpi"), N_("Dim Screen"), "dim_screen",
-                           NULL, NULL, 0);
-
-   ACT_GO_ACPI(undim_screen);
-   e_action_predef_name_set(N_("Acpi"), N_("Undim Screen"), "undim_screen",
-                           NULL, NULL, 0);
-
    return 1;
 }
 
@@ -3093,7 +3135,8 @@ e_actions_shutdown(void)
 {
    e_action_predef_name_all_del();
 
-   E_FREE_LIST(action_list, e_object_del);
+   while(action_list)
+     e_object_del(action_list->data);
 
    action_names = eina_list_free(action_names);
    eina_hash_free(actions);
index 62846ec..15a4158 100644 (file)
 #include "e.h"
-#include "e_alert.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <X11/Xlib.h>
-#include <X11/X.h>
-#include <X11/extensions/shape.h>
-#include <Ecore.h>
-
-/* local subsystem functions */
-
-/* local subsystem globals */
-static Display     *dd = NULL;
-static char        *title = NULL, *str1 = NULL, *str2 = NULL;
-static Font         font = 0;
-static XFontStruct *fs = NULL;
-static GC           gc = 0;
-static Window       win = 0, b1 = 0, b2 = 0;
-static int          ww = 320, hh = 240, wx = 20, wy = 20;
-
-EAPI unsigned long       e_alert_composite_win = 0;
-
-/* externally accessible functions */
+#include <sys/wait.h>
+
+/* public variables */
+EAPI unsigned long e_alert_composite_win = 0;
+
 EINTERN int
-e_alert_init(const char *disp)
+e_alert_init(void)
 {
-   XGCValues            gcv;
-   int                  wid, hih, mask;
-   XSetWindowAttributes att;
-   
-   dd = XOpenDisplay(disp);
-   if (!dd) return 0;
-   font = XLoadFont(dd, "fixed");
-   fs = XQueryFont(dd, font);
-   
-   /* dont i18n this - i dont want gettext doing anything as this is called 
-      from a segv */
-   title = "Enlightenment Error";
-   str1 = "(F1) Recover";
-   str2 = "(F2) Exit";
-   
-   wid = DisplayWidth(dd, DefaultScreen(dd));
-   hih = DisplayHeight(dd, DefaultScreen(dd));
-   att.background_pixel  = WhitePixel(dd, DefaultScreen(dd));
-   att.border_pixel      = BlackPixel(dd, DefaultScreen(dd));
-   att.override_redirect = True;
-   mask = CWBackPixel | CWBorderPixel | CWOverrideRedirect;
-   
-   wx = (wid - ww) / 2;
-   wy = (hih - hh) / 2;
-
-   win = XCreateWindow(dd, DefaultRootWindow(dd), 
-                       wx, wy, ww, hh, 0,
-                       CopyFromParent, InputOutput,
-                       CopyFromParent, mask, &att);
-
-   b1 = XCreateWindow(dd, win, -100, -100, 1, 1, 0, CopyFromParent,
-                     InputOutput, CopyFromParent, mask, &att);
-   b2 = XCreateWindow(dd, win, -100, -100, 1, 1, 0, CopyFromParent,
-                     InputOutput, CopyFromParent, mask, &att);
-   XMapWindow(dd, b1);
-   XMapWindow(dd, b2);
-
-   gc = XCreateGC(dd, win, 0, &gcv);
-   XSetForeground(dd, gc, att.border_pixel);
-   XSelectInput(dd, win, KeyPressMask | KeyReleaseMask | ExposureMask);
-
    return 1;
 }
 
 EINTERN int
 e_alert_shutdown(void)
 {
-   if (!x_fatal)
-     {
-        XDestroyWindow(dd, win);
-        XFreeGC(dd, gc);
-        XFreeFont(dd, fs);
-        XCloseDisplay(dd);
-     }
-   title = NULL;
-   str1 = NULL;
-   str2 = NULL;
-   dd = NULL;
-   font = 0;
-   fs = NULL;
-   gc = 0;
    return 1;
 }
 
-EAPI void
-e_alert_show(const char *text)
+EAPI void 
+e_alert_show(int sig) 
 {
-   int                  w, i, j, k;
-   char                 line[1024];
-   XEvent               ev;
-   int                  fw, fh, mh;
-   KeyCode              key;
-   int                  button;
+   char *args[4];
+   pid_t pid;
 
-   if (!text) return;
+#define E_ALERT_EXE "/enlightenment/utils/enlightenment_alert"
 
-   if ((!dd) || (!fs))
-     {
-       fputs(text, stderr);
-       fflush(stderr);
-       exit(1);
-     }
-   
-   fh = fs->ascent + fs->descent;
-   mh = ((ww - 20) / 2) - 20;
-
-   /* fixed size... */
-   w = 20;
-   XMoveResizeWindow(dd, b1, w, hh - 15 - fh, mh + 10, fh + 10);
-   XSelectInput(dd, b1, ButtonPressMask | ButtonReleaseMask | ExposureMask);
-   w = ww - 20 - mh;
-   XMoveResizeWindow(dd, b2, w, hh - 15 - fh, mh + 10, fh + 10);
-   XSelectInput(dd, b2, ButtonPressMask | ButtonReleaseMask | ExposureMask);
-
-   if (e_alert_composite_win)
-     {
-#ifdef ShapeInput        
-        XRectangle rect;
-        
-        rect.x = wx;
-        rect.y = wy;
-        rect.width = ww;
-        rect.height = hh;
-        XShapeCombineRectangles(dd, e_alert_composite_win, ShapeInput, 
-                                0, 0, &rect, 1, ShapeSet, Unsorted);
-#endif        
-        XReparentWindow(dd, win, e_alert_composite_win, wx, wy);
-     }
-   XMapRaised(dd, win);
-   XGrabPointer(dd, win, True, ButtonPressMask | ButtonReleaseMask,
-               GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
-   XGrabKeyboard(dd, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
-   XSetInputFocus(dd, win, RevertToPointerRoot, CurrentTime);
-   XSync(dd, False);
-   
-   button = 0;
-   while (button == 0)
+   args[0] = alloca(strlen(e_prefix_lib_get()) + strlen(E_ALERT_EXE) + 1);
+   strcpy(args[0], e_prefix_lib_get());
+   strcat(args[0], E_ALERT_EXE);
+
+   args[1] = alloca(10);
+   snprintf(args[1], 10, "%d", sig);
+
+   args[2] = alloca(21);
+   snprintf(args[2], 21, "%lu", (long unsigned int)getpid());
+
+   args[3] = alloca(21);
+   snprintf(args[3], 21, "%lu", e_alert_composite_win);
+
+   pid = fork();
+   if (pid < -1)
+     goto restart_e;
+
+   if (pid == 0)
      {
-       XNextEvent(dd, &ev);
-       switch (ev.type)
-         {
-          case KeyPress:
-            key = XKeysymToKeycode(dd, XStringToKeysym("F1"));
-            if (key == ev.xkey.keycode)
-              {
-                 button = 1;
-                 break;
-              }
-            key = XKeysymToKeycode(dd, XStringToKeysym("F2"));
-            if (key == ev.xkey.keycode)
-              {
-                 button = 2;
-                 break;
-              }
-            break;
-          case ButtonPress:
-            if (ev.xbutton.window == b1)
-              button = 1;
-            else if (ev.xbutton.window == b2)
-              button = 2;
-            break;
-          case Expose:
-            while (XCheckTypedWindowEvent(dd, ev.xexpose.window, Expose, &ev));
-            
-            /* outline */
-            XDrawRectangle(dd, win, gc, 0, 0, ww - 1, hh - 1);
-            
-            XDrawRectangle(dd, win, gc, 2, 2, ww - 4 - 1, fh + 4 - 1);
-            
-            fw = XTextWidth(fs, title, strlen(title));
-            XDrawString(dd, win, gc, 2 + 2 + ((ww - 4 - 4 - fw) / 2) , 2 + 2 + fs->ascent, title, strlen(title));
-            
-            i = 0;
-            j = 0;
-            k = 2 + fh + 4 + 2;
-            while (text[i])
-              {
-                 line[j++] = text[i++];
-                 if (line[j - 1] == '\n')
-                   {
-                      line[j - 1] = 0;
-                      j = 0;
-                      XDrawString(dd, win, gc, 4, k + fs->ascent, line, strlen(line));
-                      k += fh + 2;
-                   }
-              }
-            fw = XTextWidth(fs, str1, strlen(str1));
-            XDrawRectangle(dd, b1, gc, 0, 0, mh - 1, fh + 10 - 1);
-            XDrawString(dd, b1, gc, 5 + ((mh - fw) / 2), 5 + fs->ascent, str1, strlen(str1));
-
-            fw = XTextWidth(fs, str2, strlen(str2));
-            XDrawRectangle(dd, b2, gc, 0, 0, mh - 1, fh + 10 - 1);
-            XDrawString(dd, b2, gc, 5 + ((mh - fw) / 2), 5 + fs->ascent, str2, strlen(str2));
-            
-            XSync(dd, False);
-            break;
-
-         default:
-            break;
-         }
+        /* The child process */
+        execvp(args[0], args);
      }
-   XDestroyWindow(dd, win);
-   XSync(dd, False);
-   
-   switch (button)
+   else
      {
-      case 1:
-       ecore_app_restart();
-       break;
-      case 2:
-       exit(-11);
-       break;
-      default:
-       break;
+        /* The parent process */
+        pid_t ret;
+        int status = 0;
+
+        do
+          {
+             ret = waitpid(pid, &status, 0);
+             if (errno == ECHILD)
+               break ;
+          }
+        while (ret != pid);
+
+        if (status == 0)
+          goto restart_e;
+
+        if (!WIFEXITED(status))
+          goto restart_e;
+
+        if (WEXITSTATUS(status) == 1)
+          goto restart_e;
+
+        exit(-11);
      }
+
+ restart_e:
+   if (getenv("E_START_MTRACK"))
+     e_util_env_set("MTRACK", "track");
+   ecore_app_restart();
 }
 
-/* local subsystem functions */
index 7c821dd..19cd635 100644 (file)
@@ -1,13 +1,19 @@
 #ifdef E_TYPEDEFS
 
+typedef enum _E_Alert_Op_Type 
+{
+   E_ALERT_OP_RESTART = 0, 
+   E_ALERT_OP_EXIT
+} E_Alert_Op_Type;
+
 #else
 #ifndef E_ALERT_H
 #define E_ALERT_H
 
-EINTERN int e_alert_init(const char *disp);
+EINTERN int e_alert_init(void);
 EINTERN int e_alert_shutdown(void);
 
-void e_alert_show(const char *text);
+EAPI void e_alert_show(int sig);
 
 #endif
 #endif
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
new file mode 100644 (file)
index 0000000..dfe392d
--- /dev/null
@@ -0,0 +1,551 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+#include <limits.h>
+#include <Eina.h>
+#include <Ecore.h>
+#include <Ecore_Ipc.h>
+#include <xcb/xcb.h>
+#include <xcb/shape.h>
+
+#define WINDOW_WIDTH 320
+#define WINDOW_HEIGHT 240
+
+/* local function prototypes */
+static int _e_alert_connect(void);
+static void _e_alert_create(void);
+static void _e_alert_display(void);
+static void _e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h);
+static void _e_alert_window_raise(xcb_window_t win);
+static void _e_alert_sync(void);
+static void _e_alert_shutdown(void);
+static void _e_alert_run(void);
+static void _e_alert_draw(void);
+static int _e_alert_handle_key_press(xcb_generic_event_t *event);
+static int _e_alert_handle_button_press(xcb_generic_event_t *event);
+static xcb_char2b_t *_e_alert_build_string(const char *str);
+static void _e_alert_draw_outline(void);
+static void _e_alert_draw_title_outline(void);
+static void _e_alert_draw_title(void);
+static void _e_alert_draw_text(void);
+static void _e_alert_draw_button_outlines(void);
+static void _e_alert_draw_button_text(void);
+
+/* local variables */
+static xcb_connection_t *conn = NULL;
+static xcb_screen_t *screen = NULL;
+static xcb_window_t win = 0, comp_win = 0;
+static xcb_window_t btn1 = 0;
+static xcb_window_t btn2 = 0;
+static xcb_font_t font = 0;
+static xcb_gcontext_t gc = 0;
+static int sw = 0, sh = 0;
+static int fa = 0, fh = 0, fw = 0;
+static const char *title = NULL, *str1 = NULL, *str2 = NULL;
+static int ret = 0, sig = 0;
+static pid_t pid;
+
+int
+main(int argc, char **argv)
+{
+   int i = 0;
+
+   for (i = 1; i < argc; i++)
+     {
+        if ((!strcmp(argv[i], "-h")) ||
+            (!strcmp(argv[i], "-help")) ||
+            (!strcmp(argv[i], "--help")))
+          {
+            printf("This is an internal tool for Enlightenment.\n"
+                   "do not use it.\n");
+            exit(0);
+         }
+       else if ((i == 1))
+          sig = atoi(argv[i]); // signal
+        else if ((i == 2))
+          pid = atoi(argv[i]); // E's pid
+        else if ((i == 3))
+          comp_win = atoi(argv[i]); // Composite Alert Window
+     }
+
+   if (!ecore_init()) return EXIT_FAILURE;
+   ecore_app_args_set(argc, (const char **)argv);
+
+   if (!_e_alert_connect())
+     {
+        printf("FAILED TO INIT ALERT SYSTEM!!!\n");
+        ecore_shutdown();
+        return EXIT_FAILURE;
+     }
+
+   title = "Enlightenment Error";
+   str1 = "(F1) Recover";
+   str2 = "(F2) Exit";
+
+   _e_alert_create();
+   _e_alert_display();
+   _e_alert_run();
+   _e_alert_shutdown();
+
+   ecore_shutdown();
+
+   /* ret == 1 => restart e => exit code 1 */
+   /* ret == 2 => exit e => any code will do that */
+   return ret;
+}
+
+/* local functions */
+static int
+_e_alert_connect(void)
+{
+   conn = xcb_connect(NULL, NULL);
+   if ((!conn) || (xcb_connection_has_error(conn)))
+     {
+        printf("E_Alert_Main: Error Trying to Connect!!\n");
+        return 0;
+     }
+
+   /* grab default screen */
+   screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
+   sw = screen->width_in_pixels;
+   sh = screen->height_in_pixels;
+
+   return 1;
+}
+
+static void 
+_e_alert_create(void) 
+{
+   uint32_t mask, mask_list[4];
+   int wx = 0, wy = 0;
+
+   wx = ((sw - WINDOW_WIDTH) / 2);
+   wy = ((sh - WINDOW_HEIGHT) / 2);
+
+   font = xcb_generate_id(conn);
+   xcb_open_font(conn, font, strlen("fixed"), "fixed");
+
+   /* create main window */
+   mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | 
+           XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK);
+   mask_list[0] = screen->white_pixel;
+   mask_list[1] = screen->black_pixel;
+   mask_list[2] = 1;
+   mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE | 
+                   XCB_EVENT_MASK_EXPOSURE);
+
+   win = xcb_generate_id(conn);
+   xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root, 
+                     wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0, 
+                     XCB_WINDOW_CLASS_INPUT_OUTPUT, 
+                     XCB_COPY_FROM_PARENT, mask, mask_list);
+
+   /* create button 1 */
+   mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS | 
+                   XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_EXPOSURE);
+
+   btn1 = xcb_generate_id(conn);
+   xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win, 
+                     -100, -100, 1, 1, 0, 
+                     XCB_WINDOW_CLASS_INPUT_OUTPUT, 
+                     XCB_COPY_FROM_PARENT, mask, mask_list);
+   xcb_map_window(conn, btn1);
+
+   /* create button 2 */
+   btn2 = xcb_generate_id(conn);
+   xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win, 
+                     -100, -100, 1, 1, 0, 
+                     XCB_WINDOW_CLASS_INPUT_OUTPUT, 
+                     XCB_COPY_FROM_PARENT, mask, mask_list);
+   xcb_map_window(conn, btn2);
+
+   /* create drawing gc */
+   mask = (XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT);
+   mask_list[0] = screen->black_pixel;
+   mask_list[1] = screen->white_pixel;
+   mask_list[2] = font;
+
+   gc = xcb_generate_id(conn);
+   xcb_create_gc(conn, gc, win, mask, mask_list);
+}
+
+static void 
+_e_alert_display(void) 
+{
+   xcb_char2b_t *str = NULL;
+   xcb_query_text_extents_cookie_t cookie;
+   xcb_query_text_extents_reply_t *reply;
+   int x = 0, w = 0;
+
+   str = _e_alert_build_string(title);
+
+   cookie = 
+     xcb_query_text_extents_unchecked(conn, font, strlen(title), str);
+   reply = xcb_query_text_extents_reply(conn, cookie, NULL);
+   if (reply) 
+     {
+        fa = reply->font_ascent;
+        fh = (fa + reply->font_descent);
+        fw = reply->overall_width;
+        free(reply);
+     }
+   free(str);
+
+   /* move buttons */
+   x = 20;
+   w = (WINDOW_WIDTH / 2) - 40;
+   _e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20), 
+                               w, (fh + 20));
+
+   x = ((WINDOW_WIDTH / 2) + 20);
+   _e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20), 
+                               w, (fh + 20));
+
+   if (comp_win)
+     {
+        xcb_rectangle_t rect;
+        int wx = 0, wy = 0;
+
+        wx = ((sw - WINDOW_WIDTH) / 2);
+        wy = ((sh - WINDOW_HEIGHT) / 2);
+
+        rect.x = wx;
+        rect.y = wy;
+        rect.width = WINDOW_WIDTH;
+        rect.height = WINDOW_HEIGHT;
+
+        xcb_shape_rectangles(conn, XCB_SHAPE_SO_SET, 
+                             XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, 
+                             comp_win, 0, 0, 1, &rect);
+
+        xcb_reparent_window(conn, win, comp_win, wx, wy);
+     }
+
+   /* map and raise main window */
+   xcb_map_window(conn, win);
+   _e_alert_window_raise(win);
+
+   /* grab pointer & keyboard */
+   xcb_grab_pointer_unchecked(conn, 0, win, 
+                              (XCB_EVENT_MASK_BUTTON_PRESS | 
+                                  XCB_EVENT_MASK_BUTTON_RELEASE), 
+                              XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, 
+                              XCB_NONE, XCB_NONE, XCB_CURRENT_TIME);
+   xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME, 
+                               XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
+   xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, 
+                       win, XCB_CURRENT_TIME);
+
+   /* flush screen */
+   xcb_flush(conn);
+
+   /* sync */
+   _e_alert_sync();
+}
+
+static void 
+_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h) 
+{
+   uint32_t list[4], mask;
+
+   if (!btn) return;
+
+   mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | 
+           XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT);
+   list[0] = x;
+   list[1] = y;
+   list[2] = w;
+   list[3] = h;
+
+   xcb_configure_window(conn, btn, mask, (const uint32_t *)&list);
+}
+
+static void
+_e_alert_window_raise(xcb_window_t window)
+{
+   uint32_t list[] = { XCB_STACK_MODE_ABOVE };
+
+   if (!window) return;
+   xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, list);
+}
+
+static void 
+_e_alert_sync(void) 
+{
+   free(xcb_get_input_focus_reply(conn, 
+                                  xcb_get_input_focus(conn), NULL));
+}
+
+static void 
+_e_alert_shutdown(void) 
+{
+   if (!xcb_connection_has_error(conn)) 
+     {
+        xcb_close_font(conn, font);
+        xcb_destroy_window(conn, btn1);
+        xcb_destroy_window(conn, btn2);
+        xcb_destroy_window(conn, win);
+        if (comp_win) xcb_destroy_window(conn, comp_win);
+        xcb_free_gc(conn, gc);
+        xcb_disconnect(conn);
+     }
+}
+
+static void 
+_e_alert_run(void) 
+{
+   xcb_generic_event_t *event = NULL;
+
+   xcb_flush(conn);
+   while ((event = xcb_wait_for_event(conn))) 
+     {
+        switch (event->response_type & ~0x80) 
+          {
+           case XCB_BUTTON_PRESS:
+             ret = _e_alert_handle_button_press(event);
+             break;
+           case XCB_KEY_PRESS: 
+             ret = _e_alert_handle_key_press(event);
+             break;
+           case XCB_EXPOSE: 
+               {
+                  xcb_expose_event_t *ev;
+
+                  ev = (xcb_expose_event_t *)event;
+                  if (ev->window != win) break;
+
+                  _e_alert_draw();
+                  _e_alert_sync();
+
+                  break;
+               }
+           default:
+             break;
+          }
+        free(event);
+        if (ret > 0) return;
+     }
+}
+
+static void 
+_e_alert_draw(void) 
+{
+   _e_alert_draw_outline();
+   _e_alert_draw_title_outline();
+   _e_alert_draw_title();
+   _e_alert_draw_text();
+   _e_alert_draw_button_outlines();
+   _e_alert_draw_button_text();
+
+   xcb_flush(conn);
+}
+
+static int 
+_e_alert_handle_key_press(xcb_generic_event_t *event) 
+{
+   xcb_key_press_event_t *ev;
+
+   ev = (xcb_key_press_event_t *)event;
+   if (ev->detail == 67) // F1
+     return 1;
+   else if (ev->detail == 68) // F2
+     return 2;
+   else
+     return 0;
+}
+
+static int 
+_e_alert_handle_button_press(xcb_generic_event_t *event) 
+{
+   xcb_button_press_event_t *ev;
+
+   ev = (xcb_button_press_event_t *)event;
+   if (ev->child == btn1) 
+     return 1;
+   else if (ev->child == btn2)
+     return 2;
+   else
+     return 0;
+}
+
+static xcb_char2b_t *
+_e_alert_build_string(const char *str)
+{
+   unsigned int i = 0;
+   xcb_char2b_t *r = NULL;
+
+   if (!(r = malloc(strlen(str) * sizeof(xcb_char2b_t))))
+     return NULL;
+
+   for (i = 0; i < strlen(str); i++)
+     {
+        r[i].byte1 = 0;
+        r[i].byte2 = str[i];
+     }
+
+   return r;
+}
+
+static void 
+_e_alert_draw_outline(void) 
+{
+   xcb_rectangle_t rect;
+
+   /* draw outline */
+   rect.x = 0;
+   rect.y = 0;
+   rect.width = (WINDOW_WIDTH - 1);
+   rect.height = (WINDOW_HEIGHT - 1);
+   xcb_poly_rectangle(conn, win, gc, 1, &rect);
+}
+
+static void 
+_e_alert_draw_title_outline(void) 
+{
+   xcb_rectangle_t rect;
+
+   /* draw title box */
+   rect.x = 2;
+   rect.y = 2;
+   rect.width = (WINDOW_WIDTH - 4 - 1);
+   rect.height = (fh + 4 + 2);
+   xcb_poly_rectangle(conn, win, gc, 1, &rect);
+}
+
+static void 
+_e_alert_draw_title(void) 
+{
+   xcb_void_cookie_t cookie;
+   int x = 0, y = 0;
+
+   /* draw title */
+   x = (2 + 2 + ((WINDOW_WIDTH - 4 - 4 - fw) / 2));
+   y = (2 + 2 + fh);
+
+   cookie = 
+     xcb_image_text_8(conn, strlen(title), win, gc, x, y, title);
+}
+
+struct {
+  int signal;
+  const char *name;
+} signal_name[5] = {
+  { SIGSEGV, "SEGV" },
+  { SIGILL, "SIGILL" },
+  { SIGFPE, "SIGFPE" },
+  { SIGBUS, "SIGBUS" },
+  { SIGABRT, "SIGABRT" }
+};
+
+static void
+_e_alert_draw_text(void)
+{
+   xcb_void_cookie_t cookie;
+   char warn[1024], msg[PATH_MAX], line[1024];
+   unsigned int i = 0, j = 0, k = 0;
+
+   snprintf(msg, sizeof(msg),
+            "This is not meant to happen and is likely a sign of \n"
+            "a bug in Enlightenment or the libraries it relies \n"
+            "on. You can gdb attach to this process (%d) now \n"
+            "to try debug it or you could exit, or just hit \n"
+            "restart to try and get your desktop back the way \n"
+            "it was.\n"
+            "\n"
+            "Please compile everything with -g in your CFLAGS.", pid);
+
+   strcpy(warn, "");
+
+   for (i = 0; i < sizeof(signal_name) / sizeof(signal_name[0]); ++i)
+     if (signal_name[i].signal == sig)
+       snprintf(warn, sizeof(warn),
+               "This is very bad. Enlightenment %s'd.",
+               signal_name[i].name);
+
+   /* draw text */
+   k = (fh + 12);
+   cookie =
+     xcb_image_text_8(conn, strlen(warn), win, gc,
+                      4, (k + fa), warn);
+   k += (2 * (fh + 2));
+   while (msg[i])
+     {
+        line[j++] = msg[i++];
+        if (line[j - 1] == '\n')
+          {
+             line[j - 1] = 0;
+             j = 0;
+             cookie =
+               xcb_image_text_8(conn, strlen(line), win, gc,
+                                4, (k + fa), line);
+             k += (fh + 2);
+          }
+     }
+}
+
+static void
+_e_alert_draw_button_outlines(void)
+{
+   xcb_rectangle_t rect;
+
+   rect.x = 0;
+   rect.y = 0;
+   rect.width = (WINDOW_WIDTH / 2) - 40 - 1;
+   rect.height = (fh + 20) - 1;
+
+   /* draw button outlines */
+   xcb_poly_rectangle(conn, btn1, gc, 1, &rect);
+   xcb_poly_rectangle(conn, btn2, gc, 1, &rect);
+}
+
+static void
+_e_alert_draw_button_text(void)
+{
+   xcb_void_cookie_t dcookie;
+   xcb_char2b_t *str = NULL;
+   xcb_query_text_extents_cookie_t cookie;
+   xcb_query_text_extents_reply_t *reply;
+   int x = 0, w = 0, bw = 0;
+
+   bw = (WINDOW_WIDTH / 2) - 40 - 1;
+
+   /* draw button1 text */
+   str = _e_alert_build_string(str1);
+
+   cookie =
+     xcb_query_text_extents_unchecked(conn, font, strlen(str1), str);
+   reply = xcb_query_text_extents_reply(conn, cookie, NULL);
+   if (reply)
+     {
+        w = reply->overall_width;
+        free(reply);
+     }
+   free(str);
+
+   x = (5 + ((bw - w) / 2));
+
+   dcookie =
+     xcb_image_text_8(conn, strlen(str1), btn1, gc, x, (10 + fa), str1);
+
+   /* draw button2 text */
+   str = _e_alert_build_string(str2);
+
+   cookie =
+     xcb_query_text_extents_unchecked(conn, font, strlen(str2), str);
+   reply = xcb_query_text_extents_reply(conn, cookie, NULL);
+   if (reply)
+     {
+        w = reply->overall_width;
+        free(reply);
+     }
+   free(str);
+
+   x = (5 + ((bw - w) / 2));
+
+   dcookie =
+     xcb_image_text_8(conn, strlen(str2), btn2, gc, x, (10 + fa), str2);
+}
diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
new file mode 100644 (file)
index 0000000..de17e98
--- /dev/null
@@ -0,0 +1,323 @@
+#include "e.h"
+#ifdef HAVE_EEZE
+# include <Eeze.h>
+#endif
+
+// FIXME: backlight should be tied per zone but this implementation is just
+// a signleton right now as thats 99% of use cases. but api supports
+// doing more. for now make it work in the singleton
+
+#define MODE_NONE  -1
+#define MODE_RANDR 0
+#define MODE_SYS   1
+
+static double bl_val = 1.0;
+static double bl_animval = 1.0;
+static E_Backlight_Mode bl_mode = E_BACKLIGHT_MODE_NORMAL;
+static int sysmode = MODE_NONE;
+static Ecore_Animator *bl_anim = NULL;
+
+static void _e_backlight_update(E_Zone *zone);
+static void _e_backlight_set(E_Zone *zone, double val);
+static Eina_Bool _bl_anim(void *data, double pos);
+static Eina_Bool bl_avail = EINA_FALSE;
+#ifdef HAVE_EEZE
+static const char *bl_sysval = NULL;
+static Ecore_Event_Handler *bl_sys_exit_handler = NULL;
+static Ecore_Exe *bl_sys_set_exe = NULL;
+static Eina_Bool bl_sys_pending_set = EINA_FALSE;
+static Eina_Bool bl_sys_set_exe_ready = EINA_TRUE;
+
+static void _bl_sys_find(void);
+static void _bl_sys_level_get(void);
+static Eina_Bool _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event);
+static void _bl_sys_level_set(double val);
+#endif
+
+EINTERN int
+e_backlight_init(void)
+{
+#ifdef HAVE_EEZE
+   eeze_init();
+#endif
+   bl_avail = ecore_x_randr_output_backlight_available();
+
+   if (bl_avail == EINA_TRUE)
+     {
+        e_backlight_update();
+        e_backlight_level_set(NULL, 0.0, 0.0);
+        e_backlight_level_set(NULL, e_config->backlight.normal, 1.0);
+     }
+   return 1;
+}
+
+EINTERN int
+e_backlight_shutdown(void)
+{
+   if (bl_anim) ecore_animator_del(bl_anim);
+   bl_anim = NULL;
+#ifdef HAVE_EEZE
+   if (bl_sysval) eina_stringshare_del(bl_sysval);
+   bl_sysval = NULL;
+   if (bl_sys_exit_handler) ecore_event_handler_del(bl_sys_exit_handler);
+   bl_sys_exit_handler = NULL;
+   bl_sys_set_exe = NULL;
+   bl_sys_pending_set = EINA_FALSE;
+   eeze_shutdown();
+#endif
+   return 1;
+}
+
+EAPI Eina_Bool
+e_backlight_exists(void)
+{
+   if (sysmode == MODE_NONE) return EINA_FALSE;
+   return EINA_TRUE;
+}
+
+EAPI void
+e_backlight_update(void)
+{
+   Eina_List *m, *c, *z;
+   E_Manager *man;
+   E_Container *con;
+   E_Zone *zone;
+
+   if (bl_avail == EINA_TRUE)
+     {
+        EINA_LIST_FOREACH(e_manager_list(), m, man)
+          {
+             EINA_LIST_FOREACH(man->containers, c, con)
+               {
+                  EINA_LIST_FOREACH(con->zones, z, zone)
+                    {
+                       _e_backlight_update(zone);
+                    }
+               }
+          }
+     }
+}
+
+EAPI void
+e_backlight_level_set(E_Zone *zone, double val, double tim)
+{
+   double bl_now;
+   // zone == NULL == everything
+   // set backlight associated with zone to val over period of tim
+   // if tim == 0.0 - then do it instantnly, if time == -1 use some default
+   // transition time
+   if (val < 0.0) val = 0.0;
+   else if (val > 1.0) val = 1.0;
+   if (val == bl_val) return;
+   if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
+   bl_now = bl_val;
+   bl_val = val;
+   if (bl_mode != E_BACKLIGHT_MODE_NORMAL) return;
+   if (tim < 0.0) tim = e_config->backlight.transition;
+   if (tim == 0.0)
+     {
+        if (bl_anim)
+          {
+             ecore_animator_del(bl_anim);
+             bl_anim = NULL;
+          }
+        _e_backlight_set(zone, val);
+       return;
+     }
+   if (bl_anim) ecore_animator_del(bl_anim);
+   bl_anim = ecore_animator_timeline_add(tim, _bl_anim, zone);
+   bl_animval = bl_now;
+}
+
+EAPI double
+e_backlight_level_get(E_Zone *zone __UNUSED__)
+{
+   // zone == NULL == everything
+   return bl_val;
+}
+
+EAPI void
+e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
+{
+   // zone == NULL == everything
+   if (bl_mode == mode) return;
+   bl_mode = mode;
+   if      (bl_mode == E_BACKLIGHT_MODE_NORMAL)
+      e_backlight_level_set(zone, bl_val, -1.0);
+   else if (bl_mode == E_BACKLIGHT_MODE_OFF)
+      e_backlight_level_set(zone, 0.0, -1.0);
+   else if (bl_mode == E_BACKLIGHT_MODE_DIM)
+      e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
+   else if (bl_mode == E_BACKLIGHT_MODE_MAX)
+      e_backlight_level_set(zone, 1.0, -1.0);
+}
+
+EAPI E_Backlight_Mode
+e_backlight_mode_get(E_Zone *zone __UNUSED__)
+{
+   // zone == NULL == everything
+   return bl_mode;
+}
+
+/* local subsystem functions */
+
+static void
+_e_backlight_update(E_Zone *zone)
+{
+   double x_bl = -1.0;
+   Ecore_X_Window root;
+   Ecore_X_Randr_Output *out;
+   int num = 0;
+
+   root = zone->container->manager->root;
+   // try randr
+   out = ecore_x_randr_window_outputs_get(root, &num);
+   if ((out) && (num > 0))
+      x_bl = ecore_x_randr_output_backlight_level_get(root, out[0]);
+   if (out) free(out);
+   if (x_bl >= 0.0)
+     {
+        bl_val = x_bl;
+        sysmode = MODE_RANDR;
+     }
+#ifdef HAVE_EEZE
+   else
+     {
+        _bl_sys_find();
+        if (bl_sysval)
+          {
+             sysmode = MODE_SYS;
+             _bl_sys_level_get();
+          }
+     }
+#endif
+}
+
+static void
+_e_backlight_set(E_Zone *zone, double val)
+{
+   if (sysmode == MODE_RANDR)
+     {
+        Ecore_X_Window root;
+        Ecore_X_Randr_Output *out;
+        int num = 0;
+        
+        root = zone->container->manager->root;
+        out = ecore_x_randr_window_outputs_get(root, &num);
+        if ((out) && (num > 0))
+          {
+             ecore_x_randr_output_backlight_level_set(root, out[0], val);
+          }
+        if (out) free(out);
+     }
+#ifdef HAVE_EEZE
+   else if (sysmode == MODE_SYS)
+     {
+        if (bl_sysval)
+          {
+             _bl_sys_level_set(val);
+          }
+     }
+#endif
+}
+
+static Eina_Bool
+_bl_anim(void *data, double pos)
+{
+   E_Zone *zone = data;
+   double v;
+   
+   // FIXME: if zone is deleted while anim going... bad things.
+   pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
+   v = (bl_animval * (1.0 - pos)) + (bl_val *pos);
+   _e_backlight_set(zone, v);
+   if (pos >= 1.0)
+     {
+        bl_anim = NULL;
+        return EINA_FALSE;
+     }
+   return EINA_TRUE;
+}
+
+#ifdef HAVE_EEZE
+static void
+_bl_sys_find(void)
+{
+   Eina_List *devs;
+   const char *f;
+
+   devs = eeze_udev_find_by_filter("backlight", NULL, NULL);
+   if (!devs) return;
+   EINA_LIST_FREE(devs, f)
+     bl_sysval = f;
+}
+
+static void
+_bl_sys_level_get(void)
+{
+   int maxval, val;
+   const char *str;
+
+   str = eeze_udev_syspath_get_sysattr(bl_sysval, "max_brightness");
+   if (!str) return;
+
+   maxval = atoi(str);
+   eina_stringshare_del(str);
+   if (maxval <= 0) maxval = 255;
+   str = eeze_udev_syspath_get_sysattr(bl_sysval, "brightness");
+   if (!str) return;
+
+   val = atoi(str);
+   eina_stringshare_del(str);
+   if ((val >= 0) && (val <= maxval))
+     bl_val = (double)val / (double)maxval;
+// printf("GET: %i/%i (%1.3f)\n", val, maxval, bl_val);
+}
+
+static Eina_Bool
+_e_bl_cb_ext_delay(void *data __UNUSED__)
+{
+   bl_sys_set_exe_ready = EINA_TRUE;
+   if (bl_sys_pending_set)
+     {
+        bl_sys_pending_set = EINA_FALSE;
+        _bl_sys_level_set(bl_val);
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Del *ev;
+   
+   ev = event;
+   if (ev->exe == bl_sys_set_exe)
+     {
+        bl_sys_set_exe_ready = EINA_FALSE;
+        bl_sys_set_exe = NULL;
+        ecore_timer_add(0.1, _e_bl_cb_ext_delay, NULL);
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static void
+_bl_sys_level_set(double val)
+{
+   char buf[PATH_MAX];
+   
+   if (!bl_sys_exit_handler)
+      bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
+                                                    _e_bl_cb_exit, NULL);
+   if ((bl_sys_set_exe) || (!bl_sys_set_exe_ready))
+     {
+        bl_sys_pending_set = EINA_TRUE;
+        return;
+     }
+//   printf("SET: %1.3f\n", val);
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_backlight %i", 
+            e_prefix_lib_get(), (int)(val * 1000.0));
+   bl_sys_set_exe = ecore_exe_run(buf, NULL);
+}
+#endif
diff --git a/src/bin/e_backlight.h b/src/bin/e_backlight.h
new file mode 100644 (file)
index 0000000..41e1744
--- /dev/null
@@ -0,0 +1,37 @@
+#ifdef E_TYPEDEFS
+
+//typedef struct _E_Screen E_Screen;
+
+typedef enum _E_Backlight_Mode
+{
+   E_BACKLIGHT_MODE_NORMAL = 0,
+   E_BACKLIGHT_MODE_OFF = 1,
+   E_BACKLIGHT_MODE_MIN = 2,
+   E_BACKLIGHT_MODE_DIM = 3,
+   E_BACKLIGHT_MODE_MAX = 4
+      // for the future. right now not working as we'd need an optical
+      // sensor support framework
+//   E_BACKLIGHT_MODE_AUTO = 5
+} E_Backlight_Mode;
+
+#else
+#ifndef E_BACKLIGHT_H
+#define E_BACKLIGHT_H
+
+//struct _E_Screen
+//{
+//   int screen, escreen;
+//   int x, y, w, h;
+//};
+
+EINTERN int              e_backlight_init(void);
+EINTERN int              e_backlight_shutdown(void);
+EAPI Eina_Bool           e_backlight_exists(void);
+EAPI void                e_backlight_update(void);
+EAPI void                e_backlight_level_set(E_Zone *zone, double val, double tim);
+EAPI double              e_backlight_level_get(E_Zone *zone);
+EAPI void                e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode);
+EAPI E_Backlight_Mode    e_backlight_mode_get(E_Zone *zone);
+
+#endif
+#endif
diff --git a/src/bin/e_backlight_main.c b/src/bin/e_backlight_main.c
new file mode 100644 (file)
index 0000000..10e6bb8
--- /dev/null
@@ -0,0 +1,124 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <fcntl.h>
+
+#include <Eeze.h>
+
+/* local subsystem functions */
+static int
+_bl_write_file(const char *file, int val)
+{
+   char buf[256];
+   int fd = open(file, O_WRONLY);
+   if (fd < 0)
+     {
+        perror("open");
+        return -1;
+     }
+   snprintf(buf, sizeof(buf), "%i", val);
+   if (write(fd, buf, strlen(buf)) != (int)strlen(buf))
+     {
+        perror("write");
+        close(fd);
+        return -1;
+     }
+   close(fd);
+   return 0;
+}
+
+/* local subsystem globals */
+typedef struct _Bl_Entry
+{
+   char type;
+   const char *base;
+   const char *max;
+   const char *set;
+} Bl_Entry;
+
+static const Bl_Entry search[] =
+{
+   { 'F', "/sys/devices/virtual/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/devices/virtual/backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/leds/lcd-backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/class/backlight", "max_brightness", "brightness" }
+};
+
+/* externally accessible functions */
+int
+main(int argc, char **argv)
+{
+   int i;
+   int level;
+   const char *f;
+   int maxlevel = 0, curlevel = -1;
+   Eina_List *devs;
+   char buf[4096] = "";
+   
+   for (i = 1; i < argc; i++)
+     {
+        if ((!strcmp(argv[i], "-h")) ||
+            (!strcmp(argv[i], "-help")) ||
+            (!strcmp(argv[i], "--help")))
+          {
+             printf("This is an internal tool for Enlightenment.\n"
+                    "do not use it.\n");
+             exit(0);
+          }
+     }
+   if (argc == 2)
+     level = atoi(argv[1]);
+   else
+     exit(1);
+
+   if (setuid(0) != 0)
+     {
+        printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEGES\n");
+        exit(5);
+     }
+   if (setgid(0) != 0)
+     {
+        printf("ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEGES\n");
+        exit(7);
+     }
+
+   eeze_init();
+   devs = eeze_udev_find_by_filter("backlight", NULL, NULL);
+   if (!devs) return -1;
+   EINA_LIST_FREE(devs, f)
+     {
+        const char *str;
+
+        str = eeze_udev_syspath_get_sysattr(f, "max_brightness");
+        if (str)
+          {
+             maxlevel = atoi(str);
+             eina_stringshare_del(str);
+             str = eeze_udev_syspath_get_sysattr(f, "brightness");
+             if (str)
+               {
+                  curlevel = atoi(str);
+                  eina_stringshare_del(str);
+               }
+          }
+
+        if (maxlevel <= 0) maxlevel = 255;
+        if (curlevel >= 0)
+          {
+             curlevel = ((maxlevel * level) + (500 / maxlevel)) / 1000;
+     //        printf("SET: %i, %i/%i\n", level, curlevel, maxlevel);
+             snprintf(buf, sizeof(buf), "%s/brightness", f);
+             return _bl_write_file(buf, curlevel);
+          }
+        eina_stringshare_del(f);
+     }
+
+   return -1;
+}
index 8e96eae..55e7c72 100644 (file)
@@ -3,7 +3,6 @@
 /* local subsystem functions */
 static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_bg_event_bg_update_free(void *data, void *event);
-static Eina_Bool  _e_bg_slide_animator(void *data);
 
 static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
 static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
@@ -13,21 +12,6 @@ static void _e_bg_handler_image_imported(void *data, const char *image_path);
 EAPI int E_EVENT_BG_UPDATE = 0;
 static E_Fm2_Mime_Handler *bg_hdl = NULL;
 
-typedef struct _E_Bg_Anim_Params E_Bg_Anim_Params;
-struct _E_Bg_Anim_Params
-{
-   E_Zone *zone;
-   double start_time;
-   int start_x;
-   int start_y;
-   int end_x;
-   int end_y;
-
-   struct {
-      Eina_Bool x, y;
-   } freedom;
-};
-
 struct _E_Bg_Image_Import_Handle
 {
    struct {
@@ -118,7 +102,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
        EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
          {
             int spec;
-
+             
             if (!cfbg) continue;
             spec = 0;
             if (cfbg->container == container_num) spec++;
@@ -142,19 +126,27 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
                       if (bf) bgfile = bf;
                    }
               }
-            entries = edje_file_collection_list(bgfile);
-            if (entries)
-              {
-                 EINA_LIST_FOREACH(entries, ll, entry)
-                   {
-                      if (!strcmp(entry, "e/desktop/background"))
-                        {
-                           bg = cfbg;
-                           current_spec = spec;
-                        }
-                   }
-                 edje_file_collection_list_free(entries);
-              }
+             if (eina_str_has_extension(bgfile, ".edj"))
+               {
+                  entries = edje_file_collection_list(bgfile);
+                  if (entries)
+                    {
+                       EINA_LIST_FOREACH(entries, ll, entry)
+                         {
+                            if (!strcmp(entry, "e/desktop/background"))
+                              {
+                                 bg = cfbg;
+                                 current_spec = spec;
+                              }
+                         }
+                       edje_file_collection_list_free(entries);
+                    }
+               }
+             else
+               {
+                  bg = cfbg;
+                  current_spec = spec;
+               }
          }
      }
    return bg;
@@ -199,19 +191,23 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
                  if (bf) bgfile = bf;
               }
          }
-       entries = edje_file_collection_list(bgfile);
-       if (entries)
-         {
-            EINA_LIST_FOREACH(entries, l, entry)
-              {
-                 if (!strcmp(entry, "e/desktop/background"))
-                   {
-                      ok = 1;
-                      break;
-                   }
-              }
-            edje_file_collection_list_free(entries);
-         }
+        if (bgfile && eina_str_has_extension(bgfile, ".edj"))
+          {
+             entries = edje_file_collection_list(bgfile);
+             if (entries)
+               {
+                  EINA_LIST_FOREACH(entries, l, entry)
+                    {
+                       if (!strcmp(entry, "e/desktop/background"))
+                         {
+                            ok = 1;
+                            break;
+                         }
+                    }
+                  edje_file_collection_list_free(entries);
+               }
+          }
+        else if ((bgfile) && (bgfile[0])) ok = 1;
        if (!ok)
          bgfile = e_theme_edje_file_get("base/theme/background",
                                         "e/desktop/background");
@@ -232,7 +228,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
    else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
    else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change;
    if ((!trans) || (!trans[0])) transition = E_BG_TRANSITION_NONE;
-   if (e_config->desk_flip_pan_bg) transition = E_BG_TRANSITION_NONE;
 
    desk = e_desk_current_get(zone);
    if (desk)
@@ -245,7 +240,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
        const char *pfile = "";
 
        edje_object_file_get(zone->bg_object, &pfile, NULL);
-       if ((!e_util_strcmp(pfile, bgfile)) && !e_config->desk_flip_pan_bg) return;
+       if (!e_util_strcmp(pfile, bgfile)) return;
      }
 
    if (transition == E_BG_TRANSITION_NONE)
@@ -283,10 +278,20 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
        evas_object_clip_set(o, zone->bg_clip_object);
        evas_object_show(o);
      }
-   o = edje_object_add(zone->container->bg_evas);
+   if (eina_str_has_extension(bgfile, ".edj"))
+     {
+        o = edje_object_add(zone->container->bg_evas);
+        evas_object_data_set(o, "e_zone", zone);
+        edje_object_file_set(o, bgfile, "e/desktop/background");
+     }
+   else
+     {
+        o = e_icon_add(zone->container->bg_evas);
+        evas_object_data_set(o, "e_zone", zone);
+        e_icon_file_key_set(o, bgfile, NULL);
+        e_icon_fill_inside_set(o, 0);
+     }
    zone->bg_object = o;
-   evas_object_data_set(o, "e_zone", zone);
-   edje_object_file_set(o, bgfile, "e/desktop/background");
    if (transition == E_BG_TRANSITION_NONE)
      {
        evas_object_move(o, zone->x, zone->y);
@@ -295,30 +300,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
      }
    evas_object_clip_set(o, zone->bg_clip_object);
    evas_object_show(o);
-   if (e_config->desk_flip_pan_bg)
-     {
-       int x = 0, y = 0;
-
-       o = zone->bg_scrollframe;
-       if (!o)
-         {
-            o = e_scrollframe_add(zone->container->bg_evas);
-            zone->bg_scrollframe = o;
-            e_scrollframe_custom_theme_set(o, "base/theme/background",
-                                           "e/desktop/background/scrollframe");
-            e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_OFF, E_SCROLLFRAME_POLICY_OFF);
-            e_scrollframe_child_pos_set(o, 0, 0);
-            evas_object_show(o);
-         }
-       e_scrollframe_child_set(o, zone->bg_object);
-       if (desk)
-         {
-            x = desk->x;
-            y = desk->y;
-         }
-       e_bg_zone_slide(zone, x, y);
-       return;
-     }
 
    if (transition != E_BG_TRANSITION_NONE)
      {
@@ -335,71 +316,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
 }
 
 EAPI void
-e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y)
-{
-   Evas_Object *o;
-   E_Desk *desk;
-   Evas_Coord w, h, maxw, maxh, step_w, step_h;
-   Ecore_Animator *anim;
-   E_Bg_Anim_Params *params;
-   Evas_Coord vw, vh, px, py;
-   int fx, fy;
-   const void *data;
-
-   desk = e_desk_current_get(zone);
-   edje_object_size_max_get(zone->bg_object, &w, &h);
-   maxw = zone->w * zone->desk_x_count;
-   maxh = zone->h * zone->desk_y_count;
-   if (!w) w = maxw;
-   if (!h) h = maxh;
-   evas_object_resize(zone->bg_object, w, h);
-   if (zone->desk_x_count > 1)
-     step_w = ((double) (w - zone->w)) / (zone->desk_x_count - 1);
-   else step_w = 0;
-   if (zone->desk_y_count > 1)
-     step_h = ((double) (h - zone->h)) / (zone->desk_y_count - 1);
-   else step_h = 0;
-
-   o = zone->bg_scrollframe;
-   evas_object_move(o, zone->x, zone->y);
-   evas_object_resize(o, zone->w, zone->h);
-   evas_object_layer_set(o, -1);
-   evas_object_clip_set(o, zone->bg_clip_object);
-
-   data = edje_object_data_get(zone->bg_object, "directional_freedom");
-   e_scrollframe_child_viewport_size_get(o, &vw, &vh);
-   e_scrollframe_child_pos_get(o, &px, &py);
-   params = evas_object_data_get(zone->bg_object, "switch_animator_params");
-   if (!params)
-     params = E_NEW(E_Bg_Anim_Params, 1);
-   params->zone = zone;
-   params->start_x = px;
-   params->start_y = py;
-   params->end_x = desk->x * step_w * e_config->desk_flip_pan_x_axis_factor;
-   params->end_y = desk->y * step_h * e_config->desk_flip_pan_y_axis_factor;
-   params->start_time = 0.0;
-   if ((data) && (sscanf(data, "%d %d", &fx, &fy) == 2))
-     {
-       if (fx)
-         {
-            params->freedom.x = EINA_TRUE;
-            params->start_x = prev_x * step_w * e_config->desk_flip_pan_x_axis_factor;
-         }
-       if (fy)
-         {
-            params->freedom.y = EINA_TRUE;
-            params->start_y = prev_y * step_h * e_config->desk_flip_pan_y_axis_factor;
-         }
-     }
-
-   anim = evas_object_data_get(zone->bg_object, "switch_animator");
-   if (anim) ecore_animator_del(anim);
-   anim = ecore_animator_add(_e_bg_slide_animator, params);
-   evas_object_data_set(zone->bg_object, "switch_animator", anim);
-   evas_object_data_set(zone->bg_object, "switch_animator_params", params);
-}
-
-EAPI void
 e_bg_default_set(const char *file)
 {
    E_Event_Bg_Update *ev;
@@ -741,74 +657,6 @@ _e_bg_event_bg_update_free(void *data __UNUSED__, void *event)
    free(event);
 }
 
-static Eina_Bool
-_e_bg_slide_animator(void *data)
-{
-   E_Bg_Anim_Params *params;
-   E_Zone *zone;
-   Evas_Object *o;
-   double st;
-   double t, dt, spd;
-   Evas_Coord px, py, rx, ry, bw, bh, panw, panh;
-   Edje_Message_Int_Set *msg;
-
-   params = data;
-   zone = params->zone;
-   t = ecore_loop_time_get();
-   spd = e_config->desk_flip_animate_time;
-
-   o = zone->bg_scrollframe;
-   if (!params->start_time)
-     st = params->start_time = t;
-   else
-     st = params->start_time;
-
-   dt = (t - st) / spd;
-   if (dt > 1.0) dt = 1.0;
-   dt = 1.0 - dt;
-   dt *= dt; /* decelerate - could be a better hack */
-
-   if (params->end_x > params->start_x)
-     rx = params->start_x + (params->end_x - params->start_x) * (1.0 - dt);
-   else
-     rx = params->end_x + (params->start_x - params->end_x) * dt;
-   if (params->freedom.x) px = zone->x;
-   else px = rx;
-
-   if (params->end_y > params->start_y)
-     ry = params->start_y + (params->end_y - params->start_y) * (1.0 - dt);
-   else
-     ry = params->end_y + (params->start_y - params->end_y) * dt;
-   if (params->freedom.y) py = zone->y;
-   else py = ry;
-
-   e_scrollframe_child_pos_set(o, px, py);
-
-   evas_object_geometry_get(zone->bg_object, NULL, NULL, &bw, &bh);
-   panw = bw - zone->w;
-   if (panw < 0) panw = 0;
-   panh = bh - zone->h;
-   if (panh < 0) panh = 0;
-   msg = alloca(sizeof(Edje_Message_Int_Set) + (5 * sizeof(int)));
-   msg->count = 6;
-   msg->val[0] = rx;
-   msg->val[1] = ry;
-   msg->val[2] = panw;
-   msg->val[3] = panh;
-   msg->val[4] = bw;
-   msg->val[5] = bh;
-   edje_object_message_send(zone->bg_object, EDJE_MESSAGE_INT_SET, 0, msg);
-
-   if (dt <= 0.0)
-     {
-       evas_object_data_del(zone->bg_object, "switch_animator");
-       evas_object_data_del(zone->bg_object, "switch_animator_params");
-       E_FREE(params);
-       return ECORE_CALLBACK_CANCEL;
-     }
-   return ECORE_CALLBACK_RENEW;
-}
-
 static void
 _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode)
 {
index 54e48cb..39df349 100644 (file)
@@ -31,7 +31,6 @@ EINTERN int e_bg_shutdown(void);
 EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y);
 EAPI const char *e_bg_file_get(int container_num, int zone_num,  int desk_x, int desk_y);
 EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
-EAPI void e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y);
 EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file);
 EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);
 EAPI void e_bg_default_set(const char *file);
index 2633993..27f0dcc 100644 (file)
@@ -32,7 +32,7 @@ struct _E_Binding_Edge_Data
    E_Binding_Edge    *bind;
    E_Event_Zone_Edge *ev;
    E_Action          *act;
-   E_Object         *obj;
+   E_Object          *obj;
 };
 
 /* externally accessible functions */
@@ -49,48 +49,48 @@ e_bindings_init(void)
    Eina_List *l;
 
    mapping_handler = ecore_event_handler_add
-   (ECORE_X_EVENT_WINDOW_MAPPING, _e_bindings_mapping_change_event_cb, NULL);
-  
+      (ECORE_X_EVENT_MAPPING_CHANGE, _e_bindings_mapping_change_event_cb, NULL);
+
    EINA_LIST_FOREACH(e_config->mouse_bindings, l, ebm)
      e_bindings_mouse_add(ebm->context, ebm->button, ebm->modifiers,
-                         ebm->any_mod, ebm->action, ebm->params);
+                          ebm->any_mod, ebm->action, ebm->params);
 
    EINA_LIST_FOREACH(e_config->key_bindings, l, ebk)
      e_bindings_key_add(ebk->context, ebk->key, ebk->modifiers,
-                       ebk->any_mod, ebk->action, ebk->params);
+                        ebk->any_mod, ebk->action, ebk->params);
 
    EINA_LIST_FOREACH(e_config->edge_bindings, l, ebe)
      e_bindings_edge_add(ebe->context, ebe->edge, ebe->modifiers,
-                        ebe->any_mod, ebe->action, ebe->params, ebe->delay);
+                         ebe->any_mod, ebe->action, ebe->params, ebe->delay);
 
    EINA_LIST_FOREACH(e_config->signal_bindings, l, ebs)
      {
-       e_bindings_signal_add(ebs->context, ebs->signal, ebs->source, ebs->modifiers,
-                             ebs->any_mod, ebs->action, ebs->params);
-       /* FIXME: Can this be solved in a generic way? */
-       /* FIXME: Only change cursor if action is allowed! */
-       if ((ebs->action) && (ebs->signal) && (ebs->source) &&
-           (!strcmp(ebs->action, "window_resize")) &&
-           (!strncmp(ebs->signal, "mouse,down,", 11)) &&
-           (!strncmp(ebs->source, "e.event.resize.", 15)))
-         {
-            char params[32];
-
-            snprintf(params, sizeof(params), "resize_%s", ebs->params);
-            e_bindings_signal_add(ebs->context, "mouse,in", ebs->source, ebs->modifiers,
-                                  ebs->any_mod, "pointer_resize_push", params);
-            e_bindings_signal_add(ebs->context, "mouse,out", ebs->source, ebs->modifiers,
-                                  ebs->any_mod, "pointer_resize_pop", params);
-         }
+        e_bindings_signal_add(ebs->context, ebs->signal, ebs->source, ebs->modifiers,
+                              ebs->any_mod, ebs->action, ebs->params);
+        /* FIXME: Can this be solved in a generic way? */
+        /* FIXME: Only change cursor if action is allowed! */
+        if ((ebs->action) && (ebs->signal) && (ebs->source) &&
+            (!strcmp(ebs->action, "window_resize")) &&
+            (!strncmp(ebs->signal, "mouse,down,", 11)) &&
+            (!strncmp(ebs->source, "e.event.resize.", 15)))
+          {
+             char params[32];
+
+             snprintf(params, sizeof(params), "resize_%s", ebs->params);
+             e_bindings_signal_add(ebs->context, "mouse,in", ebs->source, ebs->modifiers,
+                                   ebs->any_mod, "pointer_resize_push", params);
+             e_bindings_signal_add(ebs->context, "mouse,out", ebs->source, ebs->modifiers,
+                                   ebs->any_mod, "pointer_resize_pop", params);
+          }
      }
 
    EINA_LIST_FOREACH(e_config->wheel_bindings, l, ebw)
      e_bindings_wheel_add(ebw->context, ebw->direction, ebw->z, ebw->modifiers,
-                         ebw->any_mod, ebw->action, ebw->params);
+                          ebw->any_mod, ebw->action, ebw->params);
 
    EINA_LIST_FOREACH(e_config->acpi_bindings, l, eba)
      e_bindings_acpi_add(eba->context, eba->type, eba->status, 
-                        eba->action, eba->params);
+                         eba->action, eba->params);
 
    return 1;
 }
@@ -137,19 +137,19 @@ e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
 
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-       if ((bind->ctxt == ctxt) &&
-           (bind->button == button) &&
-           (bind->mod == mod) &&
-           (bind->any_mod == any_mod) &&
-           (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-            ((!bind->action) && (!action))) &&
-           (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-            ((!bind->params) && (!params))))
-         {
-            _e_bindings_mouse_free(bind);
-            mouse_bindings = eina_list_remove_list(mouse_bindings, l);
-            break;
-         }
+        if ((bind->ctxt == ctxt) &&
+            (bind->button == button) &&
+            (bind->mod == mod) &&
+            (bind->any_mod == any_mod) &&
+            (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+             ((!bind->action) && (!action))) &&
+            (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+             ((!bind->params) && (!params))))
+          {
+             _e_bindings_mouse_free(bind);
+             mouse_bindings = eina_list_remove_list(mouse_bindings, l);
+             break;
+          }
      }
 }
 
@@ -161,15 +161,15 @@ e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            ecore_x_window_button_grab(win, bind->button,
-                                       ECORE_X_EVENT_MASK_MOUSE_DOWN |
-                                       ECORE_X_EVENT_MASK_MOUSE_UP |
-                                       ECORE_X_EVENT_MASK_MOUSE_MOVE,
-                                       _e_ecore_modifiers(bind->mod),
-                                       bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             ecore_x_window_button_grab(win, bind->button,
+                                        ECORE_X_EVENT_MASK_MOUSE_DOWN |
+                                        ECORE_X_EVENT_MASK_MOUSE_UP |
+                                        ECORE_X_EVENT_MASK_MOUSE_MOVE,
+                                        _e_ecore_modifiers(bind->mod),
+                                        bind->any_mod);
+          }
      }
 }
 
@@ -181,11 +181,11 @@ e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            ecore_x_window_button_ungrab(win, bind->button,
-                                         _e_ecore_modifiers(bind->mod), bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             ecore_x_window_button_ungrab(win, bind->button,
+                                          _e_ecore_modifiers(bind->mod), bind->any_mod);
+          }
      }
 }
 
@@ -199,18 +199,18 @@ e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, Eco
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-       if ((bind->button == (int) ev->buttons) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-
-                 act = e_action_find(bind->action);
-                 if (bind_ret) *bind_ret = bind;
-                 return act;
-              }
-         }
+        if ((bind->button == (int) ev->buttons) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (bind_ret) *bind_ret = bind;
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -220,15 +220,15 @@ e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_
 {
    E_Action *act;
    E_Binding_Mouse *bind;
-   
+
    act = e_bindings_mouse_down_find(ctxt, obj, ev, &bind);
    if (act)
      {
-       if (act->func.go_mouse)
-         act->func.go_mouse(obj, bind->params, ev);
-       else if (act->func.go)
-         act->func.go(obj, bind->params);
-       return act;
+        if (act->func.go_mouse)
+          act->func.go_mouse(obj, bind->params, ev);
+        else if (act->func.go)
+          act->func.go(obj, bind->params);
+        return act;
      }
    return act;
 }
@@ -243,18 +243,18 @@ e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, Ecore
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-       if ((bind->button == (int) ev->buttons) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-                 
-                 act = e_action_find(bind->action);
-                 if (bind_ret) *bind_ret = bind;
-                 return act;
-              }
-         }
+        if ((bind->button == (int) ev->buttons) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (bind_ret) *bind_ret = bind;
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -264,15 +264,15 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
 {
    E_Action *act;
    E_Binding_Mouse *bind;
-   
+
    act = e_bindings_mouse_up_find(ctxt, obj, ev, &bind);
    if (act)
      {
-       if (act->func.end_mouse)
-         act->func.end_mouse(obj, bind->params, ev);
-       else if (act->func.end)
-         act->func.end(obj, bind->params);
-       return act;
+        if (act->func.end_mouse)
+          act->func.end_mouse(obj, bind->params, ev);
+        else if (act->func.end)
+          act->func.end(obj, bind->params);
+        return act;
      }
    return act;
 }
@@ -281,7 +281,7 @@ EAPI void
 e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Key *bind;
-   
+
    bind = calloc(1, sizeof(E_Binding_Key));
    bind->ctxt = ctxt;
    bind->key = eina_stringshare_add(key);
@@ -300,8 +300,8 @@ e_bindings_key_get(const char *action)
 
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if (bind->action && action && !strcmp(action, bind->action))
-         return bind;
+        if (bind->action && action && !strcmp(action, bind->action))
+          return bind;
      }
    return NULL;
 }
@@ -312,14 +312,15 @@ e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod)
    E_Binding_Key *bind;
    Eina_List *l;
 
-   if(!key)
-     return NULL;
+   if (!key) return NULL;
 
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-        if (bind->key && !strcmp(key, bind->key) && (bind->mod == mod) && (bind->any_mod == any_mod))
-        return bind;
+        if ((bind->key) && (!strcmp(key, bind->key)) &&
+            (bind->mod == mod) && (bind->any_mod == any_mod))
+          return bind;
      }
+
    return NULL;
 }
 
@@ -331,19 +332,19 @@ e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
 
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if ((bind->ctxt == ctxt) &&
-           (key) && (bind->key) && (!strcmp(bind->key, key)) &&
-           (bind->mod == mod) &&
-           (bind->any_mod == any_mod) &&
-           (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-            ((!bind->action) && (!action))) &&
-           (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-            ((!bind->params) && (!params))))
-         {
-            _e_bindings_key_free(bind);
-            key_bindings = eina_list_remove_list(key_bindings, l);
-            break;
-         }
+        if ((bind->ctxt == ctxt) &&
+            (key) && (bind->key) && (!strcmp(bind->key, key)) &&
+            (bind->mod == mod) &&
+            (bind->any_mod == any_mod) &&
+            (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+             ((!bind->action) && (!action))) &&
+            (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+             ((!bind->params) && (!params))))
+          {
+             _e_bindings_key_free(bind);
+             key_bindings = eina_list_remove_list(key_bindings, l);
+             break;
+          }
      }
 }
 
@@ -355,11 +356,11 @@ e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            ecore_x_window_key_grab(win, bind->key,
-                                    _e_ecore_modifiers(bind->mod), bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             ecore_x_window_key_grab(win, bind->key,
+                                     _e_ecore_modifiers(bind->mod), bind->any_mod);
+          }
      }
 }
 
@@ -371,11 +372,11 @@ e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            ecore_x_window_key_ungrab(win, bind->key,
-                                      _e_ecore_modifiers(bind->mod), bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             ecore_x_window_key_ungrab(win, bind->key,
+                                       _e_ecore_modifiers(bind->mod), bind->any_mod);
+          }
      }
 }
 
@@ -389,25 +390,25 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-       
-                 act = e_action_find(bind->action);
-                 if (act)
-                   {
-                      if (act->func.go_key)
-                        act->func.go_key(obj, bind->params, ev);
-                      else if (act->func.go)
-                        act->func.go(obj, bind->params);
-                      return act;
-                   }
-                 return NULL;
-              }
-         }
+        if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (act)
+                    {
+                       if (act->func.go_key)
+                         act->func.go_key(obj, bind->params, ev);
+                       else if (act->func.go)
+                         act->func.go(obj, bind->params);
+                       return act;
+                    }
+                  return NULL;
+               }
+          }
      }
    return NULL;
 }
@@ -422,25 +423,75 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, bind)
      {
-       if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-                 
-                 act = e_action_find(bind->action);
-                 if (act)
-                   {
-                      if (act->func.end_key)
-                        act->func.end_key(obj, bind->params, ev);
-                      else if (act->func.end)
-                        act->func.end(obj, bind->params);
-                      return act;
-                   }
-                 return NULL;
-              }
-         }
+        if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+                  
+                  act = e_action_find(bind->action);
+                  if (act)
+                    {
+                       if (act->func.end_key)
+                         act->func.end_key(obj, bind->params, ev);
+                       else if (act->func.end)
+                         act->func.end(obj, bind->params);
+                       return act;
+                    }
+                  return NULL;
+               }
+          }
+     }
+   return NULL;
+}
+
+EAPI E_Action *
+e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
+{
+   E_Binding_Modifier mod = 0;
+   E_Binding_Key *bind;
+   Eina_List *l;
+
+   mod = _e_bindings_modifiers(ev->modifiers);
+   EINA_LIST_FOREACH(key_bindings, l, bind)
+     {
+        if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  return act;
+               }
+          }
+     }
+   return NULL;
+}
+
+EAPI E_Action *
+e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
+{
+   E_Binding_Modifier mod = 0;
+   E_Binding_Key *bind;
+   Eina_List *l;
+
+   mod = _e_bindings_modifiers(ev->modifiers);
+   EINA_LIST_FOREACH(key_bindings, l, bind)
+     {
+        if ((bind->key) && (!strcmp(bind->key, ev->keyname)) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -449,7 +500,7 @@ EAPI void
 e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay)
 {
    E_Binding_Edge *bind;
-   
+
    bind = calloc(1, sizeof(E_Binding_Edge));
    bind->ctxt = ctxt;
    bind->edge = edge;
@@ -463,6 +514,24 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
    e_zone_edge_new(edge);
 }
 
+EAPI Eina_Bool
+e_bindings_edge_flippable_get(E_Zone_Edge edge)
+{
+   E_Binding_Edge *bind;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(edge_bindings, l, bind)
+     {
+        if ((bind->edge == edge) && (bind->action))
+          {
+             if ((!strcmp(bind->action, "desk_flip_in_direction")) ||
+                 (!strcmp(bind->action, "desk_flip_by")))
+                return EINA_TRUE;
+          }
+     }
+   return EINA_FALSE;
+}
+
 EAPI E_Binding_Edge *
 e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click)
 {
@@ -471,12 +540,12 @@ e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click)
 
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       if ((bind->edge == edge) &&
-             ((click && (bind->delay == -1.0))
-              || (!click && (bind->delay >= 0.0))) &&
-             bind->action && action &&
-             !strcmp(action, bind->action))
-         return bind;
+        if ((bind->edge == edge) &&
+            ((click && (bind->delay == -1.0))
+             || (!click && (bind->delay >= 0.0))) &&
+            (bind->action) && (action) &&
+            (!strcmp(action, bind->action)))
+          return bind;
      }
    return NULL;
 }
@@ -490,22 +559,22 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
 
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       if ((bind->edge == edge))
-         {
-            if ((bind->ctxt == ctxt) &&
-                (bind->mod == mod) &&
-                ((bind->delay * 1000) == (delay * 1000)) &&
-                (bind->any_mod == any_mod) &&
-                (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-                 ((!bind->action) && (!action))) &&
-                (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-                 ((!bind->params) && (!params))))
-              {
-                 _e_bindings_edge_free(bind);
-                 edge_bindings = eina_list_remove_list(edge_bindings, l);
-              }
-            else ref_count++;
-         }
+        if ((bind->edge == edge))
+          {
+             if ((bind->ctxt == ctxt) &&
+                 (bind->mod == mod) &&
+                 ((bind->delay * 1000) == (delay * 1000)) &&
+                 (bind->any_mod == any_mod) &&
+                 (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+                  ((!bind->action) && (!action))) &&
+                 (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+                  ((!bind->params) && (!params))))
+               {
+                  _e_bindings_edge_free(bind);
+                  edge_bindings = eina_list_remove_list(edge_bindings, l);
+               }
+             else ref_count++;
+          }
      }
 
    if (!ref_count)
@@ -520,7 +589,7 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
    E_Desk *current = NULL;
    E_Action *act = NULL;
    Eina_List *l;
-   
+
    current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, ev->zone->desk_y_current);
    if (current->fullscreen_borders && (!e_config->fullscreen_flip)) return NULL;
 
@@ -530,33 +599,33 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       /* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
-       if (((bind->edge == ev->edge)) && (bind->delay >= 0.0) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 act = e_action_find(bind->action);
-                 if (act)
-                   {
-                      E_Binding_Edge_Data *ed = E_NEW(E_Binding_Edge_Data, 1);
-                      E_Event_Zone_Edge *ev2 = E_NEW(E_Event_Zone_Edge, 1);
-
-                      /* The original event will be freed before it can be
-                       * used again */
-                      ev2->zone  = ev->zone;
-                      ev2->edge  = ev->edge;
-                      ev2->x     = ev->x;
-                      ev2->y     = ev->y;
-
-                      ed->bind = bind;
-                      ed->obj  = obj;
-                      ed->act  = act;
-                      ed->ev   = ev2;
-                      bind->timer = ecore_timer_add(((double) bind->delay), _e_bindings_edge_cb_timer, ed);
-                   }
-              }
-         }
+        /* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
+        if (((bind->edge == ev->edge)) && (bind->delay >= 0.0) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  act = e_action_find(bind->action);
+                  if (act)
+                    {
+                       E_Binding_Edge_Data *ed = E_NEW(E_Binding_Edge_Data, 1);
+                       E_Event_Zone_Edge *ev2 = E_NEW(E_Event_Zone_Edge, 1);
+
+                       /* The original event will be freed before it can be
+                        * used again */
+                       ev2->zone  = ev->zone;
+                       ev2->edge  = ev->edge;
+                       ev2->x     = ev->x;
+                       ev2->y     = ev->y;
+
+                       ed->bind = bind;
+                       ed->obj  = obj;
+                       ed->act  = act;
+                       ed->ev   = ev2;
+                       bind->timer = ecore_timer_add(((double) bind->delay), _e_bindings_edge_cb_timer, ed);
+                    }
+               }
+          }
      }
    return act;
 }
@@ -575,30 +644,30 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       /* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
-       if ((bind->edge == ev->edge) && (bind->delay >= 0.0) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 if (bind->timer)
-                   {
-                      E_Binding_Edge_Data *ed;
-
-                      ed = ecore_timer_del(bind->timer);
-                      if (ed)
-                        {
-                           E_FREE(ed->ev);
-                           E_FREE(ed);
-                        }
-                   }
-                 bind->timer = NULL;
-
-                 act = e_action_find(bind->action);
-                 if (act && act->func.end)
-                   act->func.end(obj, bind->params);
-              }
-         }
+        /* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
+        if ((bind->edge == ev->edge) && (bind->delay >= 0.0) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  if (bind->timer)
+                    {
+                       E_Binding_Edge_Data *ed;
+
+                       ed = ecore_timer_del(bind->timer);
+                       if (ed)
+                         {
+                            E_FREE(ed->ev);
+                            E_FREE(ed);
+                         }
+                    }
+                  bind->timer = NULL;
+
+                  act = e_action_find(bind->action);
+                  if (act && act->func.end)
+                    act->func.end(obj, bind->params);
+               }
+          }
      }
    return act;
 }
@@ -611,7 +680,7 @@ e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event
    E_Desk *current = NULL;
    E_Action *act = NULL;
    Eina_List *l;
-   
+
    current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, ev->zone->desk_y_current);
    if (current->fullscreen_borders && (!e_config->fullscreen_flip)) return NULL;
 
@@ -621,21 +690,21 @@ e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       if (((bind->edge == ev->edge)) && (bind->delay == -1.0) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 act = e_action_find(bind->action);
-                 if (act)
-                   {
-                      if (act->func.go_edge)
-                        act->func.go_edge(obj, bind->params, ev);
-                      else if (act->func.go)
-                        act->func.go(obj, bind->params);
-                   }
-              }
-         }
+        if (((bind->edge == ev->edge)) && (bind->delay == -1.0) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  act = e_action_find(bind->action);
+                  if (act)
+                    {
+                       if (act->func.go_edge)
+                         act->func.go_edge(obj, bind->params, ev);
+                       else if (act->func.go)
+                         act->func.go(obj, bind->params);
+                    }
+               }
+          }
      }
    return act;
 }
@@ -654,16 +723,16 @@ e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-       if ((bind->edge == ev->edge) && (bind->delay == -1.0) &&
-             ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 act = e_action_find(bind->action);
-                 if (act && act->func.end)
-                   act->func.end(obj, bind->params);
-              }
-         }
+        if ((bind->edge == ev->edge) && (bind->delay == -1.0) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  act = e_action_find(bind->action);
+                  if (act && act->func.end)
+                    act->func.end(obj, bind->params);
+               }
+          }
      }
    return act;
 }
@@ -672,7 +741,7 @@ EAPI void
 e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Signal *bind;
-   
+
    bind = calloc(1, sizeof(E_Binding_Signal));
    bind->ctxt = ctxt;
    if (sig) bind->sig = eina_stringshare_add(sig);
@@ -692,22 +761,22 @@ e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src,
 
    EINA_LIST_FOREACH(signal_bindings, l, bind)
      {
-       if ((bind->ctxt == ctxt) &&
-           (((bind->sig) && (sig) && (!strcmp(bind->sig, sig))) ||
-            ((!bind->sig) && (!sig))) &&
-           (((bind->src) && (src) && (!strcmp(bind->src, src))) ||
-            ((!bind->src) && (!src))) &&
-           (bind->mod == mod) &&
-           (bind->any_mod == any_mod) &&
-           (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-            ((!bind->action) && (!action))) &&
-           (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-            ((!bind->params) && (!params))))
-         {
-            _e_bindings_signal_free(bind);
-            signal_bindings = eina_list_remove_list(signal_bindings, l);
-            break;
-         }
+        if ((bind->ctxt == ctxt) &&
+            (((bind->sig) && (sig) && (!strcmp(bind->sig, sig))) ||
+             ((!bind->sig) && (!sig))) &&
+            (((bind->src) && (src) && (!strcmp(bind->src, src))) ||
+             ((!bind->src) && (!src))) &&
+            (bind->mod == mod) &&
+            (bind->any_mod == any_mod) &&
+            (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+             ((!bind->action) && (!action))) &&
+            (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+             ((!bind->params) && (!params))))
+          {
+             _e_bindings_signal_free(bind);
+             signal_bindings = eina_list_remove_list(signal_bindings, l);
+             break;
+          }
      }
 }
 
@@ -717,26 +786,26 @@ e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, const c
    E_Binding_Modifier mod = 0;
    E_Binding_Signal *bind;
    Eina_List *l;
-   
+
    if (strstr(sig, "MOD:Shift")) mod |= E_BINDING_MODIFIER_SHIFT;
    if (strstr(sig, "MOD:Control")) mod |= E_BINDING_MODIFIER_CTRL;
    if (strstr(sig, "MOD:Alt")) mod |= E_BINDING_MODIFIER_ALT;
    if (strstr(sig, "MOD:Super")) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(signal_bindings, l, bind)
      {
-       if ((e_util_glob_match(sig, bind->sig)) &&
-           (e_util_glob_match(src, bind->src)) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-                 
-                 act = e_action_find(bind->action);
-                 if (bind_ret) *bind_ret = bind;
-                 return act;
-              }
-         }
+        if ((e_util_glob_match(sig, bind->sig)) &&
+            (e_util_glob_match(src, bind->src)) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (bind_ret) *bind_ret = bind;
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -752,11 +821,11 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig,
    act = e_bindings_signal_find(ctxt, obj, sig, src, &bind);
    if (act)
      {
-       if (act->func.go_signal)
-         act->func.go_signal(obj, bind->params, sig, src);
-       else if (act->func.go)
-         act->func.go(obj, bind->params);
-       return act;
+        if (act->func.go_signal)
+          act->func.go_signal(obj, bind->params, sig, src);
+        else if (act->func.go)
+          act->func.go(obj, bind->params);
+        return act;
      }
    return act;
 }
@@ -785,20 +854,20 @@ e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
 
    EINA_LIST_FOREACH(wheel_bindings, l, bind)
      {
-       if ((bind->ctxt == ctxt) &&
-           (bind->direction == direction) &&
-           (bind->z == z) &&
-           (bind->mod == mod) &&
-           (bind->any_mod == any_mod) &&
-           (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-            ((!bind->action) && (!action))) &&
-           (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-            ((!bind->params) && (!params))))
-         {
-            _e_bindings_wheel_free(bind);
-            wheel_bindings = eina_list_remove_list(wheel_bindings, l);
-            break;
-         }
+        if ((bind->ctxt == ctxt) &&
+            (bind->direction == direction) &&
+            (bind->z == z) &&
+            (bind->mod == mod) &&
+            (bind->any_mod == any_mod) &&
+            (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+             ((!bind->action) && (!action))) &&
+            (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+             ((!bind->params) && (!params))))
+          {
+             _e_bindings_wheel_free(bind);
+             wheel_bindings = eina_list_remove_list(wheel_bindings, l);
+             break;
+          }
      }
 }
 
@@ -810,25 +879,25 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(wheel_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            int button = 0;
-
-            if (bind->direction == 0)
-              {
-                 if (bind->z < 0) button = 4;
-                 else if (bind->z > 0) button = 5;
-              }
-            else if (bind->direction == 1)
-              {
-                 if (bind->z < 0) button = 6;
-                 else if (bind->z > 0) button = 7;
-              }
-            if (button != 0)
-              ecore_x_window_button_grab(win, button,
-                                         ECORE_X_EVENT_MASK_MOUSE_DOWN,
-                                         _e_ecore_modifiers(bind->mod), bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             int button = 0;
+
+             if (bind->direction == 0)
+               {
+                  if (bind->z < 0) button = 4;
+                  else if (bind->z > 0) button = 5;
+               }
+             else if (bind->direction == 1)
+               {
+                  if (bind->z < 0) button = 6;
+                  else if (bind->z > 0) button = 7;
+               }
+             if (button != 0)
+               ecore_x_window_button_grab(win, button,
+                                          ECORE_X_EVENT_MASK_MOUSE_DOWN,
+                                          _e_ecore_modifiers(bind->mod), bind->any_mod);
+          }
      }
 }
 
@@ -840,24 +909,24 @@ e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
 
    EINA_LIST_FOREACH(wheel_bindings, l, bind)
      {
-       if (_e_bindings_context_match(bind->ctxt, ctxt))
-         {
-            int button = 0;
-            
-            if (bind->direction == 0)
-              {
-                 if (bind->z < 0) button = 4;
-                 else if (bind->z > 0) button = 5;
-              }
-            else if (bind->direction == 1)
-              {
-                 if (bind->z < 0) button = 6;
-                 else if (bind->z > 0) button = 7;
-              }
-            if (button != 0)
-              ecore_x_window_button_ungrab(win, button,
-                                           _e_ecore_modifiers(bind->mod), bind->any_mod);
-         }
+        if (_e_bindings_context_match(bind->ctxt, ctxt))
+          {
+             int button = 0;
+
+             if (bind->direction == 0)
+               {
+                  if (bind->z < 0) button = 4;
+                  else if (bind->z > 0) button = 5;
+               }
+             else if (bind->direction == 1)
+               {
+                  if (bind->z < 0) button = 6;
+                  else if (bind->z > 0) button = 7;
+               }
+             if (button != 0)
+               ecore_x_window_button_ungrab(win, button,
+                                            _e_ecore_modifiers(bind->mod), bind->any_mod);
+          }
      }
 }
 
@@ -871,19 +940,19 @@ e_bindings_wheel_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, Ecore_Ev
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(wheel_bindings, l, bind)
      {
-       if ((bind->direction == ev->direction) &&
-           (((bind->z < 0) && (ev->z < 0)) || ((bind->z > 0) && (ev->z > 0))) &&
-           ((bind->any_mod) || (bind->mod == mod)))
-         {
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-                 
-                 act = e_action_find(bind->action);
-                 if (bind_ret) *bind_ret = bind;
-                 return act;
-              }
-         }
+        if ((bind->direction == ev->direction) &&
+            (((bind->z < 0) && (ev->z < 0)) || ((bind->z > 0) && (ev->z > 0))) &&
+            ((bind->any_mod) || (bind->mod == mod)))
+          {
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (bind_ret) *bind_ret = bind;
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -897,11 +966,11 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event
    act = e_bindings_wheel_find(ctxt, obj, ev, &bind);
    if (act)
      {
-       if (act->func.go_wheel)
-         act->func.go_wheel(obj, bind->params, ev);
-       else if (act->func.go)
-         act->func.go(obj, bind->params);
-       return act;
+        if (act->func.go_wheel)
+          act->func.go_wheel(obj, bind->params, ev);
+        else if (act->func.go)
+          act->func.go(obj, bind->params);
+        return act;
      }
    return act;
 }
@@ -928,17 +997,17 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
 
    EINA_LIST_FOREACH(acpi_bindings, l, bind)
      {
-       if ((bind->ctxt == ctxt) &&
-           (bind->type == type) && (bind->status == status) && 
-           (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-               ((!bind->action) && (!action))) &&
-           (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-               ((!bind->params) && (!params))))
-         {
-            _e_bindings_acpi_free(bind);
-            acpi_bindings = eina_list_remove_list(acpi_bindings, l);
-            break;
-         }
+        if ((bind->ctxt == ctxt) &&
+            (bind->type == type) && (bind->status == status) && 
+            (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+             ((!bind->action) && (!action))) &&
+            (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+             ((!bind->params) && (!params))))
+          {
+             _e_bindings_acpi_free(bind);
+             acpi_bindings = eina_list_remove_list(acpi_bindings, l);
+             break;
+          }
      }
 }
 
@@ -950,23 +1019,23 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_A
 
    EINA_LIST_FOREACH(acpi_bindings, l, bind)
      {
-       if (bind->type == ev->type)
-         {
-            /* if binding status is -1, then we don't compare event status */
-            if (bind->status != -1) 
-              {
-                 /* binding status is set to something, compare event status */
-                 if (bind->status != ev->status) continue;
-              }
-            if (_e_bindings_context_match(bind->ctxt, ctxt))
-              {
-                 E_Action *act;
-
-                 act = e_action_find(bind->action);
-                 if (bind_ret) *bind_ret = bind;
-                 return act;
-              }
-         }
+        if (bind->type == ev->type)
+          {
+             /* if binding status is -1, then we don't compare event status */
+             if (bind->status != -1) 
+               {
+                  /* binding status is set to something, compare event status */
+                  if (bind->status != ev->status) continue;
+               }
+             if (_e_bindings_context_match(bind->ctxt, ctxt))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(bind->action);
+                  if (bind_ret) *bind_ret = bind;
+                  return act;
+               }
+          }
      }
    return NULL;
 }
@@ -980,11 +1049,11 @@ e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi
    act = e_bindings_acpi_find(ctxt, obj, ev, &bind);
    if (act)
      {
-       if (act->func.go_acpi)
-         act->func.go_acpi(obj, bind->params, ev);
-       else if (act->func.go)
-         act->func.go(obj, bind->params);
-       return act;
+        if (act->func.go_acpi)
+          act->func.go_acpi(obj, bind->params, ev);
+        else if (act->func.go)
+          act->func.go(obj, bind->params);
+        return act;
      }
    return act;
 }
@@ -994,7 +1063,6 @@ static Eina_Bool
 _e_bindings_mapping_change_event_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
 //  Ecore_X_Event_Mapping_Change *ev = event;
-  
   e_managers_keys_ungrab();
   e_border_button_bindings_ungrab_all();
   e_border_button_bindings_grab_all();
@@ -1026,10 +1094,10 @@ _e_bindings_edge_free(E_Binding_Edge *bind)
    if (bind->params) eina_stringshare_del(bind->params);
    if (bind->timer)
      {
-       E_Binding_Edge_Data *ed;
+        E_Binding_Edge_Data *ed;
 
-       ed = ecore_timer_del(bind->timer);
-       E_FREE(ed);
+        ed = ecore_timer_del(bind->timer);
+        E_FREE(ed);
      }
    free(bind);
 }
index d230234..a5e764d 100644 (file)
@@ -120,8 +120,11 @@ EAPI void        e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
 EAPI void        e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
 EAPI E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
+EAPI E_Action   *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
+EAPI E_Action   *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
 
 EAPI void        e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
+EAPI Eina_Bool   e_bindings_edge_flippable_get(E_Zone_Edge edge);
 EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click);
 EAPI void        e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
 EAPI E_Action   *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
index 2e98272..5260d35 100644 (file)
@@ -16,6 +16,8 @@
 #define RESIZE_NONE 11
 
 /* local subsystem functions */
+static void _e_border_pri_raise(E_Border *bd);
+static void _e_border_pri_norm(E_Border *bd);
 static void _e_border_free(E_Border *bd);
 static void _e_border_del(E_Border *bd);
 
@@ -198,7 +200,7 @@ static void      _e_border_hook_call(E_Border_Hook_Point hookpoint,
 static void _e_border_client_move_resize_send(E_Border *bd);
 
 static void _e_border_frame_replace(E_Border *bd,
-                                   Eina_Bool argb);
+            Eina_Bool argb);
 
 static void _e_border_shape_input_rectangle_set(E_Border* bd);
 static void _e_border_show(E_Border *bd);
@@ -216,11 +218,12 @@ static Eina_List *handlers = NULL;
 static Eina_List *borders = NULL;
 static Eina_Hash *borders_hash = NULL;
 static E_Border *focused = NULL;
+static E_Border *focusing = NULL;
 static Eina_List *focus_next = NULL;
 static Ecore_X_Time focus_time = 0;
 
-static E_Border *resize = NULL;
-static E_Border *move = NULL;
+static E_Border *bdresize = NULL;
+static E_Border *bdmove = NULL;
 static E_Drag *drag_border = NULL;
 
 static int grabbed = 0;
@@ -477,6 +480,9 @@ e_border_new(E_Container   *con,
       bd->client.icccm.fetch.command = 1;
       if (atoms)
         {
+           Eina_Bool video_parent = EINA_FALSE;
+           Eina_Bool video_position = EINA_FALSE;
+
            /* icccm */
             for (i = 0; i < at_num; i++)
               {
@@ -589,6 +595,20 @@ e_border_new(E_Container   *con,
                     bd->client.illume.drag.fetch.locked = 1;
                   else if (atoms[i] == ECORE_X_ATOM_E_ILLUME_DRAG)
                     bd->client.illume.drag.fetch.drag = 1;
+                  else if (atoms[i] == ECORE_X_ATOM_E_VIDEO_PARENT)
+                    video_parent = EINA_TRUE;
+                  else if (atoms[i] == ECORE_X_ATOM_E_VIDEO_POSITION)
+                    video_position = EINA_TRUE;
+              }
+            if (video_position && video_parent)
+              {
+                 bd->client.e.state.video = 1;
+                 bd->client.e.fetch.video_parent = 1;
+                 bd->client.e.fetch.video_position = 1;
+                 ecore_x_window_lower(bd->win);
+                 ecore_x_composite_window_events_disable(bd->win);
+                 ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+                 fprintf(stderr, "We found a video window \\o/ %x\n", win);
               }
             free(atoms);
         }
@@ -898,7 +918,7 @@ e_border_hide(E_Border *bd,
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if (!bd->visible) return;
+   if (!bd->visible) goto send_event;
    ecore_x_window_shadow_tree_flush();
    if (bd->moving)
      _e_border_move_end(bd);
@@ -973,6 +993,9 @@ e_border_hide(E_Border *bd,
    if (!manage)
      ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MANAGED, &visible, 1);
 
+   bd->post_show = 0;
+
+send_event:
    if (!stopping)
      {
         E_Event_Border_Hide *ev;
@@ -983,7 +1006,84 @@ e_border_hide(E_Border *bd,
 //     e_object_breadcrumb_add(E_OBJECT(bd), "border_hide_event");
         ecore_event_add(E_EVENT_BORDER_HIDE, ev, _e_border_event_border_hide_free, NULL);
      }
-   bd->post_show = 0;
+}
+
+static void
+_pri_adj(int pid, int set, int adj, Eina_Bool use_adj, Eina_Bool adj_children, Eina_Bool do_children)
+{
+   int newpri = set;
+
+   if (use_adj) newpri = getpriority(PRIO_PROCESS, pid) + adj;
+   setpriority(PRIO_PROCESS, pid, newpri);
+// shouldnt need to do this as default ionice class is "none" (0), and
+// this inherits io priority FROM nice level
+//        ioprio_set(IOPRIO_WHO_PROCESS, pid,
+//                   IOPRIO_PRIO_VALUE(2, 5));
+   if (do_children)
+     {
+        Eina_List *files;
+        char *file, buf[PATH_MAX];
+        FILE *f;
+        int pid2, ppid;
+
+        // yes - this is /proc specific... so this may not work on some
+        // os's - works on linux. too bad for others.
+        files = ecore_file_ls("/proc");
+        EINA_LIST_FREE(files, file)
+          {
+             if (isdigit(file[0]))
+               {
+                  snprintf(buf, sizeof(buf), "/proc/%s/stat", file);
+                  f = fopen(buf, "r");
+                  if (f)
+                    {
+                       pid2 = -1;
+                       ppid = -1;
+                       if (fscanf(f, "%i %*s %*s %i %*s", &pid2, &ppid) == 2)
+                         {
+                            fclose(f);
+                            if (ppid == pid)
+                              {
+                                 if (adj_children)
+                                    _pri_adj(pid2, set, adj, EINA_TRUE,
+                                             adj_children, do_children);
+                                 else
+                                    _pri_adj(pid2, set, adj, use_adj,
+                                             adj_children, do_children);
+                              }
+                         }
+                       else fclose(f);
+                    }
+               }
+             free(file);
+          }
+     }
+}
+
+static void
+_e_border_pri_raise(E_Border *bd)
+{
+   if (bd->client.netwm.pid <= 0) return;
+   if (bd->client.netwm.pid == getpid()) return;
+   _pri_adj(bd->client.netwm.pid,
+            e_config->priority - 1, -1, EINA_FALSE,
+//            EINA_TRUE, EINA_TRUE);
+            EINA_TRUE, EINA_FALSE);
+//   printf("WIN: pid %i, title %s (HI!!!!!!!!!!!!!!!!!!)\n",
+//          bd->client.netwm.pid, e_border_name_get(bd));
+}
+
+static void
+_e_border_pri_norm(E_Border *bd)
+{
+   if (bd->client.netwm.pid <= 0) return;
+   if (bd->client.netwm.pid == getpid()) return;
+   _pri_adj(bd->client.netwm.pid,
+            e_config->priority, 1, EINA_FALSE,
+//            EINA_TRUE, EINA_TRUE);
+            EINA_TRUE, EINA_FALSE);
+//   printf("WIN: pid %i, title %s (NORMAL)\n",
+//          bd->client.netwm.pid, e_border_name_get(bd));
 }
 
 static void
@@ -1019,19 +1119,19 @@ _e_border_frame_replace(E_Border *bd, Eina_Bool argb)
    /* create new frame */
    if (argb)
      bd->win = ecore_x_window_manager_argb_new(bd->zone->container->win,
-                                              bd->x, bd->y, bd->w, bd->h);
+                 bd->x, bd->y, bd->w, bd->h);
    else
      {
         bd->win = ecore_x_window_override_new(bd->zone->container->win,
-                                             bd->x, bd->y, bd->w, bd->h);
+                bd->x, bd->y, bd->w, bd->h);
         ecore_x_window_shape_events_select(bd->win, 1);
      }
 
    ecore_x_window_configure(bd->win,
-                           ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
-                           ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
-                           0, 0, 0, 0, 0,
-                           win, ECORE_X_WINDOW_STACK_BELOW);
+          ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+          ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+          0, 0, 0, 0, 0,
+          win, ECORE_X_WINDOW_STACK_BELOW);
 
    e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
@@ -1052,7 +1152,7 @@ _e_border_frame_replace(E_Border *bd, Eina_Bool argb)
 
    /* move client with shell win over to new frame */
    ecore_x_window_reparent(bd->client.shell_win, bd->win,
-                          bd->client_inset.l, bd->client_inset.t);
+         bd->client_inset.l, bd->client_inset.t);
 
    bd->pointer = e_pointer_window_new(bd->win, 0);
 
@@ -1061,8 +1161,14 @@ _e_border_frame_replace(E_Border *bd, Eina_Bool argb)
 
    if (bd->visible)
      {
-       ecore_evas_show(bd->bg_ecore_evas);
-       ecore_x_window_show(bd->win);
+        E_Border *tmp;
+        Eina_List *l;
+
+        ecore_evas_show(bd->bg_ecore_evas);
+        ecore_x_window_show(bd->win);
+
+        EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+          ecore_x_window_show(tmp->win);
      }
 
    bd->bg_object = edje_object_add(bd->bg_evas);
@@ -1151,8 +1257,7 @@ _e_border_move_internal(E_Border *bd,
                   y = bd->y;
               }
          }
-       else
-       if (e_config->allow_manip)
+       else if (e_config->allow_manip)
          bd->maximized = 0;
        else
          return;
@@ -1371,7 +1476,7 @@ _e_border_move_resize_internal(E_Border *bd,
      }
    else
      {
-        if (resize && bd->client.netwm.sync.request)
+        if (bdresize && bd->client.netwm.sync.request)
           {
              bd->client.netwm.sync.wait++;
              /* Don't use x and y as supplied to this function, as it is called with 0, 0
@@ -1520,14 +1625,14 @@ EAPI void
 e_border_layer_set(E_Border *bd,
                    int       layer)
 {
-   int raise;
+   int oldraise;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
    ecore_x_window_shadow_tree_flush();
 
-   raise = e_config->transient.raise;
+   oldraise = e_config->transient.raise;
 
    bd->saved.layer = bd->layer;
    bd->layer = layer;
@@ -1548,7 +1653,7 @@ e_border_layer_set(E_Border *bd,
           }
      }
    e_border_raise(bd);
-   e_config->transient.raise = raise;
+   e_config->transient.raise = oldraise;
 }
 
 EAPI void
@@ -1613,6 +1718,7 @@ e_border_raise(E_Border *bd)
                  */
                   if (!child->iconic)
                     {
+                       child->layer = bd->layer;
                        if (!last) last = child;
                        e_border_raise (child);
                     }
@@ -1720,6 +1826,7 @@ e_border_lower(E_Border *bd)
                  */
                   if (!child->iconic)
                     {
+                       child->layer = bd->layer;
                        e_border_lower (child);
                        last = child;
                     }
@@ -1927,40 +2034,20 @@ e_border_focus_set_with_pointer(E_Border *bd)
        (!bd->client.icccm.take_focus)) return;
    if (bd->lock_focus_out) return;
 
-   /* Try to grab the pointer to make sure it's not "in use" */
-/*
- * this causes problems as the grab can cause an in/out event (by grab) that
- * normally would be like a grab from a menu or something else and e gets into
- * a self-feeding loop. sorry - can't grab :(
-   if (!ecore_x_pointer_grab(bd->zone->container->win))
+   e_border_focus_set(bd, 1, 1);
+
+   if (e_config->focus_policy == E_FOCUS_CLICK)
      return;
- */
 
    if (e_config->focus_policy == E_FOCUS_SLOPPY)
      {
         if (e_border_under_pointer_get(bd->desk, bd))
-          {
-             if (!e_border_pointer_warp_to_center(bd))
-               {
-                  e_border_focus_set(bd, 1, 1);
-               }
-          }
-        else
-          {
-             e_border_focus_set(bd, 1, 1);
-          }
-     }
-   else if (e_config->focus_policy == E_FOCUS_CLICK)
-     {
-        e_border_focus_set(bd, 1, 1);
+          e_border_pointer_warp_to_center(bd);
      }
    else
-   if (!e_border_pointer_warp_to_center(bd))
      {
-        e_border_focus_set(bd, 1, 1);
+        e_border_pointer_warp_to_center(bd);
      }
-
-   //ecore_x_pointer_ungrab();
 }
 
 EAPI void
@@ -1968,7 +2055,8 @@ e_border_focus_set(E_Border *bd,
                    int       focus,
                    int       set)
 {
-   E_Border *unfocus = NULL;
+   E_Border *bd_unfocus = NULL;
+   Eina_Bool focus_changed = EINA_FALSE;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@@ -1983,124 +2071,126 @@ e_border_focus_set(E_Border *bd,
    /* dont focus an iconified window. that's silly! */
    if (focus)
      {
-       if (bd->iconic)
-         return;
-
-       if (!bd->visible)
-         return;
+        if (bd->iconic)
+          return;
 
-       /* FIXME: hack for deskflip animation:
-        * dont update focus when sliding previous desk */
-       if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
-         return;
+        if (!bd->visible)
+          return;
 
-       /* TODO */
-       /* if !set and no other window is focused 'revert focus when lost' */
+        /* FIXME: hack for deskflip animation:
+         * dont update focus when sliding previous desk */
+        if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
+          return;
      }
 
    if ((bd->modal) && (bd->modal != bd) && (bd->modal->visible))
      {
-       e_border_focus_set(bd->modal, focus, set);
-       return;
+        e_border_focus_set(bd->modal, focus, set);
+        return;
      }
    else if ((bd->leader) && (bd->leader->modal) && (bd->leader->modal != bd))
      {
-       e_border_focus_set(bd->leader->modal, focus, set);
-       return;
+        e_border_focus_set(bd->leader->modal, focus, set);
+        return;
      }
-#ifdef INOUTDEBUG_FOCUS
-   printf("%s focus set %d %d\n", e_border_name_get(bd), focus, set);
-#endif
 
-   if ((set) && (focus))
+   if (focus)
      {
-       if (bd->visible && bd->changes.visible)
-         {
-            bd->want_focus = 1;
-            bd->changed = 1;
-            return;
-         }
-       if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
-         {
-            Eina_List *l;
+        if (set)
+          {
+             if (bd->visible && bd->changes.visible)
+               {
+                  bd->want_focus = 1;
+                  bd->changed = 1;
+               }
+             else if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
+               {
+                  Eina_List *l;
+
+                  if ((l = eina_list_data_find_list(focus_next, bd)))
+                    focus_next = eina_list_promote_list(focus_next, l);
+                  else
+                    focus_next = eina_list_prepend(focus_next, bd);
+               }
+
+             return;
+          }
 
-            if ((l = eina_list_data_find_list(focus_next, bd)))
-              focus_next = eina_list_promote_list(focus_next, l);
-            else
-              focus_next = eina_list_prepend(focus_next, bd);
-            return;
-         }
+        if (!bd->focused)
+          {
+             if (focused) bd_unfocus = focused;
+             if (focusing == bd) focusing = NULL;
+             bd->focused = 1;
+             focused = bd;
+
+             focus_changed = EINA_TRUE;
+          }
      }
-   else if ((focus) && (!bd->focused))
+   else
      {
-       E_Event_Border_Focus_In *ev;
+        bd->want_focus = 0;
+        focus_next = eina_list_remove(focus_next, bd);
+        if (bd == focusing) focusing = NULL;
+        if (bd->focused)
+          {
+             bd_unfocus = bd;
 
-       if (focused)
-         unfocus = focused;
+             /* should always be the case. anyway */
+             if (bd == focused) focused = NULL;
 
-       bd->focused = 1;
-       focused = bd;
+             if ((set) && (!focus_next) && (!focusing))
+               {
+                  e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+               }
+          }
+     }
 
-       e_focus_event_focus_in(bd);
-       e_border_focus_latest_set(bd);
-       e_hints_active_window_set(bd->zone->container->manager, bd);
+   if ((bd_unfocus) &&
+       (!e_object_is_del(E_OBJECT(bd_unfocus)) &&
+        (e_object_ref_get(E_OBJECT(bd_unfocus)) > 0)))
+     {
+        E_Event_Border_Focus_Out *ev;
 
-       edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
-       if (bd->icon_object)
-         edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+        bd_unfocus->focused = 0;
+        e_focus_event_focus_out(bd_unfocus);
 
-       ev = E_NEW(E_Event_Border_Focus_In, 1);
-       ev->border = bd;
-       e_object_ref(E_OBJECT(bd));
+        if (bd_unfocus->raise_timer)
+          ecore_timer_del(bd_unfocus->raise_timer);
+        bd_unfocus->raise_timer = NULL;
 
-       ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
-                       _e_border_event_border_focus_in_free, NULL);
-     }
-   else if ((!focus) && (bd->want_focus))
-     {
-       if ((bd->visible) && (bd->changes.visible))
-         {
-            bd->want_focus = 0;
-            bd->changed = 1;
-            return;
-         }
-     }
-   else if ((!focus) && (bd->focused))
-     {
-       unfocus = bd;
+        edje_object_signal_emit(bd_unfocus->bg_object, "e,state,unfocused", "e");
+        if (bd_unfocus->icon_object)
+          edje_object_signal_emit(bd_unfocus->icon_object, "e,state,unfocused", "e");
 
-       /* should always be the case. anyway */
-       if (bd == focused)
-         focused = NULL;
+        ev = E_NEW(E_Event_Border_Focus_Out, 1);
+        ev->border = bd_unfocus;
+        e_object_ref(E_OBJECT(bd_unfocus));
 
-       if (set)
-         e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+        ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+                        _e_border_event_border_focus_out_free, NULL);
      }
 
-   if ((unfocus) &&
-       (!e_object_is_del(E_OBJECT(unfocus)) &&
-       (e_object_ref_get(E_OBJECT(unfocus)) > 0)))
+   if (focus_changed)
      {
-       E_Event_Border_Focus_Out *ev;
+        E_Event_Border_Focus_In *ev;
 
-       bd = unfocus;
-       bd->focused = 0;
-       e_focus_event_focus_out(bd);
+        e_focus_event_focus_in(bd);
 
-       if (bd->raise_timer)
-         ecore_timer_del(bd->raise_timer);
-       bd->raise_timer = NULL;
+        if (!focus_track_frozen)
+          e_border_focus_latest_set(bd);
 
-       edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
-       if (bd->icon_object)
-         edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
+        e_hints_active_window_set(bd->zone->container->manager, bd);
 
-       ev = E_NEW(E_Event_Border_Focus_Out, 1);
-       ev->border = bd;
-       e_object_ref(E_OBJECT(bd));
+        edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+        if (bd->icon_object)
+          edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+
+        ev = E_NEW(E_Event_Border_Focus_In, 1);
+        ev->border = bd;
+        e_object_ref(E_OBJECT(bd));
 
-       ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-                       _e_border_event_border_focus_out_free, NULL);
+        ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+                        _e_border_event_border_focus_in_free, NULL);
      }
 }
 
@@ -2109,6 +2199,8 @@ e_border_shade(E_Border   *bd,
                E_Direction dir)
 {
    E_Event_Border_Resize *ev;
+   Eina_List *l;
+   E_Border *tmp;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@@ -2117,6 +2209,9 @@ e_border_shade(E_Border   *bd,
    if ((bd->client.border.name) &&
        (!strcmp("borderless", bd->client.border.name))) return;
 
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     ecore_x_window_hide(tmp->win);
+
    ecore_x_window_shadow_tree_flush();
 
    bd->shade.x = bd->x;
@@ -2198,12 +2293,17 @@ e_border_unshade(E_Border   *bd,
                  E_Direction dir)
 {
    E_Event_Border_Resize *ev;
+   Eina_List *l;
+   E_Border *tmp;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    if ((!bd->shaded) || (bd->shading))
      return;
 
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     ecore_x_window_show(tmp->win);
+
    ecore_x_window_shadow_tree_flush();
 
    bd->shade.dir = dir;
@@ -2301,6 +2401,145 @@ e_border_unshade(E_Border   *bd,
    e_remember_update(bd);
 }
 
+static void
+_e_border_client_inset_calc(E_Border *bd)
+{
+   /* int w, h; */
+   Evas_Coord cx, cy, cw, ch;
+
+   if (bd->bg_object)
+     {
+        evas_object_resize(bd->bg_object, 1000, 1000);
+        edje_object_calc_force(bd->bg_object);
+        edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
+        bd->client_inset.l = cx;
+        bd->client_inset.r = 1000 - (cx + cw);
+        bd->client_inset.t = cy;
+        bd->client_inset.b = 1000 - (cy + ch);
+     }
+   else
+     {
+        bd->client_inset.l = 0;
+        bd->client_inset.r = 0;
+        bd->client_inset.t = 0;
+        bd->client_inset.b = 0;
+     }
+
+   ecore_x_netwm_frame_size_set(bd->client.win,
+                                bd->client_inset.l, bd->client_inset.r,
+                                bd->client_inset.t, bd->client_inset.b);
+   ecore_x_e_frame_size_set(bd->client.win,
+                            bd->client_inset.l, bd->client_inset.r,
+                            bd->client_inset.t, bd->client_inset.b);
+}
+
+static void
+_e_border_maximize(E_Border *bd, E_Maximize max)
+{
+   int x1, y1, x2, y2;
+   int w, h, pw, ph;
+   int zx, zy, zw, zh;
+
+   zx = zy = zw = zh = 0;
+
+   switch (max & E_MAXIMIZE_TYPE)
+     {
+      case E_MAXIMIZE_NONE:
+         /* Ignore */
+         break;
+
+      case E_MAXIMIZE_FULLSCREEN:
+         w = bd->zone->w;
+         h = bd->zone->h;
+
+         if (bd->bg_object)
+           {
+              edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
+              _e_border_client_inset_calc(bd);
+           }
+         e_border_resize_limit(bd, &w, &h);
+         /* center x-direction */
+         x1 = bd->zone->x + (bd->zone->w - w) / 2;
+         /* center y-direction */
+         y1 = bd->zone->y + (bd->zone->h - h) / 2;
+
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, x1, y1, w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, bd->x, y1, bd->w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, x1, bd->y, w, bd->h);
+         break;
+
+      case E_MAXIMIZE_SMART:
+      case E_MAXIMIZE_EXPAND:
+         if (bd->zone)
+           e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
+         if (bd->w < zw)
+           w = bd->w;
+         else
+           w = zw;
+
+         if (bd->h < zh)
+           h = bd->h;
+         else
+           h = zh;
+
+         if (bd->x < zx) // window left not useful coordinates
+           x1 = zx;
+         else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
+           x1 = zx + zw - bd->w;
+         else // window normal position
+           x1 = bd->x;
+
+         if (bd->y < zy) // window top not useful coordinates
+           y1 = zy;
+         else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
+           y1 = zy + zh - bd->h;
+         else // window normal position
+           y1 = bd->y;
+
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, zx, zy, zw, zh);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, x1, zy, w, zh);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, zx, y1, zw, h);
+         edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
+         break;
+
+      case E_MAXIMIZE_FILL:
+         x1 = bd->zone->x;
+         y1 = bd->zone->y;
+         x2 = bd->zone->x + bd->zone->w;
+         y2 = bd->zone->y + bd->zone->h;
+
+         /* walk through all shelves */
+         e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
+
+         /* walk through all windows */
+         e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
+
+         w = x2 - x1;
+         h = y2 - y1;
+         pw = w;
+         ph = h;
+         e_border_resize_limit(bd, &w, &h);
+         /* center x-direction */
+         x1 = x1 + (pw - w) / 2;
+         /* center y-direction */
+         y1 = y1 + (ph - h) / 2;
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, x1, y1, w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, bd->x, y1, bd->w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, x1, bd->y, w, bd->h);
+         break;
+     }
+}
+
 EAPI void
 e_border_maximize(E_Border  *bd,
                   E_Maximize max)
@@ -2325,151 +2564,34 @@ e_border_maximize(E_Border  *bd,
         return;
      }
 
-   {
-      int x1, y1, x2, y2;
-      int w, h, pw, ph;
-      int zx, zy, zw, zh;
-
-      zx = zy = zw = zh = 0;
-
-      bd->pre_res_change.valid = 0;
-      if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
-        {
-           /* Horizontal hasn't been set */
-           bd->saved.x = bd->x - bd->zone->x;
-           bd->saved.w = bd->w;
-        }
-      if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
-        {
-           /* Vertical hasn't been set */
-           bd->saved.y = bd->y - bd->zone->y;
-           bd->saved.h = bd->h;
-        }
-      bd->saved.zone = bd->zone->num;
-      e_hints_window_size_set(bd);
-
-      e_border_raise(bd);
-      switch (max & E_MAXIMIZE_TYPE)
-        {
-         case E_MAXIMIZE_NONE:
-           /* Ignore */
-           max = E_MAXIMIZE_NONE;
-           break;
+   bd->pre_res_change.valid = 0;
+   if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
+     {
+        /* Horizontal hasn't been set */
+        bd->saved.x = bd->x - bd->zone->x;
+        bd->saved.w = bd->w;
+     }
+   if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
+     {
+        /* Vertical hasn't been set */
+        bd->saved.y = bd->y - bd->zone->y;
+        bd->saved.h = bd->h;
+     }
+   bd->saved.zone = bd->zone->num;
+   e_hints_window_size_set(bd);
 
-         case E_MAXIMIZE_FULLSCREEN:
-           w = bd->zone->w;
-           h = bd->zone->h;
+   e_border_raise(bd);
 
-           if (bd->bg_object)
-             {
-                Evas_Coord cx, cy, cw, ch;
-
-                edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-
-                evas_object_resize(bd->bg_object, w, h);
-                edje_object_calc_force(bd->bg_object);
-                edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                bd->client_inset.l = cx;
-                bd->client_inset.r = w - (cx + cw);
-                bd->client_inset.t = cy;
-                bd->client_inset.b = h - (cy + ch);
-                ecore_x_netwm_frame_size_set(bd->client.win,
-                                             bd->client_inset.l, bd->client_inset.r,
-                                             bd->client_inset.t, bd->client_inset.b);
-                ecore_x_e_frame_size_set(bd->client.win,
-                                         bd->client_inset.l, bd->client_inset.r,
-                                         bd->client_inset.t, bd->client_inset.b);
-             }
-           e_border_resize_limit(bd, &w, &h);
-           /* center x-direction */
-           x1 = bd->zone->x + (bd->zone->w - w) / 2;
-           /* center y-direction */
-           y1 = bd->zone->y + (bd->zone->h - h) / 2;
-
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, x1, y1, w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, bd->x, y1, bd->w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, x1, bd->y, w, bd->h);
-           break;
-
-         case E_MAXIMIZE_SMART:
-         case E_MAXIMIZE_EXPAND:
-           if (bd->zone)
-             e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
-
-           if (bd->w < zw)
-             w = bd->w;
-           else
-             w = zw;
+   _e_border_maximize(bd, max);
 
-           if (bd->h < zh)
-             h = bd->h;
-           else
-             h = zh;
-
-           if (bd->x < zx) // window left not useful coordinates
-             x1 = zx;
-           else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
-             x1 = zx + zw - bd->w;
-           else // window normal position
-             x1 = bd->x;
-
-           if (bd->y < zy) // window top not useful coordinates
-             y1 = zy;
-           else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
-             y1 = zy + zh - bd->h;
-           else // window normal position
-             y1 = bd->y;
-
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, zx, zy, zw, zh);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, x1, zy, w, zh);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, zx, y1, zw, h);
-           edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
-           break;
-
-         case E_MAXIMIZE_FILL:
-           x1 = bd->zone->x;
-           y1 = bd->zone->y;
-           x2 = bd->zone->x + bd->zone->w;
-           y2 = bd->zone->y + bd->zone->h;
-
-           /* walk through all shelves */
-           e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
-
-           /* walk through all windows */
-           e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
-
-           w = x2 - x1;
-           h = y2 - y1;
-           pw = w;
-           ph = h;
-           e_border_resize_limit(bd, &w, &h);
-           /* center x-direction */
-           x1 = x1 + (pw - w) / 2;
-           /* center y-direction */
-           y1 = y1 + (ph - h) / 2;
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, x1, y1, w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, bd->x, y1, bd->w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, x1, bd->y, w, bd->h);
-           break;
-        }
 
-      /* Remove previous type */
-      bd->maximized &= ~E_MAXIMIZE_TYPE;
-      /* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
-      bd->maximized |= max;
+   /* Remove previous type */
+   bd->maximized &= ~E_MAXIMIZE_TYPE;
+   /* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
+   bd->maximized |= max;
 
-      e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
-                                   bd->maximized & E_MAXIMIZE_VERTICAL);
-   }
+   e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
+                                bd->maximized & E_MAXIMIZE_VERTICAL);
    e_remember_update(bd);
 }
 
@@ -2500,23 +2622,8 @@ e_border_unmaximize(E_Border  *bd,
           {
              if (bd->bg_object)
                {
-                  Evas_Coord cx, cy, cw, ch;
-
                   edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
-
-                  evas_object_resize(bd->bg_object, 1000, 1000);
-                  edje_object_calc_force(bd->bg_object);
-                  edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                  bd->client_inset.l = cx;
-                  bd->client_inset.r = 1000 - (cx + cw);
-                  bd->client_inset.t = cy;
-                  bd->client_inset.b = 1000 - (cy + ch);
-                  ecore_x_netwm_frame_size_set(bd->client.win,
-                                               bd->client_inset.l, bd->client_inset.r,
-                                               bd->client_inset.t, bd->client_inset.b);
-                  ecore_x_e_frame_size_set(bd->client.win,
-                                           bd->client_inset.l, bd->client_inset.r,
-                                           bd->client_inset.t, bd->client_inset.b);
+                  _e_border_client_inset_calc(bd);
                }
 
              bd->maximized = E_MAXIMIZE_NONE;
@@ -2558,14 +2665,14 @@ e_border_unmaximize(E_Border  *bd,
              if (!(bd->maximized & E_MAXIMIZE_DIRECTION))
                {
                   bd->maximized = E_MAXIMIZE_NONE;
-                   _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
+                  _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
                   e_hints_window_size_unset(bd);
                   edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e");
                }
              else
                {
-                 _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
-                 e_hints_window_size_set(bd);
+                  _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
+                  e_hints_window_size_set(bd);
                }
           }
         e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
@@ -2616,7 +2723,8 @@ e_border_fullscreen(E_Border    *bd,
         if (!e_config->allow_above_fullscreen)
           e_border_layer_set(bd, 200);
 
-        if ((eina_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
+        if ((eina_list_count(bd->zone->container->zones) > 1) ||
+            (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
           {
              e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
           }
@@ -2625,8 +2733,12 @@ e_border_fullscreen(E_Border    *bd,
              Ecore_X_Randr_Screen_Size_MM *sizes;
              int num_sizes, i, best_size_index = 0;
 
-             ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root, &screen_size.width, &screen_size.height, NULL, NULL, NULL);
-             sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root, &num_sizes);
+             ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root,
+                                                                  &screen_size.width,
+                                                                  &screen_size.height,
+                                                                  NULL, NULL, NULL);
+             sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root,
+                                                                   &num_sizes);
              if (sizes)
                {
                   Ecore_X_Randr_Screen_Size best_size = { -1, -1 };
@@ -2677,7 +2789,7 @@ e_border_fullscreen(E_Border    *bd,
    ev = E_NEW(E_Event_Border_Fullscreen, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
+   //   e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
    ecore_event_add(E_EVENT_BORDER_FULLSCREEN, ev, _e_border_event_border_fullscreen_free, NULL);
 
    e_remember_update(bd);
@@ -2701,9 +2813,10 @@ e_border_unfullscreen(E_Border *bd)
 
         if ((screen_size.width != -1) && (screen_size.height != -1))
           {
-             ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root, screen_size_index);
-                                                          screen_size.width = -1;
-                                                          screen_size.height = -1;
+             ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root,
+                                                          screen_size_index);
+             screen_size.width = -1;
+             screen_size.height = -1;
           }
         e_border_move_resize(bd,
                              bd->saved.x + bd->zone->x,
@@ -2724,7 +2837,7 @@ e_border_unfullscreen(E_Border *bd)
    ev = E_NEW(E_Event_Border_Unfullscreen, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
+   //   e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
    ecore_event_add(E_EVENT_BORDER_UNFULLSCREEN, ev, _e_border_event_border_unfullscreen_free, NULL);
 
    e_remember_update(bd);
@@ -3040,7 +3153,7 @@ _e_border_shape_input_rectangle_set(E_Border* bd)
      {
         if (bd->visible) // not shaped input
           {
-             if (!bd->comp_hidden)
+             if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0)))
                 ecore_x_composite_window_events_enable(bd->win);
              else
                 ecore_x_composite_window_events_disable(bd->win);
@@ -3092,10 +3205,10 @@ e_border_idler_before(void)
                   if ((bd->changes.visible) && (bd->visible) &&
                       (!bd->new_client) && (!bd->changes.pos) &&
                       (!bd->changes.size))
-                   {
-                      _e_border_show(bd);
-                      bd->changes.visible = 0;
-                   }
+                    {
+                       _e_border_show(bd);
+                       bd->changes.visible = 0;
+                    }
                }
              e_container_border_list_free(bl);
 
@@ -3105,19 +3218,19 @@ e_border_idler_before(void)
                {
                   if (e_object_is_del(E_OBJECT(bd))) continue;
 
-                 if ((bd->changes.visible) && (!bd->visible))
-                   {
-                      _e_border_hide(bd);
-                      bd->changes.visible = 0;
-                   }
+                  if ((bd->changes.visible) && (!bd->visible))
+                    {
+                       _e_border_hide(bd);
+                       bd->changes.visible = 0;
+                    }
 
                   if (bd->changed) _e_border_eval(bd);
 
                   if ((bd->changes.visible) && (bd->visible))
-                   {
-                      _e_border_show(bd);
-                      bd->changes.visible = 0;
-                   }
+                    {
+                       _e_border_show(bd);
+                       bd->changes.visible = 0;
+                    }
                }
              e_container_border_list_free(bl);
           }
@@ -3125,39 +3238,43 @@ e_border_idler_before(void)
 
    if (focus_next)
      {
-       E_Border *bd = NULL, *bd2;
+        E_Border *bd = NULL, *bd2;
 
-       EINA_LIST_FREE(focus_next, bd2)
-         if ((!bd) && (bd2->visible)) bd = bd2;
+        EINA_LIST_FREE(focus_next, bd2)
+          if ((!bd) && (bd2->visible)) bd = bd2;
 
-       if (!bd)
-         {
-            /* TODO revert focus when lost here ? */
-            return;
-         }
-#ifdef INOUTDEBUG_FOCUS
-       printf("%s idler focus\n", e_border_name_get(bd));
-#endif
-       if (bd == focused)
-         return;
+        if (!bd)
+          {
+             /* TODO revert focus when lost here ? */
+             return;
+          }
+
+        if (bd == focused)
+          {
+             /* already focused. but anyway dont be so strict, this
+                fcks up illume setting focus on internal windows */
+             return;
+          }
 
-       focus_time = ecore_x_current_time_get();
+        focus_time = ecore_x_current_time_get();
 
-       if ((bd->client.icccm.take_focus) &&
-           (bd->client.icccm.accepts_focus))
-         {
-            e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-            /* TODO what if the client doesnt took focus ? */
-         }
-       else if (!bd->client.icccm.accepts_focus)
-         {
-            e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-         }
-       else if (!bd->client.icccm.take_focus)
-         {
-            e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-            /* e_border_focus_set(bd, 1, 0); */
-         }
+        focusing = bd;
+
+        if ((bd->client.icccm.take_focus) &&
+            (bd->client.icccm.accepts_focus))
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+             /* TODO what if the client doesnt took focus ? */
+          }
+        else if (!bd->client.icccm.accepts_focus)
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+          }
+        else if (!bd->client.icccm.take_focus)
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
+             /* e_border_focus_set(bd, 1, 0); */
+          }
      }
 }
 
@@ -3165,7 +3282,7 @@ EAPI Eina_List *
 e_border_client_list()
 {
    /* FIXME: This should be a somewhat ordered list */
-    return borders;
+   return borders;
 }
 
 static Ecore_X_Window action_input_win = 0;
@@ -3178,37 +3295,49 @@ static Ecore_X_Rectangle action_orig;
 static void
 _e_border_show(E_Border *bd)
 {
+   Eina_List *l;
+   E_Border *tmp;
+
    ecore_evas_show(bd->bg_ecore_evas);
 
    if (bd->post_job)
      {
-       bd->post_show = 1;
-       return;
+        bd->post_show = 1;
+        return;
      }
 
-   if (!bd->comp_hidden)
+   if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0)))
      {
         _e_border_shape_input_rectangle_set(bd);
-// not anymore
-//     ecore_x_composite_window_events_enable(bd->win);
-       ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        // not anymore
+        //     ecore_x_composite_window_events_enable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 
    ecore_x_window_show(bd->win);
+
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     ecore_x_window_show(tmp->win);
 }
 
 static void
 _e_border_hide(E_Border *bd)
 {
+   E_Border *tmp;
+   Eina_List *l;
+
    if (!e_manager_comp_evas_get(bd->zone->container->manager))
      {
-       ecore_x_window_hide(bd->win);
-       ecore_evas_hide(bd->bg_ecore_evas);
+        ecore_x_window_hide(bd->win);
+        ecore_evas_hide(bd->bg_ecore_evas);
+
+        EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+          ecore_x_window_hide(tmp->win);
      }
    else
      {
-       ecore_x_composite_window_events_disable(bd->win);
-       ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
 }
 
@@ -3716,9 +3845,11 @@ e_border_icon_add(E_Border *bd,
    o = NULL;
    if (bd->internal)
      {
-        o = edje_object_add(evas);
         if (!bd->internal_icon)
-          e_util_edje_icon_set(o, "enlightenment");
+          {
+             o = e_icon_add(evas);
+             e_util_icon_theme_set(o, "enlightenment");
+          }
         else
           {
              if (!bd->internal_icon_key)
@@ -3728,18 +3859,17 @@ e_border_icon_add(E_Border *bd,
                   ext = strrchr(bd->internal_icon, '.');
                   if ((ext) && ((!strcmp(ext, ".edj"))))
                     {
+                       o = edje_object_add(evas);
                        if (!edje_object_file_set(o, bd->internal_icon, "icon"))
-                         e_util_edje_icon_set(o, "enlightenment");
+                         e_util_icon_theme_set(o, "enlightenment");
                     }
                   else if (ext)
                     {
-                       evas_object_del(o);
                        o = e_icon_add(evas);
                        e_icon_file_set(o, bd->internal_icon);
                     }
                   else
                     {
-                       evas_object_del(o);
                        o = e_icon_add(evas);
                        if (!e_util_icon_theme_set(o, bd->internal_icon))
                          e_util_icon_theme_set(o, "enlightenment");
@@ -3747,6 +3877,7 @@ e_border_icon_add(E_Border *bd,
                }
              else
                {
+                  o = edje_object_add(evas);
                   edje_object_file_set(o, bd->internal_icon,
                                        bd->internal_icon_key);
                }
@@ -3843,51 +3974,51 @@ e_border_lost_windows_get(E_Zone *zone)
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
    EINA_LIST_FOREACH(borders, l, bd)
      {
-        if (bd->zone)
+        if (!bd->zone)
+          continue;
+
+        if ((bd->zone != zone) ||
+            (bd->zone->container != zone->container))
+          continue;
+
+        if (!E_INTERSECTS(bd->zone->x + loss_overlap,
+                          bd->zone->y + loss_overlap,
+                          bd->zone->w - (2 * loss_overlap),
+                          bd->zone->h - (2 * loss_overlap),
+                          bd->x, bd->y, bd->w, bd->h))
+          {
+             list = eina_list_append(list, bd);
+          }
+        else if ((!E_CONTAINS(bd->zone->x, bd->zone->y,
+                              bd->zone->w, bd->zone->h,
+                              bd->x, bd->y, bd->w, bd->h)) &&
+                 (bd->shaped))
           {
-             if ((bd->zone == zone) ||
-                 (bd->zone->container == zone->container))
+             Ecore_X_Rectangle *rect;
+             int i, num;
+
+             rect = ecore_x_window_shape_rectangles_get(bd->win, &num);
+             if (rect)
                {
-                  if (!E_INTERSECTS(bd->zone->x + loss_overlap,
-                                    bd->zone->y + loss_overlap,
-                                    bd->zone->w - (2 * loss_overlap),
-                                    bd->zone->h - (2 * loss_overlap),
-                                    bd->x, bd->y, bd->w, bd->h))
-                    {
-                       list = eina_list_append(list, bd);
-                    }
-                  else if ((!E_CONTAINS(bd->zone->x, bd->zone->y,
-                                        bd->zone->w, bd->zone->h,
-                                        bd->x, bd->y, bd->w, bd->h)) &&
-                           (bd->shaped))
-                    {
-                       Ecore_X_Rectangle *rect;
-                       int i, num;
+                  int ok;
 
-                       rect = ecore_x_window_shape_rectangles_get(bd->win, &num);
-                       if (rect)
+                  ok = 0;
+                  for (i = 0; i < num; i++)
+                    {
+                       if (E_INTERSECTS(bd->zone->x + loss_overlap,
+                                        bd->zone->y + loss_overlap,
+                                        bd->zone->w - (2 * loss_overlap),
+                                        bd->zone->h - (2 * loss_overlap),
+                                        rect[i].x, rect[i].y,
+                                        (int)rect[i].width, (int)rect[i].height))
                          {
-                            int ok;
-
-                            ok = 0;
-                            for (i = 0; i < num; i++)
-                              {
-                                 if (E_INTERSECTS(bd->zone->x + loss_overlap,
-                                                  bd->zone->y + loss_overlap,
-                                                  bd->zone->w - (2 * loss_overlap),
-                                                  bd->zone->h - (2 * loss_overlap),
-                                                  rect[i].x, rect[i].y,
-                                                  (int)rect[i].width, (int)rect[i].height))
-                                   {
-                                      ok = 1;
-                                      break;
-                                   }
-                              }
-                            free(rect);
-                            if (!ok)
-                              list = eina_list_append(list, bd);
+                            ok = 1;
+                            break;
                          }
                     }
+                  free(rect);
+                  if (!ok)
+                    list = eina_list_append(list, bd);
                }
           }
      }
@@ -3912,13 +4043,13 @@ e_border_ping(E_Border *bd)
 EAPI void
 e_border_move_cancel(void)
 {
-   if (move)
+   if (bdmove)
      {
-        if (move->cur_mouse_action)
+        if (bdmove->cur_mouse_action)
           {
              E_Border *bd;
 
-             bd = move;
+             bd = bdmove;
              e_object_ref(E_OBJECT(bd));
              if (bd->cur_mouse_action->func.end_mouse)
                bd->cur_mouse_action->func.end_mouse(E_OBJECT(bd), "", NULL);
@@ -3929,20 +4060,20 @@ e_border_move_cancel(void)
              e_object_unref(E_OBJECT(bd));
           }
         else
-          _e_border_move_end(move);
+          _e_border_move_end(bdmove);
      }
 }
 
 EAPI void
 e_border_resize_cancel(void)
 {
-   if (resize)
+   if (bdresize)
      {
-        if (resize->cur_mouse_action)
+        if (bdresize->cur_mouse_action)
           {
              E_Border *bd;
 
-             bd = resize;
+             bd = bdresize;
              e_object_ref(E_OBJECT(bd));
              if (bd->cur_mouse_action->func.end_mouse)
                bd->cur_mouse_action->func.end_mouse(E_OBJECT(bd), "", NULL);
@@ -3954,8 +4085,8 @@ e_border_resize_cancel(void)
           }
         else
           {
-             resize->resize_mode = RESIZE_NONE;
-             _e_border_resize_end(resize);
+             bdresize->resize_mode = RESIZE_NONE;
+             _e_border_resize_end(bdresize);
           }
      }
 }
@@ -3963,26 +4094,12 @@ e_border_resize_cancel(void)
 EAPI void
 e_border_frame_recalc(E_Border *bd)
 {
-   Evas_Coord cx, cy, cw, ch;
-
    if (!bd->bg_object) return;
 
    bd->w -= (bd->client_inset.l + bd->client_inset.r);
    bd->h -= (bd->client_inset.t + bd->client_inset.b);
 
-   evas_object_resize(bd->bg_object, 1000, 1000);
-   edje_object_calc_force(bd->bg_object);
-   edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-   bd->client_inset.l = cx;
-   bd->client_inset.r = 1000 - (cx + cw);
-   bd->client_inset.t = cy;
-   bd->client_inset.b = 1000 - (cy + ch);
-   ecore_x_netwm_frame_size_set(bd->client.win,
-                                bd->client_inset.l, bd->client_inset.r,
-                                bd->client_inset.t, bd->client_inset.b);
-   ecore_x_e_frame_size_set(bd->client.win,
-                            bd->client_inset.l, bd->client_inset.r,
-                            bd->client_inset.t, bd->client_inset.b);
+   _e_border_client_inset_calc(bd);
 
    bd->w += (bd->client_inset.l + bd->client_inset.r);
    bd->h += (bd->client_inset.t + bd->client_inset.b);
@@ -4231,6 +4348,20 @@ e_border_resize_limit(E_Border *bd,
 static void
 _e_border_free(E_Border *bd)
 {
+   if (bd->client.e.state.video_parent)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+          {
+             /* FIXME: cleanup memory */
+          }
+     }
+   if (bd->client.e.state.video_child)
+     {
+        /* FIXME: cleanup also */
+     }
    if (bd->desktop)
      {
         efreet_desktop_free(bd->desktop);
@@ -4246,9 +4377,9 @@ _e_border_free(E_Border *bd)
         e_object_del(E_OBJECT(bd->pointer));
         bd->pointer = NULL;
      }
-   if (resize == bd)
+   if (bdresize == bd)
      _e_border_resize_end(bd);
-   if (move == bd)
+   if (bdmove == bd)
      _e_border_move_end(bd);
    /* TODO: Other states to end before dying? */
 
@@ -4305,12 +4436,18 @@ _e_border_free(E_Border *bd)
 
    e_int_border_menu_del(bd);
 
+   if (focusing == bd)
+     focusing = NULL;
+
    if (focused == bd)
      {
-//     ecore_x_window_focus(bd->zone->container->manager->root);
-          e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
-          e_hints_active_window_set(bd->zone->container->manager, NULL);
-          focused = NULL;
+        if ((!focus_next) && (!focusing))
+          {
+             e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+             e_hints_active_window_set(bd->zone->container->manager, NULL);
+          }
+
+        focused = NULL;
      }
    E_FREE_LIST(bd->handlers, ecore_event_handler_del);
    if (bd->remember)
@@ -4340,14 +4477,23 @@ _e_border_free(E_Border *bd)
      }
    if (bd->client.netwm.extra_types)
      free(bd->client.netwm.extra_types);
-   if (bd->client.border.name) eina_stringshare_del(bd->client.border.name);
-   if (bd->bordername) eina_stringshare_del(bd->bordername);
-   if (bd->client.icccm.title) free(bd->client.icccm.title);
-   if (bd->client.icccm.name) free(bd->client.icccm.name);
-   if (bd->client.icccm.class) free(bd->client.icccm.class);
-   if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
-   if (bd->client.icccm.machine) free(bd->client.icccm.machine);
-   if (bd->client.icccm.window_role) free(bd->client.icccm.window_role);
+   if (bd->client.border.name)
+     eina_stringshare_del(bd->client.border.name);
+   if (bd->bordername)
+     eina_stringshare_del(bd->bordername);
+   if (bd->client.icccm.name)
+     eina_stringshare_del(bd->client.icccm.name);
+   if (bd->client.icccm.class)
+     eina_stringshare_del(bd->client.icccm.class);
+   if (bd->client.icccm.title)
+     eina_stringshare_del(bd->client.icccm.title);
+   if (bd->client.icccm.icon_name)
+     eina_stringshare_del(bd->client.icccm.icon_name);
+   if (bd->client.icccm.machine)
+     eina_stringshare_del(bd->client.icccm.machine);
+   if (bd->client.icccm.window_role)
+     eina_stringshare_del(bd->client.icccm.window_role);
+
    if ((bd->client.icccm.command.argc > 0) && (bd->client.icccm.command.argv))
      {
         int i;
@@ -4356,8 +4502,10 @@ _e_border_free(E_Border *bd)
           free(bd->client.icccm.command.argv[i]);
         free(bd->client.icccm.command.argv);
      }
-   if (bd->client.netwm.name) free(bd->client.netwm.name);
-   if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
+   if (bd->client.netwm.name)
+     eina_stringshare_del(bd->client.netwm.name);
+   if (bd->client.netwm.icon_name)
+     eina_stringshare_del(bd->client.netwm.icon_name);
    e_object_del(E_OBJECT(bd->shape));
    if (bd->internal_icon) eina_stringshare_del(bd->internal_icon);
    if (bd->internal_icon_key) eina_stringshare_del(bd->internal_icon_key);
@@ -4409,6 +4557,9 @@ _e_border_del(E_Border *bd)
    if (bd == focused)
      focused = NULL;
 
+   if (bd == focusing)
+     focusing = NULL;
+
    focus_next = eina_list_remove(focus_next, bd);
 
    if (bd->fullscreen) bd->desk->fullscreen_borders--;
@@ -4773,6 +4924,7 @@ _e_border_cb_window_configure_request(void *data  __UNUSED__,
                        int zx, zy, zw, zh;
                        int rx = bd->x;
                        int ry = bd->y;
+                       zx = zy = zw = zh = 0;
 
      /*
       * This code does resize and move a window on a
@@ -4829,13 +4981,35 @@ _e_border_cb_window_configure_request(void *data  __UNUSED__,
                {
                   obd = e_border_find_by_client_window(e->abovewin);
                   if (obd)
-                    e_border_stack_above(bd, obd);
+                    {
+                       e_border_stack_above(bd, obd);
+                    }
+                  else
+                    {
+                       ecore_x_window_configure(bd->win,
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+                                                0, 0, 0, 0, 0,
+                                                e->abovewin, ECORE_X_WINDOW_STACK_ABOVE);
+                       /* FIXME: need to rebuiuld border list from current stacking */
+                    }
                }
              else if (e->detail == ECORE_X_WINDOW_STACK_BELOW)
                {
                   obd = e_border_find_by_client_window(e->abovewin);
                   if (obd)
-                    e_border_stack_below(bd, obd);
+                    {
+                       e_border_stack_below(bd, obd);
+                    }
+                  else
+                    {
+                       ecore_x_window_configure(bd->win,
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+                                                0, 0, 0, 0, 0,
+                                                e->abovewin, ECORE_X_WINDOW_STACK_BELOW);
+                       /* FIXME: need to rebuiuld border list from current stacking */
+                    }
                }
              else if (e->detail == ECORE_X_WINDOW_STACK_TOP_IF)
                {
@@ -4875,6 +5049,7 @@ _e_border_cb_window_configure_request(void *data  __UNUSED__,
           }
      }
 
+   /* FIXME: need to send synthetic stacking event too as well as move/resize */
    _e_border_client_move_resize_send(bd);
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -4955,10 +5130,21 @@ _e_border_cb_window_stack_request(void *data  __UNUSED__,
         if (e_stolen_win_get(e->win)) return ECORE_CALLBACK_PASS_ON;
         if (!e_util_container_window_find(e->win))
           {
+             Eina_List *l;
+             E_Border *tmp;
+
              if (e->detail == ECORE_X_WINDOW_STACK_ABOVE)
-               ecore_x_window_raise(e->win);
+               {
+                  EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+                    if (tmp) ecore_x_window_raise(tmp->win);
+                  ecore_x_window_raise(e->win);
+               }
              else if (e->detail == ECORE_X_WINDOW_STACK_BELOW)
-               ecore_x_window_lower(e->win);
+               {
+                  EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+                    if (tmp) ecore_x_window_lower(tmp->win);
+                  ecore_x_window_lower(e->win);
+               }
           }
         return ECORE_CALLBACK_PASS_ON;
      }
@@ -5145,7 +5331,17 @@ _e_border_cb_window_property(void *data  __UNUSED__,
     */
    else if (e->atom == ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER)
      {
-        printf("ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER\n");
+        //printf("ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER\n");
+     }
+   else if (e->atom == ECORE_X_ATOM_E_VIDEO_POSITION)
+     {
+        bd->client.e.fetch.video_position = 1;
+        bd->changed = 1;
+     }
+   else if (e->atom == ECORE_X_ATOM_E_VIDEO_PARENT)
+     {
+        bd->client.e.fetch.video_parent = 1;
+        bd->changed = 1;
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -5229,20 +5425,20 @@ _e_border_cb_window_focus_in(void *data  __UNUSED__,
       char *ct;
 
       const char *modes[] = {
-         "MODE_NORMAL",
-         "MODE_WHILE_GRABBED",
-         "MODE_GRAB",
-         "MODE_UNGRAB"
+        "MODE_NORMAL",
+        "MODE_WHILE_GRABBED",
+        "MODE_GRAB",
+        "MODE_UNGRAB"
       };
       const char *details[] = {
-         "DETAIL_ANCESTOR",
-         "DETAIL_VIRTUAL",
-         "DETAIL_INFERIOR",
-         "DETAIL_NON_LINEAR",
-         "DETAIL_NON_LINEAR_VIRTUAL",
-         "DETAIL_POINTER",
-         "DETAIL_POINTER_ROOT",
-         "DETAIL_DETAIL_NONE"
+        "DETAIL_ANCESTOR",
+        "DETAIL_VIRTUAL",
+        "DETAIL_INFERIOR",
+        "DETAIL_NON_LINEAR",
+        "DETAIL_NON_LINEAR_VIRTUAL",
+        "DETAIL_POINTER",
+        "DETAIL_POINTER_ROOT",
+        "DETAIL_DETAIL_NONE"
       };
       t = time(NULL);
       ct = ctime(&t);
@@ -5255,11 +5451,12 @@ _e_border_cb_window_focus_in(void *data  __UNUSED__,
              details[e->detail]);
 
       printf("%s cb focus in %d %d\n",
-            e_border_name_get(bd),
-            bd->client.icccm.accepts_focus,
-            bd->client.icccm.take_focus);
+             e_border_name_get(bd),
+             bd->client.icccm.accepts_focus,
+             bd->client.icccm.take_focus);
    }
 #endif
+   _e_border_pri_raise(bd);
    if (e->mode == ECORE_X_EVENT_MODE_GRAB)
      {
         if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
@@ -5296,20 +5493,20 @@ _e_border_cb_window_focus_out(void *data  __UNUSED__,
       char *ct;
 
       const char *modes[] = {
-         "MODE_NORMAL",
-         "MODE_WHILE_GRABBED",
-         "MODE_GRAB",
-         "MODE_UNGRAB"
+        "MODE_NORMAL",
+        "MODE_WHILE_GRABBED",
+        "MODE_GRAB",
+        "MODE_UNGRAB"
       };
       const char *details[] = {
-         "DETAIL_ANCESTOR",
-         "DETAIL_VIRTUAL",
-         "DETAIL_INFERIOR",
-         "DETAIL_NON_LINEAR",
-         "DETAIL_NON_LINEAR_VIRTUAL",
-         "DETAIL_POINTER",
-         "DETAIL_POINTER_ROOT",
-         "DETAIL_DETAIL_NONE"
+        "DETAIL_ANCESTOR",
+        "DETAIL_VIRTUAL",
+        "DETAIL_INFERIOR",
+        "DETAIL_NON_LINEAR",
+        "DETAIL_NON_LINEAR_VIRTUAL",
+        "DETAIL_POINTER",
+        "DETAIL_POINTER_ROOT",
+        "DETAIL_DETAIL_NONE"
       };
       t = time(NULL);
       ct = ctime(&t);
@@ -5322,11 +5519,12 @@ _e_border_cb_window_focus_out(void *data  __UNUSED__,
              details[e->detail]);
 
       printf("%s cb focus out %d %d\n",
-            e_border_name_get(bd),
-            bd->client.icccm.accepts_focus,
-            bd->client.icccm.take_focus);
+             e_border_name_get(bd),
+             bd->client.icccm.accepts_focus,
+             bd->client.icccm.take_focus);
    }
 #endif
+   _e_border_pri_norm(bd);
    if (e->mode == ECORE_X_EVENT_MODE_NORMAL)
      {
         if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
@@ -5351,9 +5549,9 @@ _e_border_cb_window_focus_out(void *data  __UNUSED__,
      {
         /* for firefox/thunderbird (xul) menu walking */
         /* NB: why did i disable this before? */
-          if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
-          else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER)
-            return ECORE_CALLBACK_PASS_ON;
+        if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
+        else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER)
+          return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED)
      {
@@ -5655,10 +5853,6 @@ _e_border_cb_config_icon_theme(void *data  __UNUSED__,
    return ECORE_CALLBACK_PASS_ON;
 }
 
-/* FIXME:
- * Using '2' is bad, may change in zone flip code.
- * Calculate pos from e->x and e->y
- */
 static Eina_Bool
 _e_border_cb_pointer_warp(void *data  __UNUSED__,
                           int ev_type __UNUSED__,
@@ -5667,8 +5861,8 @@ _e_border_cb_pointer_warp(void *data  __UNUSED__,
    E_Event_Pointer_Warp *e;
 
    e = ev;
-   if (!move) return ECORE_CALLBACK_PASS_ON;
-   e_border_move(move, move->x + (e->curr.x - e->prev.x), move->y + (e->curr.y - e->prev.y));
+   if (!bdmove) return ECORE_CALLBACK_PASS_ON;
+   e_border_move(bdmove, bdmove->x + (e->curr.x - e->prev.x), bdmove->y + (e->curr.y - e->prev.y));
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -6179,7 +6373,38 @@ _e_border_post_move_resize_job(void *data)
    E_Border *bd;
 
    bd = (E_Border *)data;
-   if ((bd->post_move) && (bd->post_resize))
+   if (bd->post_move)
+     {
+        E_Border *tmp;
+        Eina_List *l;
+
+        EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+          ecore_x_window_move(tmp->win,
+                              bd->x +
+                              bd->client_inset.l +
+                              bd->fx.x +
+                              tmp->client.e.state.video_position.x,
+                              bd->y +
+                              bd->client_inset.t +
+                              bd->fx.y +
+                              tmp->client.e.state.video_position.y);
+     }
+   if (bd->client.e.state.video)
+     {
+        E_Border *parent;
+
+        parent = bd->client.e.state.video_parent_border;
+        ecore_x_window_move(bd->win,
+                            parent->x +
+                            parent->client_inset.l +
+                            parent->fx.x +
+                            bd->client.e.state.video_position.x,
+                            parent->y +
+                            parent->client_inset.t +
+                            parent->fx.y +
+                            bd->client.e.state.video_position.y);
+     }
+   else if ((bd->post_move) && (bd->post_resize))
      {
         ecore_x_window_move_resize(bd->win,
                                    bd->x + bd->fx.x,
@@ -6195,12 +6420,27 @@ _e_border_post_move_resize_job(void *data)
         ecore_x_window_resize(bd->win, bd->w, bd->h);
      }
 
+   if (bd->client.e.state.video)
+     {
+        fprintf(stderr, "%x: [%i, %i] [%i, %i]\n",
+                bd->win,
+                bd->client.e.state.video_parent_border->x +
+                bd->client.e.state.video_parent_border->client_inset.l +
+                bd->client.e.state.video_parent_border->fx.x +
+                bd->client.e.state.video_position.x,
+                bd->client.e.state.video_parent_border->y +
+                bd->client.e.state.video_parent_border->client_inset.t +
+                bd->client.e.state.video_parent_border->fx.y +
+                bd->client.e.state.video_position.y,
+                bd->w, bd->h);
+     }
+
    if (bd->post_show)
      {
         if (bd->visible)
           {
-            bd->post_job = NULL;
-            _e_border_show(bd);
+             bd->post_job = NULL;
+             _e_border_show(bd);
           }
      }
    bd->post_show = 0;
@@ -6225,6 +6465,7 @@ _e_border_eval0(E_Border *bd)
    if (e_object_is_del(E_OBJECT(bd)))
      {
         fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
+       bd->changed = 0;
         return;
      }
 
@@ -6242,98 +6483,96 @@ _e_border_eval0(E_Border *bd)
    if (bd->client.icccm.fetch.client_leader)
      {
         /* TODO: What do to if the client leader isn't mapped yet? */
-         E_Border *bd_leader = NULL;
+        E_Border *bd_leader = NULL;
 
-         bd->client.icccm.client_leader = ecore_x_icccm_client_leader_get(bd->client.win);
-         if (bd->client.icccm.client_leader)
-           bd_leader = e_border_find_by_client_window(bd->client.icccm.client_leader);
-         if (bd->leader)
-           {
-              if (bd->leader != bd_leader)
-                {
-                   bd->leader->group = eina_list_remove(bd->leader->group, bd);
-                   if (bd->leader->modal == bd) bd->leader->modal = NULL;
-                   bd->leader = NULL;
-                }
-              else
-                bd_leader = NULL;
-           }
-         /* If this border is the leader of the group, don't register itself */
-         if ((bd_leader) && (bd_leader != bd))
-           {
-              bd_leader->group = eina_list_append(bd_leader->group, bd);
-              bd->leader = bd_leader;
-             /* Only set the window modal to the leader it there is no parent */
-              if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
-                  ((!bd->parent) || (bd->parent->modal != bd)))
-                {
-                   bd->leader->modal = bd;
-                   if (bd->leader->focused)
-                     e_border_focus_set(bd, 1, 1);
-                   else
-                     {
-                        Eina_List *l;
-                        E_Border *child;
+        bd->client.icccm.client_leader = ecore_x_icccm_client_leader_get(bd->client.win);
+        if (bd->client.icccm.client_leader)
+          bd_leader = e_border_find_by_client_window(bd->client.icccm.client_leader);
+        if (bd->leader)
+          {
+             if (bd->leader != bd_leader)
+               {
+                  bd->leader->group = eina_list_remove(bd->leader->group, bd);
+                  if (bd->leader->modal == bd) bd->leader->modal = NULL;
+                  bd->leader = NULL;
+               }
+             else
+               bd_leader = NULL;
+          }
+        /* If this border is the leader of the group, don't register itself */
+        if ((bd_leader) && (bd_leader != bd))
+          {
+             bd_leader->group = eina_list_append(bd_leader->group, bd);
+             bd->leader = bd_leader;
+             /* Only set the window modal to the leader it there is no parent */
+             if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
+                 ((!bd->parent) || (bd->parent->modal != bd)))
+               {
+                  bd->leader->modal = bd;
+                  if (bd->leader->focused)
+                    e_border_focus_set(bd, 1, 1);
+                  else
+                    {
+                       Eina_List *l;
+                       E_Border *child;
 
-                        EINA_LIST_FOREACH(bd->leader->group, l, child)
-                          {
-                             if ((child != bd) && (child->focused))
-                               e_border_focus_set(bd, 1, 1);
-                          }
-                     }
-                }
-           }
-         bd->client.icccm.fetch.client_leader = 0;
-         rem_change = 1;
+                       EINA_LIST_FOREACH(bd->leader->group, l, child)
+                         {
+                            if ((child != bd) && (child->focused))
+                              e_border_focus_set(bd, 1, 1);
+                         }
+                    }
+               }
+          }
+        bd->client.icccm.fetch.client_leader = 0;
+        rem_change = 1;
      }
    if (bd->client.icccm.fetch.title)
      {
-        if (bd->client.icccm.title) free(bd->client.icccm.title);
-        bd->client.icccm.title = ecore_x_icccm_title_get(bd->client.win);
-
-        bd->client.icccm.fetch.title = 0;
+        char *title = ecore_x_icccm_title_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.title, title);
+        if (title) free(title);
+                                 
         if (bd->bg_object)
           edje_object_part_text_set(bd->bg_object, "e.text.title",
                                     bd->client.icccm.title);
+        bd->client.icccm.fetch.title = 0;
         rem_change = 1;
      }
    if (bd->client.netwm.fetch.name)
      {
-        if (bd->client.netwm.name) free(bd->client.netwm.name);
-        ecore_x_netwm_name_get(bd->client.win, &bd->client.netwm.name);
+        char *name;
+        ecore_x_netwm_name_get(bd->client.win, &name);
+        eina_stringshare_replace(&bd->client.netwm.name, name);
+        if (name) free(name);
 
-        bd->client.netwm.fetch.name = 0;
         if (bd->bg_object)
           edje_object_part_text_set(bd->bg_object, "e.text.title",
                                     bd->client.netwm.name);
+        bd->client.netwm.fetch.name = 0;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.name_class)
      {
-        int nc_change = 0;
-        char *pname, *pclass;
+        const char *pname, *pclass;
+        char *nname, *nclass;
 
+       ecore_x_icccm_name_class_get(bd->client.win, &nname, &nclass);
         pname = bd->client.icccm.name;
         pclass = bd->client.icccm.class;
-        ecore_x_icccm_name_class_get(bd->client.win, &bd->client.icccm.name, &bd->client.icccm.class);
-        if ((pname) && (bd->client.icccm.name) &&
-            (pclass) && (bd->client.icccm.class))
-          {
-             if (!((!strcmp(bd->client.icccm.name, pname)) &&
-                   (!strcmp(bd->client.icccm.class, pclass))))
-               nc_change = 1;
-          }
-        else if (((!pname) || (!pclass)) &&
-                 ((bd->client.icccm.name) || (bd->client.icccm.class)))
-          nc_change = 1;
-        else if (((bd->client.icccm.name) || (bd->client.icccm.class)) &&
-                 ((!pname) || (!pclass)))
-          nc_change = 1;
-        if (pname) free(pname);
-        if (pclass) free(pclass);
-        if (nc_change)
+        bd->client.icccm.name = eina_stringshare_add(nname);
+        bd->client.icccm.class = eina_stringshare_add(nclass);
+        if (nname) free(nname);
+        if (nclass) free(nclass);
+
+        if (!((bd->client.icccm.name == pname) &&
+              (bd->client.icccm.class == pclass)))
           bd->changes.icon = 1;
+        
+        if (pname) eina_stringshare_del(pname);
+        if (pclass) eina_stringshare_del(pclass);
         bd->client.icccm.fetch.name_class = 0;
+        bd->changes.icon = 1;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.state)
@@ -6371,11 +6610,14 @@ _e_border_eval0(E_Border *bd)
      }
    if (bd->client.icccm.fetch.machine)
      {
-        if (bd->client.icccm.machine) free(bd->client.icccm.machine);
-        bd->client.icccm.machine = ecore_x_icccm_client_machine_get(bd->client.win);
-        if ((bd->client.icccm.client_leader) &&
-            (!bd->client.icccm.machine))
-          ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
+        char *machine = ecore_x_icccm_client_machine_get(bd->client.win);
+
+        if ((!machine) && (bd->client.icccm.client_leader))
+          machine = ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
+        
+        eina_stringshare_replace(&bd->client.icccm.machine, machine);
+        if (machine) free(machine);
+        
         bd->client.icccm.fetch.machine = 0;
         rem_change = 1;
      }
@@ -6464,9 +6706,30 @@ _e_border_eval0(E_Border *bd)
         if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767;
         if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767;
         if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767;
-//     if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1;
-//     if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1;
+        //     if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1;
+        //     if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1;
+        // if doing a resize, fix it up
+        if (bd->resize_mode != RESIZE_NONE)
+          {
+             int x, y, w, h, new_w, new_h;
 
+             x = bd->x;
+             y = bd->y;
+             w = bd->w;
+             h = bd->h;
+             new_w = w;
+             new_h = h;
+             e_border_resize_limit(bd, &new_w, &new_h);
+             if ((bd->resize_mode == RESIZE_TL) ||
+                 (bd->resize_mode == RESIZE_L) ||
+                 (bd->resize_mode == RESIZE_BL))
+               x += (w - new_w);
+             if ((bd->resize_mode == RESIZE_TL) ||
+                 (bd->resize_mode == RESIZE_T) ||
+                 (bd->resize_mode == RESIZE_TR))
+               y += (h - new_h);
+             e_border_move_resize(bd, x, y, new_w, new_h);
+          }
         bd->client.icccm.fetch.size_pos_hints = 0;
         rem_change = 1;
      }
@@ -6508,56 +6771,64 @@ _e_border_eval0(E_Border *bd)
    if (bd->client.icccm.fetch.transient_for)
      {
         /* TODO: What do to if the transient for isn't mapped yet? */
-         E_Border *bd_parent = NULL;
+        E_Border *bd_parent = NULL;
 
-         bd->client.icccm.transient_for = ecore_x_icccm_transient_for_get(bd->client.win);
-         if (bd->client.icccm.transient_for)
-           bd_parent = e_border_find_by_client_window(bd->client.icccm.transient_for);
-         /* If we already have a parent, remove it */
-         if (bd->parent)
-           {
-              if (bd_parent != bd->parent)
-                {
-                   bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
-                   if (bd->parent->modal == bd) bd->parent->modal = NULL;
-                   bd->parent = NULL;
-                }
-              else
-                bd_parent = NULL;
-           }
-         if ((bd_parent) && (bd_parent != bd))
-           {
-              bd_parent->transients = eina_list_append(bd_parent->transients, bd);
-              bd->parent = bd_parent;
-              e_border_layer_set(bd, bd->parent->layer);
-              if ((e_config->modal_windows) && (bd->client.netwm.state.modal))
-                bd->parent->modal = bd;
-
-              if (e_config->focus_setting == E_FOCUS_NEW_DIALOG ||
-                  (bd->parent->focused && (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
-                bd->take_focus = 1;
-           }
-         bd->client.icccm.fetch.transient_for = 0;
-         rem_change = 1;
+        bd->client.icccm.transient_for = ecore_x_icccm_transient_for_get(bd->client.win);
+        if (bd->client.icccm.transient_for)
+          bd_parent = e_border_find_by_client_window(bd->client.icccm.transient_for);
+        /* If we already have a parent, remove it */
+        if (bd->parent)
+          {
+             if (bd_parent != bd->parent)
+               {
+                  bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
+                  if (bd->parent->modal == bd) bd->parent->modal = NULL;
+                  bd->parent = NULL;
+               }
+             else
+               bd_parent = NULL;
+          }
+        if ((bd_parent) && (bd_parent != bd) &&
+            (eina_list_data_find(bd->transients, bd_parent) != bd_parent))
+          {
+             bd_parent->transients = eina_list_append(bd_parent->transients, bd);
+             bd->parent = bd_parent;
+             e_border_layer_set(bd, bd->parent->layer);
+             if ((e_config->modal_windows) && (bd->client.netwm.state.modal))
+               bd->parent->modal = bd;
+
+             if (e_config->focus_setting == E_FOCUS_NEW_DIALOG ||
+                 (bd->parent->focused && (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
+               bd->take_focus = 1;
+          }
+        bd->client.icccm.fetch.transient_for = 0;
+        rem_change = 1;
      }
    if (bd->client.icccm.fetch.window_role)
      {
-        if (bd->client.icccm.window_role) free(bd->client.icccm.window_role);
-        bd->client.icccm.window_role = ecore_x_icccm_window_role_get(bd->client.win);
+        char *role = ecore_x_icccm_window_role_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.window_role, role);
+        if (role) free(role);
+
         bd->client.icccm.fetch.window_role = 0;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.icon_name)
      {
-        if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
-        bd->client.icccm.icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
+        char *icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name); 
+        if (icon_name) free(icon_name);
+        
         bd->client.icccm.fetch.icon_name = 0;
         rem_change = 1;
      }
    if (bd->client.netwm.fetch.icon_name)
      {
-        if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
-        ecore_x_netwm_icon_name_get(bd->client.win, &bd->client.netwm.icon_name);
+        char *icon_name;
+        ecore_x_netwm_icon_name_get(bd->client.win, &icon_name);
+        eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name); 
+        if (icon_name) free(icon_name);
+        
         bd->client.netwm.fetch.icon_name = 0;
         rem_change = 1;
      }
@@ -6757,7 +7028,7 @@ _e_border_eval0(E_Border *bd)
               */
              ecore_x_window_size_get(bd->client.win, &cw, &ch);
              if ((cw != bd->client.w) || (ch != bd->client.h))
-                bd->changes.shape_input = 1;
+               bd->changes.shape_input = 1;
              if ((num == 1) &&
                  (rects[0].x == 0) &&
                  (rects[0].y == 0) &&
@@ -6768,7 +7039,7 @@ _e_border_eval0(E_Border *bd)
                     {
                        bd->shaped_input = 0;
                        if (!bd->bordername)
-                          bd->client.border.changed = 1;
+                         bd->client.border.changed = 1;
                     }
                }
              else
@@ -6777,7 +7048,7 @@ _e_border_eval0(E_Border *bd)
                     {
                        bd->shaped_input = 1;
                        if (!bd->bordername)
-                          bd->client.border.changed = 1;
+                         bd->client.border.changed = 1;
                     }
                }
              free(rects);
@@ -6786,7 +7057,7 @@ _e_border_eval0(E_Border *bd)
           {
              bd->shaped_input = 1;
              if (!bd->bordername)
-                bd->client.border.changed = 1;
+               bd->client.border.changed = 1;
           }
         bd->need_shape_merge = 1;
      }
@@ -6816,6 +7087,61 @@ _e_border_eval0(E_Border *bd)
         bd->client.mwm.fetch.hints = 0;
         rem_change = 1;
      }
+   if (bd->client.e.fetch.video_parent)
+     {
+        /* unlinking child/parent */
+        if (bd->client.e.state.video_parent_border != NULL)
+          {
+             bd->client.e.state.video_parent_border->client.e.state.video_child = eina_list_remove(bd->client.e.state.video_parent_border->client.e.state.video_child,
+                                                                                                   bd);
+          }
+
+        ecore_x_window_prop_card32_get(bd->client.win,
+                                       ECORE_X_ATOM_E_VIDEO_PARENT,
+                                       &bd->client.e.state.video_parent,
+                                       1);
+
+        /* linking child/parent */
+        if (bd->client.e.state.video_parent != 0)
+          {
+             E_Border *tmp;
+             Eina_List *l;
+
+             EINA_LIST_FOREACH(borders, l, tmp)
+               if (tmp->client.win == bd->client.e.state.video_parent)
+                 {
+                    fprintf(stderr, "child added to parent \\o/\n");
+                    bd->client.e.state.video_parent_border = tmp;
+                    tmp->client.e.state.video_child = eina_list_append(tmp->client.e.state.video_child,
+                                                                       bd);
+                   if (bd->desk != tmp->desk)
+                     e_border_desk_set(bd, tmp->desk);
+                    break;
+                 }
+          }
+
+        fprintf(stderr, "new parent %x => %p\n", bd->client.e.state.video_parent, bd->client.e.state.video_parent_border);
+
+        if (bd->client.e.state.video_parent_border) bd->client.e.fetch.video_parent = 0;
+       rem_change = 1;
+     }
+   if (bd->client.e.fetch.video_position && bd->client.e.fetch.video_parent == 0)
+     {
+        unsigned int xy[2];
+
+        ecore_x_window_prop_card32_get(bd->client.win,
+                                       ECORE_X_ATOM_E_VIDEO_POSITION,
+                                       xy,
+                                       2);
+        bd->client.e.state.video_position.x = xy[0];
+        bd->client.e.state.video_position.y = xy[1];
+        bd->client.e.state.video_position.updated = 1;
+        bd->client.e.fetch.video_position = 0;
+        bd->x = bd->client.e.state.video_position.x;
+        bd->y = bd->client.e.state.video_position.y;
+
+        fprintf(stderr, "internal position has been updated [%i, %i]\n", bd->client.e.state.video_position.x, bd->client.e.state.video_position.y);
+     }
    if (bd->client.netwm.update.state)
      {
         e_hints_window_state_set(bd);
@@ -6864,7 +7190,7 @@ _e_border_eval0(E_Border *bd)
         ev = E_NEW(E_Event_Border_Add, 1);
         ev->border = bd;
         e_object_ref(E_OBJECT(bd));
-//     e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
+        //     e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
         ecore_event_add(E_EVENT_BORDER_ADD, ev, _e_border_event_border_add_free, NULL);
 
         if ((!bd->lock_border) || (!bd->client.border.name))
@@ -6925,6 +7251,9 @@ _e_border_eval0(E_Border *bd)
         else if ((bd->client.netwm.state.skip_taskbar) ||
                  (bd->client.netwm.state.skip_pager))
           bordername = "skipped";
+        else if ((bd->internal) && (bd->client.icccm.class) &&
+                 (!strncmp(bd->client.icccm.class, "e_fwin", 6)))
+          bordername = "internal_fileman";
         else
           bordername = e_config->theme_default_border_style;
         if (!bordername) bordername = "default";
@@ -6933,28 +7262,20 @@ _e_border_eval0(E_Border *bd)
           {
              Evas_Object *o;
              char buf[PATH_MAX];
-             Evas_Coord cx, cy, cw, ch;
-             int l, r, t, b, ok;
+             int ok;
 
              bd->changes.border = 1;
-             if (bd->client.border.name)
-               eina_stringshare_del(bd->client.border.name);
-             bd->client.border.name = eina_stringshare_add(bordername);
+             eina_stringshare_replace(&bd->client.border.name, bordername);
 
              if (bd->bg_object)
                {
                   bd->w -= (bd->client_inset.l + bd->client_inset.r);
                   bd->h -= (bd->client_inset.t + bd->client_inset.b);
-                  bd->client_inset.l = 0;
-                  bd->client_inset.r = 0;
-                  bd->client_inset.t = 0;
-                  bd->client_inset.b = 0;
                   bd->changes.size = 1;
                   evas_object_del(bd->bg_object);
                }
              o = edje_object_add(bd->bg_evas);
-             snprintf(buf, sizeof(buf), "e/widgets/border/%s/border",
-                      bd->client.border.name);
+             snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
              ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
              if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
                {
@@ -6963,9 +7284,7 @@ _e_border_eval0(E_Border *bd)
                   if (ok)
                     {
                        /* Reset default border style to default */
-                       if (e_config->theme_default_border_style)
-                         eina_stringshare_del(e_config->theme_default_border_style);
-                       e_config->theme_default_border_style = eina_stringshare_add("default");
+                       eina_stringshare_replace(&e_config->theme_default_border_style, "default");
                        e_config_save_queue();
                     }
                }
@@ -6978,7 +7297,7 @@ _e_border_eval0(E_Border *bd)
 
                   bd->bg_object = o;
 
-                  if (!bd->client.argb)
+                  if ((e_config->use_composite) && (!bd->client.argb))
                     {
                        argb_option = edje_object_data_get(o, "argb");
                        if ((argb_option) && (!strcmp(argb_option, "1")))
@@ -7003,155 +7322,33 @@ _e_border_eval0(E_Border *bd)
                   else if (bd->client.icccm.title)
                     edje_object_part_text_set(o, "e.text.title",
                                               bd->client.icccm.title);
-                  evas_object_resize(o, 1000, 1000);
-                  edje_object_calc_force(o);
-                  edje_object_part_geometry_get(o, "e.swallow.client",
-                                                &cx, &cy, &cw, &ch);
-                  l = cx;
-                  r = 1000 - (cx + cw);
-                  t = cy;
-                  b = 1000 - (cy + ch);
                }
              else
                {
                   evas_object_del(o);
                   bd->bg_object = NULL;
-                  l = 0;
-                  r = 0;
-                  t = 0;
-                  b = 0;
                }
-             bd->client_inset.l = l;
-             bd->client_inset.r = r;
-             bd->client_inset.t = t;
-             bd->client_inset.b = b;
-             ecore_x_netwm_frame_size_set(bd->client.win, l, r, t, b);
-             ecore_x_e_frame_size_set(bd->client.win, l, r, t, b);
+
+             _e_border_client_inset_calc(bd);
+
              bd->w += (bd->client_inset.l + bd->client_inset.r);
              bd->h += (bd->client_inset.t + bd->client_inset.b);
              ecore_evas_shaped_set(bd->bg_ecore_evas, bd->shaped);
              bd->changes.size = 1;
-             ecore_x_window_move(bd->client.shell_win, l, t);
+             /*  really needed ? */
+             ecore_x_window_move(bd->client.shell_win,
+                                 bd->client_inset.l,
+                                 bd->client_inset.t);
 
              if (bd->maximized != E_MAXIMIZE_NONE)
                {
-                  int x1, y1, x2, y2;
-                  int w, h, pw, ph;
-                  int zx, zy, zw, zh;
                   E_Maximize maximized = bd->maximized;
 
                   /* to force possible resizes */
                   bd->maximized = E_MAXIMIZE_NONE;
 
-                  zx = zy = zw = zh = 0;
+                  _e_border_maximize(bd, maximized);
 
-                  switch (maximized & E_MAXIMIZE_TYPE)
-                    {
-                     case E_MAXIMIZE_FULLSCREEN:
-                        w = bd->zone->w;
-                        h = bd->zone->h;
-
-                        if (bd->bg_object)
-                          {
-                             Evas_Coord cx, cy, cw, ch;
-
-                             edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-
-                             evas_object_resize(bd->bg_object, w, h);
-                             edje_object_calc_force(bd->bg_object);
-                             edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                             bd->client_inset.l = cx;
-                             bd->client_inset.r = w - (cx + cw);
-                             bd->client_inset.t = cy;
-                             bd->client_inset.b = h - (cy + ch);
-                             ecore_x_netwm_frame_size_set(bd->client.win,
-                                                          bd->client_inset.l, bd->client_inset.r,
-                                                          bd->client_inset.t, bd->client_inset.b);
-                             ecore_x_e_frame_size_set(bd->client.win,
-                                                      bd->client_inset.l, bd->client_inset.r,
-                                                      bd->client_inset.t, bd->client_inset.b);
-                          }
-                        e_border_resize_limit(bd, &w, &h);
-                        /* center x-direction */
-                        x1 = bd->zone->x + (bd->zone->w - w) / 2;
-                        /* center y-direction */
-                        y1 = bd->zone->y + (bd->zone->h - h) / 2;
-
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1);
-
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1);
-                        break;
-
-                     case E_MAXIMIZE_SMART:
-                     case E_MAXIMIZE_EXPAND:
-                        if (bd->zone)
-                          e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
-
-                        if (bd->w < zw)
-                          w = bd->w;
-                        else
-                          w = zw;
-
-                        if (bd->h < zh)
-                          h = bd->h;
-                        else
-                          h = zh;
-
-                        if (bd->x < zx) // window left not useful coordinates
-                          x1 = zx;
-                        else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
-                          x1 = zx + zw - bd->w;
-                        else // window normal position
-                          x1 = bd->x;
-
-                        if (bd->y < zy) // window top not useful coordinates
-                          y1 = zy;
-                        else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
-                          y1 = zy + zh - bd->h;
-                        else // window normal position
-                          y1 = bd->y;
-
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, zx, zy, zw, zh, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, x1, zy, w, zh, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, zx, y1, zw, h, 0, 1);
-                        break;
-
-                     case E_MAXIMIZE_FILL:
-                        x1 = bd->zone->x;
-                        y1 = bd->zone->y;
-                        x2 = bd->zone->x + bd->zone->w;
-                        y2 = bd->zone->y + bd->zone->h;
-
-                        /* walk through all shelves */
-                        e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, maximized);
-
-                        /* walk through all windows */
-                        e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, maximized);
-
-                        w = x2 - x1;
-                        h = y2 - y1;
-                        pw = w;
-                        ph = h;
-                        e_border_resize_limit(bd, &w, &h);
-                        /* center x-direction */
-                        x1 = x1 + (pw - w) / 2;
-                        /* center y-direction */
-                        y1 = y1 + (ph - h) / 2;
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1);
-                        break;
-                    }
                   /* restore maximized state */
                   bd->maximized = maximized;
 
@@ -7176,9 +7373,9 @@ _e_border_eval0(E_Border *bd)
                     edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
                   if (bd->client.icccm.urgent)
                     edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
-// FIXME: in eval -do differently
-//          edje_object_message_signal_process(bd->bg_object);
-//          e_border_frame_recalc(bd);
+                  // FIXME: in eval -do differently
+                  //        edje_object_message_signal_process(bd->bg_object);
+                  //        e_border_frame_recalc(bd);
 
                   evas_object_move(bd->bg_object, 0, 0);
                   evas_object_resize(bd->bg_object, bd->w, bd->h);
@@ -7400,21 +7597,21 @@ _e_border_eval(E_Border *bd)
         // TODO: temoporary limited maximize algorithm
         // ->
         /*if (bd->w > zw)
-           rw = zw;
-           else
-           rw = bd->w;
+          rw = zw;
+          else
+          rw = bd->w;
 
-           if (bd->h > zh)
-           rh = zh;
-           else
-           rh = bd->h;
+          if (bd->h > zh)
+          rh = zh;
+          else
+          rh = bd->h;
 
-           if ((rw != bd->w) || (rh != bd->h))
-           {
-              bd->w = rw;
-              bd->h = rh;
-              e_border_resize (bd, bd->w, bd->h);
-           }*/
+          if ((rw != bd->w) || (rh != bd->h))
+          {
+          bd->w = rw;
+          bd->h = rh;
+          e_border_resize (bd, bd->w, bd->h);
+          }*/
         // <-
 
         if (bd->re_manage)
@@ -7424,151 +7621,150 @@ _e_border_eval(E_Border *bd)
              bd->changes.pos = 1;
              bd->placed = 1;
           }
-        else if (!bd->placed)
+        else if ((!bd->placed) && (bd->client.icccm.request_pos))
           {
-             if (bd->client.icccm.request_pos)
-               {
-                  Ecore_X_Window_Attributes *att;
-                  int bw;
 
-                  att = &bd->client.initial_attributes;
-                  bw = att->border * 2;
-                  switch (bd->client.icccm.gravity)
-                    {
-                     case ECORE_X_GRAVITY_N:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = att->y;
-                       break;
-
-                     case ECORE_X_GRAVITY_NE:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = att->y;
-                       break;
+             Ecore_X_Window_Attributes *att;
+             int bw;
 
-                     case ECORE_X_GRAVITY_E:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
-                       break;
-
-                     case ECORE_X_GRAVITY_SE:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
-
-                     case ECORE_X_GRAVITY_S:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
-
-                     case ECORE_X_GRAVITY_SW:
-                       bd->x = att->x;
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
-
-                     case ECORE_X_GRAVITY_W:
-                       bd->x = att->x;
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
-
-                     case ECORE_X_GRAVITY_CENTER:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
-                       break;
-
-                     case ECORE_X_GRAVITY_NW:
-                     default:
-                       bd->x = att->x;
-                       bd->y = att->y;
-                    }
+             att = &bd->client.initial_attributes;
+             bw = att->border * 2;
+             switch (bd->client.icccm.gravity)
+               {
+                case ECORE_X_GRAVITY_N:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = att->y;
+                   break;
+
+                case ECORE_X_GRAVITY_NE:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = att->y;
+                   break;
+
+                case ECORE_X_GRAVITY_E:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
+                   break;
+
+                case ECORE_X_GRAVITY_SE:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
+
+                case ECORE_X_GRAVITY_S:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
+
+                case ECORE_X_GRAVITY_SW:
+                   bd->x = att->x;
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
+
+                case ECORE_X_GRAVITY_W:
+                   bd->x = att->x;
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
+
+                case ECORE_X_GRAVITY_CENTER:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
+                   break;
+
+                case ECORE_X_GRAVITY_NW:
+                default:
+                   bd->x = att->x;
+                   bd->y = att->y;
+               }
 
-     /*
-      * This ensures that windows that like to open with a x/y
-      * position smaller than returned by e_zone_useful_geometry_get()
-      * are moved to useful positions.
-      */
-                  // ->
-                  if (bd->x < zx)
-                    bd->x = zx;
+             /*
+              * This ensures that windows that like to open with a x/y
+              * position smaller than returned by e_zone_useful_geometry_get()
+              * are moved to useful positions.
+              */
+             // ->
+             if (bd->x < zx)
+               bd->x = zx;
 
-                  if (bd->y < zy)
-                    bd->y = zy;
+             if (bd->y < zy)
+               bd->y = zy;
 
-                  if (bd->x + bd->w > zw)
-                    bd->x = zx + zw - bd->w;
+             if (bd->x + bd->w > zx + zw)
+               bd->x = zx + zw - bd->w;
 
-                  if (bd->y + bd->h > zh)
-                    bd->y = zy + zh - bd->h;
-     // <--
+             if (bd->y + bd->h > zy + zh)
+               bd->y = zy + zh - bd->h;
+             // <--
 
-                  if (bd->zone && e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
-                    {
-                       bd->changes.pos = 1;
-                       bd->placed = 1;
-                    }
+             if (bd->zone && e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
+               {
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
                }
-             if (!bd->placed)
+          }
+        if (!bd->placed)
+          {
+             /* FIXME: special placement for dialogs etc. etc. etc goes
+              * here */
+             /* FIXME: what if parent is not on this desktop - or zone? */
+             if ((bd->parent) && (bd->parent->visible))
                {
-     /* FIXME: special placement for dialogs etc. etc. etc goes
-      * here */
-                  /* FIXME: what if parent is not on this desktop - or zone? */
-                     if ((bd->parent) && (bd->parent->visible))
-                       {
-                          bd->x = bd->parent->x + ((bd->parent->w - bd->w) / 2);
-                          bd->y = bd->parent->y + ((bd->parent->h - bd->h) / 2);
-                          bd->changes.pos = 1;
-                          bd->placed = 1;
-                       }
+                  bd->x = bd->parent->x + ((bd->parent->w - bd->w) / 2);
+                  bd->y = bd->parent->y + ((bd->parent->h - bd->h) / 2);
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
+               }
 #if 0
-                     else if ((bd->leader) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))
-                       {
-     /* TODO: Place in center of group */
-                       }
+             else if ((bd->leader) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))
+               {
+                  /* TODO: Place in center of group */
+               }
 #endif
-                     else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
-                       {
-                          bd->x = zx + ((zw - bd->w) / 2);
-                          bd->y = zy + ((zh - bd->h) / 2);
-                          bd->changes.pos = 1;
-                          bd->placed = 1;
-                       }
-                     if (!bd->placed)
-                       {
-                          Eina_List *skiplist = NULL;
-                          int new_x, new_y;
-
-                          if (zw > bd->w)
-                            new_x = zx + (rand() % (zw - bd->w));
-                          else
-                            new_x = zx;
-                          if (zh > bd->h)
-                            new_y = zy + (rand() % (zh - bd->h));
-                          else
-                            new_y = zy;
-
-                          if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART) || (e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
-                            {
-                               skiplist = eina_list_append(skiplist, bd);
-                               e_place_zone_region_smart(bd->zone, skiplist,
-                                                         bd->x, bd->y, bd->w, bd->h,
-                                                         &new_x, &new_y);
-                               eina_list_free(skiplist);
-                            }
-                          else if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL)
-                            {
-                               e_place_zone_manual(bd->zone, bd->w, bd->client_inset.t,
-                                                   &new_x, &new_y);
-                            }
-                          else
-                            {
-                               e_place_zone_cursor(bd->zone, bd->x, bd->y, bd->w, bd->h,
-                                                   bd->client_inset.t, &new_x, &new_y);
-                            }
-                          bd->x = new_x;
-                          bd->y = new_y;
-                          bd->changes.pos = 1;
-                       }
+             else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+               {
+                  bd->x = zx + ((zw - bd->w) / 2);
+                  bd->y = zy + ((zh - bd->h) / 2);
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
                }
           }
+        if (!bd->placed)
+          {
+             Eina_List *skiplist = NULL;
+             int new_x, new_y;
+
+             if (zw > bd->w)
+               new_x = zx + (rand() % (zw - bd->w));
+             else
+               new_x = zx;
+             if (zh > bd->h)
+               new_y = zy + (rand() % (zh - bd->h));
+             else
+               new_y = zy;
+
+             if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART) || (e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
+               {
+                  skiplist = eina_list_append(skiplist, bd);
+                  e_place_zone_region_smart(bd->zone, skiplist,
+                                            bd->x, bd->y, bd->w, bd->h,
+                                            &new_x, &new_y);
+                  eina_list_free(skiplist);
+               }
+             else if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL)
+               {
+                  e_place_zone_manual(bd->zone, bd->w, bd->client_inset.t,
+                                      &new_x, &new_y);
+               }
+             else
+               {
+                  e_place_zone_cursor(bd->zone, bd->x, bd->y, bd->w, bd->h,
+                                      bd->client_inset.t, &new_x, &new_y);
+               }
+             bd->x = new_x;
+             bd->y = new_y;
+             bd->changes.pos = 1;
+          }
+
         EINA_LIST_FREE(bd->pending_move_resize, pnd)
           {
              if ((!bd->lock_client_location) && (pnd->move))
@@ -7591,6 +7787,7 @@ _e_border_eval(E_Border *bd)
                   bd->client.h = pnd->h;
                   bd->changes.size = 1;
                }
+
              free(pnd);
           }
 
@@ -7633,10 +7830,7 @@ _e_border_eval(E_Border *bd)
                                                   bd->x,
                                                   bd->y + bd->h - 1);
            if ((zone) && (zone != bd->zone))
-             {
-                e_border_zone_set(bd, zone);
-     /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
-             }
+            e_border_zone_set(bd, zone);
         }
      }
 
@@ -7646,10 +7840,10 @@ _e_border_eval(E_Border *bd)
    if ((bd->changes.shading))
      {
         /*  show at start of unshade (but don't hide until end of shade) */
-         if (bd->shaded)
-           ecore_x_window_raise(bd->client.shell_win);
-         bd->changes.shading = 0;
-         rem_change = 1;
+        if (bd->shaded)
+          ecore_x_window_raise(bd->client.shell_win);
+        bd->changes.shading = 0;
+        rem_change = 1;
      }
    if ((bd->changes.shaded) && (bd->changes.pos) && (bd->changes.size))
      {
@@ -7720,7 +7914,23 @@ _e_border_eval(E_Border *bd)
                }
           }
 
-        if (!bd->changes.pos)
+        if (bd->client.e.state.video)
+          {
+             if (bd->client.e.state.video_position.updated)
+               {
+                  ecore_x_window_move(bd->win,
+                                      bd->client.e.state.video_parent_border->x +
+                                      bd->client.e.state.video_parent_border->client_inset.l +
+                                      bd->client.e.state.video_parent_border->fx.x +
+                                      bd->client.e.state.video_position.x,
+                                      bd->client.e.state.video_parent_border->y +
+                                      bd->client.e.state.video_parent_border->client_inset.t +
+                                      bd->client.e.state.video_parent_border->fx.y +
+                                      bd->client.e.state.video_position.y);
+                  bd->client.e.state.video_position.updated = 0;
+               }
+          }
+        else if (!bd->changes.pos)
           {
              if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
              bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
@@ -7728,10 +7938,18 @@ _e_border_eval(E_Border *bd)
           }
         else
           {
+             E_Border *tmp;
+             Eina_List *l;
+
              ecore_x_window_move_resize(bd->win,
                                         bd->x + bd->fx.x,
                                         bd->y + bd->fx.y,
                                         bd->w, bd->h);
+
+             EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+               ecore_x_window_move(tmp->win,
+                                   bd->x + bd->fx.x + bd->client_inset.l + tmp->client.e.state.video_position.x,
+                                   bd->y + bd->fx.y + bd->client_inset.t + tmp->client.e.state.video_position.y);
           }
 
         ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
@@ -7742,7 +7960,7 @@ _e_border_eval(E_Border *bd)
 
         if (bd->internal_ecore_evas)
           ecore_evas_move_resize(bd->internal_ecore_evas, x, y, bd->client.w, bd->client.h);
-        else
+        else if (!bd->client.e.state.video)
           ecore_x_window_move_resize(bd->client.win, x, y, bd->client.w, bd->client.h);
 
         ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
@@ -7759,9 +7977,9 @@ _e_border_eval(E_Border *bd)
      }
    else if (bd->changes.pos)
      {
-       if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-       bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
-       bd->post_move = 1;
+        if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
+        bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
+        bd->post_move = 1;
 
         e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
 
@@ -7787,7 +8005,7 @@ _e_border_eval(E_Border *bd)
              int x, y;
 
              twin = ecore_x_window_override_new
-                (bd->zone->container->scratch_win, 0, 0, bd->w, bd->h);
+               (bd->zone->container->scratch_win, 0, 0, bd->w, bd->h);
              if (bd->shaped)
                ecore_x_window_shape_window_set(twin, bd->bg_win);
              else
@@ -7813,9 +8031,9 @@ _e_border_eval(E_Border *bd)
                   ecore_x_window_shape_rectangles_set(twin, rects, 4);
                }
              twin2 = ecore_x_window_override_new
-                (bd->zone->container->scratch_win, 0, 0,
-                    bd->w - bd->client_inset.l - bd->client_inset.r,
-                    bd->h - bd->client_inset.t - bd->client_inset.b);
+               (bd->zone->container->scratch_win, 0, 0,
+                bd->w - bd->client_inset.l - bd->client_inset.r,
+                bd->h - bd->client_inset.t - bd->client_inset.b);
              x = 0;
              y = 0;
              if ((bd->shading) || (bd->shaded))
@@ -7839,7 +8057,7 @@ _e_border_eval(E_Border *bd)
           }
         else
           ecore_x_window_shape_mask_set(bd->win, 0);
-//     bd->need_shape_export = 1;
+        //     bd->need_shape_export = 1;
         bd->need_shape_merge = 0;
      }
 
@@ -7920,29 +8138,29 @@ _e_border_eval(E_Border *bd)
             (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL) &&
             (!((bd->client.icccm.transient_for != 0) ||
                (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))) &&
-            (!move) && (!resize))
+            (!bdmove) && (!bdresize))
           {
              /* Set this window into moving state */
 
-              bd->cur_mouse_action = e_action_find("window_move");
-              if (bd->cur_mouse_action)
-                {
-                   if ((!bd->cur_mouse_action->func.end_mouse) &&
-                       (!bd->cur_mouse_action->func.end))
-                     bd->cur_mouse_action = NULL;
-                   if (bd->cur_mouse_action)
-                     {
-                        bd->x = x - (bd->w >> 1);
-                        bd->y = y - (bd->client_inset.t >> 1);
-                        bd->changed = 1;
-                        bd->changes.pos = 1;
-
-                        _e_border_client_move_resize_send(bd);
-                     }
-                }
+             bd->cur_mouse_action = e_action_find("window_move");
+             if (bd->cur_mouse_action)
+               {
+                  if ((!bd->cur_mouse_action->func.end_mouse) &&
+                      (!bd->cur_mouse_action->func.end))
+                    bd->cur_mouse_action = NULL;
+                  if (bd->cur_mouse_action)
+                    {
+                       bd->x = x - (bd->w >> 1);
+                       bd->y = y - (bd->client_inset.t >> 1);
+                       bd->changed = 1;
+                       bd->changes.pos = 1;
+
+                       _e_border_client_move_resize_send(bd);
+                    }
+               }
           }
 
-       _e_border_show(bd);
+        _e_border_show(bd);
 
         if (bd->cur_mouse_action)
           {
@@ -7995,6 +8213,17 @@ _e_border_eval(E_Border *bd)
           }
         if (!bd->desktop)
           {
+             /* libreoffice and maybe others match window class
+                with .desktop file name */
+             if (bd->client.icccm.class)
+               {
+                  char buf[128];
+                  snprintf(buf, sizeof(buf), "%s.desktop", bd->client.icccm.class);
+                  bd->desktop = efreet_util_desktop_file_id_find(buf);
+               }             
+          }
+        if (!bd->desktop)
+          {
              bd->desktop = e_exec_startup_id_pid_find(bd->client.netwm.startup_id,
                                                       bd->client.netwm.pid);
              if (bd->desktop) efreet_desktop_ref(bd->desktop);
@@ -8003,7 +8232,7 @@ _e_border_eval(E_Border *bd)
           {
              /* this works for most cases as fallback. useful when app is
                 run from a shell  */
-               bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
+             bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
           }
         if (!bd->desktop && bd->client.icccm.transient_for)
           {
@@ -8037,7 +8266,7 @@ _e_border_eval(E_Border *bd)
            ev = E_NEW(E_Event_Border_Icon_Change, 1);
            ev->border = bd;
            e_object_ref(E_OBJECT(bd));
-//          e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
+           //       e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
            ecore_event_add(E_EVENT_BORDER_ICON_CHANGE, ev,
                            _e_border_event_border_icon_change_free, NULL);
         }
@@ -8057,15 +8286,10 @@ _e_border_eval(E_Border *bd)
             (e_config->focus_setting == E_FOCUS_NEW_WINDOW_IF_TOP_STACK) ||
             (bd->want_focus))
 #else // original
-        if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
-            (bd->want_focus))
+        if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus))
 #endif
           {
-             bd->want_focus = 0;
-#ifdef INOUTDEBUG_FOCUS
-            printf("__________ focus new window _________\n");
-#endif
-
+            bd->want_focus = 0;
 #ifdef _F_FOCUS_WINDOW_IF_TOP_STACK_
              if (e_config->focus_setting == E_FOCUS_NEW_WINDOW_IF_TOP_STACK)
                 _e_border_check_stack(bd);
@@ -8080,30 +8304,24 @@ _e_border_eval(E_Border *bd)
                   (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
                    e_border_focused_get())))
                {
-#ifdef INOUTDEBUG_FOCUS
-                 printf("__________ focus new dialog _________\n");
-#endif
-
-                 e_border_focus_set_with_pointer(bd);
+                  e_border_focus_set_with_pointer(bd);
                }
           }
         else
           {
-#ifdef INOUTDEBUG_FOCUS
-            printf("__________ window takes focus _________\n");
-#endif
              /* focus window by default when it is the only one on desk */
-              E_Border *bd2 = NULL;
-              Eina_List *l;
-              EINA_LIST_FOREACH(focus_stack, l, bd2)
-                {
-                   if (bd == bd2) continue;
-                   if ((!bd2->iconic) && (bd2->visible) && (bd->desk == bd2->desk))
-                     break;
-                }
+             E_Border *bd2 = NULL;
+             Eina_List *l;
+             EINA_LIST_FOREACH(focus_stack, l, bd2)
+               {
+                  if (bd == bd2) continue;
+                  if ((!bd2->iconic) && (bd2->visible) &&
+                      ((bd->desk == bd2->desk) || bd2->sticky))
+                    break;
+               }
 
-              if (!bd2)
-                e_border_focus_set_with_pointer(bd);
+             if (!bd2)
+               e_border_focus_set_with_pointer(bd);
           }
      }
 
@@ -8127,10 +8345,10 @@ _e_border_eval(E_Border *bd)
 
    if (send_event) // FIXME: send only if a property changed - above need to
      { // check on that. for now - always send.
-         event = E_NEW(E_Event_Border_Property, 1);
-         event->border = bd;
-         e_object_ref(E_OBJECT(bd));
-         ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
+        event = E_NEW(E_Event_Border_Property, 1);
+        event->border = bd;
+        e_object_ref(E_OBJECT(bd));
+        ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
      }
    _e_border_hook_call(E_BORDER_HOOK_EVAL_END, bd);
 }
@@ -8261,36 +8479,67 @@ _e_border_shade_animator(void *data)
    val = dt / dur;
 
    if (val < 0.0) val = 0.0;
-   else if (val > 1.0)
-     val = 1.0;
+   else if (val > 1.0) val = 1.0;
 
    if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL)
      {
-        if (bd->shaded)
-          bd->shade.val = (1 - cos(val * M_PI)) / 2.0;
-        else
-          bd->shade.val = 0.5 + (cos(val * M_PI) / 2.0);
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_DECELERATE)
      {
-        if (bd->shaded)
-          bd->shade.val = sin(val * M_PI / 2.0);
-        else
-          bd->shade.val = 1 - sin(val * M_PI / 2.0);
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_ACCELERATE)
      {
-        if (bd->shaded)
-          bd->shade.val = 1 - cos(val * M_PI / 2.0);
-        else
-          bd->shade.val = cos(val * M_PI / 2.0);
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_ACCELERATE, 0.0, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
-   else /* LINEAR if none of the others */
+   else if (e_config->border_shade_transition == E_TRANSITION_LINEAR)
      {
-        if (bd->shaded)
-          bd->shade.val = val;
-        else
-          bd->shade.val = 1 - val;
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_LINEAR, 0.0, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else if (e_config->border_shade_transition == E_TRANSITION_ACCELERATE_LOTS)
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_ACCELERATE_FACTOR, 1.7, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else if (e_config->border_shade_transition == E_TRANSITION_DECELERATE_LOTS)
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_DECELERATE_FACTOR, 1.7, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL_LOTS)
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_SINUSOIDAL_FACTOR, 1.7, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else if (e_config->border_shade_transition == E_TRANSITION_BOUNCE)
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_BOUNCE, 1.2, 3.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else if (e_config->border_shade_transition == E_TRANSITION_BOUNCE_LOTS)
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_BOUNCE, 1.2, 5.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
+     }
+   else
+     {
+        bd->shade.val =
+           ecore_animator_pos_map(val, ECORE_POS_MAP_LINEAR, 0.0, 0.0);
+        if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
 
    /* due to M_PI's innacuracy, cos(M_PI/2) != 0.0, so we need this */
@@ -8328,8 +8577,7 @@ _e_border_shade_animator(void *data)
    bd->changed = 1;
 
    /* we're done */
-   if ((bd->shaded && (bd->shade.val == 1)) ||
-       ((!bd->shaded) && (bd->shade.val == 0)))
+   if (val == 1)
      {
         E_Event_Border_Resize *ev;
 
@@ -8654,7 +8902,7 @@ _e_border_resize_begin(E_Border *bd)
 
    _e_border_hook_call(E_BORDER_HOOK_RESIZE_BEGIN, bd);
 
-   resize = bd;
+   bdresize = bd;
    return 1;
 }
 
@@ -8687,7 +8935,7 @@ _e_border_resize_end(E_Border *bd)
 
    _e_border_hook_call(E_BORDER_HOOK_RESIZE_END, bd);
 
-   resize = NULL;
+   bdresize = NULL;
 
    /* If this border was maximized, we need to unset Maximized state or
     * on restart, E still thinks it's maximized */
@@ -8730,7 +8978,7 @@ _e_border_move_begin(E_Border *bd)
 #endif
    _e_border_hook_call(E_BORDER_HOOK_MOVE_BEGIN, bd);
 
-   move = bd;
+   bdmove = bd;
    return 1;
 }
 
@@ -8751,7 +8999,7 @@ _e_border_move_end(E_Border *bd)
 #endif
    _e_border_hook_call(E_BORDER_HOOK_MOVE_END, bd);
 
-   move = NULL;
+   bdmove = NULL;
    return 1;
 }
 
@@ -8782,16 +9030,23 @@ _e_border_cb_ping_poller(void *data)
      }
    else
      {
-        if (!bd->hung)
-          {
-             bd->hung = 1;
-             edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
-             /* FIXME: if below dialog is up - hide it now */
-          }
-        if (bd->delete_requested)
+        /* if time between last ping and now is greater
+         * than half the ping interval... */
+        if ((ecore_loop_time_get() - bd->ping) > 
+            ((e_config->ping_clients_interval * 
+              ecore_poller_poll_interval_get(ECORE_POLLER_CORE)) / 2.0))
           {
-             /* FIXME: pop up dialog saying app is hung - kill client, or pid */
-              e_border_act_kill_begin(bd);
+             if (!bd->hung)
+               {
+                  bd->hung = 1;
+                  edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
+                  /* FIXME: if below dialog is up - hide it now */
+               }
+             if (bd->delete_requested)
+               {
+                  /* FIXME: pop up dialog saying app is hung - kill client, or pid */
+                  e_border_act_kill_begin(bd);
+               }
           }
      }
    bd->ping_poller = NULL;
@@ -9036,8 +9291,9 @@ _e_border_pointer_warp_to_center_timer(void *data __UNUSED__)
             (y - warp_y) > 5 || (y - warp_y) < -5)
           {
              /* User moved the mouse, so stop warping */
-              warp_to = 0;
-              goto cleanup;
+             printf("user stopped pinter warp\n");
+             warp_to = 0;
+             goto cleanup;
           }
 
         /* We just use the same warp speed as configured
@@ -9057,7 +9313,7 @@ _e_border_pointer_warp_to_center_timer(void *data __UNUSED__)
         ecore_x_pointer_warp(warp_to_win, warp_x, warp_y);
         return ECORE_CALLBACK_RENEW;
      }
-cleanup:
+ cleanup:
    ecore_timer_del(warp_timer);
    warp_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
@@ -9102,22 +9358,87 @@ EAPI void
 e_border_comp_hidden_set(E_Border *bd,
                          Eina_Bool hidden)
 {
+   E_Border *tmp;
+   Eina_List *l;
+
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     {
+       if (hidden)
+        ecore_x_window_hide(tmp->win);
+       else
+        ecore_x_window_show(tmp->win);
+     }
+
    if (bd->comp_hidden == hidden) return;
 
    bd->comp_hidden = hidden;
 
-   if (bd->comp_hidden)
+   if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
+     {
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+     }
+   else
+     {
+        _e_border_shape_input_rectangle_set(bd);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+     }
+}
+
+EAPI void
+e_border_tmp_input_hidden_push(E_Border *bd)
+{
+   E_Border *tmp;
+   Eina_List *l;
+
+   E_OBJECT_CHECK(bd);
+   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     e_border_tmp_input_hidden_push(tmp);
+
+   bd->tmp_input_hidden++;
+   if (bd->tmp_input_hidden != 1) return;
+
+   if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
+     {
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+     }
+   else
+     {
+        _e_border_shape_input_rectangle_set(bd);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+     }
+}
+
+EAPI void
+e_border_tmp_input_hidden_pop(E_Border *bd)
+{
+   E_Border *tmp;
+   Eina_List *l;
+
+   E_OBJECT_CHECK(bd);
+   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+
+   EINA_LIST_FOREACH(bd->client.e.state.video_child, l, tmp)
+     e_border_tmp_input_hidden_pop(tmp);
+
+   bd->tmp_input_hidden--;
+   if (bd->tmp_input_hidden != 0) return;
+
+   if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
      {
-       ecore_x_composite_window_events_disable(bd->win);
-       ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
    else
      {
         _e_border_shape_input_rectangle_set(bd);
-       ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 }
 /*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/
index 5748823..2851f82 100644 (file)
@@ -17,10 +17,15 @@ typedef enum _E_Direction
 
 typedef enum _E_Transition
 {
-   E_TRANSITION_LINEAR,
-   E_TRANSITION_SINUSOIDAL,
-   E_TRANSITION_ACCELERATE,
-   E_TRANSITION_DECELERATE
+   E_TRANSITION_LINEAR = 0,
+   E_TRANSITION_SINUSOIDAL = 1,
+   E_TRANSITION_ACCELERATE = 2,
+   E_TRANSITION_DECELERATE = 3,
+   E_TRANSITION_ACCELERATE_LOTS = 4,
+   E_TRANSITION_DECELERATE_LOTS = 5,
+   E_TRANSITION_SINUSOIDAL_LOTS = 6,
+   E_TRANSITION_BOUNCE = 7,
+   E_TRANSITION_BOUNCE_LOTS = 8
 } E_Transition;
 
 typedef enum _E_Stacking
@@ -193,11 +198,11 @@ struct _E_Border
       
       /* ICCCM */
       struct {
-         char *title;
-         char *name;
-         char *class;
-         char *icon_name;
-         char *machine;
+        const char *title;
+        const char *name;
+        const char *class;
+         const char *icon_name;
+         const char *machine;
          int min_w, min_h;
          int max_w, max_h;
          int base_w, base_h;
@@ -213,7 +218,7 @@ struct _E_Border
          Ecore_X_Window transient_for;
          Ecore_X_Window client_leader;
          Ecore_X_Gravity gravity;
-         char *window_role;
+         const char *window_role;
          unsigned char take_focus : 1;
          unsigned char accepts_focus : 1;
          unsigned char urgent : 1;
@@ -255,8 +260,8 @@ struct _E_Border
       struct {
          pid_t         pid;
          unsigned int  desktop;
-         char         *name;
-         char         *icon_name;
+         const char         *name;
+         const char         *icon_name;
          Ecore_X_Icon *icons;
          int           num_icons;
          unsigned int  user_time;
@@ -341,11 +346,23 @@ struct _E_Border
       /* Extra e stuff */
       struct {
          struct {
+            struct {
+               int x, y;
+
+               unsigned char updated : 1;
+            } video_position;
+            Ecore_X_Window video_parent;
+            E_Border *video_parent_border;
+            Eina_List *video_child;
+
             unsigned char centered : 1;
+            unsigned char video : 1;
          } state;
 
          struct {
             unsigned char state : 1;
+            unsigned char video_parent : 1;
+            unsigned char video_position : 1;
          } fetch;
       } e;
       
@@ -410,6 +427,21 @@ struct _E_Border
                 unsigned char drag : 1;
                 unsigned char locked : 1;
              } drag;
+           struct
+             {
+                unsigned int state;
+                unsigned int need_change : 1;
+                int          angle;
+                struct
+                  {
+                     unsigned char down : 1;
+                     unsigned char locked : 1;
+                     unsigned char resize : 1;
+                     int           x, y, dx, dy, sx, sy;
+                     int           w, h;
+                  } mouse;
+               Eina_List *handlers;
+             } win_state;
         } illume;
 
       Ecore_X_Window_Attributes initial_attributes;
@@ -569,9 +601,12 @@ struct _E_Border
    unsigned char post_move   : 1;
    unsigned char post_resize : 1;
    unsigned char post_show : 1;
+   
    Ecore_Idle_Enterer *post_job;
 
    Eina_Bool argb;
+   
+   int tmp_input_hidden;
 };
 
 struct _E_Border_Pending_Move_Resize 
@@ -712,6 +747,8 @@ EAPI E_Border *e_border_under_pointer_get(E_Desk *desk, E_Border *exclude);
 EAPI int e_border_pointer_warp_to_center(E_Border *bd);
 
 EAPI void e_border_comp_hidden_set(E_Border *bd, Eina_Bool hidden);
+EAPI void e_border_tmp_input_hidden_push(E_Border *bd);
+EAPI void e_border_tmp_input_hidden_pop(E_Border *bd);
 
 extern EAPI int E_EVENT_BORDER_RESIZE;
 extern EAPI int E_EVENT_BORDER_MOVE;
index fa5cf0a..774a220 100644 (file)
@@ -6,23 +6,9 @@
 #define DEF_MENUCLICK 0.25
 #endif
 
-typedef enum _Eet_Union
-{
-  EET_SCREEN_INFO_11 = (int)((1 << 16) | 1),
-  EET_SCREEN_INFO_12 = (int)((1 << 16) | 2),
-  EET_SCREEN_INFO_13 = (int)((1 << 16) | 3),
-  EET_UNKNOWN
-} Eet_Union;
-
-struct {
-   Eet_Union u;
-   const char *name;
-} eet_mapping[] = {
-  { EET_SCREEN_INFO_11, "E_Config_Screen_11" },
-  { EET_SCREEN_INFO_12, "E_Config_Screen_12" },
-  { EET_SCREEN_INFO_12, "E_Config_Screen_13" },
-  { EET_UNKNOWN, NULL }
-};
+#define RANDR_SERIALIZED_SETUP_11 ((int)((1 << 16) | 1))
+#define RANDR_SERIALIZED_SETUP_12 ((int)((1 << 16) | 2))
+#define RANDR_SERIALIZED_SETUP_13 ((int)((1 << 16) | 3))
 
 EAPI E_Config *e_config = NULL;
 
@@ -34,8 +20,6 @@ static void _e_config_free(E_Config *cfg);
 static Eina_Bool _e_config_cb_timer(void *data);
 static int _e_config_eet_close_handle(Eet_File *ef, char *file);
 static void _e_config_acpi_bindings_add(void);
-static const char * _eet_union_type_get(const void *data, Eina_Bool *unknow);
-static Eina_Bool _eet_union_type_set(const char *type, void *data, Eina_Bool unknow);
 
 /* local subsystem globals */
 static int _e_config_save_block = 0;
@@ -65,15 +49,16 @@ static E_Config_DD *_e_config_shelf_desk_edd = NULL;
 static E_Config_DD *_e_config_mime_icon_edd = NULL;
 static E_Config_DD *_e_config_syscon_action_edd = NULL;
 static E_Config_DD *_e_config_env_var_edd = NULL;
-static E_Config_DD *_e_config_screen_size_edd = NULL;
-static E_Config_DD *_e_config_screen_size_mm_edd = NULL;
-static E_Config_DD *_e_config_eina_rectangle_edd = NULL;
-static E_Config_DD *_e_config_screen_info_edd = NULL;
-static E_Config_DD *_e_config_screen_restore_info_11_edd = NULL;
-static E_Config_DD *_e_config_screen_restore_info_12_edd = NULL;
-static E_Config_DD *_e_config_screen_output_edid_hash_edd = NULL;
-static E_Config_DD *_e_config_screen_output_restore_info_edd = NULL;
-static E_Config_DD *_e_config_screen_crtc_restore_info_edd = NULL;
+static E_Config_DD *_e_config_randr_size_edd = NULL;
+static E_Config_DD *_e_config_randr_size_mm_edd = NULL;
+static E_Config_DD *_e_config_randr_edid_hash_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_11_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_12_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_output_policy_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_output_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_mode_info_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_crtc_edd = NULL;
 
 
 EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
@@ -143,7 +128,7 @@ e_config_init(void)
    else
      {
        Eet_File *ef;
-       char buf[4096];
+       char buf[PATH_MAX];
 
        /* try user profile config */
        e_user_dir_concat_static(buf, "config/profile.cfg");
@@ -526,107 +511,109 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, val, STR);
    E_CONFIG_VAL(D, T, unset, UCHAR);
 
-   _e_config_screen_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
+   _e_config_randr_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size
-#define D _e_config_screen_size_edd
+#define D _e_config_randr_size_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
 
-   _e_config_screen_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
+   _e_config_randr_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size_MM
-#define D _e_config_screen_size_mm_edd
+#define D _e_config_randr_size_mm_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width_mm, INT);
    E_CONFIG_VAL(D, T, height_mm, INT);
 
-   _e_config_screen_restore_info_11_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11", E_Randr_Screen_Restore_Info_11);
+   _e_config_randr_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Edid_Hash", E_Randr_Edid_Hash);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info_11
-#define D _e_config_screen_restore_info_11_edd
-   E_CONFIG_SUB(D, T, size, _e_config_screen_size_edd);
+#define T E_Randr_Edid_Hash
+#define D _e_config_randr_edid_hash_edd
+   E_CONFIG_VAL(D, T, hash, INT);
+
+   _e_config_randr_serialized_setup_11_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_11", E_Randr_Serialized_Setup_11);
+#undef T
+#undef D
+#define T E_Randr_Serialized_Setup_11
+#define D _e_config_randr_serialized_setup_11_edd
+   E_CONFIG_SUB(D, T, size, _e_config_randr_size_edd);
    E_CONFIG_VAL(D, T, orientation, INT);
    E_CONFIG_VAL(D, T, refresh_rate, SHORT);
 
-    _e_config_eina_rectangle_edd = E_CONFIG_DD_NEW("Eina_Rectangle", Eina_Rectangle);
+    _e_config_randr_serialized_output_policy_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output_Policy", E_Randr_Serialized_Output_Policy);
 #undef T
 #undef D
-#define T Eina_Rectangle
-#define D _e_config_eina_rectangle_edd
-   E_CONFIG_VAL(D, T, x, INT);
-   E_CONFIG_VAL(D, T, y, INT);
-   E_CONFIG_VAL(D, T, w, INT);
-   E_CONFIG_VAL(D, T, h, INT);
+#define T E_Randr_Serialized_Output_Policy
+#define D _e_config_randr_serialized_output_policy_edd
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, name_length, INT);
+   E_CONFIG_VAL(D, T, policy, INT);
 
-      _e_config_screen_output_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Output_Edid_Hash", E_Randr_Output_Edid_Hash);
+    _e_config_randr_serialized_output_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output", E_Randr_Serialized_Output);
 #undef T
 #undef D
-#define T E_Randr_Output_Edid_Hash
-#define D _e_config_screen_output_edid_hash_edd
-   E_CONFIG_VAL(D, T, hash, INT);
+#define T E_Randr_Serialized_Output
+#define D _e_config_randr_serialized_output_edd
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, name_length, INT);
+   E_CONFIG_SUB(D, T, edid_hash, _e_config_randr_edid_hash_edd);
+   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
 
-   // FIXME: need to totally re-do this randr config stuff - remove the
-   // union stuff. do this differently to not use unions really. not
-   // intended for how it is used here really.
-    _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", E_Randr_Output_Restore_Info);
+    _e_config_randr_serialized_mode_info_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Mode_Info", Ecore_X_Randr_Mode_Info);
 #undef T
 #undef D
-#define T E_Randr_Output_Restore_Info
-#define D _e_config_screen_output_restore_info_edd
-   E_CONFIG_SUB(D, T, edid_hash, _e_config_screen_output_edid_hash_edd);
-   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
+#define T Ecore_X_Randr_Mode_Info
+#define D _e_config_randr_serialized_mode_info_edd
+   E_CONFIG_VAL(D, T, width, INT);
+   E_CONFIG_VAL(D, T, height, INT);
+   E_CONFIG_VAL(D, T, dotClock, LL);
+   E_CONFIG_VAL(D, T, hSyncStart, INT);
+   E_CONFIG_VAL(D, T, hSyncEnd, INT);
+   E_CONFIG_VAL(D, T, hTotal, INT);
+   E_CONFIG_VAL(D, T, hSkew, INT);
+   E_CONFIG_VAL(D, T, vSyncStart, INT);
+   E_CONFIG_VAL(D, T, vSyncEnd, INT);
+   E_CONFIG_VAL(D, T, vTotal, INT);
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, nameLength, INT);
+   E_CONFIG_VAL(D, T, modeFlags, LL);
 
-  _e_config_screen_crtc_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Crtc_Restore_Info", E_Randr_Crtc_Restore_Info);
+  _e_config_randr_serialized_crtc_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Crtc", E_Randr_Serialized_Crtc);
 #undef T
 #undef D
-#define T E_Randr_Crtc_Restore_Info
-#define D _e_config_screen_crtc_restore_info_edd
-   E_CONFIG_SUB(D, T, geometry, _e_config_eina_rectangle_edd);
-   E_CONFIG_LIST(D, T, outputs, _e_config_screen_output_restore_info_edd);
+#define T E_Randr_Serialized_Crtc
+#define D _e_config_randr_serialized_crtc_edd
+   E_CONFIG_LIST(D, T, serialized_outputs, _e_config_randr_serialized_output_edd);
+   E_CONFIG_SUB(D, T, mode_info, _e_config_randr_serialized_mode_info_edd);
+   E_CONFIG_VAL(D, T, pos.x, INT);
+   E_CONFIG_VAL(D, T, pos.y, INT);
+   EET_DATA_DESCRIPTOR_ADD_LIST_STRING(D, T, "Crtc_Possible_Outputs_Names", possible_outputs_names);
    E_CONFIG_VAL(D, T, orientation, INT);
 
-   _e_config_screen_restore_info_12_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12", E_Randr_Screen_Restore_Info_12);
+   _e_config_randr_serialized_setup_12_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_12", E_Randr_Serialized_Setup_12);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info_12
-#define D _e_config_screen_restore_info_12_edd
-   E_CONFIG_LIST(D, T, crtcs, _e_config_screen_crtc_restore_info_edd);
-   E_CONFIG_LIST(D, T, outputs_edid_hashes, _e_config_screen_output_edid_hash_edd);
-   E_CONFIG_VAL(D, T, noutputs, INT);
-   E_CONFIG_VAL(D, T, output_policy, INT);
-   E_CONFIG_VAL(D, T, alignment, INT);
+#define T E_Randr_Serialized_Setup_12
+#define D _e_config_randr_serialized_setup_12_edd
+   E_CONFIG_VAL(D, T, timestamp, DOUBLE);
+   E_CONFIG_LIST(D, T, serialized_crtcs, _e_config_randr_serialized_crtc_edd);
+   E_CONFIG_LIST(D, T, serialized_edid_hashes, _e_config_randr_edid_hash_edd);
 
+   _e_config_randr_serialized_setup_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup", E_Randr_Serialized_Setup);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info
-#define D _e_config_screen_info_edd
-   Eet_Data_Descriptor_Class eddc;
-   Eet_Data_Descriptor *unified, *edd_11_info, *edd_12_info;
-   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, T);
-   D = eet_data_descriptor_stream_new(&eddc);
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.type_get = _eet_union_type_get;
-   eddc.func.type_set = _eet_union_type_set;
-   //virtual types to work around EET's inability to differentiate when it
-   //comes to pointers (a->b) vs. values (a.b) in union mappings
-   edd_11_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11_Struct", E_Randr_Screen_Restore_Info_11);
-   E_CONFIG_SUB(edd_11_info, E_Randr_Screen_Restore_Info_Union, restore_info_11, _e_config_screen_restore_info_11_edd);
-   edd_12_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12_Struct", E_Randr_Screen_Restore_Info_12);
-   E_CONFIG_LIST(edd_12_info, E_Randr_Screen_Restore_Info_Union, restore_info_12, _e_config_screen_restore_info_12_edd);
-   unified = eet_data_descriptor_stream_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_11", edd_11_info);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_12", edd_12_info);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_13", edd_12_info);
-// DISABLE! crashie crashie long time   
-//   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
-   E_CONFIG_VAL(D, T, randr_version, INT);
+#define T E_Randr_Serialized_Setup
+#define D _e_config_randr_serialized_setup_edd
+   E_CONFIG_SUB(D, T, serialized_setup_11, _e_config_randr_serialized_setup_11_edd);
+   E_CONFIG_LIST(D, T, serialized_setups_12, _e_config_randr_serialized_setup_12_edd);
+   E_CONFIG_LIST(D, T, serialized_outputs_policies, _e_config_randr_serialized_output_policy_edd);
 
    _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);
 #undef T
@@ -787,7 +774,8 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR);
    E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE);
 
-   E_CONFIG_LIST(D, T, screen_info, _e_config_screen_info_edd);
+   //randr specifics
+   E_CONFIG_SUB(D, T, randr_serialized_setup, _e_config_randr_serialized_setup_edd);
 
    E_CONFIG_VAL(D, T, screensaver_enable, INT);
    E_CONFIG_VAL(D, T, screensaver_timeout, INT);
@@ -797,6 +785,10 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, screensaver_ask_presentation, UCHAR);
    E_CONFIG_VAL(D, T, screensaver_ask_presentation_timeout, DOUBLE);
 
+   E_CONFIG_VAL(D, T, screensaver_suspend, UCHAR);
+   E_CONFIG_VAL(D, T, screensaver_suspend_on_ac, UCHAR);
+   E_CONFIG_VAL(D, T, screensaver_suspend_delay, DOUBLE);
+   
    E_CONFIG_VAL(D, T, dpms_enable, INT);
    E_CONFIG_VAL(D, T, dpms_standby_enable, INT);
    E_CONFIG_VAL(D, T, dpms_suspend_enable, INT);
@@ -830,9 +822,6 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT);
    E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT);
    E_CONFIG_VAL(D, T, desk_flip_animate_time, DOUBLE);
-   E_CONFIG_VAL(D, T, desk_flip_pan_bg, UCHAR);
-   E_CONFIG_VAL(D, T, desk_flip_pan_x_axis_factor, DOUBLE);
-   E_CONFIG_VAL(D, T, desk_flip_pan_y_axis_factor, DOUBLE);
 
    E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
    E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@@ -903,9 +892,29 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, exec.show_exit_dialog, UCHAR);
 
    E_CONFIG_VAL(D, T, null_container_win, UCHAR);
-   
+
    E_CONFIG_LIST(D, T, env_vars, _e_config_env_var_edd);
-   
+
+   E_CONFIG_VAL(D, T, backlight.normal, DOUBLE);
+   E_CONFIG_VAL(D, T, backlight.dim, DOUBLE);
+   E_CONFIG_VAL(D, T, backlight.transition, DOUBLE);
+
+   E_CONFIG_VAL(D, T, deskenv.load_xrdb, UCHAR);
+   E_CONFIG_VAL(D, T, deskenv.load_xmodmap, UCHAR);
+   E_CONFIG_VAL(D, T, deskenv.load_gnome, UCHAR);
+   E_CONFIG_VAL(D, T, deskenv.load_kde, UCHAR);
+
+   E_CONFIG_VAL(D, T, xsettings.enabled, UCHAR);
+   E_CONFIG_VAL(D, T, xsettings.match_e17_theme, UCHAR);
+   E_CONFIG_VAL(D, T, xsettings.match_e17_icon_theme, UCHAR);
+   E_CONFIG_VAL(D, T, xsettings.xft_antialias, INT);
+   E_CONFIG_VAL(D, T, xsettings.xft_hinting, INT);
+   E_CONFIG_VAL(D, T, xsettings.xft_hint_style, STR);
+   E_CONFIG_VAL(D, T, xsettings.xft_rgba, STR);
+   E_CONFIG_VAL(D, T, xsettings.net_theme_name, STR);
+   E_CONFIG_VAL(D, T, xsettings.net_icon_theme_name, STR);
+   E_CONFIG_VAL(D, T, xsettings.gtk_font_name, STR);
+
    e_config_load();
 
    e_config_save_queue();
@@ -938,7 +947,7 @@ e_config_shutdown(void)
    E_CONFIG_DD_FREE(_e_config_mime_icon_edd);
    E_CONFIG_DD_FREE(_e_config_syscon_action_edd);
    E_CONFIG_DD_FREE(_e_config_env_var_edd);
-   E_CONFIG_DD_FREE(_e_config_screen_info_edd);
+   E_CONFIG_DD_FREE(_e_config_randr_serialized_setup_edd);
    return 1;
 }
 
@@ -1012,15 +1021,13 @@ e_config_load(void)
      {
         printf("EEEK! no config of any sort! abort abort abort!\n");
         fprintf(stderr, "EEEK! no config of any sort! abort abort abort!\n");
-        e_alert_show("Enlightenment was started without any configuration\n"
-                     "files available for the given profile (normally\n"
-                     "default or the last profile used or provided on the\n"
-                     "command-line with -profile etc.)\n"
-                     "\n"
-                     "Cannot contiue without configuration to work with.\n"
-                     "Please ensure you have system or user configuration\n"
-                     "for the profile you are using before proceeeding."
-                     );
+        e_error_message_show("Enlightenment was started without any configuration\n"
+                             "files available for the given profile (normally\n"
+                             "default or the last profile used or provided on the\n"
+                             "command-line with -profile etc.)\n\n"
+                             "Cannot contiue without configuration to work with.\n"
+                             "Please ensure you have system or user configuration\n"
+                             "for the profile you are using before proceeeding.");
         abort();
      }
    if (e_config->config_version < E_CONFIG_FILE_VERSION)
@@ -1142,12 +1149,6 @@ e_config_load(void)
        COPYVAL(screensaver_ask_presentation_timeout);
        IFCFGEND;
 
-        IFCFG(0x0133);
-        COPYVAL(desk_flip_pan_bg);
-        COPYVAL(desk_flip_pan_x_axis_factor);
-        COPYVAL(desk_flip_pan_y_axis_factor);
-        IFCFGEND;
-
         IFCFG(0x0134);
         COPYVAL(exec.expire_timeout);
         COPYVAL(exec.show_run_dialog);
@@ -1167,6 +1168,18 @@ e_config_load(void)
        COPYVAL(geometry_auto_move);
         IFCFGEND;
 
+        IFCFG(0x0142);
+        COPYVAL(backlight.normal);
+        COPYVAL(backlight.dim);
+        COPYVAL(backlight.transition);
+        IFCFGEND;
+
+        IFCFG(0x0145);
+        COPYVAL(xsettings.enabled);
+        COPYVAL(xsettings.match_e17_theme);
+        COPYVAL(xsettings.match_e17_icon_theme);
+        IFCFGEND;
+
         e_config->config_version = E_CONFIG_FILE_VERSION;
         _e_config_free(tcfg);
      }
@@ -1177,7 +1190,7 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
    E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
    E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
-   E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3);
+   E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 8);
    E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0);
    E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
    E_CONFIG_LIMIT(e_config->priority, 0, 19);
@@ -1270,9 +1283,6 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1);
    E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1);
    E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1);
-   E_CONFIG_LIMIT(e_config->desk_flip_pan_bg, 0, 1);
-   E_CONFIG_LIMIT(e_config->desk_flip_pan_x_axis_factor, 0.0, 1.0);
-   E_CONFIG_LIMIT(e_config->desk_flip_pan_y_axis_factor, 0.0, 1.0);
    E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3);
    E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
 
@@ -1642,7 +1652,6 @@ e_config_profile_save(void)
                     {
                        e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.%i.cfg", i - 1);
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.%i.cfg", i);
-
                        if ((ecore_file_exists(bsrc)) &&
                            (ecore_file_size(bsrc)))
                          {
@@ -1716,7 +1725,6 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
                     {
                        e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/%s/%s.%i.cfg", _e_config_profile, domain, i - 1);
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/%s/%s.%i.cfg", _e_config_profile, domain, i);
-
                        if ((ecore_file_exists(bsrc)) &&
                            (ecore_file_size(bsrc)))
                          {
@@ -1904,10 +1912,12 @@ _e_config_free(E_Config *ecf)
    E_Color_Class *cc;
    E_Path_Dir *epd;
    E_Remember *rem;
-   E_Randr_Screen_Restore_Info *screen_info;
-   E_Randr_Crtc_Restore_Info *crtc_info;
-   E_Randr_Output_Info *output_info;
-   E_Randr_Screen_Restore_Info_12 *restore_info_12;
+   E_Randr_Serialized_Setup_12 *serialized_setup_12;
+   E_Randr_Serialized_Crtc *serialized_crtc;
+   E_Randr_Serialized_Output_Policy *serialized_output_policy;
+   E_Randr_Serialized_Output *serialized_output;
+   E_Randr_Edid_Hash *edid_hash;
+   char *output_name;
    E_Config_Env_Var *evr;
 
 
@@ -2058,54 +2068,70 @@ _e_config_free(E_Config *ecf)
         if (sca->icon) eina_stringshare_del(sca->icon);
         E_FREE(sca);
      }
-   if (ecf->screen_info)
+   if(ecf->randr_serialized_setup)
      {
-       EINA_LIST_FREE(ecf->screen_info, screen_info)
-         {
-            switch (screen_info->randr_version)
-              {
-               case EET_SCREEN_INFO_11:
-                  free(screen_info->rrvd_restore_info.restore_info_11);
-                  break;
-               case EET_SCREEN_INFO_12:
-               case EET_SCREEN_INFO_13:
-                  EINA_LIST_FREE(screen_info->rrvd_restore_info.restore_info_12, restore_info_12)
-                    {
-                       EINA_LIST_FREE(restore_info_12->crtcs, crtc_info)
-                         {
-                            EINA_LIST_FREE(crtc_info->outputs, output_info)
-                              {
-                                 free(output_info->name);
-                                 free(output_info->edid);
-                                 free (output_info);
-                              }
-                            free (crtc_info);
-                         }
-                       free(restore_info_12);
-                    }
-                  eina_list_free(screen_info->rrvd_restore_info.restore_info_12);
-                  break;
-              }
-            free(screen_info);
-         }
+           free (ecf->randr_serialized_setup->serialized_setup_11);
+           if (ecf->randr_serialized_setup->serialized_setups_12)
+             {
+                EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_setups_12, serialized_setup_12)
+                  {
+                     EINA_LIST_FREE(serialized_setup_12->serialized_crtcs, serialized_crtc)
+                       {
+                          if (!serialized_crtc) continue;
+                          EINA_LIST_FREE(serialized_crtc->serialized_outputs, serialized_output)
+                            {
+                               if (!serialized_output) continue;
+                               free(serialized_output->name);
+                               free(serialized_output);
+                            }
+                          EINA_LIST_FREE(serialized_crtc->possible_outputs_names, output_name)
+                            {
+                               if (output_name) free(output_name);
+                            }
+                          if (serialized_crtc->mode_info.name)
+                            free(serialized_crtc->mode_info.name);
+                          free(serialized_crtc);
+                       }
+                     EINA_LIST_FREE(serialized_setup_12->serialized_edid_hashes, edid_hash)
+                       {
+                          if (edid_hash) free(edid_hash);
+                       }
+                     free(serialized_setup_12);
+                  }
+             }
+           EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_outputs_policies, serialized_output_policy)
+             {
+                if (!serialized_output_policy) continue;
+                free(serialized_output_policy->name);
+                free(serialized_output_policy);
+             }
+           free(ecf->randr_serialized_setup);
      }
+
    EINA_LIST_FREE(ecf->env_vars, evr)
      {
         if (evr->var) eina_stringshare_del(evr->var);
         if (evr->val) eina_stringshare_del(evr->val);
         E_FREE(evr);
      }
+   if (ecf->xsettings.net_icon_theme_name)
+     eina_stringshare_del(ecf->xsettings.net_icon_theme_name);
+   if (ecf->xsettings.net_theme_name)
+     eina_stringshare_del(ecf->xsettings.net_theme_name);
+   if (ecf->xsettings.gtk_font_name)
+     eina_stringshare_del(ecf->xsettings.gtk_font_name);
+
    E_FREE(ecf);
 }
 
-static Eina_Bool
+   static Eina_Bool
 _e_config_cb_timer(void *data)
 {
    e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);
    return 0;
 }
 
-static int
+   static int
 _e_config_eet_close_handle(Eet_File *ef, char *file)
 {
    Eet_Error err;
@@ -2115,22 +2141,23 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
    switch (err)
      {
       case EET_ERROR_NONE:
-        /* all good - no error */
-       break;
+         /* all good - no error */
+         break;
       case EET_ERROR_BAD_OBJECT:
-       erstr = _("The EET file handle is bad.");
-       break;
+         erstr = _("The EET file handle is bad.");
+         break;
       case EET_ERROR_EMPTY:
-       erstr = _("The file data is empty.");
-       break;
+         erstr = _("The file data is empty.");
+         break;
       case EET_ERROR_NOT_WRITABLE:
-       erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
+         erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
        break;
       case EET_ERROR_OUT_OF_MEMORY:
        erstr = _("Memory ran out while preparing the write.<br>Please free up memory.");
        break;
       case EET_ERROR_WRITE_ERROR:
        erstr = _("This is a generic error.");
+        break;
       case EET_ERROR_WRITE_ERROR_FILE_TOO_BIG:
        erstr = _("The settings file is too large.<br>It should be very small (a few hundred KB at most).");
        break;
@@ -2168,7 +2195,7 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
        erstr = _("Encryption failed.");
        break;
       case EET_ERROR_DECRYPT_FAILED:
-       erstr = _("Decruption failed.");
+       erstr = _("Decryption failed.");
        break;
       default: /* if we get here eet added errors we don't know */
        erstr = _("The error is unknown to Enlightenment.");
@@ -2262,36 +2289,3 @@ _e_config_acpi_bindings_add(void)
    bind->params = eina_stringshare_add("now");
    e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind);
 }
-
-static const char *
-_eet_union_type_get(const void *data, Eina_Bool *unknow)
-{
-   const Eet_Union *u = data;
-   int i;
-
-   if (unknow) *unknow = EINA_FALSE;
-   for (i = 0; eet_mapping[i].name; ++i)
-     if (*u == eet_mapping[i].u)
-       return eet_mapping[i].name;
-
-   if (unknow) *unknow = EINA_TRUE;
-   return NULL;
-}
-
-static Eina_Bool
-_eet_union_type_set(const char *type, void *data, Eina_Bool unknow)
-{
-   Eet_Union *u = data;
-   int i;
-
-   if (unknow) return EINA_FALSE;
-
-   for (i = 0; eet_mapping[i].name; ++i)
-     if (strcmp(eet_mapping[i].name, type) == 0)
-       {
-         *u = eet_mapping[i].u;
-         return EINA_TRUE;
-       }
-
-   return EINA_FALSE;
-}
index 8fe1a46..e793cb7 100644 (file)
@@ -33,7 +33,7 @@ typedef struct _E_Event_Config_Icon_Theme   E_Event_Config_Icon_Theme;
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0142
+#define E_CONFIG_FILE_GENERATION 0x0146
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0
@@ -213,16 +213,20 @@ struct _E_Config
    double      desklock_autolock_idle_timeout; // GUI
    int         desklock_use_custom_desklock; // GUI
    const char *desklock_custom_desklock_cmd; // GUI
-   Eina_Bool   desklock_ask_presentation; // GUI
-   double      desklock_ask_presentation_timeout; // GUI
+   unsigned char desklock_ask_presentation; // GUI
+   double        desklock_ask_presentation_timeout; // GUI
 
    int         screensaver_enable; // GUI
    int         screensaver_timeout; // GUI
    int         screensaver_interval; // GUI
    int         screensaver_blanking; // GUI
    int         screensaver_expose; // GUI
-   Eina_Bool   screensaver_ask_presentation; // GUI
-   double      screensaver_ask_presentation_timeout; // GUI
+   unsigned char screensaver_ask_presentation; // GUI
+   double        screensaver_ask_presentation_timeout; // GUI
+   
+   unsigned char screensaver_suspend;
+   unsigned char screensaver_suspend_on_ac;
+   double        screensaver_suspend_delay;
 
    int         dpms_enable; // GUI
    int         dpms_standby_enable; // GUI
@@ -246,22 +250,19 @@ struct _E_Config
    int         mouse_accel_denominator; // GUI
    int         mouse_accel_threshold; // GUI
 
-   Eina_List   *screen_info; // GUI
+   E_Randr_Serialized_Setup   *randr_serialized_setup; // GUI
 
    int         border_raise_on_mouse_action; // GUI
    int         border_raise_on_focus; // GUI
    int         desk_flip_wrap; // GUI
    int         fullscreen_flip; // GUI
 
-   const char *icon_theme; // GUI
-   Eina_Bool   icon_theme_overrides; // GUI
+   const char    *icon_theme; // GUI
+   unsigned char  icon_theme_overrides; // GUI
 
-   int         desk_flip_animate_mode; // GUI
-   int         desk_flip_animate_interpolation; // GUI
-   double      desk_flip_animate_time; // GUI
-   Eina_Bool   desk_flip_pan_bg;
-   double      desk_flip_pan_x_axis_factor;
-   double      desk_flip_pan_y_axis_factor;
+   int           desk_flip_animate_mode; // GUI
+   int           desk_flip_animate_interpolation; // GUI
+   double        desk_flip_animate_time; // GUI
 
    const char *wallpaper_import_last_dev; // INTERNAL
    const char *wallpaper_import_last_path; // INTERNAL
@@ -322,27 +323,53 @@ struct _E_Config
 
    struct {
       struct {
-         int icon_size;
+         int         icon_size;
       } main, secondary, extra;
-      double timeout;
-      unsigned char do_input;
-      Eina_List *actions;
+      double         timeout;
+      unsigned char  do_input;
+      Eina_List     *actions;
    } syscon;
 
    struct {
-      Eina_Bool presentation;
-      Eina_Bool offline;
+      unsigned char presentation;
+      unsigned char offline;
    } mode;
 
    struct {
-      double    expire_timeout;
-      Eina_Bool show_run_dialog;
-      Eina_Bool show_exit_dialog;
+      double        expire_timeout;
+      unsigned char show_run_dialog;
+      unsigned char show_exit_dialog;
    } exec;
    
    unsigned char null_container_win;
    
    Eina_List *env_vars;
+   
+   struct {
+      double normal;
+      double dim;
+      double transition;
+   } backlight;
+   
+   struct {
+      unsigned char load_xrdb;
+      unsigned char load_xmodmap;
+      unsigned char load_gnome;
+      unsigned char load_kde;
+   } deskenv;
+
+   struct {
+      unsigned char  enabled;
+      unsigned char  match_e17_theme;
+      unsigned char  match_e17_icon_theme;
+      int            xft_antialias;
+      int            xft_hinting;
+      const char    *xft_hint_style;
+      const char    *xft_rgba;
+      const char    *net_theme_name;
+      const char    *net_icon_theme_name;
+      const char    *gtk_font_name;
+   } xsettings;
 };
 
 struct _E_Config_Env_Var
@@ -388,7 +415,7 @@ struct _E_Config_Binding_Mouse
 struct _E_Config_Binding_Key
 {
    int            context;
-   int            modifiers;
+   unsigned int   modifiers;
    const char    *key;
    const char    *action;
    const char    *params;
@@ -475,6 +502,7 @@ struct _E_Config_Gadcon_Client
    int            orient;
    unsigned char  autoscroll;
    unsigned char  resizable;
+   const char *theme;
 };
 
 struct _E_Config_Shelf
index fedfdbd..1290f97 100644 (file)
@@ -295,7 +295,7 @@ _e_configure_efreet_desktop_update(void)
    /* get desktops */
    settings_desktops = efreet_util_desktop_category_list("Settings");
    system_desktops = efreet_util_desktop_category_list("System");
-   if ((!settings_desktops) || (!system_desktops))
+   if ((!settings_desktops) && (!system_desktops))
      {
        EINA_LIST_FREE(settings_desktops, desktop)
           efreet_desktop_free(desktop);
@@ -315,8 +315,9 @@ _e_configure_efreet_desktop_update(void)
        const char *cfg_icon;
        char *label;
        int cfg_pri;
-
-       if (!eina_list_data_find(system_desktops, desktop)) continue;
+        int dopref;
+        
+        dopref = 0;
        cfg_cat = NULL;
        cfg_icon = NULL;
        cfg_cat_cfg = NULL;
@@ -324,6 +325,11 @@ _e_configure_efreet_desktop_update(void)
        cfg_cat_name = NULL;
        cfg_cat_icon = NULL;
        label = NULL;
+       if (!eina_list_data_find(system_desktops, desktop))
+          {
+             /* settings desktop but not in system -> put in preferences */
+             dopref = 1;
+          }
        if (desktop->x)
          {
             cfg_cat_cfg = eina_hash_find(desktop->x, "X-Enlightenment-Config-Category");
@@ -346,34 +352,45 @@ _e_configure_efreet_desktop_update(void)
        if (desktop->name) label = desktop->name;
        else if (desktop->generic_name) label = desktop->generic_name;
        else label = "???";
-       if (!cfg_cat_cfg)
-         {
-            const char *ic;
-
-            snprintf(buf, sizeof(buf), "system/%s", label);
-            cfg_cat_cfg = buf;
-            ic = cfg_cat_icon;
-            if (!ic) ic = "system";
-            e_configure_registry_category_add("system", 1000, _("System"),
-                                              NULL, ic);
-         }
-       else
-         {
-            cfg_cat = ecore_file_dir_get(cfg_cat_cfg);
-            if (!cfg_cat) cfg_cat = strdup(cfg_cat_cfg);
-            if (cfg_cat)
-              {
-                 if (!cfg_cat_name) cfg_cat_name = cfg_cat;
-                 e_configure_registry_category_add(cfg_cat,
-                                                   1000, cfg_cat_name,
-                                                   NULL, cfg_cat_icon);
-                 free(cfg_cat);
-                 cfg_cat = NULL;
-              }
-         }
-       _e_configure_registry_item_full_add(cfg_cat_cfg, cfg_pri, label,
-                                           NULL, cfg_icon,
-                                           NULL, NULL, desktop, NULL);
+        if (!cfg_cat_cfg)
+          {
+             const char *ic = cfg_cat_icon;
+             
+             if (dopref)
+               {
+                  snprintf(buf, sizeof(buf), "preferences/%s", label);
+                  if (!ic) ic = "preferences-preferences";
+                  e_configure_registry_category_add("preferences", 900,
+                                                    _("Preferences"),
+                                                    NULL, ic);
+               }
+             else
+               {
+                  snprintf(buf, sizeof(buf), "system/%s", label);
+                  if (!ic) ic = "preferences-system";
+                  e_configure_registry_category_add("system", 1000, 
+                                                    _("System"),
+                                                    NULL, ic);
+               }
+             cfg_cat_cfg = buf;
+          }
+        else
+          {
+             cfg_cat = ecore_file_dir_get(cfg_cat_cfg);
+             if (!cfg_cat) cfg_cat = strdup(cfg_cat_cfg);
+             if (cfg_cat)
+               {
+                  if (!cfg_cat_name) cfg_cat_name = cfg_cat;
+                  e_configure_registry_category_add(cfg_cat,
+                                                    1000, cfg_cat_name,
+                                                    NULL, cfg_cat_icon);
+                  free(cfg_cat);
+                  cfg_cat = NULL;
+               }
+          }
+        _e_configure_registry_item_full_add(cfg_cat_cfg, cfg_pri, label,
+                                            NULL, cfg_icon,
+                                            NULL, NULL, desktop, NULL);
      }
    EINA_LIST_FREE(settings_desktops, desktop)
       efreet_desktop_free(desktop);
index c2372ab..f5c8dab 100644 (file)
@@ -845,7 +845,7 @@ _e_container_border_list_jump(E_Border_List *list, int dir)
    E_Border *bd;
    
    if ((list->pos < 0) || 
-       (list->pos >= eina_array_count_get(&(list->client_array))))
+       (list->pos >= (int)eina_array_count_get(&(list->client_array))))
       return NULL;
    bd = eina_array_data_get(&(list->client_array), list->pos);
    list->pos += dir;
index f180e84..70ae582 100644 (file)
@@ -11,7 +11,7 @@ static void _e_desk_event_desk_before_show_free(void *data, void *ev);
 static void _e_desk_event_desk_after_show_free(void *data, void *ev);
 static void _e_desk_event_desk_deskshow_free(void *data, void *ev);
 static void _e_desk_event_desk_name_change_free(void *data, void *ev);
-static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
+static void _e_desk_show_begin(E_Desk *desk, int mode, int x, int dy);
 static void _e_desk_show_end(E_Desk *desk);
 static Eina_Bool _e_desk_show_animator(void *data);
 static void _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy);
@@ -48,7 +48,7 @@ e_desk_new(E_Zone *zone, int x, int y)
    Eina_List *l;
    E_Config_Desktop_Name *cfname;
    char name[40];
-   int ok;
+   int ok = 0;
 
    E_OBJECT_CHECK_RETURN(zone, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
@@ -61,7 +61,6 @@ e_desk_new(E_Zone *zone, int x, int y)
    desk->y = y;
 
    /* Get current desktop's name */
-   ok = 0;
    EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
      {
        if ((cfname->container >= 0) &&
@@ -91,8 +90,8 @@ e_desk_name_set(E_Desk *desk, const char *name)
 
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
-   if (desk->name) eina_stringshare_del(desk->name);
-   desk->name = eina_stringshare_add(name);
+
+   eina_stringshare_replace(&desk->name, name);
 
    ev = E_NEW(E_Event_Desk_Name_Change, 1);
    ev->desk = desk;
@@ -107,12 +106,14 @@ e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *nam
    E_Config_Desktop_Name *cfname;
 
    e_desk_name_del(container, zone, desk_x, desk_y);
+
    cfname = E_NEW(E_Config_Desktop_Name, 1);
    cfname->container = container;
    cfname->zone = zone;
    cfname->desk_x = desk_x;
    cfname->desk_y = desk_y;
    if (name) cfname->name = eina_stringshare_add(name);
+   else cfname->name = NULL;
    e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
 }
 
@@ -130,7 +131,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
             e_config->desktop_names = 
               eina_list_remove_list(e_config->desktop_names, l);
             if (cfname->name) eina_stringshare_del(cfname->name);
-            free(cfname);
+            E_FREE(cfname);
             break;
          }
      }
@@ -169,7 +170,7 @@ e_desk_name_update(void)
                                     ((int) zone->num != cfname->zone)) continue;
                                 if ((cfname->desk_x != d_x) || 
                                     (cfname->desk_y != d_y)) continue;
-                                e_desk_name_set(desk,cfname->name);
+                                e_desk_name_set(desk, cfname->name);
                                 ok = 1;
                                 break;
                              }
@@ -179,7 +180,7 @@ e_desk_name_update(void)
                                 snprintf(name, sizeof(name), 
                                          _(e_config->desktop_default_name), 
                                          d_x, d_y);
-                                e_desk_name_set(desk,name);
+                                e_desk_name_set(desk, name);
                              }
                         }
                    }
@@ -196,9 +197,10 @@ e_desk_show(E_Desk *desk)
    E_Event_Desk_Show *ev;
    E_Event_Desk_Before_Show *eev;
    E_Event_Desk_After_Show *eeev;
+   Edje_Message_Float_Set *msg;
    Eina_List *l;
    E_Shelf *es;
-   int was_zone = 0, x, y, dx = 0, dy = 0, prev_x = 0, prev_y = 0;
+   int was_zone = 0, x, y, dx = 0, dy = 0;
 
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -221,8 +223,6 @@ e_desk_show(E_Desk *desk)
             if (desk2->visible)
               {
                  desk2->visible = 0;
-                 prev_x = desk2->x;
-                 prev_y = desk2->y;
                  dx = desk->x - desk2->x;
                  dy = desk->y - desk2->y;
                  if (e_config->desk_flip_animate_mode > 0)
@@ -237,6 +237,15 @@ e_desk_show(E_Desk *desk)
    desk->zone->desk_y_current = desk->y;
    desk->visible = 1;
 
+   msg = alloca(sizeof(Edje_Message_Float_Set) + (4 * sizeof(double)));
+   msg->count = 5;
+   msg->val[0] = e_config->desk_flip_animate_time;
+   msg->val[1] = (double) desk->x;
+   msg->val[2] = (double) desk->zone->desk_x_count;
+   msg->val[3] = (double) desk->y;
+   msg->val[4] = (double) desk->zone->desk_y_count;
+   edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_FLOAT_SET, 0, msg);
+
    if (desk->zone->bg_object) was_zone = 1;
    if (e_config->desk_flip_animate_mode == 0)
      {
@@ -258,17 +267,14 @@ e_desk_show(E_Desk *desk)
 
    if (e_config->desk_flip_animate_mode > 0)
      _e_desk_show_begin(desk, e_config->desk_flip_animate_mode, dx, dy);
-
-   if (e_config->focus_last_focused_per_desktop)
-     e_desk_last_focused_focus(desk);
-
-   if (was_zone)
+   else
      {
-       if (e_config->desk_flip_pan_bg)
-         e_bg_zone_slide(desk->zone, prev_x, prev_y);
-       else
-         e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
+        if (e_config->focus_last_focused_per_desktop)
+           e_desk_last_focused_focus(desk);
      }
+
+   if (was_zone)
+     e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
    else
      e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
 
@@ -316,7 +322,7 @@ e_desk_show(E_Desk *desk)
        ecore_event_add(E_EVENT_DESK_AFTER_SHOW, eeev, 
                        _e_desk_event_desk_after_show_free, NULL);
      }
-
+   e_zone_edge_flip_eval(desk->zone);
 }
 
 EAPI void
@@ -515,7 +521,9 @@ static void
 _e_desk_free(E_Desk *desk)
 {
    if (desk->name) eina_stringshare_del(desk->name);
+   desk->name = NULL;
    if (desk->animator) ecore_animator_del(desk->animator);
+   desk->animator = NULL;
    free(desk);
 }
 
@@ -597,6 +605,7 @@ _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy)
               }
             else if ((bd->desk == desk) && (!bd->sticky))
               {
+                  e_border_tmp_input_hidden_push(bd);
                  bd->fx.start.t = t;
                  if (mode == 1)
                    {
@@ -670,11 +679,24 @@ _e_desk_show_end(E_Desk *desk)
                  if (!bd->visible)
                    e_border_show(bd);
               }
+             e_border_tmp_input_hidden_pop(bd);
          }
      }
 
-   if (e_config->focus_last_focused_per_desktop)
-     e_desk_last_focused_focus(desk);
+   if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
+       (e_config->focus_policy == E_FOCUS_SLOPPY))
+     {
+        if (e_config->focus_last_focused_per_desktop)
+          {
+             if (!e_border_under_pointer_get(desk, NULL))
+                e_desk_last_focused_focus(desk);
+          }
+     }
+   else
+     {
+        if (e_config->focus_last_focused_per_desktop)
+           e_desk_last_focused_focus(desk);
+     }
 
    e_container_border_list_free(bl);
    ecore_x_window_shadow_tree_flush();
diff --git a/src/bin/e_deskenv.c b/src/bin/e_deskenv.c
new file mode 100644 (file)
index 0000000..cd9b5d2
--- /dev/null
@@ -0,0 +1,58 @@
+#include "e.h"
+
+EINTERN int
+e_deskenv_init(void)
+{
+   char buf[PATH_MAX], buf2[PATH_MAX];
+   
+   // run xdrb -load .Xdefaults & .Xresources
+   // NOTE: one day we should replace this with an e based config + service
+   if (e_config->deskenv.load_xrdb)
+     {
+        e_user_homedir_concat(buf, sizeof(buf), ".Xdefaults");
+        if (ecore_file_exists(buf))
+          {
+             snprintf(buf2, sizeof(buf2), "xrdb -load %s", buf);
+             ecore_exe_run(buf2, NULL);
+          }
+        e_user_homedir_concat(buf, sizeof(buf), ".Xresources");
+        if (ecore_file_exists(buf))
+          {
+             snprintf(buf2, sizeof(buf2), "xrdb -load %s", buf);
+             ecore_exe_run(buf2, NULL);
+          }
+     }
+
+   // load ~/.Xmodmap
+   // NOTE: one day we should replace this with an e based config + service
+   if (e_config->deskenv.load_xmodmap)
+     {
+        e_user_homedir_concat(buf, sizeof(buf), ".Xmodmap");
+        if (ecore_file_exists(buf))
+          {
+             snprintf(buf2, sizeof(buf2), "xmodmap %s", buf);
+             ecore_exe_run(buf2, NULL);
+          }
+     }
+
+   // make gnome apps happy
+   // NOTE: one day we should replace this with an e based config + service
+   if (e_config->deskenv.load_gnome)
+     {
+        ecore_exe_run("gnome-settings-daemon", NULL);
+     }
+
+   // make kde apps happy
+   // NOTE: one day we should replace this with an e based config + service ??
+   if (e_config->deskenv.load_kde)
+     {
+        ecore_exe_run("kdeinit", NULL);
+     }
+   return 1;
+}
+
+EINTERN int
+e_deskenv_shutdown(void)
+{
+   return 1;
+}
diff --git a/src/bin/e_deskenv.h b/src/bin/e_deskenv.h
new file mode 100644 (file)
index 0000000..737c410
--- /dev/null
@@ -0,0 +1,10 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_DESKENV_H
+#define E_DESKENV_H
+
+EINTERN int  e_deskenv_init(void);
+EINTERN int  e_deskenv_shutdown(void);
+
+#endif
+#endif
index 283e4ee..035566a 100644 (file)
@@ -69,6 +69,7 @@ static Eina_Bool _e_desklock_cb_key_down(void *data, int type, void *event);
 static Eina_Bool _e_desklock_cb_mouse_move(void *data, int type, void *event);
 static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
 static Eina_Bool _e_desklock_cb_idle_poller(void *data);
+static Eina_Bool _e_desklock_cb_window_stack(void *data, int type, void *event);
 
 static void _e_desklock_null(void);
 static void _e_desklock_passwd_update(void);
@@ -362,6 +363,18 @@ e_desklock_show(void)
      eina_list_append(edd->handlers,
                      ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
                                              _e_desklock_cb_key_down, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+                     ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STACK,
+                                             _e_desklock_cb_window_stack, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+                     ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
+                                             _e_desklock_cb_window_stack, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+                     ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CREATE,
+                                             _e_desklock_cb_window_stack, NULL));
 
    if ((total_zone_num > 1) && (e_config->desklock_login_box_zone == -2)) 
      {
@@ -445,6 +458,43 @@ e_desklock_hide(void)
 }
 
 static Eina_Bool
+_e_desklock_cb_window_stack(void *data __UNUSED__,
+                           int   type,
+                           void *event)
+{
+   Ecore_X_Window win;
+   E_Desklock_Popup_Data *edp;
+   Eina_List *l;
+   Eina_Bool raise = EINA_TRUE;
+
+   if (type == ECORE_X_EVENT_WINDOW_STACK)
+     win = ((Ecore_X_Event_Window_Stack*) event)->event_win;
+   else if (type == ECORE_X_EVENT_WINDOW_STACK)
+     win = ((Ecore_X_Event_Window_Configure*) event)->event_win;
+   else if (type == ECORE_X_EVENT_WINDOW_CREATE)
+     win = ((Ecore_X_Event_Window_Create*) event)->win;
+   else 
+     return ECORE_CALLBACK_PASS_ON;
+   
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
+     {
+       if (win == edp->popup_wnd->evas_win)
+         {
+            raise = EINA_FALSE;             
+            break;
+         }
+     }
+
+   if (raise)
+     {
+       EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
+         ecore_evas_raise(edp->popup_wnd->ecore_evas);
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
 _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -509,13 +559,15 @@ _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *even
 static void
 _e_desklock_passwd_update(void)
 {
-   char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
+   int len, i;
+   char passwd_hidden[PASSWD_LEN] = "", *pp;
    E_Desklock_Popup_Data *edp;
    Eina_List *l;
 
    if (!edd) return;
 
-   for (p = edd->passwd, pp = passwd_hidden; *p; p++, pp++)
+   len = eina_unicode_utf8_get_len(edd->passwd);
+   for (i = 0, pp = passwd_hidden ; i < len ; i++, pp++)
      *pp = '*';
    *pp = 0;
 
@@ -707,8 +759,8 @@ _desklock_auth(char *passwd)
        sigaction(SIGABRT, &action, NULL);
 
        current_user = _desklock_auth_get_current_user();
-       eina_strlcpy(da.user, current_user, PATH_MAX);
-       eina_strlcpy(da.passwd, passwd, PATH_MAX);
+       eina_strlcpy(da.user, current_user, sizeof(da.user));
+       eina_strlcpy(da.passwd, passwd, sizeof(da.passwd));
        /* security - null out passwd string once we are done with it */
        for (p = passwd; *p; p++) *p = 0;
        da.pam.handle = NULL;
index 8517a89..cd43b59 100644 (file)
@@ -72,10 +72,6 @@ _e_dialog_internal_new(E_Container *con, const char *name, const char *class, in
    kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    if (!kg)
       fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
-   mask = 0;
-   kg = evas_object_key_grab(o, "space", mask, ~mask, 0);
-   if (!kg)
-      fprintf(stderr,"ERROR: unable to redirect \"space\" key events to object %p.\n", o);
 
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _e_dialog_cb_key_down, dia);
 
@@ -332,8 +328,7 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
          }
      }
    else if (((!strcmp(ev->keyname, "Return")) || 
-            (!strcmp(ev->keyname, "KP_Enter")) || 
-            (!strcmp(ev->keyname, "space"))))
+            (!strcmp(ev->keyname, "KP_Enter"))))
      {
        Evas_Object *o = NULL;
        
index 69a2246..67f5889 100644 (file)
@@ -445,11 +445,8 @@ _e_desktop_edit_update_orig_path(E_Config_Dialog_Data *cfdata)
 static int
 _e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
-   E_Desktop_Edit *editor;
    char *str;
 
-   editor = cfdata->editor;
-
    IFFREE(cfdata->desktop->name);
    IFDUP(cfdata->name, cfdata->desktop->name);
    IFFREE(cfdata->desktop->comment);
index 4d05511..3299551 100644 (file)
@@ -400,6 +400,26 @@ e_editable_cursor_pos_get(Evas_Object *editable)
 }
 
 /**
+ * Gets the geometry of the cursor of the editable object
+ *
+ * @param editable an editable object
+ * @param cx the x of the cursor
+ * @param cy the y of the cursor
+ * @param cw the width of the cursor
+ * @param ch the height of the cursor
+ */
+EAPI void
+e_editable_cursor_geometry_get(Evas_Object *editable, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+{
+   E_Editable_Smart_Data *sd;
+
+   if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
+     return;
+
+   evas_object_geometry_get(sd->cursor_object, cx, cy, cw, ch);
+}
+
+/**
  * Moves the cursor to the start of the editable object
  *
  * @param editable an editable object
index 542beb5..11543ed 100644 (file)
@@ -17,6 +17,7 @@ EAPI int          e_editable_delete                  (Evas_Object *editable, int
 
 EAPI void         e_editable_cursor_pos_set          (Evas_Object *editable, int pos);
 EAPI int          e_editable_cursor_pos_get          (Evas_Object *editable);
+EAPI void         e_editable_cursor_geometry_get     (Evas_Object *editable, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
 EAPI void         e_editable_cursor_move_to_start    (Evas_Object *editable);
 EAPI void         e_editable_cursor_move_to_end      (Evas_Object *editable);
 EAPI void         e_editable_cursor_move_left        (Evas_Object *editable);
index 574968d..944bcd3 100644 (file)
@@ -17,8 +17,9 @@ struct _E_Entry_Smart_Data
    Ecore_IMF_Context *imf_context;
 #endif
    Ecore_Event_Handler *imf_ee_commit_handler;
+   Ecore_Event_Handler *imf_ee_preedit_changed_handler;
    Ecore_Event_Handler *imf_ee_delete_handler;
-   
+
    int enabled;
    int focused;
    int selection_dragging;
@@ -26,6 +27,9 @@ struct _E_Entry_Smart_Data
    float valign;
    int min_width;
    int height;
+   int preedit_start_pos;
+   int preedit_end_pos;
+   Eina_Bool have_preedit : 1;
 };
 
 /* local subsystem functions */
@@ -55,9 +59,12 @@ static void _e_entry_cb_copy(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_paste(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_entry_imf_cursor_info_set(Evas_Object *object);
+static void _e_entry_imf_context_reset(Evas_Object *object);
 #ifdef HAVE_ECORE_IMF
 static Eina_Bool _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
 static Eina_Bool _e_entry_cb_imf_event_commit(void *data, int type, void *event);
+static Eina_Bool _e_entry_cb_imf_event_preedit_changed(void *data, int type __UNUSED__, void *event);
 static Eina_Bool _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event);
 #endif
 
@@ -239,14 +246,10 @@ e_entry_focus(Evas_Object *entry)
    if (!sd->selection_dragging)
      {
         e_editable_cursor_move_to_end(sd->editable_object);
-#ifdef HAVE_ECORE_IMF
-        if (sd->imf_context)
-          {
-             ecore_imf_context_reset(sd->imf_context);
-             ecore_imf_context_cursor_position_set(sd->imf_context,
-                                                   e_editable_cursor_pos_get(sd->editable_object));
-          }
-#endif
+
+        _e_entry_imf_context_reset(entry);
+        _e_entry_imf_cursor_info_set(entry);
+
         e_editable_selection_move_to_end(sd->editable_object);
      }
    if (sd->enabled)
@@ -536,14 +539,8 @@ _e_entry_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o
                              E_MENU_POP_DIRECTION_DOWN, event->timestamp);
      }
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(sd->editable_object));
-     }
-#endif
+   _e_entry_imf_context_reset(obj);
+   _e_entry_imf_cursor_info_set(obj);
 }
 
 /* Called when the entry object is released by the mouse */
@@ -609,14 +606,9 @@ _e_entry_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o
                                              event->cur.canvas.x - ox,
                                              event->cur.canvas.y - oy);
         e_editable_cursor_pos_set(sd->editable_object, pos);
-#ifdef HAVE_ECORE_IMF
-        if (sd->imf_context)
-          {
-             ecore_imf_context_reset(sd->imf_context);
-             ecore_imf_context_cursor_position_set(sd->imf_context,
-                                                   pos);
-          }
-#endif
+
+        _e_entry_imf_context_reset(obj);
+        _e_entry_imf_cursor_info_set(obj);
      }
 }
 
@@ -848,14 +840,8 @@ _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down *event)
         changed |= e_editable_insert(editable, start_pos, event->string);
      }
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(editable));
-     }
-#endif
+   _e_entry_imf_context_reset(entry);
+   _e_entry_imf_cursor_info_set(entry);
 
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
@@ -1001,14 +987,8 @@ _e_entry_key_down_emacs(Evas_Object *entry, Evas_Event_Key_Down *event)
             (event->string[0] >= 0x20 && event->string[0] != 0x7f)))
      changed = e_editable_insert(editable, cursor_pos, event->string);
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(editable));
-     }
-#endif
+   _e_entry_imf_context_reset(entry);
+   _e_entry_imf_cursor_info_set(entry);
 
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
@@ -1033,7 +1013,7 @@ _e_entry_smart_add(Evas_Object *object)
    if ((!object) || !(evas = evas_object_evas_get(object)))
      return;
 
-   sd = malloc(sizeof(E_Entry_Smart_Data));
+   sd = calloc(1, sizeof(E_Entry_Smart_Data));
    if (!sd) return;
    
    evas_object_smart_data_set(object, sd);
@@ -1069,6 +1049,9 @@ _e_entry_smart_add(Evas_Object *object)
         sd->imf_ee_commit_handler = 
           ecore_event_handler_add(ECORE_IMF_EVENT_COMMIT,
                                   _e_entry_cb_imf_event_commit, object);
+        sd->imf_ee_preedit_changed_handler =
+           ecore_event_handler_add(ECORE_IMF_EVENT_PREEDIT_CHANGED,
+                                   _e_entry_cb_imf_event_preedit_changed, object);
         sd->imf_ee_delete_handler = 
           ecore_event_handler_add(ECORE_IMF_EVENT_DELETE_SURROUNDING,
                                   _e_entry_cb_imf_event_delete_surrounding, sd);
@@ -1125,6 +1108,8 @@ _e_entry_smart_del(Evas_Object *object)
      {
        if (sd->imf_ee_commit_handler) 
           ecore_event_handler_del(sd->imf_ee_commit_handler);
+       if (sd->imf_ee_preedit_changed_handler)
+          ecore_event_handler_del(sd->imf_ee_preedit_changed_handler);
        if (sd->imf_ee_delete_handler) 
           ecore_event_handler_del(sd->imf_ee_delete_handler);
        ecore_imf_context_del(sd->imf_context);
@@ -1359,6 +1344,43 @@ _e_entry_cb_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
      }
 }
 
+static void
+_e_entry_imf_context_reset(Evas_Object *object)
+{
+   E_Entry_Smart_Data *sd;
+
+   if ((!object) || !(sd = evas_object_smart_data_get(object)))
+     return;
+
+#ifdef HAVE_ECORE_IMF 
+   if (sd->imf_context)
+     ecore_imf_context_reset(sd->imf_context);
+#endif
+}
+
+static void
+_e_entry_imf_cursor_info_set(Evas_Object *object)
+{
+   E_Entry_Smart_Data *sd;
+   Evas_Coord cx, cy, cw, ch;
+   Evas_Object *editable;
+
+   if ((!object) || !(sd = evas_object_smart_data_get(object)))
+     return;
+
+#ifdef HAVE_ECORE_IMF 
+   if (!sd || !sd->imf_context) return;
+
+   editable = sd->editable_object;
+
+   e_editable_cursor_geometry_get(editable, &cx, &cy, &cw, &ch);
+
+   ecore_imf_context_cursor_position_set(sd->imf_context,
+                                         e_editable_cursor_pos_get(editable));
+   ecore_imf_context_cursor_location_set(sd->imf_context, cx, cy, cw, ch);
+#endif
+}
+
 #ifdef HAVE_ECORE_IMF
 static Eina_Bool 
 _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx __UNUSED__, char **text, int *cursor_pos)
@@ -1396,7 +1418,7 @@ _e_entry_cb_imf_event_commit(void *data, int type __UNUSED__, void *event)
    if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
      return ECORE_CALLBACK_PASS_ON;
 
-   if (sd->imf_context != ev->ctx)
+   if ((!sd->imf_context) || (sd->imf_context != ev->ctx))
      return ECORE_CALLBACK_PASS_ON;
 
    editable = sd->editable_object;
@@ -1408,8 +1430,20 @@ _e_entry_cb_imf_event_commit(void *data, int type __UNUSED__, void *event)
 
    if (selecting)
      changed |= e_editable_delete(editable, start_pos, end_pos);
+
+   /* delete preedit characters */
+   if (sd->have_preedit)
+     {
+        if (sd->preedit_start_pos != sd->preedit_end_pos)
+          e_editable_delete(editable, sd->preedit_start_pos, sd->preedit_end_pos);
+        sd->have_preedit = EINA_FALSE;
+        start_pos = sd->preedit_start_pos;
+     }
+
    changed |= e_editable_insert(editable, start_pos, ev->str);
 
+   _e_entry_imf_cursor_info_set(entry);
+
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
 
@@ -1417,6 +1451,69 @@ _e_entry_cb_imf_event_commit(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
+_e_entry_cb_imf_event_preedit_changed(void *data, int type __UNUSED__, void *event)
+{
+   Evas_Object *entry;
+   E_Entry_Smart_Data *sd;
+   Ecore_IMF_Event_Preedit_Changed *ev = event;
+   Evas_Object *editable;
+   int cursor_pos, selection_pos;
+   char *preedit_string = NULL;
+   int start_pos, end_pos;
+   int selecting;
+   int changed = 0;
+
+   if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
+     return ECORE_CALLBACK_PASS_ON;
+
+   if ((!sd->imf_context) || (sd->imf_context != ev->ctx))
+     return ECORE_CALLBACK_PASS_ON;
+
+   /* Get the preedit string from IMF */
+   ecore_imf_context_preedit_string_get(sd->imf_context, &preedit_string, &cursor_pos);
+   if (!preedit_string) return ECORE_CALLBACK_PASS_ON;
+
+   editable = sd->editable_object;
+   cursor_pos = e_editable_cursor_pos_get(editable);
+   selection_pos = e_editable_selection_pos_get(editable);
+   start_pos = (cursor_pos <= selection_pos) ? cursor_pos : selection_pos;
+   end_pos = (cursor_pos >= selection_pos) ? cursor_pos : selection_pos;
+   selecting = (start_pos != end_pos);
+
+   if (selecting)
+     changed |= e_editable_delete(editable, start_pos, end_pos);
+
+   /* delete preedit characters */
+   if (sd->have_preedit)
+     {
+        if (sd->preedit_start_pos != sd->preedit_end_pos)
+          e_editable_delete(editable, sd->preedit_start_pos, sd->preedit_end_pos);
+     }
+
+   cursor_pos = e_editable_cursor_pos_get(editable);
+   sd->preedit_start_pos = cursor_pos;
+
+   /* insert preedit character(s) */
+   changed |= e_editable_insert(editable, cursor_pos, preedit_string);
+
+   sd->preedit_end_pos = e_editable_cursor_pos_get(editable);
+
+   if (!strcmp(preedit_string, ""))
+     sd->have_preedit = EINA_FALSE;
+   else
+     sd->have_preedit = EINA_TRUE;
+
+   _e_entry_imf_cursor_info_set(entry);
+
+   if (changed)
+     evas_object_smart_callback_call(entry, "preedit,changed", NULL);
+
+   free(preedit_string);
+
+   return ECORE_CALLBACK_DONE;
+}
+
+static Eina_Bool
 _e_entry_cb_imf_event_delete_surrounding(void *data, int type __UNUSED__, void *event)
 {
    E_Entry_Smart_Data *sd;
index 2c3acd5..cd7e5cc 100644 (file)
@@ -9,9 +9,7 @@ EAPI void
 e_error_message_show_internal(char *txt)
 {
    /* FIXME: maybe log these to a file and display them at some point */
-   printf("<<<< Enlightenment Error >>>>\n"
-         "%s\n",
-         txt);
+   printf("<<<< Enlightenment Error >>>>\n%s\n", txt);
 }
 
 /* local subsystem functions */
index d2c8968..c8819bc 100644 (file)
@@ -1,12 +1,12 @@
 #ifdef E_TYPEDEFS
 
-#define e_error_message_show(args...) \
+#define e_error_message_show(args...) do \
 { \
-   char __tmpbuf[4096]; \
+   char __tmpbuf[PATH_MAX]; \
  \
    snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \
    e_error_message_show_internal(__tmpbuf); \
-}
+} while (0)
 
 #else
 #ifndef E_ERROR_H
index a3b9d13..1a0b57e 100644 (file)
@@ -209,7 +209,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 //                         ECORE_EXE_PIPE_AUTO | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR |
 //                         ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
 //                         inst);
-   if ((desktop) && (desktop->path))
+   if ((desktop) && (desktop->path) && (desktop->path[0]))
      {
         if (!getcwd(buf, sizeof(buf)))
           {
@@ -225,7 +225,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
                                 _("Enlightenment was unable to change to directory:<br>"
                                   "<br>"
                                   "%s"),
-                          buf);
+                          desktop->path);
              return NULL;
           }
         e_util_library_path_strip();
@@ -446,10 +446,6 @@ _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __
    search = data;
    EINA_LIST_FOREACH(value, l, inst)
      {
-        int pid = -1;
-        
-        if (inst->exe)
-           pid = ecore_exe_pid_get(inst->exe);
         if (((search->startup_id > 0) && 
              (search->startup_id == inst->startup_id)) ||
             ((inst->exe) && (search->pid > 1) && 
index b443249..56909ed 100644 (file)
@@ -180,6 +180,7 @@ struct _E_Fm2_Icon
    Eina_Bool odd : 1;
    Eina_Bool down_sel : 1;
    Eina_Bool removable_state_change : 1;
+   Eina_Bool thumb_failed : 1;
 };
 
 struct _E_Fm2_Finfo
@@ -576,6 +577,12 @@ _e_fm2_icon_h_get(const E_Fm2_Smart_Data *sd)
    return sd->config->icon.list.h;
 }
 
+static inline unsigned int
+_e_fm2_icon_mime_size_normalize(const E_Fm2_Icon *ic)
+{
+   return e_util_icon_size_normalize(_e_fm2_icon_w_get(ic->sd));
+}
+
 static Eina_Bool
 _e_fm2_mime_flush_cb(void *data __UNUSED__)
 {
@@ -1003,25 +1010,25 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
    /* If the path is of type removable: we add a new mountpoint */
    if (sd->dev && !sd->mount && !strncmp(sd->dev, "removable:", 10))
      {
-        E_Volume *v = NULL;
+       E_Volume *v = NULL;
 
-        v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
-        if (v)
-          {
-             sd->mount = e_fm2_device_mount(v,
-                                            _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-                                            _e_fm2_cb_unmount_ok, NULL, obj);
-             if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
-          }
+       v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
+       if (v)
+         {
+            sd->mount = e_fm2_device_mount(v,
+                                           _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+                                           _e_fm2_cb_unmount_ok, NULL, obj);
+            if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
+         }
      }
    else if (sd->config->view.open_dirs_in_place == 0)
      {
-        E_Fm2_Mount *m;
-        m = e_fm2_device_mount_find(sd->realpath);
-        if (m)
-          sd->mount = e_fm2_device_mount(m->volume,
-                                         _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-                                         _e_fm2_cb_unmount_ok, NULL, obj);
+       E_Fm2_Mount *m;
+       m = e_fm2_device_mount_find(sd->realpath);
+       if (m)
+         sd->mount = e_fm2_device_mount(m->volume,
+                                        _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+                                        _e_fm2_cb_unmount_ok, NULL, obj);
      }
 
    if (!sd->mount || sd->mount->mounted)
@@ -1813,6 +1820,8 @@ _e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__,
 
    if (!o) return NULL;
 
+   e_icon_scale_size_set(o, _e_fm2_icon_mime_size_normalize(ic)); 
+
    if (!e_util_icon_theme_set(o, name))
      {
         evas_object_del(o);
@@ -1878,6 +1887,7 @@ _e_fm2_icon_explicit_get(Evas *evas, const E_Fm2_Icon *ic, const char *icon, con
         if (!o)
           return NULL;
 
+       e_icon_scale_size_set(o, _e_fm2_icon_mime_size_normalize(ic)); 
         e_icon_file_set(o, iconpath);
         e_icon_fill_inside_set(o, 1);
         if (type_ret) *type_ret = "CUSTOM";
@@ -1901,6 +1911,9 @@ _e_fm2_icon_thumb_get(Evas *evas, const E_Fm2_Icon *ic, const char *group, Evas_
    Evas_Object *o;
    char buf[PATH_MAX];
 
+   if (ic->thumb_failed)
+     return NULL;
+   
    if (!_e_fm2_icon_realpath(ic, buf, sizeof(buf)))
      return NULL;
 
@@ -2025,12 +2038,6 @@ _e_fm2_icon_mime_type_special_match(const E_Fm2_Icon *ic)
    return NULL;
 }
 
-static inline unsigned int
-_e_fm2_icon_mime_size_normalize(const E_Fm2_Icon *ic)
-{
-   return e_util_icon_size_normalize(_e_fm2_icon_w_get(ic->sd));
-}
-
 static Evas_Object *
 _e_fm2_icon_mime_fdo_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret)
 {
@@ -2040,11 +2047,7 @@ _e_fm2_icon_mime_fdo_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret
    size = _e_fm2_icon_mime_size_normalize(ic);
    icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size);
    if (icon)
-     {
-        Evas_Object *o;
-        o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
-        return o;
-     }
+      return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
    return NULL;
 }
 
@@ -2061,14 +2064,14 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r
    file = e_theme_edje_file_get("base/theme/icons", buf);
    if (file && file[0])
      {
-        Evas_Object *obj = edje_object_add(evas);
-        if (!obj) return NULL;
-        if (!edje_object_file_set(obj, file, buf))
+        Evas_Object *o = edje_object_add(evas);
+        if (!o) return NULL;
+        if (!edje_object_file_set(o, file, buf))
           {
-             evas_object_del(obj);
+             evas_object_del(o);
              return NULL;
           }
-        return obj;
+        return o;
      }
 
    return NULL;
@@ -2078,41 +2081,9 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r
  * Use mime type information to set icon.
  */
 static Evas_Object *
-_e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, void *data, int force_gen, const char **type_ret)
+_e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __UNUSED__, void *data __UNUSED__, int force_gen __UNUSED__, const char **type_ret)
 {
-   Evas_Object *o;
-   const char *icon;
-
-   /* create thumbnails for edje files */
-   if (_e_fm2_file_is_edje(ic->info.file))
-     {
-        o = _e_fm2_icon_thumb_edje_get
-            (evas, ic, gen_func, data, force_gen, type_ret);
-        if (o) return o;
-     }
-
-   /* disabled until everyone has edje in mime.types:
-    *  use mimetype to identify edje.
-    * if (ic->info.mime == _e_fm2_mime_app_edje)
-    *   return _e_fm2_icon_thumb_edje_get
-    *     (evas, ic, gen_func, data, force_gen, type_ret); */
-
-   /* check user preferences */
-   icon = _e_fm2_icon_mime_type_special_match(ic);
-   if (icon)
-     {
-        if (icon == _e_fm2_icon_desktop_str)
-          return _e_fm2_icon_desktop_get(evas, ic, type_ret);
-        else if (icon == _e_fm2_icon_thumb_str)
-          {
-             return _e_fm2_icon_thumb_get
-                      (evas, ic, NULL, gen_func, data, force_gen, type_ret);
-          }
-        else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
-          return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
-        else
-          return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
-     }
+   Evas_Object *o = NULL;
 
    if (e_config->icon_theme_overrides)
      o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret);
@@ -2126,23 +2097,7 @@ _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, v
    else
      o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret);
 
-   if (o) return o;
-
-   return NULL;
-
-   /* XXX REMOVE/DEPRECATED below here */
-   /* icon = e_fm_mime_icon_get(ic->info.mime);
-    * if (!icon) return NULL;
-    *
-    * if (icon == _e_fm2_icon_desktop_str)
-    *   return _e_fm2_icon_desktop_get(evas, ic, type_ret);
-    * else if (icon == _e_fm2_icon_thumb_str)
-    *   return _e_fm2_icon_thumb_get(evas, ic, NULL,
-    *           gen_func, data, force_gen, type_ret);
-    * else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
-    *   return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
-    * else
-    * return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret); */
+   return o;
 }
 
 /**
@@ -2197,8 +2152,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun
    const char *p;
 
    p = strrchr(ic->info.file, '.');
-   if (!p)
-     return NULL;
+   if (!p) return NULL;
 
    p++;
    if (_e_fm2_ext_is_edje(p))
@@ -2208,8 +2162,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun
      return _e_fm2_icon_desktop_get(evas, ic, type_ret);
    else if (_e_fm2_ext_is_imc(p))
      return _e_fm2_icon_imc_get(evas, ic, type_ret);
-   else
-     return NULL;
+   return NULL;
 }
 
 /**
@@ -2228,10 +2181,11 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
                Evas_Smart_Cb gen_func,
                void *data, int force_gen, const char **type_ret)
 {
+   const char *icon;
+   Evas_Object *o = NULL;
+   
    if (ic->info.icon)
      {
-        Evas_Object *o;
-
         if ((ic->info.icon[0] == '/') ||
             ((ic->info.icon[0] == '.') &&
              ((ic->info.icon[1] == '/') ||
@@ -2241,23 +2195,46 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
              if (o) return o;
           }
 
-        if (ic->info.mime)
-          {
-             o = _e_fm2_icon_mime_get(evas, ic, gen_func, data,
-                                      force_gen, type_ret);
-             if (o) return o;
-          }
-
-        o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, ic->info.icon, type_ret);
-        if (!o) goto fallback;
+       o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, ic->info.icon, type_ret);
+       if (o) return o;
+     }
 
-        return o;
+   /* create thumbnails for edje files */
+   if (_e_fm2_file_is_edje(ic->info.file))
+     {
+       o = _e_fm2_icon_thumb_edje_get
+         (evas, ic, gen_func, data, force_gen, type_ret);
+       if (o) return o;
      }
 
-   if (ic->info.icon_type == 1)
+   /* disabled until everyone has edje in mime.types:
+    *  use mimetype to identify edje.
+    * if (ic->info.mime == _e_fm2_mime_app_edje)
+    *   return _e_fm2_icon_thumb_edje_get
+    *     (evas, ic, gen_func, data, force_gen, type_ret); */
+
+   /* check user preferences */
+   icon = _e_fm2_icon_mime_type_special_match(ic);
+   if (icon)
      {
-        Evas_Object *o;
+       if (icon == _e_fm2_icon_desktop_str)
+         o = _e_fm2_icon_desktop_get(evas, ic, type_ret);
+       else if (icon == _e_fm2_icon_thumb_str)
+         {
+            if (!ic->thumb_failed)
+              o = _e_fm2_icon_thumb_get
+                (evas, ic, NULL, gen_func, data, force_gen, type_ret);
+         }
+       else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
+         o = _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
+       else
+         o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
+
+       if (o) return o;
+     }
 
+   if ((!ic->thumb_failed) && (ic->info.icon_type == 1))
+     {
         o = _e_fm2_icon_thumb_get(evas, ic, NULL,
                                   gen_func, data, force_gen, type_ret);
         if (o) return o;
@@ -2265,21 +2242,20 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
 
    if (ic->info.mime)
      {
-        Evas_Object *o;
-
         o = _e_fm2_icon_mime_get(evas, ic, gen_func, data, force_gen, type_ret);
         if (o) return o;
      }
    else if (ic->info.file)
      {
-        Evas_Object *o;
-
         o = _e_fm2_icon_discover_get(evas, ic, gen_func, data,
                                      force_gen, type_ret);
         if (o) return o;
      }
 
-fallback:
+//fallback:
+   o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, "unknown", type_ret);
+   if (o) return o;
+   
    return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret);
 }
 
@@ -2905,18 +2881,23 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 //             printf("E_FM_OP_FILE_DEL\n");
              path = e->data;
              evdir = ecore_file_dir_get(path);
-             if ((sd->id == e->ref_to) && (!strcmp(dir, evdir)))
+             if ((dir) && (evdir) && (sd->id == e->ref_to) && (!strcmp(dir, evdir)))
                {
                   _e_fm2_live_file_del
                     (obj, ecore_file_file_get(path));
                }
-             free(evdir);
+             if (evdir) free(evdir);
              break;
 
            case E_FM_OP_MONITOR_END: /*mon dir del*/
 //             printf("E_FM_OP_MONITOR_END\n");
              path = e->data;
-             if ((sd->id == e->ref_to) && (!strcmp(dir, path)))
+             /* FIXME dir should not be null but can. fix segv
+                when mounting cdrom with udisk here
+                btw monitor end seems to be a strange event for
+                mounting disks.
+             */
+             if ((dir) && (path) && (sd->id == e->ref_to) && (!strcmp(dir, path)))
                {
                   dels = eina_list_append(dels, obj);
                }
@@ -3245,21 +3226,55 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
           }
         else if (strcmp(dev, "desktop") == 0)
           {
+             char *custom_desktop_dir = getenv("XDG_DESKTOP_DIR");
              /* this is a virtual device - it's where your favorites list is
               * stored - a dir with
                 .desktop files or symlinks (in fact anything
               * you like
               */
-               if (strcmp(path, "/") == 0)
-                 {
-                    if (e_user_homedir_concat(buf, sizeof(buf), _("Desktop")) >= sizeof(buf))
-                      return NULL;
-                 }
-               else
-                 {
-                    if (e_user_homedir_snprintf(buf, sizeof(buf), "%s-%s", _("Desktop"), path) >= sizeof(buf))
+             if (custom_desktop_dir)
+               {
+                 size_t len;
+
+                 custom_desktop_dir = e_util_shell_env_path_eval(custom_desktop_dir);
+                 len = strlen(custom_desktop_dir);
+
+                 if (len >= sizeof(buf))
+                   {
+                      free(custom_desktop_dir);
                       return NULL;
-                 }
+                   }
+
+                 strncpy(buf, custom_desktop_dir, sizeof(buf));
+
+                 if (strcmp(path, "/"))
+                   {
+                      if (len + 1 + strlen(path) >= sizeof(buf))
+                        {
+                           free(custom_desktop_dir);
+                           return NULL;
+                        }
+                      buf[len++] = '-';
+                      strncpy(buf + len, path, sizeof(buf) - len);
+                   }
+                   free(custom_desktop_dir);
+               }
+             else
+               {
+                 if (strcmp(path, "/") == 0)
+                   {
+                      if (e_user_homedir_concat(buf, sizeof(buf),
+                                                _("Desktop")) >= sizeof(buf))
+                        return NULL;
+                   }
+                 else
+                   {
+                      if (e_user_homedir_snprintf(buf, sizeof(buf), "%s-%s",
+                                                  _("Desktop"), path)
+                          >= sizeof(buf))
+                        return NULL;
+                   }
+               }
                ecore_file_mkpath(buf);
           }
         else if (strcmp(dev, "temp") == 0)
@@ -4107,29 +4122,29 @@ _e_fm2_icons_place(Evas_Object *obj)
      {
       case E_FM2_VIEW_MODE_ICONS:
         _e_fm2_icons_place_icons(sd);
-       sd->max.h += ICON_BOTTOM_SPACE;
+//     sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_GRID_ICONS:
         _e_fm2_icons_place_grid_icons(sd);
-       sd->max.h += ICON_BOTTOM_SPACE;
+//     sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_ICONS:
         _e_fm2_icons_place_custom_icons(sd);
-       sd->max.h += ICON_BOTTOM_SPACE;
+//     sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS:
         /* FIXME: not going to implement this at this stage */
         _e_fm2_icons_place_custom_grid_icons(sd);
-       sd->max.h += ICON_BOTTOM_SPACE;
+//     sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS:
         /* FIXME: not going to implement this at this stage */
         _e_fm2_icons_place_custom_smart_grid_icons(sd);
-       sd->max.h += ICON_BOTTOM_SPACE;
+//     sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_LIST:
@@ -5117,7 +5132,7 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
 
         if (
           ((ic->y - ic->sd->pos.y) >= 0) &&
-          ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) <= (ic->sd->h)) &&
+          ((ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) <= (ic->sd->h)) &&
           ((ic->x - ic->sd->pos.x) >= 0) &&
           ((ic->x + ic->w - ic->sd->pos.x) <= (ic->sd->w))
           )
@@ -5130,8 +5145,8 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
         y = ic->sd->pos.y;
         if ((ic->y - ic->sd->pos.y) < 0)
           y = ic->y;
-        else if ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) > (ic->sd->h))
-          y = ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->h;
+        else if ((ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) > (ic->sd->h))
+          y = ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->h;
         e_fm2_pan_set(ic->sd->obj, x, y);
      }
    evas_object_smart_callback_call(ic->sd->obj, "pan_changed", NULL);
@@ -6239,12 +6254,13 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 
               if ((ic) && (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_CUSTOM_ICONS))
                 {
-     /* dnd doesn't tell me all the co-ords of the icons being dragged so i can't place them accurately.
-      * need to fix this. ev->data probably needs to become more compelx than a list of url's
-      */
-                     x = ev->x + (ic->x - ox) - ic->drag.x + sd->pos.x;
-                     y = ev->y + (ic->y - oy) - ic->drag.y + sd->pos.y;
-
+                   /* dnd doesn't tell me all the co-ords of the icons being dragged so i can't place them accurately.
+                    * need to fix this. ev->data probably needs to become more compelx than a list of url's
+                    */
+                   
+                     x = ev->x + (ic->x - ox) - ic->drag.x + sd->pos.x - sd->x;
+                     y = ev->y + (ic->y - oy) - ic->drag.y + sd->pos.y - sd->y;
+                   
                      if (x < 0) x = 0;
                      if (y < 0) y = 0;
 
@@ -6888,11 +6904,15 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info __UNUSED
    E_Fm2_Icon *ic;
 
    ic = data;
-   if (ic->realized)
+   
+   if (e_icon_file_get(obj))
      {
         Evas_Coord w = 0, h = 0;
         int have_alpha;
 
+       if (!ic->realized)
+         return;
+
         e_icon_size_get(obj, &w, &h);
         have_alpha = e_icon_alpha_get(obj);
 //     if (_e_fm2_view_mode_get(ic->sd) == E_FM2_VIEW_MODE_LIST)
@@ -6906,6 +6926,14 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info __UNUSED
         else
           edje_object_signal_emit(ic->obj, "e,action,thumb,gen", "e");
      }
+   else
+     {
+       ic->thumb_failed = EINA_TRUE;
+       evas_object_del(obj);
+
+       if (ic->realized)
+         _e_fm2_icon_icon_set(ic);
+     }
 }
 
 static void
@@ -8533,8 +8561,9 @@ _e_fm2_view_menu_common(E_Menu *subm, E_Fm2_Smart_Data *sd)
    char buf[64];
    int icon_size = _e_fm2_icon_w_get(sd);
 
-   if (e_scale > 0.0)
-     icon_size /= e_scale;
+   // show the icon size as selected (even if it might be influnced by e_scale)
+   /* if (e_scale > 0.0)
+    *   icon_size /= e_scale; */
 
    snprintf(buf, sizeof(buf), _("Icon Size (%d)"), icon_size);
 
@@ -9868,7 +9897,7 @@ _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const ch
 //   if (sd->custom_theme_content)
 //     snprintf(buf, sizeof(buf), "e/icons/fileman/%s/%s", sd->custom_theme_content, group);
 //   else
-   snprintf(buf, sizeof(buf), "e/icons/fileman/%s", group);
+   snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", group);
 
    if (sd->custom_theme)
      {
old mode 100755 (executable)
new mode 100644 (file)
index 73bfdaa..d753880
@@ -6,7 +6,6 @@ AM_CFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
 @e_cflags@ \
-@x_cflags@ \
 @cf_cflags@ \
 @VALGRIND_CFLAGS@ \
 @EDJE_DEF@ \
@@ -36,6 +35,17 @@ else
 udisks_s =
 endif
 
+if HAVE_EEZE_MOUNT
+AM_CFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@
+LIBS += @EEZE_LIBS@ @EET_LIBS@
+eeze_s = \
+../e_prefix.c \
+e_fm_main_eeze.h \
+e_fm_main_eeze.c
+else
+eeze_s =
+endif
+
 enlightenment_fm_SOURCES = \
 e_fm_main.h \
 e_fm_ipc.h \
@@ -43,10 +53,10 @@ e_fm_main.c \
 e_fm_ipc.c \
 $(hal_s) \
 $(udisks_s) \
+$(eeze_s) \
 ../e_fm_shared_codec.c \
 ../e_fm_shared_device.c \
 ../e_user.c \
 ../e_sha1.c
 
 enlightenment_fm_LDADD = @E_FM_LIBS@
-
old mode 100755 (executable)
new mode 100644 (file)
index a8ad68a..fa81528
@@ -810,6 +810,7 @@ _e_fm_ipc_slave_data_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
    if (!e) return ECORE_CALLBACK_PASS_ON;
 
    slave = ecore_exe_data_get(e->exe);
+   if (!slave) return ECORE_CALLBACK_RENEW;
 
    sdata = e->data;
    ssize = e->size;
@@ -859,6 +860,7 @@ _e_fm_ipc_slave_error_cb(void *data __UNUSED__, int type __UNUSED__, void *event
    if (!e) return 1;
 
    slave = ecore_exe_data_get(e->exe);
+   if (!slave) return ECORE_CALLBACK_RENEW;
 
    printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, (char *)e->data);
 
@@ -874,9 +876,8 @@ _e_fm_ipc_slave_del_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
    if (!e) return 1;
 
    slave = ecore_exe_data_get(e->exe);
-   _e_fm_ipc_client_send(slave->id, E_FM_OP_QUIT, NULL, 0);
-
    if (!slave) return 1;
+   _e_fm_ipc_client_send(slave->id, E_FM_OP_QUIT, NULL, 0);
 
    _e_fm_ipc_slaves = eina_list_remove(_e_fm_ipc_slaves, (void *)slave);
    free(slave);
old mode 100755 (executable)
new mode 100644 (file)
index ec489b7..d342e84
@@ -45,7 +45,6 @@ void *alloca (size_t);
 #include <Ecore_Ipc.h>
 #include <Ecore_File.h>
 #include <Eet.h>
-#include <Evas.h>
 
 #define E_TYPEDEFS
 #include "e_config_data.h"
@@ -90,6 +89,8 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
 #include "e_fm_shared_codec.h"
 #include "e_fm_ipc.h"
 
+int efm_log_dom = -1;
+
 static void
 _e_fm_init(void)
 {
@@ -101,6 +102,7 @@ _e_fm_init(void)
 # else
 #  ifdef HAVE_EEZE_MOUNT
    _e_fm_main_eeze_init();
+   mode = EFM_MODE_USING_EEZE_MOUNT; /* this gets overridden if the others are available */
 #  endif
 # endif
 #endif
@@ -136,16 +138,18 @@ main(int argc, char **argv)
      }
 
    eina_init();
+   eet_init();
    ecore_init();
    ecore_app_args_set(argc, (const char **)argv);
 
-   _e_fm_init();
-
    ecore_file_init();
    ecore_ipc_init();
    _e_storage_volume_edd_init();
    _e_fm_ipc_init();
-   
+   efm_log_dom = eina_log_domain_register("efm", EINA_COLOR_GREEN);
+   eina_log_domain_level_set("efm", EINA_LOG_LEVEL_DBG);
+   _e_fm_init();
+
    ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_ipc_slave_data_cb, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_ipc_slave_error_cb, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_ipc_slave_del_cb, NULL);
@@ -170,21 +174,30 @@ main(int argc, char **argv)
 void
 _e_fm_main_hal_catch(Eina_Bool usable)
 {
-   if (usable) mode = EFM_MODE_USING_HAL_MOUNT;
+   if (usable)
+     {
+        mode = EFM_MODE_USING_HAL_MOUNT;
+        return;
+     }
+# ifdef HAVE_EEZE_MOUNT
+   _e_fm_main_eeze_init();
+   mode = EFM_MODE_USING_EEZE_MOUNT;
+# endif
 }
 #endif
 #ifdef HAVE_UDISKS_MOUNT
 void
 _e_fm_main_udisks_catch(Eina_Bool usable)
 {
-   if (usable) mode = EFM_MODE_USING_UDISKS_MOUNT;
-}
-#endif
-#ifdef HAVE_EEZE_MOUNT
-void
-_e_fm_main_eeze_catch(Eina_Bool usable)
-{
-   if (usable) mode = EFM_MODE_USING_EEZE_MOUNT;
+   if (usable)
+     {
+        mode = EFM_MODE_USING_UDISKS_MOUNT;
+        return;
+     }
+# ifdef HAVE_EEZE_MOUNT
+   _e_fm_main_eeze_init();
+   mode = EFM_MODE_USING_EEZE_MOUNT;
+# endif
 }
 #endif
 
old mode 100755 (executable)
new mode 100644 (file)
index 1022576..cdde822
@@ -1,7 +1,16 @@
 #ifndef E_FM_MAIN_H
 #define E_FM_MAIN_H
 
+#include <Ecore_Ipc.h>
+
+#define DBG(...)            EINA_LOG_DOM_DBG(efm_log_dom, __VA_ARGS__)
+#define INF(...)            EINA_LOG_DOM_INFO(efm_log_dom, __VA_ARGS__)
+#define WRN(...)            EINA_LOG_DOM_WARN(efm_log_dom, __VA_ARGS__)
+#define ERR(...)            EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__)
+#define CRI(...)            EINA_LOG_DOM_CRIT(efm_log_dom, __VA_ARGS__)
+
 extern Ecore_Ipc_Server *_e_fm_ipc_server;
+extern int efm_log_dom;
 
 #define E_FM_MOUNT_TIMEOUT 30.0
 #define E_FM_UNMOUNT_TIMEOUT 60.0
diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
new file mode 100644 (file)
index 0000000..76a0fbb
--- /dev/null
@@ -0,0 +1,897 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+#else
+# include <stddef.h>
+# ifdef  __cplusplus
+extern "C"
+# endif
+void *alloca(size_t);
+#endif
+
+#ifdef __linux__
+#include <features.h>
+#endif
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <Eet.h>
+#include <Eeze.h>
+#include <Eeze_Disk.h>
+
+#include "e_fm_main.h"
+#include "e_fm_main_eeze.h"
+
+#include "e_fm_shared_codec.h"
+#include "e_fm_shared_device.h"
+#include "e_fm_ipc.h"
+#include "e_fm_device.h"
+
+#include "eeze_scanner.h"
+
+static void _e_fm_main_eeze_storage_rescan(const char *syspath);
+static void _e_fm_main_eeze_volume_rescan(const char *syspath);
+static E_Volume *_e_fm_main_eeze_volume_find_fast(const char *syspath);
+static E_Storage *_e_fm_main_eeze_storage_find_fast(const char *syspath);
+
+
+static Eina_List *_e_stores = NULL;
+static Eina_List *_e_vols = NULL;
+static Eina_Bool _e_fm_eeze_init = EINA_FALSE;
+
+static Ecore_Exe *scanner = NULL;
+static Ecore_Con_Server *svr = NULL;
+static Eet_Data_Descriptor *es_edd = NULL;
+static Eet_Connection *es_con = NULL;
+static Eina_Prefix *pfx = NULL;
+
+void
+e_util_env_set(const char *var, const char *val)
+{
+   if (val)
+     {
+#ifdef HAVE_SETENV
+       setenv(var, val, 1);
+#else
+       char buf[8192];
+
+       snprintf(buf, sizeof(buf), "%s=%s", var, val);
+       if (getenv(var))
+         putenv(buf);
+       else
+         putenv(strdup(buf));
+#endif
+     }
+   else
+     {
+#ifdef HAVE_UNSETENV
+       unsetenv(var);
+#else
+       if (getenv(var)) putenv(var);
+#endif
+     }
+}
+
+static int
+_e_fm_main_eeze_format_error_msg(char     **buf,
+                                 E_Volume  *v,
+                                 const char *name,
+                                 const char *msg)
+{
+   int size, vu, vm, en;
+   char *tmp;
+
+   vu = strlen(v->udi) + 1;
+   vm = strlen(v->mount_point) + 1;
+   en = strlen(name) + 1;
+   size = vu + vm + en + strlen(msg) + 1;
+   tmp = *buf = malloc(size);
+
+   strcpy(tmp, v->udi);
+   tmp += vu;
+   strcpy(tmp, v->mount_point);
+   tmp += vm;
+   strcpy(tmp, name);
+   tmp += en;
+   strcpy(tmp, msg);
+
+   return size;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_vol_mount_timeout(E_Volume *v)
+{
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   eeze_disk_cancel(v->disk);
+   size = _e_fm_main_eeze_format_error_msg(&buf, v, "org.enlightenment.fm2.MountTimeout", "Unable to mount the volume with specified time-out.");
+   ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, E_FM_OP_MOUNT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_cb_vol_mounted(void *user_data __UNUSED__,
+                               int type __UNUSED__,
+                               Eeze_Event_Disk_Mount *ev)
+{
+   E_Volume *v;
+   char *buf;
+   int size;
+
+   //v = eeze_disk_data_get(ev->disk); THIS IS BROKEN DON'T ASK WHY
+   v = _e_fm_main_eeze_volume_find_fast(eeze_disk_syspath_get(ev->disk));
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+
+   if (!eeze_disk_mounted_get(ev->disk))
+     {
+        ERR("Mount of '%s' failed!", v->udi);
+        return ECORE_CALLBACK_RENEW;
+     }
+   v->mounted = EINA_TRUE;
+   INF("MOUNT: %s from %s", v->udi, v->mount_point);
+   size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
+   buf = alloca(size);
+   strcpy(buf, v->udi);
+   strcpy(buf + strlen(buf) + 1, v->mount_point);
+   ecore_ipc_server_send(_e_fm_ipc_server,
+                         6 /*E_IPC_DOMAIN_FM*/,
+                         E_FM_OP_MOUNT_DONE,
+                         0, 0, 0, buf, size);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_vol_unmount_timeout(E_Volume *v)
+{
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   eeze_disk_cancel(v->disk);
+   size = _e_fm_main_eeze_format_error_msg(&buf, v, "org.enlightenment.fm2.UnmountTimeout", "Unable to unmount the volume with specified time-out.");
+   ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, E_FM_OP_UNMOUNT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_cb_vol_error(void *user_data __UNUSED__,
+                                 int type __UNUSED__,
+                                 Eeze_Event_Disk_Error *ev)
+{
+   E_Volume *v;
+   char *buf;
+   int size;
+
+   //v = eeze_disk_data_get(ev->disk); THIS IS BROKEN DON'T ASK WHY
+   v = _e_fm_main_eeze_volume_find_fast(eeze_disk_syspath_get(ev->disk));
+   if (v->mounted)
+     {
+        size = _e_fm_main_eeze_format_error_msg(&buf, v, "org.enlightenment.fm2.UnmountError", ev->message);
+        ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, E_FM_OP_UNMOUNT_ERROR,
+                              0, 0, 0, buf, size);
+     }
+   else
+     {
+        size = _e_fm_main_eeze_format_error_msg(&buf, v, "org.enlightenment.fm2.MountError", ev->message);
+        ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, E_FM_OP_MOUNT_ERROR,
+                              0, 0, 0, buf, size);
+     }
+   free(buf);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_cb_vol_unmounted(void *user_data __UNUSED__,
+                                 int type __UNUSED__,
+                                 Eeze_Event_Disk_Unmount *ev)
+{
+   char *buf;
+   int size;
+   E_Volume *v;
+
+   v = _e_fm_main_eeze_volume_find_fast(eeze_disk_syspath_get(ev->disk));
+   //v = eeze_disk_data_get(ev->disk); THIS IS BROKEN DON'T ASK WHY
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+
+   v->mounted = EINA_FALSE;
+   INF("UNMOUNT: %s from %s", v->udi, v->mount_point);
+   if (!memcmp(v->mount_point, "/media/", 7))
+     unlink(v->mount_point);
+   size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
+   buf = alloca(size);
+   strcpy(buf, v->udi);
+   strcpy(buf + strlen(buf) + 1, v->mount_point);
+   ecore_ipc_server_send(_e_fm_ipc_server,
+                         6 /*E_IPC_DOMAIN_FM*/,
+                         E_FM_OP_UNMOUNT_DONE,
+                         0, 0, 0, buf, size);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_vol_eject_timeout(E_Volume *v)
+{
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   eeze_disk_cancel(v->disk);
+   size = _e_fm_main_eeze_format_error_msg(&buf, v, "org.enlightenment.fm2.EjectTimeout", "Unable to eject the media with specified time-out.");
+   ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, E_FM_OP_EJECT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_e_fm_main_eeze_cb_vol_ejected(void *user_data __UNUSED__,
+                               int type __UNUSED__,
+                               Eeze_Event_Disk_Eject *ev)
+{
+   E_Volume *v;
+   char *buf;
+   int size;
+
+   v = eeze_disk_data_get(ev->disk);
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+
+   v->mounted = EINA_TRUE;
+   INF("EJECT: %s from %s", v->udi, v->mount_point);
+   if (!memcmp(v->mount_point, "/media/", 7))
+     unlink(v->mount_point);
+   size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
+   buf = alloca(size);
+   strcpy(buf, v->udi);
+   strcpy(buf + strlen(buf) + 1, v->mount_point);
+   ecore_ipc_server_send(_e_fm_ipc_server,
+                         6 /*E_IPC_DOMAIN_FM*/,
+                         E_FM_OP_EJECT_DONE,
+                         0, 0, 0, buf, size);
+   return ECORE_CALLBACK_RENEW;
+}
+
+void
+_e_fm_main_eeze_volume_eject(E_Volume *v)
+{
+   if (!v || v->guard) return;
+   v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);
+   eeze_disk_eject(v->disk);
+}
+
+E_Volume *
+_e_fm_main_eeze_volume_add(const char *syspath,
+                           Eina_Bool   first_time)
+{
+   E_Volume *v;
+   const char *str;
+
+   if (!syspath) return NULL;
+   if (e_volume_find(syspath)) return NULL;
+   v = calloc(1, sizeof(E_Volume));
+   if (!v) return NULL;
+   v->disk = eeze_disk_new(syspath);
+   if (!v->disk)
+     {
+        free(v);
+        return NULL;
+     }
+   INF("VOL+ %s", syspath);
+   eeze_disk_data_set(v->disk, v);
+   v->udi = eina_stringshare_add(syspath);
+   v->icon = NULL;
+   v->first_time = first_time;
+   _e_vols = eina_list_append(_e_vols, v);
+   eeze_disk_scan(v->disk);
+   v->uuid = eeze_disk_uuid_get(v->disk);
+   v->label = eeze_disk_label_get(v->disk);
+   v->fstype = eeze_disk_fstype_get(v->disk);
+   v->parent = eeze_disk_udev_get_parent(v->disk);
+   str = eeze_disk_udev_get_sysattr(v->disk, "queue/hw_sector_size");
+   if (!str)
+     str = eeze_udev_syspath_get_sysattr(v->parent, "queue/hw_sector_size");
+   if (str)
+     {
+        int64_t sector_size, size;
+        sector_size = strtoll(str, NULL, 10);
+        eina_stringshare_del(str);
+        str = eeze_disk_udev_get_sysattr(v->disk, "size");
+        if (str)
+          {
+             size = strtoll(str, NULL, 10);
+             v->size = size * sector_size;
+          }
+        eina_stringshare_del(str);
+     }
+   v->mounted = eeze_disk_mounted_get(v->disk);
+   str = eeze_disk_udev_get_property(v->disk, "DEVTYPE");
+   if (str && (!strcmp(str, "partition")))
+     v->partition = EINA_TRUE;
+   eina_stringshare_del(str);
+   if (v->mounted)
+     v->mount_point = eeze_disk_mount_point_get(v->disk);
+
+   if (v->partition)
+     {
+        str = eeze_disk_udev_get_sysattr(v->disk, "partition");
+        if (str)
+           v->partition_number = strtol(str, NULL, 10);
+        eina_stringshare_del(str);
+        v->partition_label = eeze_disk_udev_get_property(v->disk, "ID_FS_LABEL");
+     }
+
+   {
+      E_Storage *s;
+      s = e_storage_find(v->parent);
+      INF("++VOL:\n  syspath: %s\n  uuid: %s\n  fstype: %s\n  size: %llu\n label: %s\n"
+          "  partition: %d\n  partition_number: %d\n partition_label: %s\n  mounted: %d\n  mount_point: %s",
+          v->udi, v->uuid, v->fstype, v->size, v->label, v->partition, v->partition_number,
+          v->partition ? v->partition_label : "(not a partition)", v->mounted, v->mount_point);
+      if (s)
+        v->storage = s;
+      else if (v->parent)
+        s = v->storage = _e_fm_main_eeze_storage_add(v->parent);
+
+      if (s)
+        {
+           s->volumes = eina_list_append(s->volumes, v);
+           INF("  for storage: %s", s->udi);
+        }
+      else INF("  storage unknown");
+   }
+
+   v->validated = EINA_TRUE;
+   {
+      void *msg_data;
+      int msg_size;
+
+      msg_data = _e_fm_shared_codec_volume_encode(v, &msg_size);
+      if (msg_data)
+        {
+           ecore_ipc_server_send(_e_fm_ipc_server,
+                                 6 /*E_IPC_DOMAIN_FM*/,
+                                 E_FM_OP_VOLUME_ADD,
+                                 0, 0, 0, msg_data, msg_size);
+           free(msg_data);
+        }
+   }
+   return v;
+}
+
+void
+_e_fm_main_eeze_volume_del(const char *syspath)
+{
+   E_Volume *v;
+
+   v = e_volume_find(syspath);
+   if (!v) return;
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+   if (v->validated)
+     {
+        INF("--VOL %s\n", v->udi);
+        /* FIXME: send event of storage volume (disk) removed */
+        ecore_ipc_server_send(_e_fm_ipc_server,
+                              6 /*E_IPC_DOMAIN_FM*/,
+                              E_FM_OP_VOLUME_DEL,
+                              0, 0, 0, v->udi, eina_stringshare_strlen(v->udi) + 1);
+     }
+   _e_vols = eina_list_remove(_e_vols, v);
+   v->uuid = NULL;
+   v->label = NULL;
+   v->fstype = NULL;
+   _e_fm_shared_device_volume_free(v);
+}
+
+static E_Volume *
+_e_fm_main_eeze_volume_find_fast(const char *syspath)
+{
+   Eina_List *l;
+   E_Volume *v;
+
+   if (!syspath) return NULL;
+   EINA_LIST_FOREACH(_e_vols, l, v)
+     {
+        if (syspath == v->udi) return v;
+     }
+   return NULL;
+}
+
+E_Volume *
+_e_fm_main_eeze_volume_find(const char *syspath)
+{
+   Eina_List *l;
+   E_Volume *v;
+
+   if (!syspath) return NULL;
+   EINA_LIST_FOREACH(_e_vols, l, v)
+     {
+        if (!v->udi) continue;
+        if (!strcmp(syspath, v->udi)) return v;
+     }
+   return NULL;
+}
+
+void
+_e_fm_main_eeze_volume_unmount(E_Volume *v)
+{
+   INF("unmount %s %s", v->udi, v->mount_point);
+   if (!v || v->guard) return;
+
+   if (!eeze_disk_mount_wrapper_get(v->disk))
+     {
+        char buf[PATH_MAX];
+
+        snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
+        eeze_disk_mount_wrapper_set(v->disk, buf);
+     }
+   v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);
+   eeze_disk_unmount(v->disk);
+}
+
+void
+_e_fm_main_eeze_volume_mount(E_Volume *v)
+{
+   int opts = 0;
+
+   if (!v || v->guard)
+     return;
+
+   INF("mount %s %s [fs type = %s]", v->udi, v->mount_point, v->fstype);
+
+   if (v->fstype)
+     {
+        if ((!strcmp(v->fstype, "vfat")) ||
+            (!strcmp(v->fstype, "ntfs"))
+            )
+          {
+             opts = EEZE_DISK_MOUNTOPT_UID;
+          }
+
+        if ((!strcmp(v->fstype, "vfat")) ||
+            (!strcmp(v->fstype, "ntfs")) ||
+            (!strcmp(v->fstype, "iso9660")) ||
+            (!strcmp(v->fstype, "jfs")))
+          {
+             opts |= EEZE_DISK_MOUNTOPT_UTF8;
+          }
+     }
+
+   /* here we arbitrarily mount everything to /media regardless of fstab */
+   eina_stringshare_del(v->mount_point);
+   v->mount_point = eina_stringshare_printf("/media/%s", v->uuid);
+   eeze_disk_mount_point_set(v->disk, v->mount_point);
+   eeze_disk_mountopts_set(v->disk, opts);
+   if (!eeze_disk_mount_wrapper_get(v->disk))
+     {
+        char buf[PATH_MAX];
+
+        snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
+        eeze_disk_mount_wrapper_set(v->disk, buf);
+     }
+   v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);
+   eeze_disk_mount(v->disk);
+}
+
+static void
+eet_setup(void)
+{
+   Eet_Data_Descriptor_Class eddc;
+
+   if (!eet_eina_stream_data_descriptor_class_set(&eddc, sizeof(eddc), "eeze_scanner_event", sizeof(Eeze_Scanner_Event)))
+     {
+        ERR("Could not create eet data descriptor!");
+        exit(1);
+     }
+
+   es_edd = eet_data_descriptor_stream_new(&eddc);
+   EEZE_SCANNER_EDD_SETUP(es_edd);
+}
+
+static Eina_Bool
+_scanner_delay(void *data __UNUSED__)
+{
+   INF("Attempting scanner connection");
+   svr = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL);
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_scanner_poll(void *data __UNUSED__)
+{
+   const char *tmp;
+   struct stat st;
+   char buf[1024];
+
+   if (svr) return EINA_FALSE;
+   tmp = getenv("TMPDIR");
+   if ((!tmp) || (!tmp[0])) tmp = "/tmp";
+
+   snprintf(buf, sizeof(buf), "%s/.ecore_service|eeze_scanner|0", tmp);
+   if (!stat(buf, &st))
+     {
+        ecore_timer_add(1.0, _scanner_delay, NULL);
+        return EINA_FALSE;
+     }
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_scanner_add(void *data, int type __UNUSED__, Ecore_Exe_Event_Add *ev)
+{
+   if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON;
+   INF("Scanner started");
+   if (_scanner_poll(NULL))
+     ecore_poller_add(ECORE_POLLER_CORE, 32, (Ecore_Task_Cb)_scanner_poll, NULL);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_scanner_del(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev)
+{
+   if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON;
+   if (!svr)
+     {
+        INF("scanner connection dead, exiting");
+        exit(1);
+     }
+   INF("lost connection to scanner");
+   scanner = NULL;
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_scanner_read(const void *data, size_t size, void *d __UNUSED__)
+{
+   Eeze_Scanner_Event *ev = NULL;
+
+   ev = eet_data_descriptor_decode(es_edd, data, size);
+   INF("Received %s '%s'", ev->volume ? "volume" : "storage", ev->device);
+   switch (ev->type)
+     {
+      case EEZE_SCANNER_EVENT_TYPE_ADD:
+        if (ev->volume) _e_fm_main_eeze_volume_add(ev->device, EINA_TRUE);
+        else _e_fm_main_eeze_storage_add(ev->device);
+        break;
+      case EEZE_SCANNER_EVENT_TYPE_REMOVE:
+        if (ev->volume) _e_fm_main_eeze_volume_del(ev->device);
+        else _e_fm_main_eeze_storage_del(ev->device);
+        break;
+      default:
+        if (ev->volume) _e_fm_main_eeze_volume_rescan(ev->device);
+        else _e_fm_main_eeze_storage_rescan(ev->device);
+        break;
+     }       
+   eina_stringshare_del(ev->device);
+   free(ev);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_scanner_write(const void *eet_data __UNUSED__, size_t size __UNUSED__, void *user_data __UNUSED__)
+{
+   return EINA_TRUE;
+}
+
+static void
+_scanner_run(void)
+{
+   char buf[1024];
+   struct stat st;
+   snprintf(buf, sizeof(buf),
+            "%s/enlightenment/utils/eeze_scanner", eina_prefix_lib_get(pfx));
+
+   if (stat(buf, &st))
+     {
+        CRI("Could not locate scanner at '%s'! EFM exiting.", buf);
+        exit(1);
+     }
+   scanner = ecore_exe_pipe_run(buf, ECORE_EXE_NOT_LEADER, pfx);
+}
+
+static Eina_Bool
+_scanner_con(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Del *ev __UNUSED__)
+{
+   INF("Scanner connected");
+   es_con = eet_connection_new(_scanner_read, _scanner_write, NULL);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_scanner_disc(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Del *ev __UNUSED__)
+{
+   INF("Scanner disconnected");
+   if (_scanner_poll(NULL))
+     _scanner_run();
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_scanner_err(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Error *ev __UNUSED__)
+{
+   INF("Scanner connection error");
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_scanner_data(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Data *ev)
+{
+   eet_connection_received(es_con, ev->data, ev->size);
+   return ECORE_CALLBACK_RENEW;
+}
+
+void
+_e_fm_main_eeze_init(void)
+{
+   const char *tmp;
+   char **argv, buf[1024];
+   struct stat st;
+   int argc;
+
+   ecore_app_args_get(&argc, &argv);
+   pfx = eina_prefix_new(argv[0], e_storage_find,
+                    "E", "enlightenment", "AUTHORS",
+                    PACKAGE_BIN_DIR,
+                    PACKAGE_LIB_DIR,
+                    PACKAGE_DATA_DIR,
+                    LOCALE_DIR);
+   if (!pfx)
+     {
+        ERR("Could not determine prefix!");
+        exit(1);
+     }
+   if (_e_fm_eeze_init) return;
+   _e_fm_eeze_init = EINA_TRUE;
+   ecore_con_init();
+   eeze_init();
+   eina_log_domain_level_set("eeze_disk", EINA_LOG_LEVEL_DBG);
+   eeze_mount_tabs_watch();
+   ecore_event_handler_add(EEZE_EVENT_DISK_MOUNT, (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_mounted, NULL);
+   ecore_event_handler_add(EEZE_EVENT_DISK_UNMOUNT, (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_unmounted, NULL);
+   ecore_event_handler_add(EEZE_EVENT_DISK_EJECT, (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_ejected, NULL);
+   ecore_event_handler_add(EEZE_EVENT_DISK_ERROR, (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_error, NULL);
+   
+   ecore_event_handler_add(ECORE_EXE_EVENT_ADD, (Ecore_Event_Handler_Cb)_scanner_add, pfx);
+   ecore_event_handler_add(ECORE_EXE_EVENT_DEL, (Ecore_Event_Handler_Cb)_scanner_del, pfx);
+
+   ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)_scanner_con, NULL);
+   ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, (Ecore_Event_Handler_Cb)_scanner_disc, NULL);
+   ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, (Ecore_Event_Handler_Cb)_scanner_data, NULL);
+   ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ERROR, (Ecore_Event_Handler_Cb)_scanner_err, NULL);
+
+   eet_setup();
+
+   tmp = getenv("TMPDIR");
+   if ((!tmp) || (!tmp[0])) tmp = "/tmp";
+
+   snprintf(buf, sizeof(buf), "%s/.ecore_service|eeze_scanner|0", tmp);
+   if (stat(buf, &st))
+     {
+        INF("Socket file '%s' for eeze_scanner does not exist, attempting to start...", buf);
+        _scanner_run();
+        return;
+     }
+   svr = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL);
+}
+
+void
+_e_fm_main_eeze_shutdown(void)
+{
+   eeze_mount_tabs_unwatch();
+   eeze_shutdown();
+   ecore_con_shutdown();
+}
+
+
+static void
+_e_fm_main_eeze_storage_rescan(const char *syspath)
+{
+   E_Storage *s;
+
+   s = _e_fm_main_eeze_storage_find_fast(syspath);
+   if (!s) return;
+   DBG("%s changed, nothing to see here", s->udi);
+}
+
+static void
+_e_fm_main_eeze_volume_rescan(const char *syspath)
+{
+   E_Volume *v;
+
+   v = _e_fm_main_eeze_volume_find_fast(syspath);
+   if (!v) return;
+   DBG("%s changed, nothing to see here", v->udi);
+}
+
+E_Storage *
+_e_fm_main_eeze_storage_add(const char *syspath)
+{
+   E_Storage *s;
+   const char *str;
+
+   if (!syspath) return NULL;
+   if (_e_fm_main_eeze_storage_find_fast(syspath)) return NULL;
+
+   str = eeze_udev_syspath_get_property(syspath, "ID_TYPE");
+   if (!str)
+     {
+        const char *p, *subsystem;
+
+        p = eeze_udev_syspath_get_parent(syspath);
+        if (!p) return NULL;
+        subsystem = eeze_udev_syspath_get_subsystem(p);
+        if ((!subsystem) || strcmp(subsystem, "mmc"))
+          {
+             eina_stringshare_del(subsystem);
+             return NULL;
+          }
+        eina_stringshare_del(subsystem);
+     }
+   eina_stringshare_del(str);
+   s = calloc(1, sizeof(E_Storage));
+   if (!s) return NULL;
+   s->disk = eeze_disk_new(syspath);
+   if (!s->disk) goto error;
+   _e_stores = eina_list_append(_e_stores, s);
+   eeze_disk_scan(s->disk); /* performs all necessary udev lookups at once */
+   s->udi = eina_stringshare_add(eeze_disk_syspath_get(s->disk));
+   switch (eeze_disk_type_get(s->disk))
+     {
+      case EEZE_DISK_TYPE_CDROM:
+        s->drive_type = eina_stringshare_add("cdrom");
+        break;
+      case EEZE_DISK_TYPE_USB:
+        s->drive_type = eina_stringshare_add("usb");
+        break;
+      case EEZE_DISK_TYPE_INTERNAL:
+        s->drive_type = eina_stringshare_add("ata");
+        break;
+      case EEZE_DISK_TYPE_FLASH:
+        s->drive_type = eina_stringshare_add("sd_mmc");
+        break;
+      default:
+        s->drive_type = eina_stringshare_add("unknown");
+        break;
+     }
+   s->model = eina_stringshare_add(eeze_disk_model_get(s->disk));
+   s->vendor = eina_stringshare_add(eeze_disk_vendor_get(s->disk));
+   s->serial = eina_stringshare_add(eeze_disk_serial_get(s->disk));
+   if (!s->serial) ERR("Error getting serial for %s", s->udi);
+   s->removable = !!eeze_disk_removable_get(s->disk);
+
+   if (s->removable)
+     {
+        int64_t size, sector_size;
+        
+        s->media_available = EINA_TRUE; /* all storage with removable=1 in udev has media available */
+        str = eeze_disk_udev_get_sysattr(s->disk, "queue/hw_sector_size");
+        if (str)
+          {
+             sector_size = strtoll(str, NULL, 10);
+             eina_stringshare_del(str);
+             str = eeze_disk_udev_get_sysattr(s->disk, "size");
+             if (str)
+               {
+                  size = strtoll(str, NULL, 10);
+                  s->media_size = size * sector_size;
+                  eina_stringshare_del(str);
+               }
+          }
+        s->hotpluggable = EINA_TRUE;
+     }
+
+   if (eeze_disk_type_get(s->disk) == EEZE_DISK_TYPE_CDROM)
+     s->requires_eject = EINA_TRUE; /* only true on cdroms */
+   s->media_check_enabled = s->removable;
+#if 0
+FIXME
+   s->icon.drive =
+   s->icon.volume =
+#endif
+   INF("++STO:\n  syspath: %s\n  bus: %s\n  drive_type: %s\n  model: %s\n  vendor: %s\n  serial: %s\n  icon.drive: %s\n  icon.volume: %s",
+       s->udi, s->bus, s->drive_type, s->model, s->vendor, s->serial, s->icon.drive, s->icon.volume);
+   s->validated = EINA_TRUE;
+   {
+      void *msg_data;
+      int msg_size;
+
+      msg_data = _e_fm_shared_codec_storage_encode(s, &msg_size);
+      if (msg_data)
+        {
+           ecore_ipc_server_send(_e_fm_ipc_server,
+                                 6 /*E_IPC_DOMAIN_FM*/,
+                                 E_FM_OP_STORAGE_ADD,
+                                 0, 0, 0, msg_data, msg_size);
+           free(msg_data);
+        }
+   }
+   return s;
+
+error:
+   ERR("ERR %s", s->udi);
+   _e_fm_shared_device_storage_free(s);
+   return NULL;
+}
+
+void
+_e_fm_main_eeze_storage_del(const char *syspath)
+{
+   E_Storage *s;
+
+   s = e_storage_find(syspath);
+   if (!s) return;
+   if (s->validated)
+     {
+        INF("--STO %s", s->udi);
+        ecore_ipc_server_send(_e_fm_ipc_server,
+                              6 /*E_IPC_DOMAIN_FM*/,
+                              E_FM_OP_STORAGE_DEL,
+                              0, 0, 0, s->udi, eina_stringshare_strlen(s->udi) + 1);
+     }
+   _e_stores = eina_list_remove(_e_stores, s);
+   _e_fm_shared_device_storage_free(s);
+}
+
+static E_Storage *
+_e_fm_main_eeze_storage_find_fast(const char *syspath)
+{
+   Eina_List *l;
+   E_Storage *s;
+
+   EINA_LIST_FOREACH(_e_stores, l, s)
+     {
+        if (syspath == s->udi) return s;
+     }
+   return NULL;
+}
+
+E_Storage *
+_e_fm_main_eeze_storage_find(const char *syspath)
+{
+   Eina_List *l;
+   E_Storage *s;
+
+   EINA_LIST_FOREACH(_e_stores, l, s)
+     {
+        if (!strcmp(syspath, s->udi)) return s;
+     }
+   return NULL;
+}
+
diff --git a/src/bin/e_fm/e_fm_main_eeze.h b/src/bin/e_fm/e_fm_main_eeze.h
new file mode 100644 (file)
index 0000000..d06aada
--- /dev/null
@@ -0,0 +1,25 @@
+#ifndef E_FM_MAIN_EEZE_H
+#define E_FM_MAIN_EEZE_H
+
+#include <Eeze.h>
+#include <Eeze_Disk.h>
+
+#include "e_fm_shared_types.h"
+
+E_Volume *_e_fm_main_eeze_volume_add(const char *syspath, Eina_Bool first_time);
+void _e_fm_main_eeze_volume_del(const char *syspath);
+E_Volume *_e_fm_main_eeze_volume_find(const char *syspath);
+
+void _e_fm_main_eeze_volume_eject(E_Volume *v);
+void _e_fm_main_eeze_volume_unmount(E_Volume *v);
+void _e_fm_main_eeze_volume_mount(E_Volume *v);
+
+E_Storage *_e_fm_main_eeze_storage_add(const char *syspath);
+void _e_fm_main_eeze_storage_del(const char *syspath);
+E_Storage *_e_fm_main_eeze_storage_find(const char *syspath);
+
+
+void _e_fm_main_eeze_init(void);
+void _e_fm_main_eeze_shutdown(void);
+
+#endif
old mode 100755 (executable)
new mode 100644 (file)
index 27d1e94..823a65a
@@ -53,9 +53,6 @@ void *alloca(size_t);
 #ifdef HAVE_UDISKS_MOUNT
 # include "e_fm_main_udisks.h"
 #endif
-#ifdef HAVE_EEZE_MOUNT
-# include "e_fm_main_eeze.h"
-#endif
 
 #include "e_fm_shared_codec.h"
 #include "e_fm_shared_device.h"
@@ -161,9 +158,7 @@ _e_fm_main_hal_test(void *data       __UNUSED__,
 #ifdef HAVE_UDISKS_MOUNT
         _e_fm_main_udisks_init(); /* check for udisks while listening for hal */
 #else
-# ifdef HAVE_EEZE_MOUNT
-        _e_fm_main_eeze_init(); /* check for eeze while listening for hal */
-# endif
+        _e_fm_main_hal_catch(EINA_FALSE);
 #endif
         return;
      }
old mode 100755 (executable)
new mode 100644 (file)
index 681a764..0e939e5
@@ -50,9 +50,6 @@ void *alloca(size_t);
 
 #include "e_fm_main.h"
 #include "e_fm_main_udisks.h"
-#ifdef HAVE_EEZE_MOUNT
-# include "e_fm_main_eeze.h"
-#endif
 
 #include "e_fm_shared_codec.h"
 #include "e_fm_shared_device.h"
@@ -140,10 +137,7 @@ _e_fm_main_udisks_test(void *data       __UNUSED__,
    if ((error) && (dbus_error_is_set(error)))
      {
         dbus_error_free(error);
-
-#ifdef HAVE_EEZE_MOUNT
-        _e_fm_main_eeze_init(); /* check for eeze while listening for udisks */
-#endif
+        _e_fm_main_udisks_catch(EINA_FALSE);
         return;
      }
    if (_udisks_poll)
@@ -184,7 +178,7 @@ _e_fm_main_udisks_cb_dev_all(void *user_data __UNUSED__,
 
    EINA_LIST_FOREACH(ret->strings, l, udi)
      {
-//     printf("DB INIT DEV+: %s\n", udi);
+       printf("DB INIT DEV+: %s\n", udi);
           e_udisks_get_property(_e_fm_main_udisks_conn, udi, "IdUsage",
                                 (E_DBus_Callback_Func)_e_fm_main_udisks_cb_dev_verify, (void*)eina_stringshare_add(udi));
      }
@@ -208,7 +202,7 @@ _e_fm_main_udisks_cb_dev_verify(const char *udi,
      _e_fm_main_udisks_storage_add(udi);
    else if (!strcmp(ret->val.s, "filesystem"))
      {
-//     printf("DB VOL+: %s\n", udi);
+       printf("DB VOL+: %s\n", udi);
           _e_fm_main_udisks_volume_add(udi, EINA_TRUE);
      }
    //eina_stringshare_del(udi);
@@ -231,7 +225,7 @@ _e_fm_main_udisks_cb_dev_add_verify(const char *udi,
      _e_fm_main_udisks_storage_add(udi);
    else if (!strcmp(ret->val.s, "filesystem"))
      {
-//     printf("DB VOL+: %s\n", udi);
+       printf("DB VOL+: %s\n", udi);
           _e_fm_main_udisks_volume_add(udi, EINA_FALSE);
      }
    //eina_stringshare_del(udi);
@@ -264,7 +258,7 @@ _e_fm_main_udisks_cb_dev_del(void *data   __UNUSED__,
    dbus_message_get_args(msg,
                          &err, DBUS_TYPE_OBJECT_PATH,
                          &udi, DBUS_TYPE_INVALID);
-//   printf("DB DEV-: %s\n", udi);
+   printf("DB DEV-: %s\n", udi);
    if ((v = _e_fm_main_udisks_volume_find(udi)))
      {
         if (v->optype == E_VOLUME_OP_TYPE_EJECT)
@@ -287,7 +281,7 @@ _e_fm_main_udisks_cb_dev_chg(void *data   __UNUSED__,
                          DBUS_TYPE_OBJECT_PATH, &udi,
                          DBUS_TYPE_INVALID);
 
-//        printf("DB STORE CAP+: %s\n", udi);
+        printf("DB STORE CAP+: %s\n", udi);
    e_udisks_get_property(_e_fm_main_udisks_conn, udi, "IdUsage",
                          (E_DBus_Callback_Func)_e_fm_main_udisks_cb_dev_add_verify, (void*)eina_stringshare_add(udi));
 }
index aab1792..9abc588 100644 (file)
@@ -9,7 +9,7 @@
 
 static void _e_fm2_volume_write(E_Volume *v) EINA_ARG_NONNULL(1);
 static void _e_fm2_volume_erase(E_Volume *v) EINA_ARG_NONNULL(1);
-static void _e_fm2_device_mount_free(E_Fm2_Mount *m); EINA_ARG_NONNULL(1);
+static void _e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
 static void _e_fm2_device_mount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
 static void _e_fm2_device_mount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
 static void _e_fm2_device_unmount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
@@ -68,6 +68,8 @@ _e_fm2_device_volume_setup(E_Volume *v)
         else
           snprintf(label, sizeof(label) - 1, "%s", v->storage->vendor);
      }
+   else if (v->storage->drive_type && (!strcmp(v->storage->drive_type, "sd_mmc")))
+     snprintf(label, sizeof(label) - 1, "Flash Card - %s", size);
    else
      snprintf(label, sizeof(label), _("Unknown Volume"));
 
@@ -79,7 +81,7 @@ _e_fm2_device_volume_setup(E_Volume *v)
      icon = v->storage->icon.volume;
    else
      {
-        if ((!v->storage->drive_type) || (!strcmp(v->storage->drive_type, "disk")))
+        if ((!v->storage->drive_type) || (!strcmp(v->storage->drive_type, "disk")) || (!strcmp(v->storage->drive_type, "partition")))
           {
              if (v->storage->removable == 0)
                icon = "drive-harddisk";
index b3f0112..5a6ed0d 100644 (file)
@@ -18,8 +18,8 @@ EAPI void         e_fm2_device_mount_del(E_Volume *v);
 EAPI E_Fm2_Mount *e_fm2_device_mount_find(const char *path);
 EAPI E_Fm2_Mount *e_fm2_device_mount(E_Volume *v,
                                   Ecore_Cb mount_ok, Ecore_Cb mount_fail, 
-                                 Ecore_Cb unmount_ok, Ecore_Cb unmount_fail, 
-                                 void *data);
+                                  Ecore_Cb unmount_ok, Ecore_Cb unmount_fail, 
+                                  void *data);
 EAPI void         e_fm2_device_mount_fail(E_Volume *v);
 EAPI void         e_fm2_device_unmount(E_Fm2_Mount *m);
 EAPI void         e_fm2_device_unmount_fail(E_Volume *v);
index f1163d8..b27af82 100644 (file)
@@ -156,17 +156,15 @@ main(int argc, char **argv)
    last = argc - 1;
    i = 2;
 
-   if (strcmp(argv[1], "cp") == 0)
-     type = E_FM_OP_COPY;
-   else if (strcmp(argv[1], "mv") == 0)
-     type = E_FM_OP_MOVE;
-   else if (strcmp(argv[1], "rm") == 0)
-     type = E_FM_OP_REMOVE;
-   else if (strcmp(argv[1], "lns") == 0)
-     type = E_FM_OP_SYMLINK;
+   if (!strcmp(argv[1], "cp")) type = E_FM_OP_COPY;
+   else if (!strcmp(argv[1], "mv")) type = E_FM_OP_MOVE;
+   else if (!strcmp(argv[1], "rm")) type = E_FM_OP_REMOVE;
+   else if (!strcmp(argv[1], "lns")) type = E_FM_OP_SYMLINK;
    else return 0;
 
-   if ((type == E_FM_OP_COPY) || (type == E_FM_OP_MOVE) || (type == E_FM_OP_SYMLINK))
+   if ((type == E_FM_OP_COPY) || 
+       (type == E_FM_OP_SYMLINK) || 
+       (type == E_FM_OP_MOVE))
      {
        if (argc < 4) goto quit;
 
@@ -674,6 +672,14 @@ _e_fm_op_work_idler(void *data __UNUSED__)
         if ((!_e_fm_op_scan_idler_p) && (!_e_fm_op_work_error) && 
             (!_e_fm_op_scan_error))
           ecore_main_loop_quit();
+        // if 
+        // _e_fm_op_scan_idler_p == NULL &&
+        // _e_fm_op_work_error == NULL &&
+        // _e_fm_op_scan_error == 1
+        // we can spin forever. why are we spinning at all? there are no
+        // tasks to be done. we have an error. wait for it to be handled
+        if (!_e_fm_op_work_queue)
+           ecore_main_loop_quit();
 
         return ECORE_CALLBACK_RENEW;
      }
@@ -775,7 +781,13 @@ _e_fm_op_scan_idler(void *data __UNUSED__)
                                         task->dst.name);
           }
         else
-          task->started = 1;
+          {
+             task->started = 1;
+             _e_fm_op_scan_queue =
+               eina_list_remove_list(_e_fm_op_scan_queue, node);
+             node = NULL;
+             _e_fm_op_scan_atom(task);
+          }
      }
    else if (dir && !task->started)
      {
index 0459faa..f48a537 100644 (file)
@@ -103,27 +103,13 @@ _e_fm2_op_registry_entry_internal_ref(E_Fm2_Op_Registry_Entry_Internal *e)
 static void
 _e_fm2_op_registry_entry_listeners_call(const E_Fm2_Op_Registry_Entry_Internal *e)
 {
-   E_Fm2_Op_Registry_Entry_Listener *l, **shadow;
-   const E_Fm2_Op_Registry_Entry *entry;
-   unsigned int i, count;
-
-   /* NB: iterate on a copy in order to allow listeners to be deleted
-    * from callbacks.  number of listeners should be small, so the
-    * following should do fine.
-    */
-   count = eina_inlist_count(e->listeners);
-   if (count < 1) return;
-
-   shadow = alloca(sizeof(*shadow) * count);
-   if (!shadow) return;
+   E_Fm2_Op_Registry_Entry_Listener *listener;
+   Eina_Inlist *l;
 
-   i = 0;
-   EINA_INLIST_FOREACH(e->listeners, l)
-     shadow[i++] = l;
+   if (eina_inlist_count(e->listeners) < 1) return;
 
-   entry = &(e->entry);
-   for (i = 0; i < count; i++)
-     shadow[i]->cb(shadow[i]->data, entry);
+   EINA_INLIST_FOREACH_SAFE(e->listeners, l, listener)
+     listener->cb(listener->data, &e->entry);
 }
 
 static void
index 37cb1f3..4937546 100644 (file)
@@ -8,16 +8,16 @@ _e_fm_shared_device_storage_free(E_Storage *s)
    EINA_LIST_FREE(s->volumes, v)
      {
         v->storage = NULL;
-              _e_fm_shared_device_volume_free(v);
+        _e_fm_shared_device_volume_free(v);
      }
-   if (s->udi) eina_stringshare_del(s->udi);
-   if (s->bus) eina_stringshare_del(s->bus);
-   if (s->drive_type) eina_stringshare_del(s->drive_type);
-   if (s->model) eina_stringshare_del(s->model);
-   if (s->vendor) eina_stringshare_del(s->vendor);
-   if (s->serial) eina_stringshare_del(s->serial);
-   if (s->icon.drive) eina_stringshare_del(s->icon.drive);
-   if (s->icon.volume) eina_stringshare_del(s->icon.volume);
+   eina_stringshare_del(s->udi);
+   eina_stringshare_del(s->bus);
+   eina_stringshare_del(s->drive_type);
+   eina_stringshare_del(s->model);
+   eina_stringshare_del(s->vendor);
+   eina_stringshare_del(s->serial);
+   eina_stringshare_del(s->icon.drive);
+   eina_stringshare_del(s->icon.volume);
 #ifdef HAVE_EEZE_MOUNT
    if (s->disk) eeze_disk_free(s->disk);
 #endif
index 066a89b..89be48e 100644 (file)
@@ -98,6 +98,9 @@ struct _E_Volume
    DBusPendingCall *op;                // d-bus call handle
    void *prop_handler;
 #endif
+#if @EEZE_MOUNT_CONFIG@
+   Eeze_Disk *disk;
+#endif
 };
 
 struct _E_Fm2_Mount
index 18debd0..68aa8c7 100644 (file)
@@ -54,7 +54,7 @@ static void _e_gadcon_client_cb_mouse_move(void *data, Evas *e, Evas_Object *obj
 static void _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi);
+/*static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi);*/
 static void _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_remove(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -450,8 +450,9 @@ e_gadcon_populate(E_Gadcon *gc)
                  else if (gcc->o_base)
                    e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
 
-                 e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
-                 e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
+                  if (!gcc->autoscroll_set)
+                    e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
+//               e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
                  if (gcc->client_class->func.orient)
                    gcc->client_class->func.orient(gcc, gc->orient);
 
@@ -523,8 +524,9 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
                  else if (gcc->o_base)
                    e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
 
-                 e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
-                 e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
+                  if (!gcc->autoscroll_set)
+                    e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
+//               e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
                  if (gcc->client_class->func.orient)
                    gcc->client_class->func.orient(gcc, gc->orient); 
 
@@ -923,7 +925,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
    e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", 
                            "e/gadman/control");
 
-   if ((gcc->autoscroll) || (gcc->resizable))
+   if ((gcc->autoscroll)/* || (gcc->resizable)*/)
      {
        if (e_box_orientation_get(gcc->o_box))
          edje_object_signal_emit(gcc->o_control, "e,state,hsize,on", "e");
@@ -1132,7 +1134,7 @@ e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    gcc->min.w = w;
    gcc->min.h = h;
-   if ((!gcc->autoscroll) && (!gcc->resizable))
+/*   if (!gcc->resizable)*/
      {
        if (gcc->o_frame)
          e_gadcon_layout_pack_min_size_set(gcc->o_frame, w + gcc->pad.w, 
@@ -1150,7 +1152,7 @@ e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h)
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    gcc->aspect.w = w;
    gcc->aspect.h = h;
-   if ((!gcc->autoscroll) && (!gcc->resizable))
+//   if ((!gcc->autoscroll)/* && (!gcc->resizable)*/)
      {
        if (gcc->o_frame)
          {
@@ -1171,6 +1173,8 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
 
    gcc->autoscroll = autoscroll;
+   gcc->autoscroll_set = 1;
+/*   
    if (gcc->autoscroll)
      {
        if (gcc->o_frame)
@@ -1187,6 +1191,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
          }
      }
    else
+ */
      {
        if (gcc->o_frame)
          {
@@ -1212,7 +1217,7 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
 {
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
-
+/*
    gcc->resizable = resizable;
    if (gcc->resizable)
      {
@@ -1248,6 +1253,9 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
                                              gcc->aspect.h);
          }
      }
+ */
+   resizable = 0;
+   gcc = NULL;
 }
 
 EAPI int
@@ -1399,18 +1407,18 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
        if (!gcc->o_control)
          {
              mi = e_menu_item_new(menu_gadget);
-             e_menu_item_label_set(mi, _("Begin move/resize"));
+             e_menu_item_label_set(mi, _("Move"));
              e_util_menu_item_theme_icon_set(mi, "transform-scale");
              e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
          }
-
+/*
        mi = e_menu_item_new(menu_gadget);
        e_menu_item_label_set(mi, _("Resizeable"));
        e_util_menu_item_theme_icon_set(mi, "transform-scale");
        e_menu_item_check_set(mi, 1);
        if (gcc->resizable) e_menu_item_toggle_set(mi, 1);
        e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc);
-
+ */
        mi = e_menu_item_new(menu_gadget);
        e_menu_item_label_set(mi, _("Automatically scroll contents"));
        e_util_menu_item_theme_icon_set(mi, "transform-move");
@@ -1461,10 +1469,10 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
      {
        mi = e_menu_item_new(menu_main);
        if (gcc->client_class->func.label)
-         snprintf(buf, sizeof(buf), "Gadget %s", 
+         snprintf(buf, sizeof(buf), "%s", 
                   gcc->client_class->func.label((E_Gadcon_Client_Class *)gcc->client_class));
        else
-         snprintf(buf, sizeof(buf), "Gadget %s", gcc->name);
+         snprintf(buf, sizeof(buf), "%s", gcc->name);
 
        e_menu_item_label_set(mi, _(buf));
        e_menu_item_realize_callback_set(mi, _e_gadcon_client_cb_menu_pre, gcc);
@@ -1679,7 +1687,8 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
    Evas_Coord w, h;
 
    evas_object_geometry_get(gcc->o_box, NULL, NULL, &w, &h);
-   if ((gcc->autoscroll) || (gcc->resizable))
+/*   
+   if (gcc->resizable)
      {
        if (e_box_orientation_get(gcc->o_box))
          {
@@ -1692,14 +1701,26 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
               h = (w * gcc->aspect.h) / gcc->aspect.w;
          }
      }
+ */
+   if (gcc->autoscroll)
+     {
+       if (e_box_orientation_get(gcc->o_box))
+         {
+             w = gcc->min.w;
+         }
+       else
+         {
+             h = gcc->min.h;
+         }
+     }
    if (gcc->o_base)
      e_box_pack_options_set(gcc->o_base,
-                           1, 1, /* fill */
-                           1, 1, /* expand */
-                           0.5, 0.5, /* align */
-                           w, h, /* min */
-                           w, h /* max */
-                           );
+                            1, 1, /* fill */
+                            1, 1, /* expand */
+                            0.5, 0.5, /* align */
+                            w, h, /* min */
+                            w, h /* max */
+                           );
 }
 
 static Eina_Bool
@@ -1784,7 +1805,8 @@ _e_gadcon_client_save(E_Gadcon_Client *gcc)
    gcc->cf->style = NULL;
    if (gcc->style)
      gcc->cf->style = eina_stringshare_add(gcc->style);
-   gcc->cf->resizable = gcc->resizable;
+/*   gcc->cf->resizable = gcc->resizable;*/
+   gcc->cf->resizable = 0;
    e_config_save_queue();
 }
 
@@ -1966,7 +1988,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *o
        gcc->menu = mn;
 
        mi = e_menu_item_new(mn);
-       e_menu_item_label_set(mi, _("Stop move/resize this gadget"));
+       e_menu_item_label_set(mi, _("Stop moving"));
        e_util_menu_item_theme_icon_set(mi, "enlightenment/edit");
        e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 
@@ -2467,7 +2489,7 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type __UNUSED__, void *event)
                    e_gadcon_layout_pack_options_set(new_gcc->o_base, new_gcc);
 
                  e_gadcon_client_autoscroll_set(new_gcc, gcc->autoscroll);
-                 e_gadcon_client_resizable_set(new_gcc, gcc->resizable);
+/*               e_gadcon_client_resizable_set(new_gcc, gcc->resizable);*/
                  if (new_gcc->client_class->func.orient)
                    new_gcc->client_class->func.orient(new_gcc, gc->orient);
                  new_gcc->state_info.resist = 1;
@@ -2725,7 +2747,7 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Ite
    _e_gadcon_client_save(gcc);
    e_gadcon_layout_thaw(gcc->gadcon->o_container);
 }
-
+/*
 static void
 _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {
@@ -2739,7 +2761,7 @@ _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item
    _e_gadcon_client_save(gcc);
    e_gadcon_layout_thaw(gcc->gadcon->o_container);
 }
-
+*/
 static void
 _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {
@@ -3270,6 +3292,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
    E_Gadcon_Layout_Item *bi;
    E_Layout_Item_Container *lc;
    int i, set_prev_pos = 0;
+   static int recurse = 0;
 
    if (sd->frozen) return;
    if (sd->doing_config)
@@ -3278,6 +3301,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
        return;
      }
 
+   recurse++;
    min = mino = cur = 0;
 
    _e_gadcon_layout_smart_min_cur_size_calc(sd, &min, &mino, &cur); 
@@ -3301,7 +3325,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
             sd->req = sd->minw;     
          }
      }
-   _e_gadcon_layout_smart_gadcons_width_adjust(sd, min, cur);
+   if (recurse == 1) _e_gadcon_layout_smart_gadcons_width_adjust(sd, min, cur);
 
    if (sd->w <= sd->req)
      { 
@@ -3359,7 +3383,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
        bi->h = sd->h;
        xx = sd->x + bi->x;
        yy = sd->y; // + ((sd->h - bi->h) / 2);
-
+        
        if (sd->horizontal)
          {
             evas_object_move(obj, xx, yy);
@@ -3393,6 +3417,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
             evas_object_smart_callback_call(sd->obj, "size_request", NULL);
          }
      }
+   recurse--;
 }
 
 static void
@@ -3620,6 +3645,7 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
          }
        else
          {
+             bi->ask.size2 = bi->ask.size = bi->min.w;
             *min += bi->min.w;
             if (bi->min.h > *mino) *mino = bi->min.h;
             if (bi->ask.size < bi->min.w)
@@ -3689,118 +3715,59 @@ _e_gadcon_layout_smart_width_smart_sort_reverse_cb(const void *d1, const void *d
 static void 
 _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 { 
-   E_Gadcon_Layout_Item *bi2 = NULL;
    E_Gadcon_Layout_Item *bi = NULL;
    Eina_List *l, *l2;
-   Evas_Object *item, *item2;
-   int need, limit = 0, reduce_total, reduce;
-   int max_size, c;
+   Evas_Object *item;
+   int needed = 0;
+   int need = 0;
+   int max_size, autosize = 0;
 
    if (sd->w < cur)
      {
-       if (sd->w < min)
-         max_size = min;
-       else
-         max_size = cur;
-
+       if (sd->w < min) max_size = min;
+       else max_size = cur;
        need = max_size - sd->w;
      }
    else
      return;
-
+   
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), 
                              _e_gadcon_layout_smart_width_smart_sort_reverse_cb);
-
-   __adjust_size_again:
-   c = 0;
    EINA_LIST_FOREACH(sd->items, l, item)
      { 
-       if (eina_list_next(l)) 
-         {
-            item2 = eina_list_data_get(eina_list_next(l));
-            bi = evas_object_data_get(item, "e_gadcon_layout_data");
-            bi2 = evas_object_data_get(item2, "e_gadcon_layout_data"); 
-
-            if (bi->ask.size2 > bi2->ask.size2)
-              { 
-                 limit = bi2->ask.size2;
-                 c++;
-                 break;
-              } 
-            c++;
-         }
+        bi = evas_object_data_get(item, "e_gadcon_layout_data");
+        if (bi->gcc->autoscroll) autosize += bi->ask.size2;
      } 
 
-   if (eina_list_count(sd->items) == 1) c = 1;
-
-   if (l)
+   if (autosize < 1) autosize = 1;
+   while (need > 0)
      { 
-       reduce = bi->ask.size2 - limit; 
-       reduce_total = reduce * c; 
-
-       if (reduce_total <= need) 
-         {
-            /* EINA_FUCK_REVERSE_FOREACH(l, l2, item) */
-            for (l2 = l; l2;  l2 = l2->prev)
-              {
-                 item = l2->data;
-                 bi2 = evas_object_data_get(item, "e_gadcon_layout_data"); 
-                 bi2->ask.size2 -= reduce; 
-              } 
-            need -= reduce * c;
-            if (need) 
-              goto __adjust_size_again;
-         } 
-       else
-         { 
-            int reduce_by, c2; 
-
-            while (need)
-              { 
-                 reduce_by = 1;
-                 while (1) 
-                   { 
-                      if (((reduce_by + 1) * c) < need) 
-                        reduce_by++; 
-                      else 
-                        break; 
-                   } 
-                 c2 = c;
-                 EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
-                   { 
-                      if ((!c2) || (!need)) break;
-                      bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
-                      bi2->ask.size2 -= reduce_by; 
-                      need -= reduce_by; 
-                      c2--;
-                   } 
+        needed = need;
+        EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
+          { 
+             if (need <= 0) break;
+             bi = evas_object_data_get(item, "e_gadcon_layout_data");
+             if (bi->gcc->autoscroll)
+               {
+                  int reduce_by; 
+                  
+                  reduce_by = (need * bi->ask.size2) / autosize;
+                  if (reduce_by < 1) reduce_by = 1;
+                  if (bi->ask.size2 - reduce_by > 8)
+                    {
+                       bi->ask.size2 -= reduce_by;
+                       need -= reduce_by ; 
+                    }
+                  else
+                    {
+                       need -= bi->ask.size2 - 8;
+                       bi->ask.size2 = 8;
+                    }
               }
          } 
-     }
-   else
-     { 
-       int reduce_by, c2; 
-
-       while (need)
-         { 
-            reduce_by = 1;
-            while (1) 
-              { 
-                 if (((reduce_by + 1) * c) < need) 
-                   reduce_by++; 
-                 else 
-                   break; 
-              } 
-            c2 = c;
-            EINA_LIST_FOREACH(sd->items, l2, item)
-              {
-                  if ((!c2) || (!need)) break;
-                 bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
-                 bi2->ask.size2 -= reduce_by; 
-                 need -= reduce_by;
-                 c2--;
-              } 
-         }
+        /* If the 'needed' size change didn't get modified (no gadget has autoscroll)
+           then we must break or we end up in an infinite loop */
+        if (need == needed) break;
      }
 }
 
index bbc4f42..94ce3dd 100644 (file)
@@ -134,7 +134,7 @@ struct _E_Gadcon_Client_Class
        E_Gadcon_Client *(*init)     (E_Gadcon *gc, const char *name, const char *id, const char *style);
        void             (*shutdown) (E_Gadcon_Client *gcc);
        void             (*orient)   (E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-       char            *(*label)    (E_Gadcon_Client_Class *client_class);
+       const char      *(*label)    (E_Gadcon_Client_Class *client_class);
        Evas_Object     *(*icon)     (E_Gadcon_Client_Class *client_class, Evas *evas);
        /* All members below are part of version 2 */
        /* Create new id, so that the gadcon client can refer to a config set inside the module */
@@ -195,9 +195,9 @@ struct _E_Gadcon_Client
    const char *style;
    unsigned char autoscroll : 1;
    unsigned char resizable : 1;
-   
    unsigned char moving : 1;
    unsigned char resizing : 1;
+   unsigned char autoscroll_set : 1;
    Evas_Coord dx, dy;
 
    struct 
@@ -315,5 +315,29 @@ EAPI void e_gadcon_location_unregister (E_Gadcon_Location *loc);
 EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
 EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
 
+#define GADCON_CLIENT_CONFIG_GET(_type, _items, _gc_class, _id)                \
+  if (!_id)                                                            \
+    {                                                                  \
+       char buf[128];                                                  \
+       int num = 0;                                                    \
+       _type *ci;                                                      \
+       if (_items)                                                     \
+        {                                                              \
+           const char *p;                                              \
+           ci = eina_list_last(_items)->data;                          \
+           p = strrchr (ci->id, '.');                                  \
+           if (p) num = atoi (p + 1) + 1;                              \
+        }                                                              \
+       snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num);     \
+       _id = buf;                                                      \
+    }                                                                  \
+  else                                                                 \
+    {                                                                  \
+       Eina_List *l;                                                   \
+       _type *ci;                                                      \
+       EINA_LIST_FOREACH(_items, l, ci)                                        \
+        if ((ci->id) && (!strcmp(ci->id, id))) return ci;              \
+    }
+
 #endif
 #endif
index f9a6df4..b48f352 100644 (file)
@@ -33,7 +33,7 @@ e_hints_init(void)
    roots = ecore_x_window_root_list(&num);
    if (roots)
      {
-        Ecore_X_Atom supported[41];
+        Ecore_X_Atom supported[43];
         int supported_num, i;
 
         supported_num = 0;
@@ -110,6 +110,8 @@ e_hints_init(void)
         supported[supported_num++] = ECORE_X_ATOM_NET_WM_PING;
         supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST;
         supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER;
+        supported[supported_num++] = ECORE_X_ATOM_E_VIDEO_PARENT;
+        supported[supported_num++] = ECORE_X_ATOM_E_VIDEO_POSITION;
 
         for (i = 0; i < num; i++)
           {
index 91b2c35..3dac5d8 100644 (file)
@@ -1,18 +1,47 @@
 #include "e.h"
 
+//#define USE_ICON_CACHE
+
 typedef struct _E_Smart_Data E_Smart_Data;
+typedef struct _Cache_Item Cache_Item;
+typedef struct _Cache Cache;
 
 struct _E_Smart_Data
 {
    Evas_Coord x, y, w, h;
    Evas_Object *obj;
    Evas_Object *eventarea;
+   Ecore_Timer *timer;
    int size;
+   int frame, frame_count;
    const char *fdo;
    unsigned char fill_inside : 1;
    unsigned char scale_up : 1;
    unsigned char preload : 1;
    unsigned char loading : 1;
+#ifdef USE_ICON_CACHE
+   const char *file;
+   Cache_Item *ci;
+#endif
+};
+
+struct _Cache_Item
+{
+  unsigned int timestamp;
+
+  Evas_Object *icon, *obj;
+  const char *id;
+  Eina_List *objs;
+};
+
+struct _Cache
+{
+  Eina_Hash *hash;
+
+  char *file;
+  Eet_File *ef;
+  Ecore_Timer *timer;
+  Eina_List *load_queue;
 };
 
 /* local subsystem functions */
@@ -30,9 +59,93 @@ static void _e_icon_smart_clip_unset(Evas_Object *obj);
 static void _e_icon_obj_prepare(Evas_Object *obj, E_Smart_Data *sd);
 static void _e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
+#ifdef USE_ICON_CACHE
+static Eina_Bool _e_icon_cache_find(Evas_Object *o, const char *file);
+static void _e_icon_cache_icon_loaded(Cache_Item *ci);
+static void _e_icon_cache_icon_try_next(Cache_Item *ci);
+static void _e_icon_cache_item_free(void *data);
+static void _e_icon_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
+#endif
+
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
 
+#ifdef USE_ICON_CACHE
+static Cache *_cache = NULL;
+static E_Config_DD *cache_edd = NULL;
+static E_Config_DD *cache_item_edd = NULL;
+#define DBG(...)
+#endif
+
+EINTERN int
+e_icon_init(void)
+{
+#ifdef USE_ICON_CACHE
+
+   Eet_File *ef;
+   char buf[PATH_MAX];
+
+#undef T
+#undef D
+#define T Cache_Item
+#define D cache_item_edd
+   D = E_CONFIG_DD_NEW("Cache_Item", T);
+   E_CONFIG_VAL(D, T, timestamp, UINT);
+#undef T
+#undef D
+#define T Cache
+#define D cache_edd
+   D = E_CONFIG_DD_NEW("Cache", T);
+   E_CONFIG_HASH(D, T, hash, cache_item_edd);
+#undef T
+#undef D
+
+   e_user_dir_concat_static(buf, "icon_cache.eet");
+
+   ef = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+   if (!ef) return 1; /* not critical */
+
+   _cache = eet_data_read(ef, cache_edd, "idx");
+   if (!_cache)
+     _cache = E_NEW(Cache, 1);
+
+   if (!_cache->hash)
+     _cache->hash = eina_hash_string_superfast_new(_e_icon_cache_item_free);
+
+   eet_close(ef);
+
+   _cache->file = strdup(buf);
+
+   _cache->ef = NULL;
+#endif
+   return 1;
+}
+
+EINTERN int
+e_icon_shutdown(void)
+{
+#ifdef USE_ICON_CACHE
+   if (_cache)
+     {
+       E_FREE(_cache->file);
+
+       if (_cache->ef)
+         eet_close(_cache->ef);
+
+       if (_cache->load_queue)
+         eina_list_free(_cache->load_queue);
+
+       eina_hash_free(_cache->hash);
+       E_FREE(_cache);
+     }
+
+   E_CONFIG_DD_FREE(cache_item_edd);
+   E_CONFIG_DD_FREE(cache_edd);
+#endif
+
+   return 1;
+}
+
 /* externally accessible functions */
 EAPI Evas_Object *
 e_icon_add(Evas *evas)
@@ -48,19 +161,64 @@ _e_icon_obj_prepare(Evas_Object *obj, E_Smart_Data *sd)
 
    if (!strcmp(evas_object_type_get(sd->obj), "edje"))
      {
-        Evas_Object *pclip;
-
-        pclip = evas_object_clip_get(sd->obj);
-        evas_object_del(sd->obj);
-        sd->obj = evas_object_image_add(evas_object_evas_get(obj));
-        evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
-        evas_object_smart_member_add(sd->obj, obj);
-        evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
-                                       _e_icon_preloaded, obj);
-        evas_object_clip_set(sd->obj, pclip);
+       Evas_Object *pclip;
+
+       pclip = evas_object_clip_get(sd->obj);
+       evas_object_del(sd->obj);
+#ifdef USE_ICON_CACHE
+       sd->ci = NULL;
+       eina_stringshare_replace(&sd->file, NULL);
+#endif
+       sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+       evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
+       evas_object_smart_member_add(sd->obj, obj);
+       evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
+                                      _e_icon_preloaded, obj);
+       evas_object_clip_set(sd->obj, pclip);
      }
 }
 
+static Eina_Bool
+_frame_anim(void *data)
+{
+   E_Smart_Data *sd = data;
+   double t;
+   int fr;
+
+   sd->frame++;
+   fr = (sd->frame % (sd->frame_count)) + 1;
+   evas_object_image_animated_frame_set(sd->obj, fr);
+   t = evas_object_image_animated_frame_duration_get(sd->obj, fr, 0);
+   sd->timer = ecore_timer_add(t, _frame_anim, sd);
+   return EINA_FALSE;
+}
+
+static int
+_handle_anim(E_Smart_Data *sd)
+{
+   double t;
+
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+   if (!evas_object_image_animated_get(sd->obj)) return 0;
+   // FIXME: hack around jiyouns BUG!!!!!!!!
+     {
+       const char *file;
+       char buf[256];
+       snprintf(buf, sizeof(buf), "%ld", (long)sd);
+       evas_object_image_file_get(sd->obj, &file, NULL);
+       evas_object_image_file_set(sd->obj, file, buf);
+     }
+   sd->frame_count = evas_object_image_animated_frame_count_get(sd->obj);
+   if (sd->frame_count < 2) return 0;
+   evas_object_show(sd->obj);
+   t = evas_object_image_animated_frame_duration_get(sd->obj, sd->frame, 0);
+   sd->timer = ecore_timer_add(t, _frame_anim, sd);
+   return 1;
+}
+
 EAPI Eina_Bool
 e_icon_file_set(Evas_Object *obj, const char *file)
 {
@@ -68,36 +226,70 @@ e_icon_file_set(Evas_Object *obj, const char *file)
    int len;
 
    if (!file) return EINA_FALSE;
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    len = strlen(file);
    if ((len > 4) && (!strcasecmp(file + len - 4, ".edj")))
       return e_icon_file_edje_set(obj, file, "icon");
-   
+
    /* smart code here */
    _e_icon_obj_prepare(obj, sd);
    /* FIXME: 64x64 - unhappy about this. use icon size */
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+       eina_stringshare_del(sd->fdo);
+       sd->fdo = NULL;
      }
 
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    if (sd->preload) evas_object_hide(sd->obj);
+
+#ifdef USE_ICON_CACHE
+   if (_e_icon_cache_find(obj, file))
+     {
+       _e_icon_smart_reconfigure(sd);
+       return EINA_TRUE;
+     }
+#endif
+
    evas_object_image_file_set(sd->obj, file, NULL);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      return EINA_FALSE;
-   if (sd->preload)
+
+   if (!_handle_anim(sd))
      {
-        sd->loading = 1;
-        evas_object_image_preload(sd->obj, EINA_FALSE);
+       if (sd->preload)
+         {
+            sd->loading = 1;
+            evas_object_image_preload(sd->obj, EINA_FALSE);
+         }
+       else if (evas_object_visible_get(obj))
+         {
+            evas_object_show(sd->obj);
+#ifdef USE_ICON_CACHE
+            _e_icon_cache_icon_loaded(sd->ci);
+#endif
+         }
      }
-   else if (evas_object_visible_get(obj))
-     evas_object_show(sd->obj);
+#ifdef USE_ICON_CACHE
+   else
+     {
+       evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+                                           _e_icon_obj_del, obj);
+       _cache->load_queue = eina_list_remove(_cache->load_queue, sd->ci);
+       eina_stringshare_del(sd->ci->id);
+       E_FREE(sd->ci);
+       sd->ci = NULL;
+     }
+#endif
 
    _e_icon_smart_reconfigure(sd);
    return EINA_TRUE;
@@ -108,16 +300,22 @@ e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    /* smart code here */
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+       eina_stringshare_del(sd->fdo);
+       sd->fdo = NULL;
      }
+
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+
    _e_icon_obj_prepare(obj, sd);
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
@@ -125,13 +323,16 @@ e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
    evas_object_image_file_set(sd->obj, file, key);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      return EINA_FALSE;
-   if (sd->preload)
+   if (!_handle_anim(sd))
      {
-        sd->loading = 1;
-        evas_object_image_preload(sd->obj, 0);
+       if (sd->preload)
+         {
+            sd->loading = 1;
+            evas_object_image_preload(sd->obj, 0);
+         }
+       else if (evas_object_visible_get(obj))
+          evas_object_show(sd->obj);
      }
-   else if (evas_object_visible_get(obj))
-     evas_object_show(sd->obj);
    _e_icon_smart_reconfigure(sd);
    return EINA_TRUE;
 }
@@ -141,7 +342,7 @@ e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    /* smart code here */
@@ -149,9 +350,15 @@ e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+       eina_stringshare_del(sd->fdo);
+       sd->fdo = NULL;
      }
+
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+
    sd->obj = edje_object_add(evas_object_evas_get(obj));
    edje_object_file_set(sd->obj, file, part);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
@@ -168,13 +375,18 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
    E_Smart_Data *sd;
    const char *path;
    int len;
-   
+
    if (!icon) return EINA_TRUE;
    if (icon[0] == '/') return e_icon_file_set(obj, icon);
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+
    eina_stringshare_replace(&sd->fdo, icon);
    if (!sd->fdo) return EINA_FALSE;
 
@@ -184,7 +396,7 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
    len = strlen(icon);
    if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
       return e_icon_file_edje_set(obj, path, "icon");
-   
+
    /* smart code here */
    _e_icon_obj_prepare(obj, sd);
    sd->loading = 0;
@@ -196,8 +408,8 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
      return EINA_FALSE;
    if (sd->preload)
      {
-        sd->loading = 1;
-        evas_object_image_preload(sd->obj, 0);
+       sd->loading = 1;
+       evas_object_image_preload(sd->obj, 0);
      }
    else if (evas_object_visible_get(obj))
      evas_object_show(sd->obj);
@@ -212,6 +424,11 @@ e_icon_object_set(Evas_Object *obj, Evas_Object *o)
 
    if (!(sd = evas_object_smart_data_get(obj))) return;
 
+   if (sd->timer) ecore_timer_del(sd->timer);
+   sd->timer = NULL;
+   sd->frame = 0;
+   sd->frame_count = 0;
+
    /* smart code here */
    if (sd->obj) evas_object_del(sd->obj);
    sd->loading = 0;
@@ -228,6 +445,9 @@ e_icon_file_get(const Evas_Object *obj)
    const char *file;
 
    if (!(sd = evas_object_smart_data_get(obj))) return NULL;
+#ifdef USE_ICON_CACHE
+   if (sd->file) return sd->file;
+#endif
    if (!strcmp(evas_object_type_get(sd->obj), "edje"))
      {
        edje_object_file_get(sd->obj, &file, NULL);
@@ -301,7 +521,7 @@ e_icon_size_get(const Evas_Object *obj, int *w, int *h)
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      {
        if (w) *w = 0;
        if (h) *h = 0;
@@ -501,9 +721,14 @@ _e_icon_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
    E_Smart_Data *sd;
 
    if (!(sd = evas_object_smart_data_get(data))) return;
+
    evas_object_smart_callback_call(data, "preloaded", NULL);
    evas_object_show(sd->obj);
    sd->loading = 0;
+
+#ifdef USE_ICON_CACHE
+   _e_icon_cache_icon_loaded(sd->ci);
+#endif
 }
 
 static void
@@ -518,7 +743,7 @@ _e_icon_smart_add(Evas_Object *obj)
 
    sd->obj = evas_object_image_add(evas_object_evas_get(obj));
    evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
-                                  _e_icon_preloaded, obj);
+                                 _e_icon_preloaded, obj);
    sd->x = 0;
    sd->y = 0;
    sd->w = 0;
@@ -539,6 +764,10 @@ _e_icon_smart_del(Evas_Object *obj)
    evas_object_del(sd->obj);
    evas_object_del(sd->eventarea);
    if (sd->fdo) eina_stringshare_del(sd->fdo);
+#ifdef USE_ICON_CACHE
+   if (sd->file) eina_stringshare_del(sd->file);
+#endif
+   if (sd->timer) ecore_timer_del(sd->timer);
    free(sd);
 }
 
@@ -565,20 +794,20 @@ _e_icon_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    sd->h = h;
    if (sd->fdo)
      {
-        const char *path;
-
-        sd->size = MAX(w, h);
-        path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
-        if (!path) return;
-
-        /* smart code here */
-        evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
-        evas_object_image_file_set(sd->obj, path, NULL);
-        if (sd->preload)
-          {
-             sd->loading = 1;
-             evas_object_image_preload(sd->obj, 0);
-          }
+       const char *path;
+
+       sd->size = MAX(w, h);
+       path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
+       if (!path) return;
+
+       /* smart code here */
+       evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+       evas_object_image_file_set(sd->obj, path, NULL);
+       if (sd->preload)
+         {
+            sd->loading = 1;
+            evas_object_image_preload(sd->obj, 0);
+         }
      }
 
    _e_icon_smart_reconfigure(sd);
@@ -591,7 +820,14 @@ _e_icon_smart_show(Evas_Object *obj)
 
    if (!(sd = evas_object_smart_data_get(obj))) return;
    if (!((sd->preload) && (sd->loading)))
-     evas_object_show(sd->obj);
+     {
+       evas_object_show(sd->obj);
+#ifdef USE_ICON_CACHE
+       if (!sd->preload)
+         _e_icon_cache_icon_loaded(sd->ci);
+#endif
+     }
+
    evas_object_show(sd->eventarea);
 }
 
@@ -633,3 +869,239 @@ _e_icon_smart_clip_unset(Evas_Object *obj)
    evas_object_clip_unset(sd->obj);
    evas_object_clip_unset(sd->eventarea);
 }
+
+#ifdef USE_ICON_CACHE
+
+static void
+_e_icon_cache_item_free(void *data)
+{
+   Cache_Item *ci = data;
+   eina_stringshare_del(ci->id);
+   E_FREE(ci);
+}
+
+static Eina_Bool
+_e_icon_cache_save(void *data)
+{
+   if (_cache->load_queue)
+     {
+       Cache_Item *ci;
+       Eina_List *l;
+
+       /* EINA_LIST_FOREACH(_cache->load_queue, l, ci)
+        *   printf("  : %s\n", ci->id); */
+
+       return ECORE_CALLBACK_RENEW;
+     }
+
+   eet_sync(_cache->ef);
+   eet_close(_cache->ef);
+
+   _cache->ef = NULL;
+   _cache->timer = NULL;
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_e_icon_cache_find(Evas_Object *obj, const char *file)
+{
+   E_Smart_Data *sd;
+   Cache_Item *ci;
+   char buf[PATH_MAX];
+   const char *id;
+   Eina_List *l;
+
+   if (!_cache) return EINA_FALSE;
+
+   if (!(sd = evas_object_smart_data_get(obj)))
+     return EINA_FALSE;
+
+   snprintf(buf, PATH_MAX, "%d:%s", sd->size, file);
+
+   if ((ci = eina_hash_find(_cache->hash, buf)))
+     {
+       unsigned int w, h, alpha;
+       void *data;
+       int found = 0;
+
+       if (!_cache->ef)
+         _cache->ef = eet_open(_cache->file, EET_FILE_MODE_READ_WRITE);
+
+       if (_cache->ef && (data = eet_data_image_read(_cache->ef, buf,
+                                                     &w, &h, &alpha,
+                                                     NULL, NULL, NULL)))
+         {
+            evas_object_image_size_set(sd->obj, w, h);
+            evas_object_image_alpha_set(sd->obj, alpha);
+            evas_object_image_data_copy_set(sd->obj, data);
+            evas_object_smart_callback_call(obj, "preloaded", NULL);
+            evas_object_show(sd->obj);
+            free(data);
+            found = 1;
+         }
+       
+       if ((_cache->ef) && !(_cache->timer))
+         _cache->timer = ecore_timer_add(3.0, _e_icon_cache_save, NULL);
+
+       if (found)
+         return EINA_TRUE;
+
+       eina_hash_del_by_key(_cache->hash, ci->id);
+       ci = NULL;
+     }
+
+   id = eina_stringshare_add(buf);
+
+   /* not found in cache, check load queue */
+   EINA_LIST_FOREACH(_cache->load_queue, l, ci)
+     {
+       if (ci->id != id) continue;
+       ci->objs = eina_list_append(ci->objs, obj);
+       sd->ci = ci;
+       evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_DEL,
+                                      _e_icon_obj_del, obj);
+       eina_stringshare_del(id);
+       return EINA_TRUE;
+     }
+
+   ci = E_NEW(Cache_Item, 1);
+   ci->id = id;
+   ci->icon = sd->obj;
+   ci->obj = obj;
+   sd->ci = ci;
+   sd->file = eina_stringshare_add(file);
+
+   evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_DEL, _e_icon_obj_del, obj);
+
+   _cache->load_queue = eina_list_append(_cache->load_queue, ci);
+
+   return EINA_FALSE;
+}
+
+static void
+_e_icon_cache_icon_try_next(Cache_Item *ci)
+{
+   Evas_Object *obj;
+   E_Smart_Data *sd;
+
+   if (!ci->objs)
+     {
+       /* no more e_icon wait for this object to bet loaded */
+       _cache->load_queue = eina_list_remove(_cache->load_queue, ci);
+       _e_icon_cache_item_free(ci);
+       return;
+     }
+
+   obj = eina_list_data_get(ci->objs);
+   ci->objs = eina_list_remove_list(ci->objs, ci->objs);
+
+   if (!obj)
+     goto __try_next;
+
+   if (!(sd = evas_object_smart_data_get(obj)))
+     goto __try_next;
+
+   evas_object_image_file_set(sd->obj, sd->file, NULL);
+   if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
+     goto __try_next;
+
+   sd->ci->icon = sd->obj;
+   sd->ci->obj = obj;
+   evas_object_image_preload(sd->obj, EINA_FALSE);
+   return;
+
+ __try_next:
+   evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+                                      _e_icon_obj_del, obj);
+   _e_icon_cache_icon_try_next(ci);
+}
+
+static void
+_e_icon_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   E_Smart_Data *sd;
+
+   if (!(sd = evas_object_smart_data_get(data))) return;
+   if (!sd->ci) return;
+
+   /* check if the deleted object is the one that is used for
+      preloading.  when other objs wait for this image data start
+      preloading again with the next. */
+
+   if (sd->ci->icon == obj)
+     {
+       _e_icon_cache_icon_try_next(sd->ci);
+       sd->ci = NULL;
+     }
+   else
+     {
+       sd->ci->objs = eina_list_remove(sd->ci->objs, data);
+       sd->ci = NULL;
+     }
+}
+
+static void
+_e_icon_cache_icon_loaded(Cache_Item *ci)
+{
+   int w, h, alpha;
+   E_Smart_Data *sd;
+   Evas_Object *obj;
+   void *data;
+
+   if (!_cache) return;
+
+   if (!ci || !ci->id) return;
+   _cache->load_queue = eina_list_remove(_cache->load_queue, ci);
+
+   data = evas_object_image_data_get(ci->icon, EINA_FALSE);
+   evas_object_image_size_get(ci->icon, &w, &h);
+   alpha = evas_object_image_alpha_get(ci->icon);
+
+   evas_object_event_callback_del_full(ci->icon, EVAS_CALLBACK_DEL,
+                                      _e_icon_obj_del, ci->obj);
+   evas_object_smart_callback_call(ci->obj, "preloaded", NULL);
+
+   DBG("icon loaded %p, %s\n", data, ci->id);
+
+   sd = evas_object_smart_data_get(ci->obj);
+   sd->ci = NULL;
+
+   /* pass loaded data to other e_icon wating for this */
+   EINA_LIST_FREE(ci->objs, obj)
+     {
+       sd = evas_object_smart_data_get(obj);
+       sd->ci = NULL;
+       evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+                                           _e_icon_obj_del, obj);
+       if (!data) continue;
+
+       evas_object_image_size_set(sd->obj, w, h);
+       evas_object_image_alpha_set(sd->obj, alpha);
+       evas_object_image_data_copy_set(sd->obj, data);
+       evas_object_show(sd->obj);
+       evas_object_smart_callback_call(obj, "preloaded", NULL);
+     }
+
+   if (data)
+     {
+       if (!_cache->ef)
+         _cache->ef = eet_open(_cache->file, EET_FILE_MODE_READ_WRITE);
+       if (_cache->ef && eet_data_image_write(_cache->ef, ci->id, data,
+                                              w, h, alpha, 1, 100, 0))
+         {
+            eina_hash_add(_cache->hash, ci->id, ci);
+            eet_data_write(_cache->ef, cache_edd, "idx", _cache, 1);
+
+            if (!_cache->timer)
+              _cache->timer = ecore_timer_add(3.0, _e_icon_cache_save, NULL);
+
+            eina_stringshare_replace(&ci->id, NULL);
+            return;
+         }
+     }
+
+   DBG("couldnt write cache %p !!!\n", _cache->ef);
+   _e_icon_cache_item_free(ci);
+}
+#endif
index 4491a13..6e67ffa 100644 (file)
@@ -3,6 +3,9 @@
 #ifndef E_ICON_H
 #define E_ICON_H
 
+EINTERN int e_icon_init(void);
+EINTERN int e_icon_shutdown(void);
+
 EAPI Evas_Object *e_icon_add              (Evas *evas);
 EAPI Eina_Bool    e_icon_file_set         (Evas_Object *obj, const char *file);
 EAPI Eina_Bool    e_icon_file_key_set     (Evas_Object *obj, const char *file, const char *key);
index 5ba44cc..0990fb0 100644 (file)
@@ -21,6 +21,7 @@ main(int argc, char **argv)
    char *set_gtk_im_module = NULL;
    char *set_qt_im_module = NULL;
    char *set_xmodifiers = NULL;
+   char *set_ecore_imf_module = NULL;
    int list = 0;
 
    /* handle some command-line parameters */
@@ -68,6 +69,13 @@ main(int argc, char **argv)
              valid_args++;
              write_ops++;
          }
+       else if ((!strcmp(argv[i], "-set-ecore-imf-module")) && (i < (argc - 1)))
+         {
+            i++;
+            set_ecore_imf_module = argv[i];
+             valid_args++;
+             write_ops++;
+         }
        else if ((!strcmp(argv[i], "-h")) ||
                 (!strcmp(argv[i], "-help")) ||
                 (!strcmp(argv[i], "--h")) ||
@@ -115,7 +123,8 @@ main(int argc, char **argv)
    
    if (!ef)
      {
-       printf("ERROR: cannot open file %s for READ/WRITE (%d:%s)\n", file, errno, strerror(errno));
+       printf("ERROR: cannot open file %s for READ/WRITE (%i:%s)\n", 
+               file, errno, strerror(errno));
        return -1;
      }
 
@@ -133,6 +142,7 @@ main(int argc, char **argv)
             write_imc->gtk_im_module = read_imc->gtk_im_module;
             write_imc->qt_im_module = read_imc->qt_im_module;
             write_imc->xmodifiers = read_imc->xmodifiers;
+            write_imc->ecore_imf_module = read_imc->ecore_imf_module;
             write_imc->e_im_exec = read_imc->e_im_exec;
             write_imc->e_im_setup_exec = read_imc->e_im_setup_exec;
          }
@@ -145,6 +155,8 @@ main(int argc, char **argv)
          write_imc->qt_im_module = set_qt_im_module;
        if (set_xmodifiers)     
          write_imc->xmodifiers = set_xmodifiers;
+       if (set_ecore_imf_module)     
+         write_imc->ecore_imf_module = set_ecore_imf_module;
        if (set_exe)
          write_imc->e_im_exec = set_exe;
        if (set_setup)
@@ -159,13 +171,14 @@ main(int argc, char **argv)
    if (list)
      {
        printf("Config File List:\n");
-       printf("Config Version:\t%d\n", read_imc->version);
-       printf("Config Name:\t%s\n", read_imc->e_im_name);
-       printf("Command Line:\t%s\n", read_imc->e_im_exec);
-       printf("Setup Line:\t%s\n", read_imc->e_im_setup_exec);
-       printf("gtk_im_module:\t%s\n", read_imc->gtk_im_module);
-       printf("qt_im_module:\t%s\n", read_imc->qt_im_module);
-       printf("xmodifiers:\t%s\n", read_imc->xmodifiers);
+       printf("Config Version:    %i\n", read_imc->version);
+       printf("Config Name:       %s\n", read_imc->e_im_name);
+       printf("Command Line:      %s\n", read_imc->e_im_exec);
+       printf("Setup Line:        %s\n", read_imc->e_im_setup_exec);
+       printf("gtk_im_module:     %s\n", read_imc->gtk_im_module);
+       printf("qt_im_module:      %s\n", read_imc->qt_im_module);
+       printf("xmodifiers:        %s\n", read_imc->xmodifiers);
+       printf("ecore_imf_module:  %s\n", read_imc->ecore_imf_module);
      }
    
    e_intl_input_method_config_free(read_imc);
@@ -186,6 +199,7 @@ _e_help(void)
          "  -set-setup EXE             Set the setup application execute line\n"
          "  -set-gtk-im-module         Set the gtk_im_module env var\n"
          "  -set-qt-im-module          Set the qt_im_module env var\n"
+         "  -set-ecore-imf-module      Set the ecore_imf_module env var\n"
          "  -set-xmodifiers            Set the xmodifiers env var\n"
          "  -list                      List Contents of Input Method Config file\n"
          );
index 82460a1..964d1b0 100644 (file)
 #include "e_widget_toolbook.h"
 #include "e_acpi.h"
 #include "e_env.h"
+#include "e_backlight.h"
+#include "e_deskenv.h"
+#include "e_xsettings.h"
index 4b1ffbe..ff0c307 100644 (file)
@@ -19,7 +19,6 @@ static void _e_border_menu_cb_resistance(void *data, E_Menu *m, E_Menu_Item *mi)
 static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_application_pre(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
-static void _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
 static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_stacking_pre(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -48,6 +47,7 @@ static void _e_border_menu_cb_iconpref_netwm(void *data, E_Menu *m, E_Menu_Item
 static void _e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_default_icon(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
 
 EAPI void
 e_int_border_menu_create(E_Border *bd)
@@ -67,27 +67,50 @@ e_int_border_menu_create(E_Border *bd)
 
    if (!bd->internal)
      {
-        if (bd->client.icccm.class)
-          snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
-        else
-          snprintf(buf, sizeof(buf), _("Application"));
-        mi = e_menu_item_new(m);
-        e_menu_item_label_set(mi, buf);
-        e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
-        if (bd->desktop)
-          e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
+       if (bd->client.icccm.class)
+         snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
+       else
+         snprintf(buf, sizeof(buf), _("Application"));
+       mi = e_menu_item_new(m);
+       e_menu_item_label_set(mi, buf);
+       e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
+       if (bd->desktop)
+         e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
+
+       mi = e_menu_item_new(m);
+       e_menu_item_separator_set(mi, 1);
      }
 
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Window"));
-   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, bd);
-   e_menu_item_icon_edje_set(mi,
-                             e_theme_edje_file_get("base/theme/borders",
-                                                   "e/widgets/border/default/window"),
-                                                   "e/widgets/border/default/window");
+   if ((!bd->lock_user_stacking) && (!bd->fullscreen))
+     {
+        mi = e_menu_item_new(m);
+        e_menu_item_label_set(mi, _("Stacking"));
+        e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_stacking_pre, bd);
+        e_menu_item_icon_edje_set(mi,
+                                  e_theme_edje_file_get("base/theme/borders",
+                                                        "e/widgets/border/default/stacking"),
+                                 "e/widgets/border/default/stacking");
+     }
 
-   mi = e_menu_item_new(m);
-   e_menu_item_separator_set(mi, 1);
+   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+     {
+        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
+               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
+              (bd->lock_user_maximize)))
+          {
+             if ((!bd->lock_user_maximize) && (!bd->shaded))
+               {
+                  mi = e_menu_item_new(m);
+                  e_menu_item_label_set(mi, _("Maximize"));
+                  e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_maximize_pre, bd);
+                  e_menu_item_icon_edje_set(mi,
+                                            e_theme_edje_file_get("base/theme/borders",
+                                                                  "e/widgets/border/default/maximize"),
+                                           "e/widgets/border/default/maximize");
+               }
+          }
+     }
 
    if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1))) 
      {
@@ -97,34 +120,27 @@ e_int_border_menu_create(E_Border *bd)
         e_menu_item_icon_edje_set(mi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/sendto"),
-                                                        "e/widgets/border/default/sendto");
+                                 "e/widgets/border/default/sendto");
      }
 
    mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Always on Top"));
-   e_menu_item_check_set(mi, 1);
-   e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
-   if (bd->layer == 150)
-     e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd);
-   else
-     e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
+   e_menu_item_label_set(mi, _("Window"));
+   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, bd);
    e_menu_item_icon_edje_set(mi,
-                            e_theme_edje_file_get("base/theme/borders",
-                                                  "e/widgets/border/default/stack_on_top"),
-                                                   "e/widgets/border/default/stack_on_top");
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/window"),
+                            "e/widgets/border/default/window");
 
-   if (!bd->lock_user_sticky)
-     {
-        mi = e_menu_item_new(m);
-        e_menu_item_label_set(mi, _("Sticky"));
-        e_menu_item_check_set(mi, 1);
-        e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
-        e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
-        e_menu_item_icon_edje_set(mi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/stick"),
-                                                        "e/widgets/border/default/stick");
-     }
+   mi = e_menu_item_new(m);
+   e_menu_item_separator_set(mi, 1);
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Settings"));
+   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_settings_pre, bd);
+   e_menu_item_icon_edje_set(mi,
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/settings"),
+                            "e/widgets/border/default/settings");
 
    if (!bd->lock_close)
      {
@@ -137,7 +153,7 @@ e_int_border_menu_create(E_Border *bd)
        e_menu_item_icon_edje_set(mi,
                                  e_theme_edje_file_get("base/theme/borders",
                                                        "e/widgets/border/default/close"),
-                                                       "e/widgets/border/default/close");
+                                 "e/widgets/border/default/close");
      }
 }
 
@@ -295,7 +311,7 @@ _e_border_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/fullscreen"),
-                                                        "e/widgets/border/default/fullscreen");
+                                 "e/widgets/border/default/fullscreen");
      }
 
    if (!bd->fullscreen)
@@ -309,7 +325,7 @@ _e_border_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+                                 "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Maximize vertically"));
@@ -320,7 +336,7 @@ _e_border_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+                                 "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Maximize horizontally"));
@@ -331,7 +347,7 @@ _e_border_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+                                 "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Unmaximize"));
@@ -342,7 +358,7 @@ _e_border_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+                                 "e/widgets/border/default/maximize");
      }
 }
 
@@ -444,17 +460,17 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
 
    if (bd->desktop)
      {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Edit Icon"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
-        e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
+       submi = e_menu_item_new(subm);
+       e_menu_item_label_set(submi, _("Edit Icon"));
+       e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
+       e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
      }
    else if (bd->client.icccm.class) 
      {
-        /* icons with no class useless to borders */
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Create Icon"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
+       /* icons with no class useless to borders */
+       submi = e_menu_item_new(subm);
+       e_menu_item_label_set(submi, _("Create Icon"));
+       e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
      }
 
    submi = e_menu_item_new(subm);
@@ -468,7 +484,7 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Add to IBar"));
    e_menu_item_submenu_pre_callback_set(submi, 
-                                        _e_border_menu_cb_ibar_add_pre, bd);
+                                       _e_border_menu_cb_ibar_add_pre, bd);
    e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
 
    if (e_configure_registry_exists("keyboard_and_mouse/key_bindings"))
@@ -481,7 +497,7 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
 }
 
 static void
-_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+_e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
 {
    E_Menu *subm;
    E_Menu_Item *submi;
@@ -493,36 +509,6 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   submi = e_menu_item_new(subm);
-   e_menu_item_label_set(submi, _("Placement"));
-   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_placement_pre, bd);
-   e_menu_item_icon_edje_set(submi,
-                             e_theme_edje_file_get("base/theme/borders",
-                                                   "e/widgets/border/default/placement"),
-                                                   "e/widgets/border/default/placement");
-
-   if ((!bd->lock_user_stacking) && (!bd->fullscreen))
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Stacking"));
-        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_stacking_pre, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/stacking"),
-                                                        "e/widgets/border/default/stacking");
-     }
-
-   submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   submi = e_menu_item_new(subm);
-   e_menu_item_label_set(submi, _("Skip"));
-   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
-   e_menu_item_icon_edje_set(submi,
-                            e_theme_edje_file_get("base/theme/borders",
-                                                  "e/widgets/border/default/skip"),
-                                                   "e/widgets/border/default/skip");
-
    if (!bd->lock_border)
      {
         submi = e_menu_item_new(subm);
@@ -531,19 +517,16 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/borderless"),
-                                                        "e/widgets/border/default/borderless");
+                                 "e/widgets/border/default/borderless");
      }
 
    submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Locks"));
    e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/locks"),
-                                                   "e/widgets/border/default/locks");
+                            "e/widgets/border/default/locks");
 
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Remember"));
@@ -551,33 +534,22 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/remember"),
-                                                   "e/widgets/border/default/remember");
+                            "e/widgets/border/default/remember");
 
    submi = e_menu_item_new(subm);
    e_menu_item_separator_set(submi, 1);
 
-   if ((!bd->internal) && (!bd->lock_close))
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Kill"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/kill"),
-                                                        "e/widgets/border/default/kill");
-     }
-
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("ICCCM/NetWM"));
    e_menu_item_callback_set(submi, _e_border_menu_cb_prop, bd);
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/properties"),
-                                                   "e/widgets/border/default/properties");
+                            "e/widgets/border/default/properties");
 }
 
 static void
-_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
 {
    E_Menu *subm;
    E_Menu_Item *submi;
@@ -589,17 +561,6 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1))) 
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Move to"));
-        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_sendto_pre, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/sendto"),
-                                                        "e/widgets/border/default/sendto");
-     }
-
    if (!bd->lock_user_sticky)
      {
         submi = e_menu_item_new(subm);
@@ -610,42 +571,19 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stick"),
-                                                        "e/widgets/border/default/stick");
+                                 "e/widgets/border/default/stick");
      }
 
    submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
-       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
-     {
-        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
-               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
-              (bd->lock_user_maximize)))
-          {
-             if ((!bd->lock_user_maximize) && (!bd->shaded))
-               {
-                  submi = e_menu_item_new(subm);
-                  e_menu_item_label_set(submi, _("Maximize"));
-                  e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_maximize_pre, bd);
-                  e_menu_item_icon_edje_set(submi,
-                                            e_theme_edje_file_get("base/theme/borders",
-                                                                  "e/widgets/border/default/maximize"),
-                                                                  "e/widgets/border/default/maximize");
-               }
-          }
+   e_menu_item_label_set(submi, _("Skip"));
+   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
+   e_menu_item_icon_edje_set(submi,
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/skip"),
+                             "e/widgets/border/default/skip");
 
-        if ((!bd->lock_user_iconify) && (!bd->fullscreen))
-          {
-             submi = e_menu_item_new(subm);
-             e_menu_item_label_set(submi, _("Iconify"));
-             e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
-             e_menu_item_icon_edje_set(submi,
-                                       e_theme_edje_file_get("base/theme/borders",
-                                                             "e/widgets/border/default/minimize"),
-                                                             "e/widgets/border/default/minimize");
-          }
-     }
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
 
    if ((!bd->lock_user_location) && (!bd->fullscreen) &&
        (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip))
@@ -656,11 +594,11 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/move_icon"),
-                                                        "e/widgets/border/default/move_icon");
+                                 "e/widgets/border/default/move_icon");
      }
 
    if (((!bd->lock_user_size) && (!bd->fullscreen) &&
-       (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) &&
+       (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) &&
        ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
         (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN)))
      {
@@ -670,7 +608,21 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/resize_icon"),
-                                                        "e/widgets/border/default/resize_icon");
+                                 "e/widgets/border/default/resize_icon");
+     }
+
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
+   
+   if ((!bd->lock_user_iconify) && (!bd->fullscreen))
+     {
+       submi = e_menu_item_new(subm);
+       e_menu_item_label_set(submi, _("Iconify"));
+       e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
+       e_menu_item_icon_edje_set(submi,
+                                 e_theme_edje_file_get("base/theme/borders",
+                                                       "e/widgets/border/default/minimize"),
+                                 "e/widgets/border/default/minimize");
      }
 
    if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
@@ -684,7 +636,21 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/shade"),
-                                                        "e/widgets/border/default/shade");
+                                 "e/widgets/border/default/shade");
+     }
+
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
+
+   if ((!bd->internal) && (!bd->lock_close))
+     {
+        submi = e_menu_item_new(subm);
+        e_menu_item_label_set(submi, _("Kill"));
+        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
+        e_menu_item_icon_edje_set(submi,
+                                  e_theme_edje_file_get("base/theme/borders",
+                                                        "e/widgets/border/default/kill"),
+                                 "e/widgets/border/default/kill");
      }
 }
 
@@ -867,8 +833,8 @@ _e_border_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
              e_menu_item_disabled_set(submi, EINA_TRUE);
           }
                  
-// FIXME: Remove labels and add deskpreview to menu.
-// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
+       // FIXME: Remove labels and add deskpreview to menu.
+       // Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
 
         for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++)
           {
@@ -985,7 +951,7 @@ _e_border_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stack_on_top"),
-                                                        "e/widgets/border/default/stack_on_top");
+                                 "e/widgets/border/default/stack_on_top");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Lower"));
@@ -993,7 +959,7 @@ _e_border_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stack_below"),
-                                                        "e/widgets/border/default/stack_below");
+                                 "e/widgets/border/default/stack_below");
      }
 
    submi = e_menu_item_new(subm);
@@ -1011,7 +977,7 @@ _e_border_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
              e_menu_item_icon_edje_set(submi,
                                        e_theme_edje_file_get("base/theme/borders",
                                                              "e/widgets/border/default/stick"),
-                                                             "e/widgets/border/default/stick");
+                                      "e/widgets/border/default/stick");
           }
         if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) &&
             (bd->user_skip_winlist) && (bd->borderless))
@@ -1022,7 +988,7 @@ _e_border_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
              e_menu_item_icon_edje_set(submi,
                                        e_theme_edje_file_get("base/theme/borders",
                                                              "e/widgets/border/default/stick"),
-                                                             "e/widgets/border/default/stick");
+                                      "e/widgets/border/default/stick");
           }
      }
 }
@@ -1149,9 +1115,9 @@ _e_border_menu_cb_border_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
    e_menu_item_toggle_set(submi, (bd->offer_resistance ? 1 : 0));
    e_menu_item_callback_set(submi, _e_border_menu_cb_resistance, bd);
    e_menu_item_icon_edje_set(submi,
-   e_theme_edje_file_get("base/theme/borders",
-                               "e/widgets/border/default/borderless"),
-                               "e/widgets/border/default/borderless");
+                            e_theme_edje_file_get("base/theme/borders",
+                                                  "e/widgets/border/default/borderless"),
+                            "e/widgets/border/default/borderless");
 }
 
 static void
index 6290c98..c746fd5 100644 (file)
@@ -174,6 +174,10 @@ e_int_menus_main_new(void)
 
    subm = e_menu_new();
    dat->enlightenment = subm;
+   
+   l = _e_int_menus_augmentation_find("enlightenment/0");
+   if (l) _e_int_menus_augmentation_add(subm, l);
+   
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Enlightenment"));
    e_util_menu_item_theme_icon_set(mi, "enlightenment");
@@ -189,14 +193,14 @@ e_int_menus_main_new(void)
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
    e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
 
-   l = _e_int_menus_augmentation_find("main/5");
-   if (l) _e_int_menus_augmentation_add(m, l);
+   l = _e_int_menus_augmentation_find("enlightenment/1");
+   if (l) _e_int_menus_augmentation_add(subm, l);
 
    mi = e_menu_item_new(subm);
    e_menu_item_separator_set(mi, 1);
 
-   l = _e_int_menus_augmentation_find("main/6");
-   if (l) _e_int_menus_augmentation_add(m, l);
+   l = _e_int_menus_augmentation_find("enlightenment/2");
+   if (l) _e_int_menus_augmentation_add(subm, l);
 
    mi = e_menu_item_new(subm);
    e_menu_item_label_set(mi, _("Restart"));
@@ -208,13 +212,16 @@ e_int_menus_main_new(void)
    e_util_menu_item_theme_icon_set(mi, "application-exit");
    e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
 
-   l = _e_int_menus_augmentation_find("main/7");
+   l = _e_int_menus_augmentation_find("enlightenment/3");
+   if (l) _e_int_menus_augmentation_add(subm, l);
+   
+   l = _e_int_menus_augmentation_find("main/5");
    if (l) _e_int_menus_augmentation_add(m, l);
 
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-   l = _e_int_menus_augmentation_find("main/8");
+   l = _e_int_menus_augmentation_find("main/6");
    if (l) _e_int_menus_augmentation_add(m, l);
 
    subm = e_int_menus_config_new();
@@ -224,10 +231,10 @@ e_int_menus_main_new(void)
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_submenu_set(mi, subm);
 
-   l = _e_int_menus_augmentation_find("main/9");
+   l = _e_int_menus_augmentation_find("main/7");
    if (l) _e_int_menus_augmentation_add(m, l);
 
-   l = eina_hash_find(_e_int_menus_augmentation, "main/10");
+   l = eina_hash_find(_e_int_menus_augmentation, "main/8");
    if (l) 
      {
         separator = 1;
@@ -236,7 +243,7 @@ e_int_menus_main_new(void)
         _e_int_menus_augmentation_add(m, l);
      }
 
-   l = eina_hash_find(_e_int_menus_augmentation, "main/11");
+   l = eina_hash_find(_e_int_menus_augmentation, "main/9");
    if (l) 
      {
         if (!separator) 
index 2ac06fe..3ba42c6 100644 (file)
@@ -303,7 +303,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      }
    else if (cfdata->layer == 1) 
      {
-        if ((cfdata->escfg->popup != 0) || (cfdata->escfg->layer != 1)) 
+        if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 0)) 
           {
              cfdata->escfg->popup = 1;
              cfdata->escfg->layer = 0;
@@ -410,6 +410,7 @@ _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
    Evas *evas;
    Eina_List *l, *styles;
    char *style;
+   const char *str;
    int mw, n = 0;
 
    evas = evas_object_evas_get(obj);
@@ -443,6 +444,9 @@ _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas);
+
+   EINA_LIST_FREE(styles, str)
+     eina_stringshare_del(str);
 }
 
 static void 
index af32ee3..d8eecfe 100644 (file)
@@ -3,7 +3,8 @@
 static Ecore_Exe *_e_intl_input_method_exec = NULL;
 static Ecore_Event_Handler *_e_intl_exit_handler = NULL;
 
-static char *_e_intl_orig_lc_all = NULL;
+static char *_e_intl_orig_lang = NULL;
+static char *_e_intl_orig_language = NULL;
 static char *_e_intl_language = NULL;
 
 static char *_e_intl_language_alias = NULL;
@@ -11,6 +12,7 @@ static char *_e_intl_language_alias = NULL;
 static char *_e_intl_orig_xmodifiers = NULL;
 static char *_e_intl_orig_qt_im_module = NULL;
 static char *_e_intl_orig_gtk_im_module = NULL;
+static char *_e_intl_orig_ecore_imf_module = NULL;
 
 static const char *_e_intl_imc_personal_path = NULL;
 static const char *_e_intl_imc_system_path = NULL;
@@ -54,11 +56,13 @@ e_intl_init(void)
 
    e_intl_data_init();
 
-   if ((s = getenv("LC_ALL"))) _e_intl_orig_lc_all = strdup(s);
+   if ((s = getenv("LANG"))) _e_intl_orig_lang = strdup(s);
+   if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s);
 
    if ((s = getenv("GTK_IM_MODULE"))) _e_intl_orig_gtk_im_module = strdup(s);
    if ((s = getenv("QT_IM_MODULE"))) _e_intl_orig_qt_im_module = strdup(s);
    if ((s = getenv("XMODIFIERS"))) _e_intl_orig_xmodifiers = strdup(s);
+   if ((s = getenv("ECORE_IMF_MODULE"))) _e_intl_orig_ecore_imf_module = strdup(s);
 
    return 1;
 }
@@ -67,11 +71,13 @@ EINTERN int
 e_intl_shutdown(void)
 {
    E_FREE(_e_intl_language);
-   E_FREE(_e_intl_orig_lc_all);
+   E_FREE(_e_intl_orig_lang);
+   E_FREE(_e_intl_orig_language);
 
    E_FREE(_e_intl_orig_gtk_im_module);
    E_FREE(_e_intl_orig_qt_im_module);
    E_FREE(_e_intl_orig_xmodifiers);
+   E_FREE(_e_intl_orig_ecore_imf_module);
 
    if (_e_intl_imc_personal_path)
      eina_stringshare_del(_e_intl_imc_personal_path);
@@ -139,7 +145,7 @@ e_intl_language_set(const char *lang)
     */
    if (!lang)
      {
-       e_util_env_set("LC_ALL", _e_intl_orig_lc_all);
+       e_util_env_set("LANG", _e_intl_orig_lang);
 
        if (!lang) lang = getenv("LC_ALL");
        if (!lang) lang = getenv("LANG");
@@ -183,10 +189,12 @@ e_intl_language_set(const char *lang)
        /* Only set env vars is a non NULL locale was passed */
        if (set_envars)
          {
-            e_util_env_set("LC_ALL", _e_intl_language);
+             e_util_env_set("LANG", lang);
+             /* Unset LANGUAGE, apparently causes issues if set */
+             e_util_env_set("LANGUAGE", NULL);
          }
 
-       setlocale(LC_ALL, _e_intl_language);
+       setlocale(LC_ALL, lang);
         if (_e_intl_language)
          {
              char *locale_path;
@@ -309,6 +317,7 @@ e_intl_input_method_set(const char *imc_path)
        e_util_env_set("GTK_IM_MODULE", _e_intl_orig_gtk_im_module);
         e_util_env_set("QT_IM_MODULE", _e_intl_orig_qt_im_module);
         e_util_env_set("XMODIFIERS", _e_intl_orig_xmodifiers);
+       e_util_env_set("ECORE_IMF_MODULE", _e_intl_orig_ecore_imf_module);
      }
 
    if (imc_path)
@@ -327,6 +336,7 @@ e_intl_input_method_set(const char *imc_path)
                  e_util_env_set("GTK_IM_MODULE", imc->gtk_im_module);
                  e_util_env_set("QT_IM_MODULE", imc->qt_im_module);
                  e_util_env_set("XMODIFIERS", imc->xmodifiers);
+                 e_util_env_set("ECORE_IMF_MODULE", imc->ecore_imf_module);
 
                  E_EXE_STOP(_e_intl_input_method_exec);
 
@@ -774,6 +784,8 @@ e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask)
    if (mask & E_INTL_LOC_MODIFIER)
      locale_size += strlen(locale_parts->modifier) + 1;
 
+   if (!locale_size) return NULL;
+
    /* Allocate memory */
    locale = (char *) malloc(locale_size);
    locale[0] = 0;
index 9a23014..bd57c49 100644 (file)
@@ -15,6 +15,7 @@ e_intl_data_init(void)
    E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, gtk_im_module, STR);
    E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, qt_im_module, STR);
    E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, xmodifiers, STR);
+   E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, ecore_imf_module, STR);
    E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_exec, STR);
    E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_setup_exec, STR);
 
@@ -66,6 +67,7 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc)
        if (imc->gtk_im_module) eina_stringshare_del(imc->gtk_im_module);
        if (imc->qt_im_module) eina_stringshare_del(imc->qt_im_module);
        if (imc->xmodifiers) eina_stringshare_del(imc->xmodifiers);
+       if (imc->ecore_imf_module) eina_stringshare_del(imc->ecore_imf_module);
        if (imc->e_im_exec) eina_stringshare_del(imc->e_im_exec);
        if (imc->e_im_setup_exec) eina_stringshare_del(imc->e_im_setup_exec);
        E_FREE(imc);
index 8798be9..07b8650 100644 (file)
@@ -6,7 +6,7 @@ typedef struct _E_Input_Method_Config E_Input_Method_Config;
 #ifndef E_INTL_DATA_H
 #define E_INTL_DATA_H
 
-#define E_INTL_INPUT_METHOD_CONFIG_VERSION 2
+#define E_INTL_INPUT_METHOD_CONFIG_VERSION 3
 
 struct _E_Input_Method_Config
 {
@@ -15,14 +15,15 @@ struct _E_Input_Method_Config
    const char *gtk_im_module;
    const char *qt_im_module;
    const char *xmodifiers;
+   const char *ecore_imf_module;
    const char *e_im_exec;
    const char *e_im_setup_exec;
 };
 
 EINTERN int             e_intl_data_init(void);
 EINTERN int             e_intl_data_shutdown(void);
-EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File *imc_file);
-EAPI int                e_intl_input_method_config_write (Eet_File *imc_file, E_Input_Method_Config *imc);
-EAPI void               e_intl_input_method_config_free (E_Input_Method_Config *imc);
+EAPI E_Input_Method_Config *e_intl_input_method_config_read(Eet_File *imc_file);
+EAPI int                e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc);
+EAPI void               e_intl_input_method_config_free(E_Input_Method_Config *imc);
 #endif
 #endif
index 31280b6..07a3c74 100644 (file)
@@ -32,45 +32,48 @@ e_ipc_init(void)
      }
    else
      {
-       struct stat st;
-
-       if (stat(buf, &st) == 0)
-         {
-            if ((st.st_uid ==
-                 getuid()) &&
-                ((st.st_mode & (S_IFDIR|S_IRWXU|S_IRWXG|S_IRWXO)) ==
-                 (S_IRWXU|S_IFDIR)))
-              {
-              }
-            else
-              {
-                 e_error_message_show(_("Possible IPC Hack Attempt. The IPC socket\n"
-                                        "directory already exists BUT has permissions\n"
-                                        "that are too leanient (must only be readable\n" "and writable by the owner, and nobody else)\n"
-                                        "or is not owned by you. Please check:\n"
-                                        "%s/enlightenment-%s\n"), tmp, user);
-                 return 0;
-              }
-         }
-       else
-         {
-            e_error_message_show(_("The IPC socket directory cannot be created or\n"
-                                   "examined.\n"
-                                   "Please check:\n"
-                                   "%s/enlightenment-%s\n"),
-                                 tmp, user);
-            return 0;
-         }
+        struct stat st;
+
+        if (stat(buf, &st) == 0)
+          {
+             if ((st.st_uid == getuid()) &&
+                 ((st.st_mode & (S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO)) ==
+                  (S_IRWXU | S_IFDIR)))
+               {
+               }
+             else
+               {
+                  e_error_message_show(_("Possible IPC Hack Attempt. The IPC socket\n"
+                                         "directory already exists BUT has permissions\n"
+                                         "that are too leanient (must only be readable\n" "and writable by the owner, and nobody else)\n"
+                                                                                          "or is not owned by you. Please check:\n"
+                                                                                          "%s/enlightenment-%s\n"), tmp, user);
+                  return 0;
+               }
+          }
+        else
+          {
+             e_error_message_show(_("The IPC socket directory cannot be created or\n"
+                                    "examined.\n"
+                                    "Please check:\n"
+                                    "%s/enlightenment-%s\n"),
+                                  tmp, user);
+             return 0;
+          }
      }
-   snprintf(buf, sizeof(buf), "%s/enlightenment-%s/disp-%s-%i", tmp, user, disp, pid);
+   snprintf(buf, sizeof(buf), "%s/enlightenment-%s/disp-%s-%i", 
+            tmp, user, disp, pid);
    _e_ipc_server = ecore_ipc_server_add(ECORE_IPC_LOCAL_SYSTEM, buf, 0, NULL);
    e_util_env_set("E_IPC_SOCKET", "");
    if (!_e_ipc_server) return 0;
    e_util_env_set("E_IPC_SOCKET", buf);
    printf("INFO: E_IPC_SOCKET=%s\n", buf);
-   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _e_ipc_cb_client_add, NULL);
-   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _e_ipc_cb_client_del, NULL);
-   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _e_ipc_cb_client_data, NULL);
+   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, 
+                           _e_ipc_cb_client_add, NULL);
+   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, 
+                           _e_ipc_cb_client_del, NULL);
+   ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, 
+                           _e_ipc_cb_client_data, NULL);
 
    e_ipc_codec_init();
 #endif
@@ -84,8 +87,8 @@ e_ipc_shutdown(void)
    e_ipc_codec_shutdown();
    if (_e_ipc_server)
      {
-       ecore_ipc_server_del(_e_ipc_server);
-       _e_ipc_server = NULL;
+        ecore_ipc_server_del(_e_ipc_server);
+        _e_ipc_server = NULL;
      }
 #endif
    return 1;
@@ -99,7 +102,8 @@ _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event)
    Ecore_Ipc_Event_Client_Add *e;
 
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) 
+     return ECORE_CALLBACK_PASS_ON;
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -109,7 +113,8 @@ _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event)
    Ecore_Ipc_Event_Client_Del *e;
 
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) 
+     return ECORE_CALLBACK_PASS_ON;
    /* delete client sruct */
    e_thumb_client_del(e);
    e_fm2_client_del(e);
@@ -124,7 +129,8 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
    Ecore_Ipc_Event_Client_Data *e;
 
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) 
+     return ECORE_CALLBACK_PASS_ON;
    switch (e->major)
      {
       case E_IPC_DOMAIN_SETUP:
@@ -133,7 +139,7 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
       case E_IPC_DOMAIN_EVENT:
         switch (e->minor)
           {
-          case E_IPC_OP_EXEC_ACTION:
+           case E_IPC_OP_EXEC_ACTION:
                {
                   E_Ipc_2Str *req = NULL;
 
@@ -151,7 +157,7 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
                               {
                                  E_Action *act = e_action_find(req->str1);
 
-                                 if (act && act->func.go)
+                                 if ((act) && (act->func.go))
                                    {
                                       act->func.go(E_OBJECT(man), req->str2);
                                       ok = 1;
@@ -178,22 +184,43 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
                     }
                }
              break;
-          default:
+
+           default:
              break;
           }
-       break;
+        break;
+
       case E_IPC_DOMAIN_THUMB:
-       e_thumb_client_data(e);
-       break;
+        e_thumb_client_data(e);
+        break;
+
       case E_IPC_DOMAIN_FM:
-       e_fm2_client_data(e);
-       break;
+        e_fm2_client_data(e);
+        break;
+
       case E_IPC_DOMAIN_INIT:
-       e_init_client_data(e);
-       break;
+        e_init_client_data(e);
+        break;
+
+      case E_IPC_DOMAIN_ALERT:
+          {
+             switch (e->minor)
+               {
+                case E_ALERT_OP_RESTART:
+                  if (getenv("E_START_MTRACK"))
+                    e_util_env_set("MTRACK", "track");
+                  ecore_app_restart();
+                  break;
+                case E_ALERT_OP_EXIT:
+                  exit(-11);
+                  break;
+               }
+          }
+        break;
       default:
-       break;
+        break;
      }
    return 1;
 }
+
 #endif
index 85ac7be..760c588 100644 (file)
@@ -15,6 +15,7 @@ typedef enum _E_Ipc_Domain
    E_IPC_DOMAIN_THUMB,
    E_IPC_DOMAIN_FM,
    E_IPC_DOMAIN_INIT,
+   E_IPC_DOMAIN_ALERT,
    E_IPC_DOMAIN_LAST
 } E_Ipc_Domain;
 
index ce1da8e..82376fc 100644 (file)
@@ -117,6 +117,7 @@ _e_smart_add(Evas_Object *obj)
    sd->vh = 1;
 
    sd->evas_obj = ecore_evas_object_image_new(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
+   ecore_evas_alpha_set(evas_object_data_get(sd->evas_obj, "Ecore_Evas"), 1);
    evas_object_smart_member_add(sd->evas_obj, obj);
    evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh);
    sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
index f79bcb1..8aa0294 100644 (file)
@@ -1,15 +1,22 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "e.h"
-
 #ifdef HAVE_ECORE_IMF
-#include <Ecore_IMF.h>
+# include <Ecore_IMF.h>
 #endif
 
-#include <fcntl.h>
-#include <setjmp.h>
+#define MAX_LEVEL 55
+
+#define TS_DO
+#ifdef TS_DO
+#define TS(x) \
+   { \
+      t1 = ecore_time_unix_get(); \
+      printf("ESTART: %1.5f [%1.5f] - %s\n", t1 - t0, t1 - t2, x); \
+      t2 = t1; \
+   }
+static double t0, t1, t2;
+#else
+# define TS(x)
+#endif
 
 /*
  * i need to make more use of these when i'm baffled as to when something is
@@ -59,106 +66,80 @@ my_free_hook(void *p, const void *caller)
 }
 */
 
-EAPI int e_precache_end = 0;
-EAPI Eina_Bool x_fatal = EINA_FALSE;
-
-static int really_know = 0;
-
-/* local subsystem functions */
+/* local function prototypes */
+static void _e_main_shutdown(int errcode);
 static void _e_main_shutdown_push(int (*func)(void));
-static void _e_main_shutdown(int errorcode);
-
-static int  _e_main_x_shutdown(void);
-static int  _e_main_dirs_init(void);
-static int  _e_main_dirs_shutdown(void);
-static int  _e_main_screens_init(void);
-static int  _e_main_screens_shutdown(void);
-static void _e_main_manage_all(void);
-static int  _e_main_path_init(void);
-static int  _e_main_path_shutdown(void);
-
+static void _e_main_parse_arguments(int argc, char **argv);
 static void _e_main_cb_x_fatal(void *data __UNUSED__);
 static Eina_Bool _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
 static Eina_Bool _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
 static Eina_Bool _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
-static Eina_Bool _e_main_cb_x_flusher(void *data __UNUSED__);
-static Eina_Bool _e_main_cb_idler_before(void *data __UNUSED__);
-static Eina_Bool _e_main_cb_idler_after(void *data __UNUSED__);
-static Eina_Bool _e_main_cb_eet_cacheburst_end(void *data __UNUSED__);
-static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
+static int _e_main_x_shutdown(void);
+static int _e_main_dirs_init(void);
+static int _e_main_dirs_shutdown(void);
+static int _e_main_path_init(void);
+static int _e_main_path_shutdown(void);
+static void _e_main_test_formats(void);
+static int _e_main_screens_init(void);
+static int _e_main_screens_shutdown(void);
 static void _e_main_desk_save(void);
 static void _e_main_desk_restore(E_Manager *man, E_Container *con);
+static void _e_main_efreet_paths_init(void);
+static void _e_main_modules_load(Eina_Bool safe_mode);
+static void _e_main_manage_all(void);
+static Eina_Bool _e_main_cb_x_flusher(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_idle_before(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_idle_after(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
 
-/* local subsystem globals */
-#define MAX_LEVEL 64
-static int (*_e_main_shutdown_func[MAX_LEVEL]) (void);
-static int _e_main_level = 0;
-static int _e_cacheburst = 0;
+/* local variables */
+static Eina_Bool really_know = EINA_FALSE;
 static Eina_Bool locked = EINA_FALSE;
-
-static jmp_buf x_fatal_buf;
 static Eina_Bool inloop = EINA_FALSE;
+static jmp_buf x_fatal_buff;
 
-static Eina_List *_e_main_idler_before_list = NULL;
-
-static Ecore_Idle_Enterer *_e_main_idle_enterer_before  = NULL;
-static Ecore_Idle_Enterer *_e_main_idle_enterer_after   = NULL;
-static Ecore_Idle_Enterer *_e_main_idle_enterer_flusher = NULL;
+static int _e_main_lvl = 0;
+static int (*_e_main_shutdown_func[MAX_LEVEL])(void);
 
-#define TS_DO
-
-#ifdef TS_DO   
-#define TS(x) \
-   { \
-      t1 = ecore_time_unix_get(); \
-      printf("ESTART: %1.5f [%1.5f] - %s\n", t1 - t0, t1 - t2, x); \
-      t2 = t1; \
-   }
-static double t0, t1, t2;
-#else
-#define TS(x)
-#endif
+static Eina_List *_idle_before_list = NULL;
+static Ecore_Idle_Enterer *_idle_before = NULL;
+static Ecore_Idle_Enterer *_idle_after = NULL;
+static Ecore_Idle_Enterer *_idle_flush = NULL;
 
-#undef DBG_EINA_STRINGSHARE
+/* external variables */
+EAPI Eina_Bool e_precache_end = EINA_FALSE;
+EAPI Eina_Bool x_fatal = EINA_FALSE;
+EAPI Eina_Bool good = EINA_FALSE;
+EAPI Eina_Bool evil = EINA_FALSE;
+EAPI Eina_Bool starting = EINA_TRUE;
+EAPI Eina_Bool stopping = EINA_FALSE;
+EAPI Eina_Bool restart = EINA_FALSE;
 
-#ifdef DBG_EINA_STRINGSHARE
-static Eina_Bool
-stdbg(void *data __UNUSED__)
+static void
+_fix_user_default_edj(void)
 {
-// enable to debug eina stringshare usage
-   eina_stringshare_dump();
-   return ECORE_CALLBACK_CANCEL;
+   char buff[PATH_MAX];
+   
+   /* fix for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
+   e_user_dir_concat_static(buff, "themes/default.edj");
+   if (ecore_file_exists(buff)) ecore_file_unlink(buff);
 }
-#endif
 
 /* externally accessible functions */
-int
-main(int argc, char **argv)
+int 
+main(int argc, char **argv) 
 {
-   int i;
-   int nostartup = 0;
-   int after_restart = 0; 
-   int safe_mode = 0;
-   char buf[PATH_MAX];
-   char *s;
+   Eina_Bool nostartup = EINA_FALSE;
+   Eina_Bool safe_mode = EINA_FALSE;
+   Eina_Bool after_restart = EINA_FALSE;
+   double t = 0.0, tstart = 0.0;
+   char *s = NULL, buff[32];
    struct sigaction action;
-   double t, tstart;
-
 #ifdef TS_DO
    t0 = t1 = t2 = ecore_time_unix_get();
 #endif
-   TS("begin");
-   
-#if 0
-     { 
-       stack_t ss;
 
-       ss.ss_sp = malloc(8 * 1024);
-       ss.ss_size = 8 * 1024;
-       ss.ss_flags = 0;
-       sigaltstack(&ss, NULL);
-     }
-#endif
+   TS("Begin Startup");
 
    /* If _F_DO_NOT_USE_SIG_HANDLER_ is defined, enlighentment doesn't show error dialog */
    /* and Signals will be handled by another signal handler */
@@ -166,7 +147,7 @@ main(int argc, char **argv)
    /* trap deadly bug signals and allow some form of sane recovery */
    /* or ability to gdb attach and debug at this point - better than your */
    /* wm/desktop vanishing and not knowing what happened */
-
+   TS("Signal Trap");
    action.sa_sigaction = e_sigseg_act;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
@@ -191,349 +172,247 @@ main(int argc, char **argv)
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
    sigaction(SIGABRT, &action, NULL);
-
-   TS("signals done");
+   TS("Signal Trap Done");
 #endif
 
    t = ecore_time_unix_get();
    s = getenv("E_START_TIME");
-   if ((s) && (!getenv("E_RESTART_OK")))
+   if ((s) && (!getenv("E_RESTART_OK"))) 
      {
-       tstart = atof(s);
-       if ((t - tstart) < 5.0) safe_mode = 1;
+        tstart = atof(s);
+        if ((t - tstart) < 5.0) safe_mode = EINA_TRUE;
      }
-
    tstart = t;
-   snprintf(buf, sizeof(buf), "%1.1f", tstart);
-   e_util_env_set("E_START_TIME", buf);
+   snprintf(buff, sizeof(buff), "%1.1f", tstart);
+   e_util_env_set("E_START_TIME", buff);
 
-   /* FIXME: this is the init code for letting e be relocatable. right now
-    * its not used - so i want to see if it can reliably determine its exe
-    * prefix
-    */
-   TS("determine prefix");
-   if (!e_prefix_determine(argv[0]))
-     {
-       fprintf(stderr,
-               "ERROR: Enlightenment cannot determine its installed\n"
-               "       prefix from the system or argv[0].\n"
-               "       This is because it is not on Linux AND has been\n"
-               "       Executed strangely. This is unusual.\n"
-               );
+   if (getenv("E_START_MTRACK"))
+     e_util_env_set("MTRACK", NULL);
+   TS("Eina Init");
+   if (!eina_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize Eina!\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("Eina Init Done");
+   _e_main_shutdown_push(eina_shutdown);
+
+   TS("Determine Prefix");
+   if (!e_prefix_determine(argv[0])) 
+     {
+        fprintf(stderr, 
+                "ERROR: Enlightenment cannot determine it's installed\n"
+                "       prefix from the system or argv[0].\n"
+                "       This is because it is not on Linux AND has been\n"
+                "       executed strangely. This is unusual.\n");
      }
-   TS("prefix done");
+   TS("Determine Prefix Done");
 
    /* for debugging by redirecting stdout of e to a log file to tail */
    setvbuf(stdout, NULL, _IONBF, 0);
 
-   if (getenv("E_RESTART")) after_restart = 1;
-
-   if (getenv("DESKTOP_STARTUP_ID")) 
+   TS("Environment Variables");
+   if (getenv("E_RESTART")) after_restart = EINA_TRUE;
+   if (getenv("DESKTOP_STARTUP_ID"))
      e_util_env_set("DESKTOP_STARTUP_ID", NULL);
-
    e_util_env_set("E_RESTART_OK", NULL);
    e_util_env_set("E_RESTART", "1");
-
-   /* envrionment varabiles so you know E is running/launched you */
    e_util_env_set("PANTS", "ON");
    e_util_env_set("DESKTOP", "Enlightenment-0.17.0");
+   TS("Environment Variables Done");
 
-   TS("eina init");
-   eina_init();
-   _e_main_shutdown_push(eina_shutdown);
+   TS("Parse Arguments");
+   _e_main_parse_arguments(argc, argv);
+   TS("Parse Arguments Done");
 
-   TS("intl init");
-   e_intl_init();
-   _e_main_shutdown_push(e_intl_shutdown);
+   /*** Initialize Core EFL Libraries We Need ***/
 
-   TS("parse args");
-   /* handle some command-line parameters */
-   for (i = 1; i < argc; i++)
+   TS("Eet Init");
+   if (!eet_init()) 
      {
-       if ((!strcmp(argv[i], "-display")) && (i < (argc - 1)))
-         {
-            i++;
-            e_util_env_set("DISPLAY", argv[i]);
-         }
-       else if ((!strcmp(argv[i], "-fake-xinerama-screen")) && (i < (argc - 1)))
-         {
-            int x, y, w, h;
-
-            i++;
-            /* WWxHH+XX+YY */
-            if (sscanf(argv[i], "%ix%i+%i+%i", &w, &h, &x, &y) == 4)
-              e_xinerama_fake_screen_add(x, y, w, h);
-         }
-       else if (!strcmp(argv[i], "-good"))
-         {
-            good = 1;
-            evil = 0;
-            printf("LA LA LA\n");
-         }
-       else if (!strcmp(argv[i], "-evil"))
-         {
-            good = 0;
-            evil = 1;
-            printf("MUHAHAHAHHAHAHAHAHA\n");
-         }
-       else if (!strcmp(argv[i], "-psychotic"))
-         {
-            good = 1;
-            evil = 1;
-            printf("MUHAHALALALALALALALA\n");
-         }
-       else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1)))
-         {
-            i++;
-            if (!getenv("E_CONF_PROFILE"))
-              e_util_env_set("E_CONF_PROFILE", argv[i]);
-         }
-       else if (!strcmp(argv[i], "-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it"))
-         {
-             really_know = 1;
-         }
-       else if (!strcmp(argv[i], "-locked"))
-         {
-            locked = EINA_TRUE;
-            puts("enlightenment will start with desklock on.");
-         }
-       else if ((!strcmp(argv[i], "-h")) ||
-                (!strcmp(argv[i], "-help")) ||
-                (!strcmp(argv[i], "--help")))
-         {
-            printf
-              (_(
-                 "Options:\n"
-                 "\t-display DISPLAY\n"
-                 "\t\tConnect to display named DISPLAY.\n"
-                 "\t\tEG: -display :1.0\n"
-                 "\t-fake-xinerama-screen WxH+X+Y\n"
-                 "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-                 "\t\tgiven the geometry. Add as many as you like. They all\n"
-                 "\t\treplace the real xinerama screens, if any. This can\n"
-                 "\t\tbe used to simulate xinerama.\n"
-                 "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
-                 "\t-profile CONF_PROFILE\n"
-                 "\t\tUse the configuration profile CONF_PROFILE instead of the user selected default or just \"default\".\n"
-                 "\t-good\n"
-                 "\t\tBe good.\n"
-                 "\t-evil\n"
-                 "\t\tBe evil.\n"
-                 "\t-psychotic\n"
-                 "\t\tBe psychotic.\n"
-                 "\t-locked\n"
-                 "\t\tStart with desklock on, so password will be asked.\n"
-                 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
-                 "\t\tIf you need this help, you don't need this option.\n"
-                 )
-               );
-            _e_main_shutdown(-1);
-         }
+        e_error_message_show(_("Enlightenment cannot initialize Eet!\n"));
+        _e_main_shutdown(-1);
      }
+   TS("Eet Init Done");
+   _e_main_shutdown_push(eet_shutdown);
 
-   /* fix up DISPLAY to be :N.0 if no .screen is in it */
-   s = getenv("DISPLAY");
-   if (s)
+   TS("Ecore Init");
+   if (!ecore_init()) 
      {
-       char *p;
-
-       p = strrchr(s, ':');
-       if (!p)
-         {
-            snprintf(buf, sizeof(buf), "%s:0.0", s);
-            e_util_env_set("DISPLAY", buf);
-         }
-       else
-         {
-            p = strrchr(p, '.');
-            if (!p)
-              {
-                 snprintf(buf, sizeof(buf), "%s.0", s);
-                 e_util_env_set("DISPLAY", buf);
-              }
-         }
+        e_error_message_show(_("Enlightenment cannot initialize Ecore!\n"));
+        _e_main_shutdown(-1);
      }
+   TS("Ecore Init Done");
+   _e_main_shutdown_push(ecore_shutdown);
+
+   ecore_app_args_set(argc, (const char **)argv);
 
-   TS("arg parse done");
-   /* fixes for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
+   TS("Ecore Event Handlers");
+   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, 
+                                _e_main_cb_signal_exit, NULL))
      {
-       e_user_dir_concat_static(buf, "themes/default.edj");
-       if (ecore_file_exists(buf)) ecore_file_unlink(buf);
+       e_error_message_show(_("Enlightenment cannot set up an exit signal handler.\n"
+                              "Perhaps you are out of memory?"));
+       _e_main_shutdown(-1);
      }
-
-   TS("ecore init");
-   /* basic ecore init */
-   if (!ecore_init())
+   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_HUP, 
+                                _e_main_cb_signal_hup, NULL))
      {
-       e_error_message_show(_("Enlightenment cannot Initialize Ecore!\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+       e_error_message_show(_("Enlightenment cannot set up a HUP signal handler.\n"
+                              "Perhaps you are out of memory?"));
+       _e_main_shutdown(-1);
+     }
+   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, 
+                                _e_main_cb_signal_user, NULL))
+     {
+       e_error_message_show(_("Enlightenment cannot set up a USER signal handler.\n"
+                              "Perhaps you are out of memory?"));
+       _e_main_shutdown(-1);
      }
+   TS("Ecore Event Handlers Done");
+
 #ifdef HAVE_ECORE_IMF
-   ecore_imf_init();
+   TS("Ecore_IMF Init");
+   if (!ecore_imf_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_IMF!\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("Ecore_IMF Init Done");
    _e_main_shutdown_push(ecore_imf_shutdown);
 #endif
-// FIXME: SEGV's on shutdown if fm2 windows up - disable for now. => is it history ?
-  _e_main_shutdown_push(ecore_shutdown);
-
-   /* init edje and set it up in frozen mode */
-   edje_init();
-   edje_freeze();
-   _e_main_shutdown_push(edje_shutdown);
 
-   _e_cacheburst++;
-/* eet_cacheburst(_e_cacheburst); */
-   ecore_timer_add(5.0, _e_main_cb_eet_cacheburst_end, NULL);
-
-   TS("ecore_file init");
-   /* init the file system */
-   if (!ecore_file_init())
+   TS("Ecore_File Init");
+   if (!ecore_file_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot initialize the File system.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_File!\n"));
+        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(ecore_file_shutdown);   
+   TS("Ecore_File Init Done");
+   _e_main_shutdown_push(ecore_file_shutdown);
 
-   TS("more ecore");
-   /* setup my args */
-   ecore_app_args_set(argc, (const char **)argv);
+   TS("Ecore_Con Init");
+   if (!ecore_con_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_Con!\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("Ecore_Con Init Done");
+   _e_main_shutdown_push(ecore_con_shutdown);
 
-   /* setup a handler for when e is asked to exit via a system signal */
-   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_main_cb_signal_exit, NULL))
+   TS("Ecore_Ipc Init");
+   if (!ecore_ipc_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up an exit signal handler.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_Ipc!\n"));
+        _e_main_shutdown(-1);
      }
-   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_HUP, _e_main_cb_signal_hup, NULL))
+   TS("Ecore_Ipc Init Done");
+   _e_main_shutdown_push(ecore_ipc_shutdown);
+
+   _idle_before = ecore_idle_enterer_before_add(_e_main_cb_idle_before, NULL);
+
+   TS("Ecore_X Init");
+   if (!ecore_x_init(NULL)) 
      {
-       e_error_message_show(_("Enlightenment cannot set up a HUP signal handler.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_X!\n"));
+        _e_main_shutdown(-1);
      }
-   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _e_main_cb_signal_user, NULL))
+   TS("Ecore_X Init Done");
+   _e_main_shutdown_push(_e_main_x_shutdown);
+
+   ecore_x_io_error_handler_set(_e_main_cb_x_fatal, NULL);
+
+   TS("Ecore_Evas Init");
+   if (!ecore_evas_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up a USER signal handler.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize Ecore_Evas!\n"));
+        _e_main_shutdown(-1);
      }
+   TS("Ecore_Evas Init Done");
+//   _e_main_shutdown_push(ecore_evas_shutdown);
 
-   /* an idle enterer to be called before all others */
-   _e_main_idle_enterer_before = ecore_idle_enterer_before_add(_e_main_cb_idler_before, NULL);
+   /* e doesn't sync to compositor - it should be one */
+   ecore_evas_app_comp_sync_set(0);
 
-   TS("x connect");
-   /* init x */
-   if (!ecore_x_init(NULL))
+   TS("Ecore_Evas Engine Check");
+   if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_XCB)) 
      {
-       e_error_message_show(_("Enlightenment cannot initialize its X connection.\n"
-                              "Have you set your DISPLAY variable?"));
-       _e_main_shutdown(-1);
+        if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_XLIB))
+          {
+             e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software X11\n"
+                                    "rendering in Evas. Please check your installation of Evas and\n"
+                                    "Ecore and check they support the Software X11 rendering engine."));
+             _e_main_shutdown(-1);
+          }
      }
-   _e_main_shutdown_push(_e_main_x_shutdown);
-   /* init white box of death alert */
-   if (!e_alert_init(NULL))
+   if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_BUFFER))
      {
-       e_error_message_show(_("Enlightenment cannot initialize its emergency alert system.\n"
-                              "Have you set your DISPLAY variable?"));
+       e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+                              "rendering in Evas. Please check your installation of Evas and\n"
+                              "Ecore and check they support the Software Buffer rendering engine."));
        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(e_alert_shutdown);
+   TS("Ecore_Evas Engine Check Done");
 
-   /* we want to have been launched by enlightenment_start. there is a very */
-   /* good reason we want to have been launched this way, thus check */
-   if (!getenv("E_START"))
+   TS("Edje Init");
+   if (!edje_init()) 
      {
-       e_alert_show("You are executing enlightenment directly. This is\n"
-                    "bad. Please do not execute the \"enlightenment\"\n"
-                    "binary. Use the \"enlightenment_start\" launcher. It\n"
-                    "will handle setting up environment variables, paths,\n"
-                    "and launching any other required services etc.\n"
-                    "before enlightenment itself begins running.\n");
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize Edje!\n"));
+        _e_main_shutdown(-1);
      }
+   TS("Edje Init Done");
+   _e_main_shutdown_push(edje_shutdown);
+   edje_freeze();
 
-   TS("ecore_con");
-   /* init generic communications */
-   if (!ecore_con_init())
+   /*** Initialize E Subsystems We Need ***/
+
+   TS("E Intl Init");
+   if (!e_intl_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot initialize the connections system.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize E_Intl!\n"));
+        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(ecore_con_shutdown);
-   /* init ipc */
-   if (!ecore_ipc_init())
+   TS("E Intl Init Done");
+   _e_main_shutdown_push(e_intl_shutdown);
+
+   /* init white box of death alert */
+   TS("E_Alert Init");
+   if (!e_alert_init())
      {
-       e_error_message_show(_("Enlightenment cannot initialize the IPC system.\n"
-                              "Perhaps you are out of memory?"));
+       e_error_message_show(_("Enlightenment cannot initialize its emergency alert system.\n"
+                              "Have you set your DISPLAY variable?"));
        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(ecore_ipc_shutdown);
+   TS("E_Alert Init Done");
+   _e_main_shutdown_push(e_alert_shutdown);
 
-   TS("xinerama");
-   if (!e_xinerama_init())
+   TS("E_Xinerama Init");
+   if (!e_xinerama_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot setup xinerama wrapping.\n"
-                              "This should not happen."));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
+        _e_main_shutdown(-1);
      }
+   TS("E_Xinerama Init Done");
    _e_main_shutdown_push(e_xinerama_shutdown);
 
-   TS("randr");
-   if (!e_randr_init())
-     {
-       e_error_message_show(_("Enlightenment cannot setup randr wrapping.\n"
-                              "This should not happen."));
-     }
-   else
+   TS("E_Randr Init");
+   if (!e_randr_init()) 
      {
-       _e_main_shutdown_push(e_randr_shutdown);
+        e_error_message_show(_("Enlightenment cannot initialize E_Randr!\n"));
      }
+   else 
+     _e_main_shutdown_push(e_randr_shutdown);
+   TS("E_Randr Init Done");
 
-/* ecore_x_grab(); */
-
-   ecore_x_io_error_handler_set(_e_main_cb_x_fatal, NULL);
-
-   TS("x hints");
-   /* Init window manager hints */
+   TS("E_Hints Init");
    e_hints_init();
-   TS("x hints done");
-
-   TS("ecore_evas init");
-   /* init the evas wrapper */
-   if (!ecore_evas_init())
-     { 
-       e_error_message_show(_("Enlightenment cannot initialize the Evas system.\n"
-                              "Perhaps you are out of memory?"));
-       _e_main_shutdown(-1);
-    }
-   ecore_evas_app_comp_sync_set(0); /* e doesn't sync to compositor - it should be one */
-   if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_XLIB))
-     {
-       e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software X11\n"
-                              "rendering in Evas. Please check your installation of Evas and\n"
-                              "Ecore and check they support the Software X11 rendering engine."));
-       _e_main_shutdown(-1);
-     }
-   if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_BUFFER))
-     {
-       e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software Buffer\n"
-                              "rendering in Evas. Please check your installation of Evas and\n"
-                              "Ecore and check they support the Software Buffer rendering engine."));
-       _e_main_shutdown(-1);
-     }
-// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
-// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
-// down.   
-//   _e_main_shutdown_push(ecore_evas_shutdown);        
-   TS("test done");
+   TS("E_Hints Init Done");
 
-   /*** Finished loading subsystems, Loading WM Specifics ***/
-   TS("configure");
-   e_configure_init();
+   TS("E_Configure Init");
+   e_configure_init(); 
+   TS("E_Configure Init Done");
 
-   TS("dirs");
+   TS("E Directories Init");
    /* setup directories we will be using for configurations storage etc. */
    if (!_e_main_dirs_init())
      {
@@ -541,641 +420,568 @@ main(int argc, char **argv)
                               "Perhaps you have no home directory or the disk is full?"));
        _e_main_shutdown(-1);
      }
+   TS("E Directories Init Done");
    _e_main_shutdown_push(_e_main_dirs_shutdown);
 
-   TS("filereg");
-   /* setup file registry */
+   TS("E_Filereg Init");
    if (!e_filereg_init())
      {
        e_error_message_show(_("Enlightenment cannot set up its file registry system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Filereg Init Done");
    _e_main_shutdown_push(e_filereg_shutdown);
 
-   TS("config");
-   /* init config system */
+   TS("E_Config Init");
    if (!e_config_init())
      {
        e_error_message_show(_("Enlightenment cannot set up its config system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Config Init Done");
    _e_main_shutdown_push(e_config_shutdown);
 
-   TS("env");
-   /* init config system */
+   _fix_user_default_edj();
+
+   TS("E_Env Init");
    if (!e_env_init())
      {
        e_error_message_show(_("Enlightenment cannot set up its environment."));
        _e_main_shutdown(-1);
      }
+   TS("E_Env Init Done");
    _e_main_shutdown_push(e_env_shutdown);
 
    e_util_env_set("E_ICON_THEME", e_config->icon_theme);
-
-   locked |= e_config->desklock_start_locked;
-
-   /* set all execced stuff to configured priority */
    ecore_exe_run_priority_set(e_config->priority);
+   locked |= e_config->desklock_start_locked;
 
-   TS("scale");
-   /* init config system */
+   TS("E_Scale Init");
    if (!e_scale_init())
      {
        e_error_message_show(_("Enlightenment cannot set up its scale system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Scale Init Done");
    _e_main_shutdown_push(e_scale_shutdown);
 
-   TS("pointer");
-   if (!e_pointer_init())
+   TS("E_Pointer Init");
+   if (!e_pointer_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up the pointer system."));
+       e_error_message_show(_("Enlightenment cannot set up its pointer system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Pointer Init Done");
    _e_main_shutdown_push(e_pointer_shutdown);
 
-   TS("path");
-   /* setup paths for finding things */
+   TS("E Paths Init");
    if (!_e_main_path_init())
      {
        e_error_message_show(_("Enlightenment cannot set up paths for finding files.\n"
                               "Perhaps you are out of memory?"));
        _e_main_shutdown(-1);
      }
+   TS("E Paths Init Done");
    _e_main_shutdown_push(_e_main_path_shutdown);
 
-   TS("ipc");
-   /* setup e ipc service */
-   if (e_ipc_init())
-     _e_main_shutdown_push(e_ipc_shutdown);
+   TS("E_Ipc Init");
+   if (!e_ipc_init()) _e_main_shutdown(-1);
+   TS("E_Ipc Init Done");
+   _e_main_shutdown_push(e_ipc_shutdown);
 
-   /* setup edje to animate @ e_config->framerate frames per sec. */
    edje_frametime_set(1.0 / e_config->framerate);
 
-   TS("font");
-   /* init font system */
-   if (!e_font_init())
+   TS("E_Font Init");
+   if (!e_font_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its font system."));
-        _e_main_shutdown(-1);
+       _e_main_shutdown(-1);
      }
+   TS("E_Font Init Done");
    _e_main_shutdown_push(e_font_shutdown);
+
+   TS("E_Font Apply");
    e_font_apply();
+   TS("E_Font Apply Done");
+
+   TS("E_Canvas Recache");
    e_canvas_recache();
+   TS("E_Canvas Recache Done");
 
-   TS("theme");
-   /* init theme system */
-   if (!e_theme_init())
+   TS("E_Theme Init");
+   if (!e_theme_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its theme system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Theme Init Done");
    _e_main_shutdown_push(e_theme_shutdown);
 
-   TS("move/resize info");
-   /* init move resize popup */
+   TS("E_Moveresize Init");
    e_moveresize_init();
+   TS("E_Moveresize Init Done");
    _e_main_shutdown_push(e_moveresize_shutdown);
-   
-   TS("splash");
-   /* setup init status window/screen */
-   if (!e_init_init())
+
+   if (e_config->show_splash) 
      {
-        e_error_message_show(_("Enlightenment cannot set up init screen.\n"
-                               "Perhaps you are out of memory?"));
-        _e_main_shutdown(-1);
+        TS("E_Splash Init");
+        if (!e_init_init()) 
+          {
+             e_error_message_show(_("Enlightenment cannot set up its init screen."));
+             _e_main_shutdown(-1);
+          }
+        TS("E_Splash Init Done");
+        _e_main_shutdown_push(e_init_shutdown);
      }
-   _e_main_shutdown_push(e_init_shutdown);
-   if (!((!e_config->show_splash) || (after_restart)))
+   if (!((!e_config->show_splash) || (after_restart))) 
      {
-       e_init_title_set(_("Enlightenment"));
-       e_init_version_set(VERSION);
-       e_init_show();
-       pause();
+        e_init_title_set(_("Enlightenment"));
+        e_init_version_set(VERSION);
+        e_init_show();
+        pause();
      }
 
-   e_init_status_set(_("Starting International Support"));
-   TS("intl post");
-   /* init intl system */
-   if (!e_intl_post_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Starting International Support"));
+   TS("E_Intl Post Init");
+   if (!e_intl_post_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its intl system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Intl Post Init Done");
    _e_main_shutdown_push(e_intl_post_shutdown);
 
-   TS("efreet");
-   /* init FDO desktop */
-   if (!efreet_init())
+   TS("Efreet Init");
+   if (!efreet_init()) 
      {
         e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
-                               "Perhaps you are out of memory?"));
+                               "Perhaps you lack permissions on ~/.cache/efreet or are\n"
+                               "out of memory or disk space?"));
         _e_main_shutdown(-1);
      }
+   TS("Efreet Init Done");
    _e_main_shutdown_push(efreet_shutdown);
-   TS("efreet done");
 
-   if (!really_know)
+   if (!really_know) 
      {
-        e_init_status_set(_("Testing Format Support"));
-        TS("test file format support");   
-          {
-             Ecore_Evas *ee;
-             Evas_Object *im, *txt;
-             char buf[PATH_MAX];
-             Evas_Coord tw, th;
-
-             ee = ecore_evas_buffer_new(1, 1);
-             if (!ee)
-               {
-                  e_error_message_show(_("Enlightenment found Evas can't create a buffer canvas. Please check\n"
-                                         "Evas has Software Buffer engine support.\n"));
-                  _e_main_shutdown(-1);
-               }
-             e_canvas_add(ee);
-             im = evas_object_image_add(ecore_evas_get(ee));
-
-             e_prefix_data_concat_static(buf, "data/images/test.png");
-             evas_object_image_file_set(im, buf, NULL);
-             if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
-               {
-                  e_error_message_show(_("Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
-                                         "loader support.\n"));
-                  _e_main_shutdown(-1);
-               }
-
-            e_prefix_data_concat_static(buf, "data/images/test.jpg");
-             evas_object_image_file_set(im, buf, NULL);
-             if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
-               {
-                  e_error_message_show(_("Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
-                                         "loader support.\n"));
-                  _e_main_shutdown(-1);
-               }
-             
-             e_prefix_data_concat_static(buf, "data/images/test.edj");
-             evas_object_image_file_set(im, buf, "images/0");
-             if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
-               {
-                  e_error_message_show(_("Enlightenment found Evas can't load EET files. Check Evas has EET\n"
-                                         "loader support.\n"));
-                  _e_main_shutdown(-1);
-               }
-             evas_object_del(im);
-             txt = evas_object_text_add(ecore_evas_get(ee));
-             evas_object_text_font_set(txt, "Sans", 10);
-             evas_object_text_text_set(txt, "Hello");
-             evas_object_geometry_get(txt, NULL, NULL, &tw, &th);
-             if ((tw <= 0) && (th <= 0))
-               {
-                  e_error_message_show(_("Enlightenment found Evas can't load the 'Sans' font. Check Evas has fontconfig\n"
-                                         "support and system fontconfig defines a 'Sans' font.\n"));
-                  _e_main_shutdown(-1);
-               }
-             evas_object_del(txt);
-             e_canvas_del(ee);
-             ecore_evas_free(ee);
-          }
+        TS("Test File Format Support");
+        _e_main_test_formats();
+        TS("Test File Format Support Done");
      }
-
-   e_init_status_set(_("Check SVG Support"));
-   TS("svg");
+   else 
      {
-        Ecore_Evas *ee;
-        Evas_Object *im;
-        char buf[PATH_MAX];
-
-        ee = ecore_evas_buffer_new(1, 1);
-        if (!ee)
-          {
-             e_error_message_show(_("Enlightenment found Evas can't create a buffer canvas. Please check\n"
-                                    "Evas has Software Buffer engine support.\n"));
-             _e_main_shutdown(-1);
-          }
-        e_canvas_add(ee);
-        im = evas_object_image_add(ecore_evas_get(ee));
-
-        e_prefix_data_concat_static(buf, "data/images/test.svg");
-        evas_object_image_file_set(im, buf, NULL);
-        if (evas_object_image_load_error_get(im) == EVAS_LOAD_ERROR_NONE)
-          {
-             efreet_icon_extension_add(".svg");
-             /* prefer png over svg */
-             efreet_icon_extension_add(".png");
-          }
-        evas_object_del(im);
-        e_canvas_del(ee);
-        ecore_evas_free(ee);
+        efreet_icon_extension_add(".svg");
+        efreet_icon_extension_add(".jpg");
+        efreet_icon_extension_add(".png");
+        efreet_icon_extension_add(".edj");
      }
 
-   e_init_status_set(_("Setup Screens"));
-   TS("screens");
-   /* manage the root window */
-   if (!_e_main_screens_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Screens"));
+   TS("Screens Init");
+   if (!_e_main_screens_init()) 
      {
        e_error_message_show(_("Enlightenment set up window management for all the screens on your system\n"
                               "failed. Perhaps another window manager is running?\n"));
        _e_main_shutdown(-1);
      }
+   TS("Screens Init Done");
    _e_main_shutdown_push(_e_main_screens_shutdown);
 
-   e_init_status_set(_("Setup Screensaver"));
-   TS("screensaver");
-   /* setup screensaver */
-   if (!e_screensaver_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup ACPI"));
+   TS("E_Acpi Init");
+   e_acpi_init();
+   TS("E_Acpi Init Done");
+   _e_main_shutdown_push(e_acpi_shutdown);
+
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Backlight"));
+   TS("E_Backlight Init");
+   if (!e_backlight_init()) 
+     {
+       e_error_message_show(_("Enlightenment cannot configure the backlight."));
+       _e_main_shutdown(-1);
+     }
+   TS("E_Backlight Init Done");
+   _e_main_shutdown_push(e_backlight_shutdown);
+
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup DPMS"));
+   TS("E_Dpms Init");
+   if (!e_dpms_init()) 
+     {
+       e_error_message_show(_("Enlightenment cannot configure the DPMS settings."));
+       _e_main_shutdown(-1);
+     }
+   TS("E_Dpms Init Done");
+   _e_main_shutdown_push(e_dpms_shutdown);
+
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Screensaver"));
+   TS("E_Screensaver Init");
+   if (!e_screensaver_init()) 
      {
        e_error_message_show(_("Enlightenment cannot configure the X screensaver."));
        _e_main_shutdown(-1);
      }
+   TS("E_Screensaver Init Done");
    _e_main_shutdown_push(e_screensaver_shutdown);
 
-   e_init_status_set(_("Setup Desklock"));
-   TS("desklock");
-   /* setup desklock */
-   if (!e_desklock_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Powersave Modes"));
+   TS("E_Powersave Init");
+   if (!e_powersave_init()) 
+     {
+       e_error_message_show(_("Enlightenment cannot set up its powersave modes."));
+       _e_main_shutdown(-1);
+     }
+   TS("E_Powersave Init Done");
+   _e_main_shutdown_push(e_powersave_shutdown);
+
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Desklock"));
+   TS("E_Desklock Init");
+   if (!e_desklock_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its desk locking system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Desklock Init Done");
    _e_main_shutdown_push(e_desklock_shutdown);
 
-   e_init_status_set(_("Setup Popups"));
-   TS("popup");
-   /* init popup system */
-   if (!e_popup_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Popups"));
+   TS("E_Popups Init");
+   if (!e_popup_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its popup system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Popups Init Done");
    _e_main_shutdown_push(e_popup_shutdown);
 
    if ((locked) && ((!e_config->show_splash) && (!after_restart)))
      e_desklock_show();
 
-   TS("msgbus");
-   /* setup e msgbus (DBUS) service */
-   if (e_msgbus_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Message Bus"));
+   TS("E_Msgbus Init");
+   if (e_msgbus_init()) 
      _e_main_shutdown_push(e_msgbus_shutdown);
+   TS("E_Msgbus Init Done");
 
-   e_init_status_set(_("Setup Paths"));
-   TS("efreet paths");
-     {
-       Eina_List **list;
-
-       list = efreet_icon_extra_list_get();
-       if (list)
-         {
-            e_user_dir_concat_static(buf, "icons");
-            *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf));
-            e_prefix_data_concat_static(buf, "data/icons");
-            *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf));
-         }
-     }
-   efreet_icon_extension_add(".edj");
-   TS("efreet paths done");
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Paths"));
+   TS("Efreet Paths");
+   _e_main_efreet_paths_init();
+   TS("Efreet Paths Done");
 
-   e_init_status_set(_("Setup System Controls"));
-   TS("sys init");
-   /* init the enlightenment sys command system */
-   if (!e_sys_init())
-    {
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup System Controls"));
+   TS("E_Sys Init");
+   if (!e_sys_init()) 
+     {
        e_error_message_show(_("Enlightenment cannot initialize the System Command system.\n"));
        _e_main_shutdown(-1);
-    }
+     }
+   TS("E_Sys Init Done");
    _e_main_shutdown_push(e_sys_shutdown);
 
-   e_init_status_set(_("Setup Actions"));
-   TS("actions");
-   /* init actions system */
-   if (!e_actions_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Actions"));
+   TS("E_Actions Init");
+   if (!e_actions_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its actions system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Actions Init Done");
+   _e_main_shutdown_push(e_actions_shutdown);
 
-   e_init_status_set(_("Setup Execution System"));
-   TS("exec");
-   /* init app system */
-   if (!e_exec_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Execution System"));
+   TS("E_Exec Init");
+   if (!e_exec_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its exec system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Exec Init Done");
    _e_main_shutdown_push(e_exec_shutdown);
 
-   TS("container freeze");
+   TS("E_Container Freeze");
    e_container_all_freeze();
+   TS("E_Container Freeze Done");
 
-   e_init_status_set(_("Setup FM"));
-   TS("fm2");
-   /* init the enlightenment file manager */
-   if (!e_fm2_init())
-    {
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Filemanager"));
+   TS("E_Fm2 Init");
+   if (!e_fm2_init()) 
+     {
        e_error_message_show(_("Enlightenment cannot initialize the File manager.\n"));
        _e_main_shutdown(-1);
-    }
+     }
+   TS("E_Fm2 Init Done");
    _e_main_shutdown_push(e_fm2_shutdown);
 
-   /*
-   TS("fwin");
-   if (!e_fwin_init())
-    {
-       e_error_message_show(_("Enlightenment cannot initialize the File manager.\n"));
-       _e_main_shutdown(-1);
-    }
-   _e_main_shutdown_push(e_fwin_shutdown);
-    */
-
-   e_init_status_set(_("Setup Message System"));
-   TS("msg");
-   /* setup generic msg handling etc */
-   if (!e_msg_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Message System"));
+   TS("E_Msg Init");
+   if (!e_msg_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its msg system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Msg Init Done");
    _e_main_shutdown_push(e_msg_shutdown);
 
-   e_init_status_set(_("Setup DND"));
-   TS("dnd");
-   /* setup dnd */
-   if (!e_dnd_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup DND"));
+   TS("E_Dnd Init");
+   if (!e_dnd_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its dnd system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Dnd Init Done");
    _e_main_shutdown_push(e_dnd_shutdown);
 
-   e_init_status_set(_("Setup Grab Input Handling"));
-   TS("grabinput");
-   /* setup input grabbing co-operation system */
-   if (!e_grabinput_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Grab Input Handling"));
+   TS("E_Grabinput Init");
+   if (!e_grabinput_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up its input grab handling system."));
+       e_error_message_show(_("Enlightenment cannot set up its grab input handling system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Grabinput Init Done");
    _e_main_shutdown_push(e_grabinput_shutdown);
 
-   e_init_status_set(_("Setup Modules"));
-   TS("modules");
-   /* setup module loading etc */
-   if (!e_module_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Modules"));
+   TS("E_Module Init");
+   if (!e_module_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its module system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Module Init Done");
    _e_main_shutdown_push(e_module_shutdown);
 
-   e_init_status_set(_("Setup Remembers"));
-   TS("remember");
-   /* do remember stuff */
-   if (!e_remember_init(after_restart ? E_STARTUP_RESTART: E_STARTUP_START))
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Remembers"));
+   TS("E_Remember Init");
+   if (!e_remember_init(after_restart ? E_STARTUP_RESTART : E_STARTUP_START)) 
      {
        e_error_message_show(_("Enlightenment cannot setup remember settings."));
        _e_main_shutdown(-1);
      }
+   TS("E_Remember Init Done");
    _e_main_shutdown_push(e_remember_shutdown);
 
-   e_init_status_set(_("Setup Color Classes"));
-   TS("colorclasses");
-   /* setup color_class */
-   if (!e_color_class_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Color Classes"));
+   TS("E_Color_Class Init");
+   if (!e_color_class_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its color class system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Color_Class Init Done");
    _e_main_shutdown_push(e_color_class_shutdown);
 
-   e_init_status_set(_("Setup Gadcon"));
-   TS("gadcon");
-   /* setup gadcon */
-   if (!e_gadcon_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Gadcon"));
+   TS("E_Gadcon Init");
+   if (!e_gadcon_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its gadget control system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Gadcon Init Done");
    _e_main_shutdown_push(e_gadcon_shutdown);
 
-   e_init_status_set(_("Setup ACPI"));
-   TS("acpi");
-   /* acpi init will never fail. It always returns one even if acpid 
-    * is not running, so no need to trap the return */
-   e_acpi_init();
-   _e_main_shutdown_push(e_acpi_shutdown);
-
-   e_init_status_set(_("Setup DPMS"));
-   TS("dpms");     
-   /* setup dpms */
-   if (!e_dpms_init())
-     {
-       e_error_message_show(_("Enlightenment cannot configure the DPMS settings."));
-       _e_main_shutdown(-1);
-     }
-   _e_main_shutdown_push(e_dpms_shutdown);
-
-   e_init_status_set(_("Setup Powersave modes"));
-   TS("powersave");
-   if (!e_powersave_init())
-     {
-       e_error_message_show(_("Enlightenment cannot set up its powersave modes."));
-       _e_main_shutdown(-1);
-     }
-   _e_main_shutdown_push(e_powersave_shutdown);
-
-   e_init_status_set(_("Setup Wallpaper"));
-   TS("bg");
-   /* init desktop background system */
-   if (!e_bg_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Wallpaper"));
+   TS("E_Bg Init");
+   if (!e_bg_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its desktop background system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Bg Init Done");
    _e_main_shutdown_push(e_bg_shutdown);
 
-   e_init_status_set(_("Setup Mouse"));
-   TS("mouse");     
-   /* setup mouse accel */
-   if (!e_mouse_update())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Mouse"));
+   TS("E_Mouse Init");
+   if (!e_mouse_update()) 
      {
        e_error_message_show(_("Enlightenment cannot configure the mouse settings."));
        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(e_actions_shutdown);
+   TS("E_Mouse Init Done");
 
-   e_init_status_set(_("Setup Bindings"));
-   TS("bindings");
-   /* init bindings system */
-   if (!e_bindings_init())
+   if (e_config->show_splash) 
+     e_init_status_set(_("Setup Bindings"));
+   TS("E_Bindings Init");
+   if (!e_bindings_init()) 
      {
        e_error_message_show(_("Enlightenment cannot set up its bindings system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Bindings Init Done");
    _e_main_shutdown_push(e_bindings_shutdown);
 
-   e_init_status_set(_("Setup Shelves"));
-   TS("shelves");
-   /* setup shelves */
-   if (!e_shelf_init())
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Shelves"));
+   TS("E_Shelf Init");
+   if (!e_shelf_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up its shelf system."));
+       e_error_message_show(_("Enlightenment cannot set up its module system."));
        _e_main_shutdown(-1);
      }
+   TS("E_Shelf Init Done");
    _e_main_shutdown_push(e_shelf_shutdown);
 
-   e_init_status_set(_("Setup Thumbnailer"));
-   TS("thumb init");
-   /* init the enlightenment thumbnailing system */
-   if (!e_thumb_init())
-    {
-       e_error_message_show(_("Enlightenment cannot initialize the Thumbnailing system.\n"));
-       _e_main_shutdown(-1);
-    }
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Thumbnailer"));
+   TS("E_Thumb Init");
+   if (!e_thumb_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize the Thumbnailing system.\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("E_Thumb Init Done");
    _e_main_shutdown_push(e_thumb_shutdown);
 
-   e_init_status_set(_("Setup File Ordering"));
-   TS("order");
-   if (!e_order_init())
+   TS("E_Icon Init");
+   if (!e_icon_init()) 
      {
-       e_error_message_show(_("Enlightenment cannot set up its order file system."));
-       _e_main_shutdown(-1);
+        e_error_message_show(_("Enlightenment cannot initialize the Icon Cache system.\n"));
+        _e_main_shutdown(-1);
      }
-   _e_main_shutdown_push(e_order_shutdown);
+   TS("E_Thumb Init Done");
+   _e_main_shutdown_push(e_icon_shutdown);
 
-   TS("add idle enterers");
-   /* add in a handler that just before we go idle we flush x - will happen after ecore_evas's idle rendering as it's after ecore_evas_init() */
-   _e_main_idle_enterer_flusher = 
-     ecore_idle_enterer_add(_e_main_cb_x_flusher, NULL);
-
-   e_managers_keys_grab();
+   TS("E_XSettings Init");
+   if (!e_xsettings_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize the XSettings system.\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("E_XSettings Init Done");
+   _e_main_shutdown_push(e_xsettings_shutdown);
 
-   /* ecore_x_ungrab(); */
+   if (!after_restart) 
+     {
+        if (e_config->show_splash)
+          e_init_status_set(_("Setup Desktop Environment"));
+        TS("E_Deskenv Init");
+        if (!e_deskenv_init()) 
+          {
+             e_error_message_show(_("Enlightenment cannot initialize its desktop environment.\n"));
+             _e_main_shutdown(-1);
+          }
+        TS("E_Deskenv Init Done");
+        _e_main_shutdown_push(e_deskenv_shutdown);
+     }
 
-   /* load modules */
-   e_init_status_set(_("Load Modules"));
-   TS("load modules");
-   if (safe_mode)
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup File Ordering"));
+   TS("E_Order Init");
+   if (!e_order_init()) 
      {
-       E_Module *m; 
-       char *crashmodule;
+       e_error_message_show(_("Enlightenment cannot set up its order file system."));
+       _e_main_shutdown(-1);
+     }
+   TS("E_Order Init Done");
+   _e_main_shutdown_push(e_order_shutdown);
 
-       crashmodule = getenv("E_MODULE_LOAD");
-       if (crashmodule) m = e_module_new(crashmodule);
+   TS("Add Idler For X Flush");
+   _idle_flush = ecore_idle_enterer_add(_e_main_cb_x_flusher, NULL);
+   TS("Add Idler For X Flush Done");
 
-       if ((crashmodule) && (m))
-         {
-            e_module_disable(m);
-            e_object_del(E_OBJECT(m));
+   TS("E_Manager Keys Grab");
+   e_managers_keys_grab();
+   TS("E_Manager Keys Grab Done");
 
-            e_int_config_modules(e_container_current_get(e_manager_current_get()), NULL);
-            e_error_message_show
-              (_("Enlightenment crashed early on start and has<br>"
-                 "been restarted. There was an error loading<br>"
-                 "module named: %s. This module has been disabled<br>"
-                 "and will not be loaded."), crashmodule);
-            e_util_dialog_show
-              (_("Enlightenment crashed early on start and has been restarted"),
-                  _("Enlightenment crashed early on start and has been restarted.<br>"
-                    "There was an error loading module named: %s<br><br>"
-                    "This module has been disabled and will not be loaded."), crashmodule);
-            e_module_all_load();
-         }
-       else
-         {     
-            e_int_config_modules(e_container_current_get(e_manager_current_get()), NULL);
-            e_error_message_show
-              (_("Enlightenment crashed early on start and has<br>"
-                 "been restarted. All modules have been disabled<br>"
-                 "and will not be loaded to help remove any problem<br>"
-                 "modules from your configuration. The module<br>"
-                 "configuration dialog should let you select your<br>"
-                 "modules again."));
-            e_util_dialog_show
-              (_("Enlightenment crashed early on start and has been restarted"),
-                  _("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 modules from your configuration.<br><br>"
-                    "The module configuration dialog should let you select your<br>"
-                    "modules again."));
-         }
-     }
-   else
-     e_module_all_load();
+   if (e_config->show_splash)
+     e_init_status_set(_("Load Modules"));
+   TS("Load Modules");
+   _e_main_modules_load(safe_mode);
+   TS("Load Modules Done");
 
-   TS("init properites");
-   if (!nostartup)
+   TS("Run Startup Apps");
+   if (!nostartup) 
      {
-       if (after_restart) e_startup(E_STARTUP_RESTART);
-       else e_startup(E_STARTUP_START);
+        if (after_restart) 
+          e_startup(E_STARTUP_RESTART);
+        else
+          e_startup(E_STARTUP_START);
      }
+   TS("Run Startup Apps Done");
 
-   if (!((!e_config->show_splash) || (after_restart)))
+   if (!((!e_config->show_splash) || (after_restart))) 
      {
-       ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL);
-       if (locked) e_desklock_show();
+        ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL);
+        if (locked) e_desklock_show();
      }
 
+   TS("E_Container Thaw");
    e_container_all_thaw();
+   TS("E_Container Thaw Done");
 
-   TS("test code");
-   /* run any testing code now we are set up */
+   TS("E_Test Init");
    e_test();
+   TS("E_Test Done");
 
-   e_init_status_set(_("Configure Shelves"));
-   TS("shelf config update");
+   if (e_config->show_splash)
+     e_init_status_set(_("Configure Shelves"));
+   TS("E_Shelf Config Update");
    e_shelf_config_update();
+   TS("E_Shelf Config Update Done");
 
-   TS("manage all windows");
+   TS("Manage all windows");
    _e_main_manage_all();
 
-   /* an idle enterer to be called after all others */
-   _e_main_idle_enterer_after = 
-     ecore_idle_enterer_add(_e_main_cb_idler_after, NULL);
-
-   e_init_status_set(_("Almost Done"));
-   TS("MAIN LOOP AT LAST");
-   /* no longer starting up */
-   starting = 0;
-   /* start our main loop */
+   _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL);
 
-#ifdef DBG_EINA_STRINGSHARE
-   // enable to debug eina stringshare usage
-   ecore_timer_add(5.0, stdbg, NULL);
-#endif
+   if (e_config->show_splash)
+     e_init_status_set(_("Almost Done"));
 
+   starting = EINA_FALSE;
    inloop = EINA_TRUE;
-   if (!setjmp(x_fatal_buf))
-      ecore_main_loop_begin();
+
+   TS("MAIN LOOP AT LAST");
+   if (!setjmp(x_fatal_buff))
+     ecore_main_loop_begin();
    else
-      printf("FATAL: X died. Connection gone. abbreviated shutdown\n");
+     printf("FATAL: X Died. Connection gone. Abbreviated Shutdown\n");
+
    inloop = EINA_FALSE;
-   
-   stopping = 1;
+   stopping = EINA_TRUE;
 
    if (!x_fatal) e_canvas_idle_flush();
 
-   /* ask all modules to save their config and then shutdown */
-   /* NB: no need to do this as config shutdown will flush any saves */
-   /*     and all changed config was already saved before */
    e_config_save_flush();
-
-   /* Store current selected desktops */
    _e_main_desk_save();
-
    e_remember_internal_save();
-   
-   /* unroll our stack of shutdown functions with exit code of 0 */
+
    _e_main_shutdown(0);
 
-   /* if we were flagged to restart, then  restart. */
-   if (restart)
+   if (restart) 
      {
-       e_util_env_set("E_RESTART_OK", "1");
-       ecore_app_restart();
+        e_util_env_set("E_RESTART_OK", "1");
+        if (getenv("E_START_MTRACK"))
+          e_util_env_set("MTRACK", "track");
+        ecore_app_restart();
      }
 
    e_prefix_shutdown();
 
-   /* just return 0 to keep the compiler quiet */
    return 0;
 }
 
@@ -1189,7 +995,7 @@ e_main_idler_before_add(int (*func) (void *data), void *data, int once)
    eb->func = func;
    eb->data = data;
    eb->once = once;
-   _e_main_idler_before_list = eina_list_append(_e_main_idler_before_list, eb);
+   _idle_before_list = eina_list_append(_idle_before_list, eb);
    return eb;
 }
 
@@ -1199,203 +1005,256 @@ e_main_idler_before_del(E_Before_Idler *eb)
    eb->delete_me = 1;
 }
 
-/* local subsystem functions */
-static void
-_e_main_shutdown_push(int (*func) (void))
+/* local functions */
+static void 
+_e_main_shutdown(int errcode) 
 {
-   _e_main_level++;
-   if (_e_main_level > MAX_LEVEL)
-     {
-       _e_main_level--;
-       e_error_message_show("WARNING: too many init levels. MAX = %i", MAX_LEVEL);
-       return;
-     }
-   _e_main_shutdown_func[_e_main_level - 1] = func;
-}
+   int i = 0;
 
-static void
-_e_main_shutdown(int errorcode)
-{
-   int i;
+   printf("E17: Begin Shutdown Procedure!\n");
 
-   printf("E17: Begin shutdown procedure!\n");
-   if (_e_main_idle_enterer_before)
-     {
-       ecore_idle_enterer_del(_e_main_idle_enterer_before);
-       _e_main_idle_enterer_before = NULL;
-     }
-   if (_e_main_idle_enterer_after)
-     {
-       ecore_idle_enterer_del(_e_main_idle_enterer_after);
-       _e_main_idle_enterer_after = NULL;
-     }
-   if (_e_main_idle_enterer_flusher)
-     {
-       ecore_idle_enterer_del(_e_main_idle_enterer_flusher);
-       _e_main_idle_enterer_flusher = NULL;
-     }
-   for (i = _e_main_level - 1; i >= 0; i--)
-     (*_e_main_shutdown_func[i])();
-   if (errorcode < 0) exit(errorcode); 
-}
+   if (_idle_before) ecore_idle_enterer_del(_idle_before);
+   _idle_before = NULL;
+   if (_idle_after) ecore_idle_enterer_del(_idle_after);
+   _idle_after = NULL;
+   if (_idle_flush) ecore_idle_enterer_del(_idle_flush);
+   _idle_flush = NULL;
 
-static int
-_e_main_x_shutdown(void)
-{
-   if (x_fatal) return 1;
-/* ecore_x_ungrab(); */
-   ecore_x_focus_reset();
-   ecore_x_events_allow_all();
-   ecore_x_shutdown();
-   return 1;
+   for (i = (_e_main_lvl - 1); i >= 0; i--)
+     (*_e_main_shutdown_func[i])();
+   if (errcode < 0) exit(errcode);
 }
 
-static int
-_e_main_dirs_init(void)
+static void 
+_e_main_shutdown_push(int (*func)(void)) 
 {
-   const char *base;
-   const char *dirs[] = {
-     "images",
-     "fonts",
-     "themes",
-     "icons",
-     "backgrounds",
-     "applications",
-     "applications/menu",
-     "applications/menu/favorite",
-     "applications/menu/all",
-     "applications/bar",
-     "applications/bar/default",
-     "applications/startup",
-     "applications/restart",
-     "applications/trash",
-     "modules",
-     "config",
-     "locale",
-     "input_methods",
-     NULL
-   };
-
-   base = e_user_dir_get();
-   if (ecore_file_mksubdirs(base, dirs) != sizeof(dirs)/sizeof(dirs[0]) - 1)
+   _e_main_lvl++;
+   if (_e_main_lvl > MAX_LEVEL) 
      {
-       e_error_message_show
-         ("Could not create one of the required subdirectories of '%s'", base);
-       return 0;
+        _e_main_lvl--;
+       e_error_message_show("WARNING: too many init levels. MAX = %i", 
+                             MAX_LEVEL);
+        return;
      }
-
-   return 1;
-}
-
-static int
-_e_main_dirs_shutdown(void)
-{
-   return 1;
+   _e_main_shutdown_func[_e_main_lvl - 1] = func;
 }
 
-static int
-_e_main_screens_init(void)
+static void 
+_e_main_parse_arguments(int argc, char **argv) 
 {
-   Ecore_X_Window *roots;
-   int num, i;
-
-   TS("screens: atoms");
-   if (!e_atoms_init()) return 0;
-   TS("screens: manager");
-   if (!e_manager_init()) return 0;
-   TS("screens: container");
-   if (!e_container_init()) return 0;
-   TS("screens: zone");
-   if (!e_zone_init()) return 0;
-   TS("screens: desk");
-   if (!e_desk_init()) return 0;
-   TS("screens: menu");
-   if (!e_menu_init()) return 0;
-   TS("screens: exehist");
-   if (!e_exehist_init()) return 0;
+   char *s = NULL;
+   int i = 0;
 
-   TS("screens: get roots");
-   num = 0;
-   roots = ecore_x_window_root_list(&num);
-   if ((!roots) || (num <= 0))
-     {
-       e_error_message_show("X reports there are no root windows and %i screens!\n", 
-                            num);
-       return 0;
-     }
-   TS("screens: focus");
-   if (!e_focus_init()) return 0;
-   TS("screens: border");
-   if (!e_border_init()) return 0;
-   TS("screens: win");
-   if (!e_win_init()) return 0;
-   TS("screens: manage roots");
-   for (i = 0; i < num; i++)
+   /* handle some command-line parameters */
+   for (i = 1; i < argc; i++)
      {
-       E_Manager *man;
-       E_Container *con;
+       if ((!strcmp(argv[i], "-display")) && (i < (argc - 1)))
+         {
+            i++;
+            e_util_env_set("DISPLAY", argv[i]);
+         }
+       else if ((!strcmp(argv[i], "-fake-xinerama-screen")) && (i < (argc - 1)))
+         {
+            int x, y, w, h;
 
-       man = e_manager_new(roots[i], i);
-       if (man)
-         e_manager_show(man);
-       else
+            i++;
+            if (sscanf(argv[i], "%ix%i+%i+%i", &w, &h, &x, &y) == 4)
+              e_xinerama_fake_screen_add(x, y, w, h);
+         }
+       else if (!strcmp(argv[i], "-good"))
          {
-            e_error_message_show("Cannot create manager object for screen %i\n", 
-                                 i);
-            free(roots);
-            return 0;
+            good = EINA_TRUE;
+            evil = EINA_FALSE;
+            printf("LA LA LA\n");
          }
-       con = e_container_new(man);
-       if (con)
+       else if (!strcmp(argv[i], "-evil"))
          {
-            e_container_show(con);
-            e_grabinput_focus(con->bg_win, E_FOCUS_METHOD_PASSIVE);
-            e_hints_manager_init(man);
-            _e_main_desk_restore(man, con);
-//          e_manager_manage_windows(man);
+            good = EINA_FALSE;
+            evil = EINA_TRUE;
+            printf("MUHAHAHAHHAHAHAHAHA\n");
          }
-       else
+       else if (!strcmp(argv[i], "-psychotic"))
          {
-            e_error_message_show("Cannot create desktop object for manager on screen %i\n", 
-                                 i);
-            free(roots);
-            return 0;
+            good = EINA_TRUE;
+            evil = EINA_TRUE;
+            printf("MUHAHALALALALALALALA\n");
          }
-     }
-   TS("screens: sync");
-
-   free(roots);
-   ecore_x_sync();
-   return 1;
+       else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1)))
+         {
+            i++;
+            if (!getenv("E_CONF_PROFILE"))
+              e_util_env_set("E_CONF_PROFILE", argv[i]);
+         }
+       else if (!strcmp(argv[i], "-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it"))
+          really_know = EINA_TRUE;
+       else if (!strcmp(argv[i], "-locked"))
+          locked = EINA_TRUE;
+       else if ((!strcmp(argv[i], "-h")) ||
+                (!strcmp(argv[i], "-help")) ||
+                (!strcmp(argv[i], "--help")))
+         {
+            printf
+              (_(
+                 "Options:\n"
+                 "\t-display DISPLAY\n"
+                 "\t\tConnect to display named DISPLAY.\n"
+                 "\t\tEG: -display :1.0\n"
+                 "\t-fake-xinerama-screen WxH+X+Y\n"
+                 "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+                 "\t\tgiven the geometry. Add as many as you like. They all\n"
+                 "\t\treplace the real xinerama screens, if any. This can\n"
+                 "\t\tbe used to simulate xinerama.\n"
+                 "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
+                 "\t-profile CONF_PROFILE\n"
+                 "\t\tUse the configuration profile CONF_PROFILE instead of the user selected default or just \"default\".\n"
+                 "\t-good\n"
+                 "\t\tBe good.\n"
+                 "\t-evil\n"
+                 "\t\tBe evil.\n"
+                 "\t-psychotic\n"
+                 "\t\tBe psychotic.\n"
+                 "\t-locked\n"
+                 "\t\tStart with desklock on, so password will be asked.\n"
+                 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+                 "\t\tIf you need this help, you don't need this option.\n"
+                 )
+               );
+            _e_main_shutdown(-1);
+         }
+     }
+
+   /* fix up DISPLAY to be :N.0 if no .screen is in it */
+   s = getenv("DISPLAY");
+   if (s)
+     {
+       char *p, buff[PATH_MAX];
+
+       if (!(p = strrchr(s, ':')))
+         {
+             snprintf(buff, sizeof(buff), "%s:0.0", s);
+             e_util_env_set("DISPLAY", buff);
+         }
+       else
+         {
+            if (!(p = strrchr(p, '.')))
+              {
+                 snprintf(buff, sizeof(buff), "%s.0", s);
+                 e_util_env_set("DISPLAY", buff);
+              }
+         }
+     }
+
+   /* we want to have been launched by enlightenment_start. there is a very */
+   /* good reason we want to have been launched this way, thus check */
+   if (!getenv("E_START"))
+     {
+       e_error_message_show(_("You are executing enlightenment directly. This is\n"
+                               "bad. Please do not execute the \"enlightenment\"\n"
+                               "binary. Use the \"enlightenment_start\" launcher. It\n"
+                               "will handle setting up environment variables, paths,\n"
+                               "and launching any other required services etc.\n"
+                               "before enlightenment itself begins running.\n"));
+       _e_main_shutdown(-1);
+     }
 }
 
-static int
-_e_main_screens_shutdown(void)
+static void 
+_e_main_cb_x_fatal(void *data __UNUSED__) 
 {
-   e_win_shutdown();
-   e_border_shutdown();
-   e_focus_shutdown();
-   e_exehist_shutdown();
-   e_menu_shutdown();
-// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
-// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
-// down.   
-//   e_desk_shutdown();
-//   e_zone_shutdown();
-//   e_container_shutdown();
-//   e_manager_shutdown();
-   e_atoms_shutdown();
+   e_error_message_show("Lost X Connection.");
+   ecore_main_loop_quit();
+   if (!x_fatal) 
+     {
+        x_fatal = EINA_TRUE;
+        if (inloop) longjmp(x_fatal_buff, -99);
+     }
+}
+
+static Eina_Bool
+_e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
+   e_sys_action_do(E_SYS_EXIT, NULL);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   e_sys_action_do(E_SYS_RESTART, NULL);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
+{
+   Ecore_Event_Signal_User *e = ev;
+   
+   if (e->number == 1)
+     {
+        E_Action *a = e_action_find("configuration");
+        if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+     }
+   else if (e->number == 2)
+     {
+        // comp module has its own handler for this for enabling/disabling fps debug
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static int 
+_e_main_x_shutdown(void)
+{
+   if (x_fatal) return 1;
+   /* ecore_x_ungrab(); */
+   ecore_x_focus_reset();
+   ecore_x_events_allow_all();
+   ecore_x_shutdown();
    return 1;
 }
 
-static void
-_e_main_manage_all(void)
+static int 
+_e_main_dirs_init(void)
 {
-   Eina_List *l;
-   E_Manager *man;
+   const char *base;
+   const char *dirs[] = 
+     {
+        "images",
+        "fonts",
+        "themes",
+        "icons",
+        "backgrounds",
+        "applications",
+        "applications/menu",
+        "applications/menu/favorite",
+        "applications/menu/all",
+        "applications/bar",
+        "applications/bar/default",
+        "applications/startup",
+        "applications/restart",
+        "applications/trash",
+        "modules",
+        "config",
+        "locale",
+        "input_methods",
+        NULL
+     };
 
-   EINA_LIST_FOREACH(e_manager_list(), l, man)
-     e_manager_manage_windows(man);
+   base = e_user_dir_get();
+   if (ecore_file_mksubdirs(base, dirs) != sizeof(dirs)/sizeof(dirs[0]) - 1)
+     {
+       e_error_message_show("Could not create one of the required "
+                             "subdirectories of '%s'", base);
+       return 0;
+     }
+
+   return 1;
+}
+
+static int 
+_e_main_dirs_shutdown(void)
+{
+   return 1;
 }
 
 static int
@@ -1558,125 +1417,179 @@ _e_main_path_shutdown(void)
    return 1;
 }
 
-static void
-_e_main_cb_x_fatal(void *data __UNUSED__)
+static void 
+_e_main_test_formats(void) 
 {
-   e_error_message_show("Lost X connection.");
-   ecore_main_loop_quit();
-   // x is foobared - best to get the hell out of the mainloop
-   if (!x_fatal)
+   Evas *evas;
+   Ecore_Evas *ee;
+   Evas_Object *im, *txt;
+   Evas_Coord tw, th;
+   char buff[PATH_MAX];
+
+   if (e_config->show_splash)
+     e_init_status_set(_("Testing Format Support"));
+
+   if (!(ee = ecore_evas_buffer_new(1, 1))) 
      {
-        x_fatal = EINA_TRUE;
-        if (inloop) longjmp(x_fatal_buf, -99);
+        e_error_message_show(_("Enlightenment found Evas can't create a buffer canvas. Please check\n"
+                               "Evas has Software Buffer engine support.\n"));
+        _e_main_shutdown(-1);
      }
-}
+   e_canvas_add(ee);
+   evas = ecore_evas_get(ee);
+   im = evas_object_image_add(evas);
 
-static Eina_Bool
-_e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
-{
-   /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
-   e_sys_action_do(E_SYS_EXIT, NULL);
-   return ECORE_CALLBACK_RENEW;
-}
+   e_prefix_data_concat_static(buff, "data/images/test.svg");
+   evas_object_image_file_set(im, buff, NULL);
+   if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) 
+     {
+        e_error_message_show(_("Enlightenment found Evas can't load SVG files. "
+                               "Check Evas has SVG loader support.\n"));
+     }
+   else 
+     efreet_icon_extension_add(".svg");
 
-static Eina_Bool
-_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
-{
-   e_sys_action_do(E_SYS_RESTART, NULL);
-   return ECORE_CALLBACK_RENEW;
-}
+   e_prefix_data_concat_static(buff, "data/images/test.jpg");
+   evas_object_image_file_set(im, buff, NULL);
+   if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+     {
+        e_error_message_show(_("Enlightenment found Evas can't load JPEG files. "
+                               "Check Evas has JPEG loader support.\n"));
+        _e_main_shutdown(-1);
+     }
+   efreet_icon_extension_add(".jpg");
 
-static Eina_Bool
-_e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
-{
-   Ecore_Event_Signal_User *e = ev;
-   
-   if (e->number == 1)
+   e_prefix_data_concat_static(buff, "data/images/test.png");
+   evas_object_image_file_set(im, buff, NULL);
+   if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) 
      {
-        E_Action *a = e_action_find("configuration");
-        if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+        e_error_message_show(_("Enlightenment found Evas can't load PNG files. "
+                               "Check Evas has PNG loader support.\n"));
+        _e_main_shutdown(-1);
      }
-   else if (e->number == 2)
+   efreet_icon_extension_add(".png");
+
+   e_prefix_data_concat_static(buff, "data/images/test.edj");
+   evas_object_image_file_set(im, buff, "images/0");
+   if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
      {
-        // comp module has its own handler for this for enabling/disabling fps debug
+        e_error_message_show(_("Enlightenment found Evas can't load EET files. "
+                               "Check Evas has EET loader support.\n"));
+        _e_main_shutdown(-1);
      }
-   return ECORE_CALLBACK_RENEW;
-}
+   efreet_icon_extension_add(".edj");
 
-static Eina_Bool
-_e_main_cb_x_flusher(void *data __UNUSED__)
-{
-   eet_clearcache();
-   ecore_x_flush();
-   return ECORE_CALLBACK_RENEW;
+   evas_object_del(im);
+
+   txt = evas_object_text_add(evas);
+   evas_object_text_font_set(txt, "Sans", 10);
+   evas_object_text_text_set(txt, "Hello");
+   evas_object_geometry_get(txt, NULL, NULL, &tw, &th);
+   if ((tw <= 0) && (th <= 0))
+     {
+        e_error_message_show(_("Enlightenment found Evas can't load the 'Sans' font. Check Evas has fontconfig\n"
+                               "support and system fontconfig defines a 'Sans' font.\n"));
+        _e_main_shutdown(-1);
+     }
+   evas_object_del(txt);
+   e_canvas_del(ee);
+   ecore_evas_free(ee);
 }
 
-static Eina_Bool
-_e_main_cb_idler_before(void *data __UNUSED__)
+static int
+_e_main_screens_init(void)
 {
-   Eina_List *l, *pl;
-   E_Before_Idler *eb;
+   Ecore_X_Window *roots;
+   int num, i;
 
-   e_menu_idler_before();
-   e_focus_idler_before();
-   e_border_idler_before();
-   e_popup_idler_before();
-   e_drag_idler_before();
-   e_pointer_idler_before();
-   EINA_LIST_FOREACH(_e_main_idler_before_list, l, eb)
+   TS("\tscreens: atoms");
+   if (!e_atoms_init()) return 0;
+   TS("\tscreens: manager");
+   if (!e_manager_init()) return 0;
+   TS("\tscreens: container");
+   if (!e_container_init()) return 0;
+   TS("\tscreens: zone");
+   if (!e_zone_init()) return 0;
+   TS("\tscreens: desk");
+   if (!e_desk_init()) return 0;
+   TS("\tscreens: menu");
+   if (!e_menu_init()) return 0;
+   TS("\tscreens: exehist");
+   if (!e_exehist_init()) return 0;
+
+   TS("\tscreens: get roots");
+   num = 0;
+   roots = ecore_x_window_root_list(&num);
+   if ((!roots) || (num <= 0))
      {
-       if (!eb->delete_me)
-         {
-            if (!eb->func(eb->data)) eb->delete_me = 1;
-         }
+       e_error_message_show("X reports there are no root windows and %i screens!\n", 
+                            num);
+       return 0;
      }
-   EINA_LIST_FOREACH_SAFE(_e_main_idler_before_list, pl, l, eb)
+   TS("\tscreens: focus");
+   if (!e_focus_init()) return 0;
+   TS("\tscreens: border");
+   if (!e_border_init()) return 0;
+   TS("\tscreens: win");
+   if (!e_win_init()) return 0;
+   TS("\tscreens: manage roots");
+   for (i = 0; i < num; i++)
      {
-       if ((eb->once) || (eb->delete_me))
+       E_Manager *man;
+       E_Container *con;
+
+       man = e_manager_new(roots[i], i);
+       if (man)
+         e_manager_show(man);
+       else
          {
-            _e_main_idler_before_list =
-              eina_list_remove_list(_e_main_idler_before_list, pl);
-            free(eb);
+            e_error_message_show("Cannot create manager object for screen %i\n", 
+                                 i);
+            free(roots);
+            return 0;
          }
-     }
-   _e_cacheburst--;
-/* eet_cacheburst(_e_cacheburst); */
-   edje_thaw();
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_e_main_cb_idler_after(void *data __UNUSED__)
-{
-   edje_freeze();
-   _e_cacheburst++;
-/* eet_cacheburst(_e_cacheburst); */
-     {
-       static int first_idle = 1;
-
-       if (first_idle)
+       con = e_container_new(man);
+       if (con)
+         {
+            e_container_show(con);
+            e_grabinput_focus(con->bg_win, E_FOCUS_METHOD_PASSIVE);
+            e_hints_manager_init(man);
+            _e_main_desk_restore(man, con);
+//          e_manager_manage_windows(man);
+         }
+       else
          {
-            TS("SLEEP");
-            first_idle = 0;
-            e_precache_end = 1;
+            e_error_message_show("Cannot create desktop object for manager on screen %i\n", 
+                                 i);
+            free(roots);
+            return 0;
          }
      }
-   return ECORE_CALLBACK_RENEW;
-}
+   free(roots);
 
-static Eina_Bool
-_e_main_cb_eet_cacheburst_end(void *data __UNUSED__)
-{
-   _e_cacheburst--;
-/* eet_cacheburst(_e_cacheburst); */
-   return ECORE_CALLBACK_CANCEL;
+   TS("\tscreens: sync");
+   ecore_x_sync();
+
+   return 1;
 }
 
-static Eina_Bool
-_e_main_cb_startup_fake_end(void *data __UNUSED__)
+static int
+_e_main_screens_shutdown(void)
 {
-   e_init_hide();
-   return ECORE_CALLBACK_CANCEL;
+   e_win_shutdown();
+   e_border_shutdown();
+   e_focus_shutdown();
+   e_exehist_shutdown();
+   e_menu_shutdown();
+// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
+// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
+// down.   
+//   e_desk_shutdown();
+//   e_zone_shutdown();
+//   e_container_shutdown();
+//   e_manager_shutdown();
+   e_atoms_shutdown();
+   return 1;
 }
 
 static void
@@ -1728,3 +1641,145 @@ _e_main_desk_restore(E_Manager *man, E_Container *con)
        e_desk_show(desk);
      }
 }
+
+static void 
+_e_main_efreet_paths_init(void) 
+{
+   Eina_List **list;
+
+   if ((list = efreet_icon_extra_list_get()))
+     {
+        char buff[PATH_MAX];
+
+        e_user_dir_concat_static(buff, "icons");
+        *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buff));
+        e_prefix_data_concat_static(buff, "data/icons");
+        *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buff));
+     }
+}
+
+static void 
+_e_main_modules_load(Eina_Bool safe_mode) 
+{
+   if (!safe_mode)
+     e_module_all_load();
+   else 
+     {
+       E_Module *m; 
+       char *crashmodule;
+
+       crashmodule = getenv("E_MODULE_LOAD");
+       if (crashmodule) m = e_module_new(crashmodule);
+
+       if ((crashmodule) && (m))
+         {
+            e_module_disable(m);
+            e_object_del(E_OBJECT(m));
+
+            e_int_config_modules(e_container_current_get(e_manager_current_get()), NULL);
+            e_error_message_show
+              (_("Enlightenment crashed early on start and has<br>"
+                 "been restarted. There was an error loading<br>"
+                 "module named: %s. This module has been disabled<br>"
+                 "and will not be loaded."), crashmodule);
+            e_util_dialog_show
+              (_("Enlightenment crashed early on start and has been restarted"),
+                  _("Enlightenment crashed early on start and has been restarted.<br>"
+                    "There was an error loading module named: %s<br><br>"
+                    "This module has been disabled and will not be loaded."), crashmodule);
+            e_module_all_load();
+         }
+       else
+         {     
+            e_int_config_modules(e_container_current_get(e_manager_current_get()), NULL);
+            e_error_message_show
+              (_("Enlightenment crashed early on start and has<br>"
+                 "been restarted. All modules have been disabled<br>"
+                 "and will not be loaded to help remove any problem<br>"
+                 "modules from your configuration. The module<br>"
+                 "configuration dialog should let you select your<br>"
+                 "modules again."));
+            e_util_dialog_show
+              (_("Enlightenment crashed early on start and has been restarted"),
+                  _("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 modules from your configuration.<br><br>"
+                    "The module configuration dialog should let you select your<br>"
+                    "modules again."));
+         }
+     }
+}
+
+static void
+_e_main_manage_all(void)
+{
+   Eina_List *l;
+   E_Manager *man;
+
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     e_manager_manage_windows(man);
+}
+
+static Eina_Bool
+_e_main_cb_idle_before(void *data __UNUSED__)
+{
+   Eina_List *l, *pl;
+   E_Before_Idler *eb;
+
+   e_menu_idler_before();
+   e_focus_idler_before();
+   e_border_idler_before();
+   e_popup_idler_before();
+   e_drag_idler_before();
+   e_pointer_idler_before();
+   EINA_LIST_FOREACH(_idle_before_list, l, eb)
+     {
+       if (!eb->delete_me)
+         {
+            if (!eb->func(eb->data)) eb->delete_me = 1;
+         }
+     }
+   EINA_LIST_FOREACH_SAFE(_idle_before_list, pl, l, eb)
+     {
+       if ((eb->once) || (eb->delete_me))
+         {
+            _idle_before_list =
+              eina_list_remove_list(_idle_before_list, pl);
+            free(eb);
+         }
+     }
+   edje_thaw();
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_main_cb_idle_after(void *data __UNUSED__)
+{
+   static int first_idle = 1;
+
+   edje_freeze();
+
+   if (first_idle)
+     {
+        TS("SLEEP");
+        first_idle = 0;
+        e_precache_end = EINA_TRUE;
+     }
+
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_main_cb_x_flusher(void *data __UNUSED__)
+{
+   eet_clearcache();
+   ecore_x_flush();
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_e_main_cb_startup_fake_end(void *data __UNUSED__)
+{
+   e_init_hide();
+   return ECORE_CALLBACK_CANCEL;
+}
index e73eb58..0b7c25d 100644 (file)
@@ -84,7 +84,6 @@ EAPI E_Manager *
 e_manager_new(Ecore_X_Window root, int num)
 {
    E_Manager *man;
-   Ecore_Event_Handler *h;
 
    if (!ecore_x_window_manage(root)) return NULL;
    ecore_x_window_background_color_set(root, 0, 0, 0);
@@ -106,22 +105,46 @@ e_manager_new(Ecore_X_Window root, int num)
        man->win = man->root;
      }
 
-   h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_manager_cb_window_show_request, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, _e_manager_cb_window_configure, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_manager_cb_key_down, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_manager_cb_key_up, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST, _e_manager_cb_frame_extents_request, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_X_EVENT_PING, _e_manager_cb_ping, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_manager_cb_screensaver_notify, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
-   h = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _e_manager_cb_client_message, man);
-   if (h) man->handlers = eina_list_append(man->handlers, h);
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, 
+                                              _e_manager_cb_window_show_request, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, 
+                                              _e_manager_cb_window_configure, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, 
+                                              _e_manager_cb_key_down, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_EVENT_KEY_UP, 
+                                              _e_manager_cb_key_up, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST, 
+                                              _e_manager_cb_frame_extents_request, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_PING, 
+                                              _e_manager_cb_ping, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, 
+                                              _e_manager_cb_screensaver_notify, 
+                                              man));
+   man->handlers = 
+     eina_list_append(man->handlers, 
+                      ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, 
+                                              _e_manager_cb_client_message, 
+                                              man));
 
    man->pointer = e_pointer_window_new(man->root, 1);
 
@@ -543,6 +566,12 @@ e_manager_comp_src_list(E_Manager *man)
    return man->comp->func.src_list_get(man->comp->data, man);
 }
 
+EAPI E_Manager_Comp_Source*
+e_manager_comp_src_get(E_Manager *man, Ecore_X_Window win)
+{
+   return man->comp->func.src_get(man->comp->data, man, win);
+}
+
 EAPI Evas_Object *
 e_manager_comp_src_image_get(E_Manager *man, E_Manager_Comp_Source *src)
 {
@@ -579,6 +608,78 @@ e_manager_comp_src_hidden_get(E_Manager *man, E_Manager_Comp_Source *src)
    return man->comp->func.src_hidden_get(man->comp->data, man, src);
 }
 
+EAPI Ecore_X_Window
+e_manager_comp_src_window_get(E_Manager *man, E_Manager_Comp_Source *src)
+{
+   return man->comp->func.src_window_get(man->comp->data, man, src);
+}
+
+EAPI E_Popup *
+e_manager_comp_src_popup_get(E_Manager *man, E_Manager_Comp_Source *src)
+{
+   return man->comp->func.src_popup_get(man->comp->data, man, src);
+}
+
+EAPI E_Border *
+e_manager_comp_src_border_get(E_Manager *man, E_Manager_Comp_Source *src)
+{
+   return man->comp->func.src_border_get(man->comp->data, man, src);
+}
+
+#ifdef _F_COMP_SCREEN_LOCK_
+EAPI void
+e_manager_comp_screen_lock(E_Manager *man)
+{
+   E_OBJECT_CHECK(man);
+   E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
+   if (!man->comp) return;
+   return man->comp->func.screen_lock(man->comp->data, man);
+}
+
+EAPI void
+e_manager_comp_screen_unlock(E_Manager *man)
+{
+   E_OBJECT_CHECK(man);
+   E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
+   if (!man->comp) return;
+   return man->comp->func.screen_unlock(man->comp->data, man);
+}
+#endif
+
+#ifdef _F_COMP_INPUT_REGION_SET_
+EAPI Eina_Bool
+e_manager_comp_src_input_region_set(E_Manager *man, E_Manager_Comp_Source *src, int x, int y, int w, int h)
+{
+   E_OBJECT_CHECK_RETURN(man, EINA_FALSE);
+   E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, EINA_FALSE);
+   if (!man->comp) return EINA_FALSE;
+   E_OBJECT_CHECK_RETURN(src, EINA_FALSE);
+   return man->comp->func.src_input_region_set(man->comp->data, man, src, x, y, w, h);
+}
+#endif
+
+#ifdef _F_COMP_MOVE_LOCK_
+EAPI Eina_Bool
+e_manager_comp_src_move_lock(E_Manager *man, E_Manager_Comp_Source *src)
+{
+   E_OBJECT_CHECK_RETURN(man, EINA_FALSE);
+   E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, EINA_FALSE);
+   if (!man->comp) return EINA_FALSE;
+   E_OBJECT_CHECK_RETURN(src, EINA_FALSE);
+   return man->comp->func.src_move_lock(man->comp->data, man, src);
+}
+
+EAPI Eina_Bool
+e_manager_comp_src_move_unlock(E_Manager *man, E_Manager_Comp_Source *src)
+{
+   E_OBJECT_CHECK_RETURN(man, EINA_FALSE);
+   E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, EINA_FALSE);
+   if (!man->comp) return EINA_FALSE;
+   E_OBJECT_CHECK_RETURN(src, EINA_FALSE);
+   return man->comp->func.src_move_unlock(man->comp->data, man, src);
+}
+#endif
+
 EAPI void
 e_manager_comp_event_resize_send(E_Manager *man)
 {
index cf8a304..824fa42 100644 (file)
@@ -9,27 +9,7 @@ typedef struct _E_Manager_Comp_Source E_Manager_Comp_Source;
 #define E_MANAGER_H
 
 #define E_MANAGER_TYPE (int) 0xE0b01008
-
-struct _E_Manager_Comp
-{
-   struct {
-      Evas             * (*evas_get)             (void *data, E_Manager *man);
-      void               (*update)               (void *data, E_Manager *man);
-      const Eina_List  * (*src_list_get)         (void *data, E_Manager *man);
-      Evas_Object      * (*src_image_get)        (void *data, E_Manager *man, E_Manager_Comp_Source *src);
-      Evas_Object      * (*src_shadow_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
-      Evas_Object      * (*src_image_mirror_add) (void *data, E_Manager *man, E_Manager_Comp_Source *src);
-      Eina_Bool          (*src_visible_get)      (void *data, E_Manager *man, E_Manager_Comp_Source *src);
-      void               (*src_hidden_set)       (void *data, E_Manager *man, E_Manager_Comp_Source *src, Eina_Bool hidden);
-      Eina_Bool          (*src_hidden_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
-#ifdef _F_COMP_SCREEN_LOCK_
-      void               (*screen_lock)          (void *data, E_Manager *man);
-      void               (*screen_unlock)        (void *data, E_Manager *man);
-#endif
-   } func;
-   void                   *data;
-};
-
+  
 struct _E_Manager
 {
    E_Object             e_obj_inherit;
@@ -48,6 +28,37 @@ struct _E_Manager
    E_Manager_Comp      *comp;
 };
 
+struct _E_Manager_Comp
+{
+  struct {
+    Evas             * (*evas_get)             (void *data, E_Manager *man);
+    void               (*update)               (void *data, E_Manager *man);
+    const Eina_List  * (*src_list_get)         (void *data, E_Manager *man);
+    Evas_Object      * (*src_image_get)        (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    Evas_Object      * (*src_shadow_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    Evas_Object      * (*src_image_mirror_add) (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    Eina_Bool          (*src_visible_get)      (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    void               (*src_hidden_set)       (void *data, E_Manager *man, E_Manager_Comp_Source *src, Eina_Bool hidden);
+    Eina_Bool          (*src_hidden_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    E_Manager_Comp_Source * (*src_get)         (void *data, E_Manager *man, Ecore_X_Window win);
+    E_Popup          * (*src_popup_get)        (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    E_Border         * (*src_border_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    Ecore_X_Window     (*src_window_get)       (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+#ifdef _F_COMP_SCREEN_LOCK_
+    void               (*screen_lock)          (void *data, E_Manager *man);
+    void               (*screen_unlock)        (void *data, E_Manager *man);
+#endif
+#ifdef _F_COMP_INPUT_REGION_SET_
+    Eina_Bool          (*src_input_region_set) (void *data, E_Manager *man, E_Manager_Comp_Source *src, int x, int y, int w, int h);
+#endif
+#ifdef _F_COMP_MOVE_LOCK_
+    Eina_Bool          (*src_move_lock)        (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+    Eina_Bool          (*src_move_unlock)      (void *data, E_Manager *man, E_Manager_Comp_Source *src);
+#endif
+  } func;
+  void                   *data;
+};
+
 EINTERN int        e_manager_init(void);
 EINTERN int        e_manager_shutdown(void);
 EAPI Eina_List *e_manager_list(void);
@@ -124,6 +135,20 @@ EAPI void             e_manager_comp_event_src_add_send(E_Manager *man, E_Manage
 EAPI void             e_manager_comp_event_src_del_send(E_Manager *man, E_Manager_Comp_Source *src, void (*afterfunc) (void *data, E_Manager *man, E_Manager_Comp_Source *src), void *data);
 EAPI void             e_manager_comp_event_src_config_send(E_Manager *man, E_Manager_Comp_Source *src, void (*afterfunc) (void *data, E_Manager *man, E_Manager_Comp_Source *src), void *data);
 EAPI void             e_manager_comp_event_src_visibility_send(E_Manager *man, E_Manager_Comp_Source *src, void (*afterfunc) (void *data, E_Manager *man, E_Manager_Comp_Source *src), void *data);
-
+EAPI E_Manager_Comp_Source *e_manager_comp_src_get(E_Manager *man, Ecore_X_Window win);
+EAPI E_Popup         *e_manager_comp_src_popup_get(E_Manager *man, E_Manager_Comp_Source *src);
+EAPI E_Border        *e_manager_comp_src_border_get(E_Manager *man, E_Manager_Comp_Source *src);
+EAPI Ecore_X_Window   e_manager_comp_src_window_get(E_Manager *man, E_Manager_Comp_Source *src);
+#ifdef _F_COMP_SCREEN_LOCK_
+EAPI void             e_manager_comp_screen_lock(E_Manager *man);
+EAPI void             e_manager_comp_screen_unlock(E_Manager *man);
+#endif
+#ifdef _F_COMP_INPUT_REGION_SET_
+EAPI Eina_Bool        e_manager_comp_src_input_region_set(E_Manager *man, E_Manager_Comp_Source *src, int x, int y, int w, int h);
+#endif
+#ifdef _F_COMP_MOVE_LOCK_
+EAPI Eina_Bool        e_manager_comp_src_move_lock(E_Manager *man, E_Manager_Comp_Source *src);
+EAPI Eina_Bool        e_manager_comp_src_move_unlock(E_Manager *man, E_Manager_Comp_Source *src);
+#endif
 #endif
 #endif
index 7e0c1b1..28f9062 100644 (file)
@@ -1362,6 +1362,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
                    {
                       o = e_icon_add(mi->menu->evas);
                       mi->icon_object = o;
+                      e_icon_scale_size_set(o, e_util_icon_size_normalize(24 * e_scale)); 
                        e_icon_preload_set(mi->icon_object, 1);
                       e_icon_file_set(o, mi->icon);
                       e_icon_fill_inside_set(mi->icon_object, 1);
index 13e16ea..16ff9cf 100644 (file)
@@ -21,6 +21,9 @@ typedef struct _E_Menu_Category_Callback E_Menu_Category_Callback;
 
 #define E_MENU_ITEM_TYPE 0xE0b0100a
 
+typedef void (*E_Menu_Cb) (void *data, E_Menu *m, E_Menu_Item *mi);
+
+
 struct _E_Menu
 {
    E_Object             e_obj_inherit;
@@ -110,27 +113,27 @@ struct _E_Menu_Item
    
    struct {
       void *data;
-      void (*func) (void *data, E_Menu *m, E_Menu_Item *mi);
+      E_Menu_Cb func;
    } cb; /* Callback for menu item activation */
 
    struct {
       void *data;
-      void (*func) (void *data, E_Menu *m, E_Menu_Item *mi);
+      E_Menu_Cb func;
    } realize_cb; /* Callback for menu item icon realization */
 
     struct {
       void *data;
-      void (*func) (void *data, E_Menu *m, E_Menu_Item *mi);
+      E_Menu_Cb func;
    } submenu_pre_cb;
 
     struct {
       void *data;
-      void (*func) (void *data, E_Menu *m, E_Menu_Item *mi);
+      E_Menu_Cb func;
    } submenu_post_cb;
 
    struct {
       void *data;
-      void (*func) (void *data, E_Menu *m, E_Menu_Item *mi);
+      E_Menu_Cb func;
    } drag_cb; /* Callback for menu item dragging */
 
    struct {
@@ -194,11 +197,11 @@ EAPI void         e_menu_item_radio_set(E_Menu_Item *mi, int rad);
 EAPI void         e_menu_item_radio_group_set(E_Menu_Item *mi, int radg);
 EAPI void         e_menu_item_toggle_set(E_Menu_Item *mi, int tog);
 EAPI int          e_menu_item_toggle_get(E_Menu_Item *mi);
-EAPI void         e_menu_item_callback_set(E_Menu_Item *mi,  void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data);
-EAPI void         e_menu_item_realize_callback_set(E_Menu_Item *mi,  void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data);
-EAPI void         e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi,  void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data);
-EAPI void         e_menu_item_submenu_post_callback_set(E_Menu_Item *mi,  void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data);
-EAPI void         e_menu_item_drag_callback_set(E_Menu_Item *mi,  void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data);
+EAPI void         e_menu_item_callback_set(E_Menu_Item *mi,  E_Menu_Cb func, void *data);
+EAPI void         e_menu_item_realize_callback_set(E_Menu_Item *mi,  E_Menu_Cb func, void *data);
+EAPI void         e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi,  E_Menu_Cb func, void *data);
+EAPI void         e_menu_item_submenu_post_callback_set(E_Menu_Item *mi,  E_Menu_Cb func, void *data);
+EAPI void         e_menu_item_drag_callback_set(E_Menu_Item *mi,  E_Menu_Cb func, void *data);
 EAPI void         e_menu_item_active_set(E_Menu_Item *mi, int active);
 EAPI void         e_menu_item_disabled_set(E_Menu_Item *mi, int disable);
 
index e744ff4..633f96d 100644 (file)
@@ -46,9 +46,7 @@ e_module_shutdown(void)
 
    /* do not use EINA_LIST_FREE! e_object_del modifies list */
    if (x_fatal)
-     {
-        e_module_save_all();
-     }
+       e_module_save_all();
    else
      {
         while (_e_modules)
@@ -81,7 +79,7 @@ e_module_all_load(void)
      {
        if (!em) continue;
 
-       printf ("[E17_MODULE_INFO] NAME:%s,   ENABLE:%d,  DELAYED:%d\n", em->name, em->enabled, em->delayed);
+        printf ("[E17_MODULE_INFO] NAME:%s,   ENABLE:%d,  DELAYED:%d\n", em->name, em->enabled, em->delayed);
 
        if ((em->delayed) && (em->enabled))
          {
@@ -97,9 +95,9 @@ e_module_all_load(void)
 
             if (!em->name) continue;
 
-            setenv("E_MODULE_LOAD", em->name, 1);
+            e_util_env_set("E_MODULE_LOAD", em->name);
             snprintf (buf, sizeof(buf), _("Loading Module: %s"), em->name);
-            e_init_status_set(em->name);
+            e_init_status_set(buf);
 
             m = e_module_new(em->name);
             if (m) e_module_enable(m);
@@ -143,7 +141,7 @@ e_module_new(const char *name)
        m->error = 1;
        goto init_done;
      }
-   m->handle = dlopen(modpath, RTLD_NOW | RTLD_GLOBAL);
+   m->handle = dlopen(modpath, (RTLD_NOW | RTLD_GLOBAL));
    if (!m->handle)
      {
        snprintf(body, sizeof(body), 
@@ -576,7 +574,6 @@ _e_module_sort_priority(const void *d1, const void *d2)
    return (m2->priority - m1->priority);
 }
 
-
 static void 
 _e_module_event_update_free(void *data __UNUSED__, void *event) 
 {
index e9ed98c..7fd07df 100644 (file)
@@ -143,4 +143,6 @@ _e_msg_event_free(void *data __UNUSED__, void *ev)
 
    e = ev;
    if (e->obj) e_object_unref(e->obj);
+
+   E_FREE(ev);
 }
index d91a816..424568c 100644 (file)
@@ -1,22 +1,36 @@
 #include "e.h"
 
 /* local subsystem functions */
-static void _e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err);
-
-static DBusMessage* _e_msgbus_core_restart_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg);
-
-static DBusMessage* _e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg);
-
-static DBusMessage* _e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg);
-static DBusMessage* _e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage *msg);
+static void _e_msgbus_request_name_cb(void        *data,
+                                      DBusMessage *msg,
+                                      DBusError   *err);
+
+static DBusMessage *_e_msgbus_core_restart_cb(E_DBus_Object *obj,
+                                              DBusMessage   *msg);
+static DBusMessage *_e_msgbus_core_shutdown_cb(E_DBus_Object *obj,
+                                               DBusMessage   *msg);
+
+static DBusMessage *_e_msgbus_module_load_cb(E_DBus_Object *obj,
+                                             DBusMessage   *msg);
+static DBusMessage *_e_msgbus_module_unload_cb(E_DBus_Object *obj,
+                                               DBusMessage   *msg);
+static DBusMessage *_e_msgbus_module_enable_cb(E_DBus_Object *obj,
+                                               DBusMessage   *msg);
+static DBusMessage *_e_msgbus_module_disable_cb(E_DBus_Object *obj,
+                                                DBusMessage   *msg);
+static DBusMessage *_e_msgbus_module_list_cb(E_DBus_Object *obj,
+                                             DBusMessage   *msg);
+
+static DBusMessage *_e_msgbus_profile_set_cb(E_DBus_Object *obj,
+                                             DBusMessage   *msg);
+static DBusMessage *_e_msgbus_profile_get_cb(E_DBus_Object *obj,
+                                             DBusMessage   *msg);
+static DBusMessage *_e_msgbus_profile_list_cb(E_DBus_Object *obj,
+                                              DBusMessage   *msg);
+static DBusMessage *_e_msgbus_profile_add_cb(E_DBus_Object *obj,
+                                             DBusMessage   *msg);
+static DBusMessage *_e_msgbus_profile_delete_cb(E_DBus_Object *obj,
+                                                DBusMessage   *msg);
 
 /* local subsystem globals */
 static E_Msgbus_Data *_e_msgbus_data = NULL;
@@ -37,8 +51,8 @@ e_msgbus_init(void)
    _e_msgbus_data->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
    if (!_e_msgbus_data->conn)
      {
-       printf("WARNING: Cannot get DBUS_BUS_SESSION\n");
-       return 0;
+        printf("WARNING: Cannot get DBUS_BUS_SESSION\n");
+        return 0;
      }
    e_dbus_request_name(_e_msgbus_data->conn, "org.enlightenment.wm.service", 0, _e_msgbus_request_name_cb, NULL);
    _e_msgbus_data->obj = e_dbus_object_add(_e_msgbus_data->conn, "/org/enlightenment/wm/RemoteObject", NULL);
@@ -46,21 +60,21 @@ e_msgbus_init(void)
    iface = e_dbus_interface_new("org.enlightenment.wm.Core");
    if (!iface)
      {
-       printf("WARNING: Cannot add org.enlightenment.wm.Core interface\n");
-       return 0;
+        printf("WARNING: Cannot add org.enlightenment.wm.Core interface\n");
+        return 0;
      }
    e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
    e_dbus_interface_unref(iface);
+
    /* Hardcore methods */
    e_dbus_interface_method_add(iface, "Restart", "", "", _e_msgbus_core_restart_cb);
    e_dbus_interface_method_add(iface, "Shutdown", "", "", _e_msgbus_core_shutdown_cb);
-  
+
    iface = e_dbus_interface_new("org.enlightenment.wm.Module");
    if (!iface)
      {
-       printf("WARNING: Cannot add org.enlightenment.wm.Module interface\n");
-       return 0;
+        printf("WARNING: Cannot add org.enlightenment.wm.Module interface\n");
+        return 0;
      }
    e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
    e_dbus_interface_unref(iface);
@@ -75,8 +89,8 @@ e_msgbus_init(void)
    iface = e_dbus_interface_new("org.enlightenment.wm.Profile");
    if (!iface)
      {
-       printf("WARNING: Cannot add org.enlightenment.wm.Profile interface\n");
-       return 0;
+        printf("WARNING: Cannot add org.enlightenment.wm.Profile interface\n");
+        return 0;
      }
    e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
    e_dbus_interface_unref(iface);
@@ -87,7 +101,7 @@ e_msgbus_init(void)
    e_dbus_interface_method_add(iface, "List", "", "as", _e_msgbus_profile_list_cb);
    e_dbus_interface_method_add(iface, "Add", "s", "", _e_msgbus_profile_add_cb);
    e_dbus_interface_method_add(iface, "Delete", "s", "", _e_msgbus_profile_delete_cb);
-   
+
    return 1;
 }
 
@@ -127,103 +141,114 @@ e_msgbus_interface_detach(E_DBus_Interface *iface)
 }
 
 static void
-_e_msgbus_request_name_cb(void *data __UNUSED__, DBusMessage *msg __UNUSED__, DBusError *err __UNUSED__)
+_e_msgbus_request_name_cb(void        *data __UNUSED__,
+                          DBusMessage *msg __UNUSED__,
+                          DBusError   *err __UNUSED__)
 {
 //TODO Handle Errors
 }
 
 /* Core Handlers */
-static DBusMessage* 
-_e_msgbus_core_restart_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_core_restart_cb(E_DBus_Object *obj __UNUSED__,
+                          DBusMessage   *msg)
 {
    e_sys_action_do(E_SYS_RESTART, NULL);
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_core_shutdown_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_core_shutdown_cb(E_DBus_Object *obj __UNUSED__,
+                           DBusMessage   *msg)
 {
    e_sys_action_do(E_SYS_EXIT, NULL);
    return dbus_message_new_method_return(msg);
 }
 
 /* Modules Handlers */
-static DBusMessage* 
-_e_msgbus_module_load_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_module_load_cb(E_DBus_Object *obj __UNUSED__,
+                         DBusMessage   *msg)
 {
    DBusMessageIter iter;
    char *module;
-   
+
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &module);
-   
-   if (!e_module_find(module)) 
+
+   if (!e_module_find(module))
      {
-       e_module_new(module);
-       e_config_save_queue();
+        e_module_new(module);
+        e_config_save_queue();
      }
 
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage*
-_e_msgbus_module_unload_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_module_unload_cb(E_DBus_Object *obj __UNUSED__,
+                           DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *module; 
+   char *module;
    E_Module *m;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &module);
-     
-   if ((m = e_module_find(module))) 
+
+   if ((m = e_module_find(module)))
      {
-       e_module_disable(m);
-       e_object_del(E_OBJECT(m));
-       e_config_save_queue();
+        e_module_disable(m);
+        e_object_del(E_OBJECT(m));
+        e_config_save_queue();
      }
 
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage*
-_e_msgbus_module_enable_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_module_enable_cb(E_DBus_Object *obj __UNUSED__,
+                           DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *module; 
+   char *module;
    E_Module *m;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &module);
-   if ((m = e_module_find(module))) {
-      e_module_enable(m);
-      e_config_save_queue();
-   }
+
+   if ((m = e_module_find(module)))
+     {
+        e_module_enable(m);
+        e_config_save_queue();
+     }
+
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage*
-_e_msgbus_module_disable_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_module_disable_cb(E_DBus_Object *obj __UNUSED__,
+                            DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *module; 
+   char *module;
    E_Module *m;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &module);
-   if ((m = e_module_find(module))) {
-      e_module_disable(m);
-      e_config_save_queue();
-   }
+
+   if ((m = e_module_find(module)))
+     {
+        e_module_disable(m);
+        e_config_save_queue();
+     }
 
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage*
-_e_msgbus_module_list_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_module_list_cb(E_DBus_Object *obj __UNUSED__,
+                         DBusMessage   *msg)
 {
    Eina_List *l;
    E_Module *mod;
@@ -237,16 +262,16 @@ _e_msgbus_module_list_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
 
    EINA_LIST_FOREACH(e_module_list(), l, mod)
      {
-       DBusMessageIter sub;
-       const char *name;
-       int enabled;
-
-       name = mod->name;
-       enabled = mod->enabled;
-       dbus_message_iter_open_container(&arr, DBUS_TYPE_STRUCT, NULL, &sub);
-       dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &(name));
-       dbus_message_iter_append_basic(&sub, DBUS_TYPE_INT32, &(enabled));
-       dbus_message_iter_close_container(&arr, &sub);
+        DBusMessageIter sub;
+        const char *name;
+        int enabled;
+
+        name = mod->name;
+        enabled = mod->enabled;
+        dbus_message_iter_open_container(&arr, DBUS_TYPE_STRUCT, NULL, &sub);
+        dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &(name));
+        dbus_message_iter_append_basic(&sub, DBUS_TYPE_INT32, &(enabled));
+        dbus_message_iter_close_container(&arr, &sub);
      }
    dbus_message_iter_close_container(&iter, &arr);
 
@@ -254,11 +279,12 @@ _e_msgbus_module_list_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
 }
 
 /* Profile Handlers */
-static DBusMessage*
-_e_msgbus_profile_set_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_profile_set_cb(E_DBus_Object *obj __UNUSED__,
+                         DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *profile; 
+   char *profile;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &profile);
@@ -272,8 +298,9 @@ _e_msgbus_profile_set_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage*
-_e_msgbus_profile_get_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_profile_get_cb(E_DBus_Object *obj __UNUSED__,
+                         DBusMessage   *msg)
 {
    DBusMessageIter iter;
    DBusMessage *reply;
@@ -288,8 +315,9 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
    return reply;
 }
 
-static DBusMessage*
-_e_msgbus_profile_list_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_profile_list_cb(E_DBus_Object *obj __UNUSED__,
+                          DBusMessage   *msg)
 {
    Eina_List *l;
    const char *name;
@@ -303,18 +331,19 @@ _e_msgbus_profile_list_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
 
    EINA_LIST_FOREACH(e_config_profile_list(), l, name)
      {
-       dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, &name);
+        dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, &name);
      }
    dbus_message_iter_close_container(&iter, &arr);
 
    return reply;
 }
 
-static DBusMessage*
-_e_msgbus_profile_add_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_profile_add_cb(E_DBus_Object *obj __UNUSED__,
+                         DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *profile; 
+   char *profile;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &profile);
@@ -322,24 +351,24 @@ _e_msgbus_profile_add_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
    e_config_profile_add(profile);
 
    return dbus_message_new_method_return(msg);
-
 }
 
-static DBusMessage*
-_e_msgbus_profile_delete_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+static DBusMessage *
+_e_msgbus_profile_delete_cb(E_DBus_Object *obj __UNUSED__,
+                            DBusMessage   *msg)
 {
    DBusMessageIter iter;
-   char *profile; 
+   char *profile;
 
    dbus_message_iter_init(msg, &iter);
    dbus_message_iter_get_basic(&iter, &profile);
    if (!strcmp(e_config_profile_get(), profile))
      {
-       DBusMessage *ret;
+        DBusMessage *ret;
 
-       ret = dbus_message_new_error(msg, "org.enlightenment.DBus.InvalidArgument", 
-             "Can't delete active profile");
-       return ret;
+        ret = dbus_message_new_error(msg, "org.enlightenment.DBus.InvalidArgument",
+                                     "Can't delete active profile");
+        return ret;
      }
    e_config_profile_del(profile);
 
index 7405b46..958b0b0 100644 (file)
@@ -10,7 +10,7 @@ typedef struct _E_Pointer_Stack E_Pointer_Stack;
 
 struct _E_Pointer_Stack
 {
-   void *obj;
+   void       *obj;
    const char *type;
 };
 
@@ -19,16 +19,28 @@ static Eina_List *handlers = NULL;
 
 static void _e_pointer_canvas_add(E_Pointer *p);
 static void _e_pointer_canvas_del(E_Pointer *p);
-static void _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info);
-static void _e_pointer_free(E_Pointer *p);
-static void _e_pointer_stack_free(E_Pointer_Stack *elem);
-static void  _e_pointer_type_set(E_Pointer *p, const char *type);
-static void _e_pointer_active_handle(E_Pointer *p);
-
-static Eina_Bool _e_pointer_cb_mouse_down(void *data, int type, void *event);
-static Eina_Bool _e_pointer_cb_mouse_up(void *data, int type, void *event);
-static Eina_Bool _e_pointer_cb_mouse_move(void *data, int type, void *event);
-static Eina_Bool _e_pointer_cb_mouse_wheel(void *data, int type, void *event);
+static void _e_pointer_cb_move(void        *data,
+                               Evas        *e __UNUSED__,
+                               Evas_Object *obj __UNUSED__,
+                               void        *event_info);
+static void      _e_pointer_free(E_Pointer *p);
+static void      _e_pointer_stack_free(E_Pointer_Stack *elem);
+static void      _e_pointer_type_set(E_Pointer  *p,
+                                     const char *type);
+static void      _e_pointer_active_handle(E_Pointer *p);
+
+static Eina_Bool _e_pointer_cb_mouse_down(void *data,
+                                          int   type,
+                                          void *event);
+static Eina_Bool _e_pointer_cb_mouse_up(void *data,
+                                        int   type,
+                                        void *event);
+static Eina_Bool _e_pointer_cb_mouse_move(void *data,
+                                          int   type,
+                                          void *event);
+static Eina_Bool _e_pointer_cb_mouse_wheel(void *data,
+                                           int   type,
+                                           void *event);
 static Eina_Bool _e_pointer_cb_idle_timer_pre(void *data);
 static Eina_Bool _e_pointer_cb_idle_timer_wait(void *data);
 static Eina_Bool _e_pointer_cb_idle_poller(void *data);
@@ -37,21 +49,21 @@ static Eina_Bool _e_pointer_cb_idle_poller(void *data);
 EINTERN int
 e_pointer_init(void)
 {
-   handlers = 
-     eina_list_append(handlers, 
-                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, 
+   handlers =
+     eina_list_append(handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
                                               _e_pointer_cb_mouse_down, NULL));
-   handlers = 
-     eina_list_append(handlers, 
-                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, 
+   handlers =
+     eina_list_append(handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
                                               _e_pointer_cb_mouse_up, NULL));
-   handlers = 
-     eina_list_append(handlers, 
-                      ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, 
+   handlers =
+     eina_list_append(handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,
                                               _e_pointer_cb_mouse_move, NULL));
-   handlers = 
-     eina_list_append(handlers, 
-                      ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, 
+   handlers =
+     eina_list_append(handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
                                               _e_pointer_cb_mouse_wheel, NULL));
    return 1;
 }
@@ -64,7 +76,8 @@ e_pointer_shutdown(void)
 }
 
 EAPI E_Pointer *
-e_pointer_window_new(Ecore_X_Window win, int filled)
+e_pointer_window_new(Ecore_X_Window win,
+                     int            filled)
 {
    E_Pointer *p = NULL;
 
@@ -79,7 +92,7 @@ e_pointer_window_new(Ecore_X_Window win, int filled)
 
    ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
    if (filled) e_pointer_type_push(p, p, "default");
-   _e_pointers = eina_list_append(_e_pointers, p); 
+   _e_pointers = eina_list_append(_e_pointers, p);
    return p;
 }
 
@@ -92,55 +105,59 @@ e_pointers_size_set(int size)
    if (!e_config->show_cursor) return;
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       Evas_Engine_Info_Buffer *einfo;
-
-       if (p->evas)
-         {
-            p->w = p->h = size;
-            evas_output_size_set(p->evas, p->w, p->h);
-            evas_output_viewport_set(p->evas, 0, 0, p->w, p->h);
-
-            p->pixels = realloc(p->pixels, p->w * p->h * sizeof(int));
-
-            einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(p->evas);
-            if (einfo)
-              {
-                 einfo->info.dest_buffer = p->pixels;
-                 einfo->info.dest_buffer_row_bytes = p->w * sizeof(int);
-                 evas_engine_info_set(p->evas, (Evas_Engine_Info *)einfo);
-              }
-
-            evas_object_move(p->pointer_object, 0, 0);
-            evas_object_resize(p->pointer_object, p->w, p->h);
-         }
-       else
-         {
-            const char *type;
-
-            ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
-            type = p->type;
-            if (type)
-              {
-                 p->type = NULL;
-                 _e_pointer_type_set(p, type);
-                 eina_stringshare_del(type);
-              }
-         }
+        Evas_Engine_Info_Buffer *einfo;
+
+        if (p->evas)
+          {
+             p->w = p->h = size;
+             evas_output_size_set(p->evas, p->w, p->h);
+             evas_output_viewport_set(p->evas, 0, 0, p->w, p->h);
+
+             p->pixels = realloc(p->pixels, p->w * p->h * sizeof(int));
+
+             einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(p->evas);
+             if (einfo)
+               {
+                  einfo->info.dest_buffer = p->pixels;
+                  einfo->info.dest_buffer_row_bytes = p->w * sizeof(int);
+                  evas_engine_info_set(p->evas, (Evas_Engine_Info *)einfo);
+               }
+
+             evas_object_move(p->pointer_object, 0, 0);
+             evas_object_resize(p->pointer_object, p->w, p->h);
+          }
+        else
+          {
+             const char *type;
+
+             ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
+             type = p->type;
+             if (type)
+               {
+                  p->type = NULL;
+                  _e_pointer_type_set(p, type);
+                  eina_stringshare_del(type);
+               }
+          }
      }
 }
 
 EAPI void
 e_pointer_hide(E_Pointer *p)
 {
-    if (p->win) ecore_x_window_cursor_set(p->win, 0);
-    if (p->evas) _e_pointer_canvas_del(p);
+   if (!p) return;
+   if (p->win) ecore_x_window_cursor_set(p->win, 0);
+   if (p->evas) _e_pointer_canvas_del(p);
 }
 
 EAPI void
-e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
+e_pointer_type_push(E_Pointer  *p,
+                    void       *obj,
+                    const char *type)
 {
    E_Pointer_Stack *stack;
 
+   if (!p) return;
    p->e_cursor = e_config->use_e_cursor;
 
    _e_pointer_type_set(p, type);
@@ -150,35 +167,38 @@ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
    stack = E_NEW(E_Pointer_Stack, 1);
    if (stack)
      {
-       stack->type = eina_stringshare_add(p->type);
-       stack->obj = p->obj;
-       p->stack = eina_list_prepend(p->stack, stack);
+        stack->type = eina_stringshare_add(p->type);
+        stack->obj = p->obj;
+        p->stack = eina_list_prepend(p->stack, stack);
      }
 }
 
 EAPI void
-e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
+e_pointer_type_pop(E_Pointer  *p,
+                   void       *obj,
+                   const char *type)
 {
    Eina_List *l;
    E_Pointer_Stack *stack;
 
+   if (!p) return;
    EINA_LIST_FOREACH(p->stack, l, stack)
      {
-       if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type))))
-         {
-            _e_pointer_stack_free(stack);
-            p->stack = eina_list_remove_list(p->stack, l);
-            if (type) break;
-         }
+        if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type))))
+          {
+             _e_pointer_stack_free(stack);
+             p->stack = eina_list_remove_list(p->stack, l);
+             if (type) break;
+          }
      }
 
    if (!p->stack)
      {
-       if (p->evas) _e_pointer_canvas_del(p);
-       ecore_x_window_cursor_set(p->win, 0);
-       if (p->type) eina_stringshare_del(p->type);
-       p->type = NULL;
-       return;
+        if (p->evas) _e_pointer_canvas_del(p);
+        ecore_x_window_cursor_set(p->win, 0);
+        if (p->type) eina_stringshare_del(p->type);
+        p->type = NULL;
+        return;
      }
 
    stack = eina_list_data_get(p->stack);
@@ -201,23 +221,23 @@ e_pointer_idler_before(void)
    if (!e_config->show_cursor) return;
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       Eina_List *updates;
+        Eina_List *updates;
 
-       if (!p->e_cursor) continue;
-       if (!p->evas) continue;
+        if (!p->e_cursor) continue;
+        if (!p->evas) continue;
 
-       updates = evas_render_updates(p->evas);
-       if ((updates) || (p->hot.update))
-         {
-            Ecore_X_Cursor cur;
+        updates = evas_render_updates(p->evas);
+        if ((updates) || (p->hot.update))
+          {
+             Ecore_X_Cursor cur;
 
-            cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, 
+             cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h,
                                       p->hot.x, p->hot.y);
-            ecore_x_window_cursor_set(p->win, cur);
-            ecore_x_cursor_free(cur);
-            evas_render_updates_free(updates);
-            p->hot.update = 0;
-         }
+             ecore_x_window_cursor_set(p->win, cur);
+             ecore_x_cursor_free(cur);
+             evas_render_updates_free(updates);
+             p->hot.update = 0;
+          }
      }
 }
 
@@ -229,6 +249,7 @@ _e_pointer_canvas_add(E_Pointer *p)
    Evas_Object *o;
    int rmethod;
 
+   if (!p) return;
    p->w = e_config->cursor_size;
    p->h = e_config->cursor_size;
 
@@ -236,8 +257,8 @@ _e_pointer_canvas_add(E_Pointer *p)
    p->evas = evas_new();
    if (!p->evas)
      {
-       e_object_del(E_OBJECT(p));
-       return;
+        e_object_del(E_OBJECT(p));
+        return;
      }
    rmethod = evas_render_method_lookup("buffer");
    evas_output_method_set(p->evas, rmethod);
@@ -248,13 +269,13 @@ _e_pointer_canvas_add(E_Pointer *p)
    if (!p->pixels)
      {
         _e_pointer_canvas_del(p);
-       return;
+        return;
      }
    einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(p->evas);
    if (!einfo)
      {
         _e_pointer_canvas_del(p);
-       return;
+        return;
      }
    einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32;
    einfo->info.dest_buffer = p->pixels;
@@ -271,9 +292,9 @@ _e_pointer_canvas_add(E_Pointer *p)
    /* Create the hotspot object */
    o = evas_object_rectangle_add(p->evas);
    evas_object_color_set(o, 0, 0, 0, 0);
-   p->hot_object = o;   
+   p->hot_object = o;
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE,
-                                 _e_pointer_cb_move, p);
+                                  _e_pointer_cb_move, p);
    /* init edje */
    evas_object_move(p->pointer_object, 0, 0);
    evas_object_resize(p->pointer_object, p->w, p->h);
@@ -283,6 +304,7 @@ _e_pointer_canvas_add(E_Pointer *p)
 static void
 _e_pointer_canvas_del(E_Pointer *p)
 {
+   if (!p) return;
    if (p->pointer_object) evas_object_del(p->pointer_object);
    if (p->hot_object) evas_object_del(p->hot_object);
    if (p->evas) evas_free(p->evas);
@@ -294,28 +316,32 @@ _e_pointer_canvas_del(E_Pointer *p)
 }
 
 static void
-_e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_e_pointer_cb_move(void        *data,
+                   Evas        *e __UNUSED__,
+                   Evas_Object *obj __UNUSED__,
+                   void        *event_info __UNUSED__)
 {
    E_Pointer *p;
    Evas_Coord x, y;
 
    if (!e_config->show_cursor) return;
 
-   p = data;
+   if (!(p = data)) return;
    if (!p->e_cursor) return;
    edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
-                                &x, &y, NULL, NULL);
+                                 &x, &y, NULL, NULL);
    if ((p->hot.x != x) || (p->hot.y != y))
      {
-       p->hot.x = x;
-       p->hot.y = y;
-       p->hot.update = 1;
+        p->hot.x = x;
+        p->hot.y = y;
+        p->hot.update = 1;
      }
 }
 
 static void
 _e_pointer_free(E_Pointer *p)
 {
+   if (!p) return;
    _e_pointers = eina_list_remove(_e_pointers, p);
 
    _e_pointer_canvas_del(p);
@@ -339,113 +365,117 @@ _e_pointer_stack_free(E_Pointer_Stack *elem)
    free(elem);
 }
 
-static void 
-_e_pointer_type_set(E_Pointer *p, const char *type)
+static void
+_e_pointer_type_set(E_Pointer  *p,
+                    const char *type)
 {
+   if (!p) return;
+
    /* Check if this pointer is already set */
    if ((p->type) && (!strcmp(p->type, type))) return;
 
-   if (p->type) eina_stringshare_del(p->type);
-   p->type = eina_stringshare_add(type);
+   eina_stringshare_replace(&p->type, type);
 
    /* Do not set type if in "hidden mode" */
    if (!e_config->show_cursor)
      {
-       ecore_x_window_cursor_set(p->win, 0);
-       return;
+        ecore_x_window_cursor_set(p->win, 0);
+        return;
      }
 
    if (p->e_cursor)
      {
-       char cursor[1024];
-       Evas_Coord x, y;
+        char cursor[1024];
+        Evas_Coord x, y;
 
-       if (!p->evas) _e_pointer_canvas_add(p);
-       if (p->color)
-          snprintf(cursor, sizeof(cursor), 
+        if (!p->evas) _e_pointer_canvas_add(p);
+        if (p->color)
+          snprintf(cursor, sizeof(cursor),
                    "e/pointer/enlightenment/%s/color", type);
-       else
-          snprintf(cursor, sizeof(cursor), 
+        else
+          snprintf(cursor, sizeof(cursor),
                    "e/pointer/enlightenment/%s/mono", type);
-        if (!e_theme_edje_object_set(p->pointer_object, 
+        if (!e_theme_edje_object_set(p->pointer_object,
                                      "base/theme/pointer", cursor))
           goto fallback;
-       edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", 
+        edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot",
                                  p->hot_object);
-       edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", 
-                                     &x, &y, NULL, NULL);
-       if ((p->hot.x != x) || (p->hot.y != y))
-         {
-            p->hot.x = x;
-            p->hot.y = y;
-         }
-       p->hot.update = 1;
-       return;
+        edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
+                                      &x, &y, NULL, NULL);
+        if ((p->hot.x != x) || (p->hot.y != y))
+          {
+             p->hot.x = x;
+             p->hot.y = y;
+          }
+        p->hot.update = 1;
+        return;
      }
-   fallback:
-     {
-       Ecore_X_Cursor cursor = 0;
+fallback:
+   {
+      Ecore_X_Cursor cursor = 0;
 
-       if (p->evas) _e_pointer_canvas_del(p);
-       if (!strcmp(type, "move"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
+      if (p->evas) _e_pointer_canvas_del(p);
+      if (!strcmp(type, "move"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
 #if 0
-       else if (!strcmp(type, "resize"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
+      else if (!strcmp(type, "resize"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
 #endif
-       else if (!strcmp(type, "resize_tl"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
-       else if (!strcmp(type, "resize_t"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
-       else if (!strcmp(type, "resize_tr"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
-       else if (!strcmp(type, "resize_r"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
-       else if (!strcmp(type, "resize_br"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
-       else if (!strcmp(type, "resize_b"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
-       else if (!strcmp(type, "resize_bl"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
-       else if (!strcmp(type, "resize_l"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
-       else if (!strcmp(type, "entry"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
-       else if (!strcmp(type, "default"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
-       else if (!strcmp(type, "plus"))
-          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
-       else
-         {
-            printf("Unknown pointer type: %s\n", type);
-            cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW);
-         }
-        if (!cursor) printf("X Cursor for %s is missing\n", type);
-        ecore_x_window_cursor_set(p->win, cursor);
-       if (cursor) ecore_x_cursor_free(cursor);
-     }
+      else if (!strcmp(type, "resize_tl"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
+      else if (!strcmp(type, "resize_t"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
+      else if (!strcmp(type, "resize_tr"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
+      else if (!strcmp(type, "resize_r"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
+      else if (!strcmp(type, "resize_br"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
+      else if (!strcmp(type, "resize_b"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
+      else if (!strcmp(type, "resize_bl"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
+      else if (!strcmp(type, "resize_l"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
+      else if (!strcmp(type, "entry"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
+      else if (!strcmp(type, "default"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
+      else if (!strcmp(type, "plus"))
+        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
+      else
+        {
+           printf("Unknown pointer type: %s\n", type);
+           cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW);
+        }
+      if (!cursor) printf("X Cursor for %s is missing\n", type);
+      ecore_x_window_cursor_set(p->win, cursor);
+      if (cursor) ecore_x_cursor_free(cursor);
+   }
 }
 
 static void
 _e_pointer_active_handle(E_Pointer *p)
 {
+   if (!p) return;
+
    /* we got some mouse event - if there was an idle timer emit an active
     * signal as we WERE idle, NOW we are active */
    if (p->idle_timer)
      {
-       ecore_timer_del(p->idle_timer);
-       p->idle_timer = NULL;
+        ecore_timer_del(p->idle_timer);
+        p->idle_timer = NULL;
      }
    if (p->idle_poller)
      {
-       ecore_poller_del(p->idle_poller);
-       p->idle_poller = NULL;
+        ecore_poller_del(p->idle_poller);
+        p->idle_poller = NULL;
      }
    if (p->idle)
      {
-       if (p->pointer_object)
-         edje_object_signal_emit(p->pointer_object, "e,state,mouse,active", "e");
-       p->idle = 0;
+        if (p->pointer_object)
+          edje_object_signal_emit(p->pointer_object, "e,state,mouse,active", "e");
+        p->idle = 0;
      }
    if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) return;
    /* and schedule a pre-idle check in 1 second if no more events happen */
@@ -454,77 +484,85 @@ _e_pointer_active_handle(E_Pointer *p)
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_e_pointer_cb_mouse_down(void *data __UNUSED__,
+                         int   type __UNUSED__,
+                         void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
 
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       _e_pointer_active_handle(p);
-       if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
-         {
-            if (p->pointer_object)
-              edje_object_signal_emit(p->pointer_object, 
+        _e_pointer_active_handle(p);
+        if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
+          {
+             if (p->pointer_object)
+               edje_object_signal_emit(p->pointer_object,
                                        "e,action,mouse,down", "e");
-         }
+          }
      }
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_e_pointer_cb_mouse_up(void *data __UNUSED__,
+                       int   type __UNUSED__,
+                       void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
 
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       _e_pointer_active_handle(p);
-       if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
-         {
-            if (p->pointer_object)
-              edje_object_signal_emit(p->pointer_object, 
+        _e_pointer_active_handle(p);
+        if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
+          {
+             if (p->pointer_object)
+               edje_object_signal_emit(p->pointer_object,
                                        "e,action,mouse,up", "e");
-         }
+          }
      }
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_e_pointer_cb_mouse_move(void *data __UNUSED__,
+                         int   type __UNUSED__,
+                         void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
 
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       _e_pointer_active_handle(p);
-       if (e_powersave_mode_get() < E_POWERSAVE_MODE_HIGH)
-         {
-            if (p->pointer_object)
-              edje_object_signal_emit(p->pointer_object, 
+        _e_pointer_active_handle(p);
+        if (e_powersave_mode_get() < E_POWERSAVE_MODE_HIGH)
+          {
+             if (p->pointer_object)
+               edje_object_signal_emit(p->pointer_object,
                                        "e,action,mouse,move", "e");
-         }
+          }
      }
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_e_pointer_cb_mouse_wheel(void *data __UNUSED__,
+                          int   type __UNUSED__,
+                          void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
 
    EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-       _e_pointer_active_handle(p);
-       if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
-         {
-            if (p->pointer_object)
-              edje_object_signal_emit(p->pointer_object, 
+        _e_pointer_active_handle(p);
+        if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
+          {
+             if (p->pointer_object)
+               edje_object_signal_emit(p->pointer_object,
                                        "e,action,mouse,wheel", "e");
-         }
+          }
      }
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -535,7 +573,7 @@ _e_pointer_cb_idle_timer_pre(void *data)
    E_Pointer *p;
    int x, y;
 
-   p = data;
+   if (!(p = data)) return ECORE_CALLBACK_RENEW;
    ecore_x_pointer_xy_get(p->win, &x, &y);
    p->x = x;
    p->y = y;
@@ -548,18 +586,18 @@ _e_pointer_cb_idle_timer_wait(void *data)
 {
    E_Pointer *p;
 
-   p = data;
+   if (!(p = data)) return ECORE_CALLBACK_RENEW;
    if ((e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) ||
        (!e_config->idle_cursor))
      {
-       if (p->idle_poller) ecore_poller_del(p->idle_poller);
-       p->idle_poller = NULL;
-       p->idle_timer = NULL;
-       return ECORE_CALLBACK_CANCEL;
+        if (p->idle_poller) ecore_poller_del(p->idle_poller);
+        p->idle_poller = NULL;
+        p->idle_timer = NULL;
+        return ECORE_CALLBACK_CANCEL;
      }
    if (!p->idle_poller)
      p->idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 64,
-                                      _e_pointer_cb_idle_poller, p);
+                                       _e_pointer_cb_idle_poller, p);
    p->idle_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
 }
@@ -570,38 +608,39 @@ _e_pointer_cb_idle_poller(void *data)
    E_Pointer *p;
    int x, y;
 
-   p = data;
+   if (!(p = data)) return ECORE_CALLBACK_RENEW;
    if ((e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) ||
        (!e_config->idle_cursor))
      {
-       p->idle_poller = NULL;
-       return ECORE_CALLBACK_CANCEL;
+        p->idle_poller = NULL;
+        return ECORE_CALLBACK_CANCEL;
      }
    /* check if pointer actually moved since the 1 second post-mouse move idle
     * pre-timer that fetches the position */
    ecore_x_pointer_xy_get(p->win, &x, &y);
    if ((x != p->x) || (y != p->y))
      {
-       /* it moved - so we are not idle yet - record position and wait 
-        * 4 secons more */
-       p->x = x;
-       p->y = y;
-       if (p->idle)
-         {
-            if (p->pointer_object)
-              edje_object_signal_emit(p->pointer_object, 
-                                       "e,state,mouse,active", "e");
-            p->idle = 0;
-         }
-       /* use poller to check from now on */
-       return ECORE_CALLBACK_RENEW;
+        /* it moved - so we are not idle yet - record position and wait
+         * 4 secons more */
+          p->x = x;
+          p->y = y;
+          if (p->idle)
+            {
+               if (p->pointer_object)
+                 edje_object_signal_emit(p->pointer_object,
+                                         "e,state,mouse,active", "e");
+               p->idle = 0;
+            }
+          /* use poller to check from now on */
+          return ECORE_CALLBACK_RENEW;
      }
    /* we are idle - report it if not idle before */
    if (!p->idle)
      {
-       if (p->pointer_object)
-         edje_object_signal_emit(p->pointer_object, "e,state,mouse,idle", "e");
-       p->idle = 1;
+        if (p->pointer_object)
+          edje_object_signal_emit(p->pointer_object, "e,state,mouse,idle", "e");
+        p->idle = 1;
      }
    return ECORE_CALLBACK_RENEW;
 }
+
index adf9be8..d568a42 100644 (file)
  */
 #include "e.h"
 
-#define ECORE_X_RANDR_1_1 ((1 << 16) | 1)
-#define ECORE_X_RANDR_1_2 ((1 << 16) | 2)
-#define ECORE_X_RANDR_1_3 ((1 << 16) | 3)
+#define ECORE_X_RANDR_1_1   ((1 << 16) | 1)
+#define ECORE_X_RANDR_1_2   ((1 << 16) | 2)
+#define ECORE_X_RANDR_1_3   ((1 << 16) | 3)
 
-#define Ecore_X_Randr_None   0
+#define Ecore_X_Randr_None  0
 #define Ecore_X_Randr_Unset -1
 
 /*
+ * Save mechanism:
+ * Single monitor:
+ * - Save monitor using the resolution
+ *
+ * Multiple monitors:
+ * - Use the EDID information to make sure we restore the right monitor.
+ *
  * TODO:
  * -fix output policies above and left
  */
 
 //following macro namescheme follows cardinal relation
 //1 : M
-#define E_RANDR_NO_SCREEN_RET(ret) if (!e_randr_screen_info) return ret
-#define E_RANDR_NO_11_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11) return ret
-#define E_RANDR_NO_12_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12) return ret
-#define E_RANDR_NO_CRTCS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs) return ret
-#define E_RANDR_NO_OUTPUTS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs) return ret
-#define E_RANDR_NO_CRTC_RET(crtc, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc) return ret
-#define E_RANDR_NO_OUTPUT_RET(output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) return ret
-#define E_RANDR_NO_MODE_RET(mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) return ret
-#define E_RANDR_NO_CRTC_OUTPUT_RET(crtc, output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) return ret
-#define E_RANDR_NO_CRTC_OUTPUT_MODE_RET(crtc, output, mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) return ret
-
-#define E_RANDR_NO_11 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11)
-#define E_RANDR_NO_12 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12)
-#define E_RANDR_NO_CRTCS (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs)
+#define E_RANDR_NO_SCREEN_RET(ret)                               if (!e_randr_screen_info) \
+    return ret
+#define E_RANDR_NO_11_RET(ret)                                   if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11) \
+    return ret
+#define E_RANDR_NO_12_RET(ret)                                   if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12) \
+    return ret
+#define E_RANDR_NO_CRTCS_RET(ret)                                if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs) \
+    return ret
+#define E_RANDR_NO_OUTPUTS_RET(ret)                              if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs) \
+    return ret
+#define E_RANDR_NO_CRTC_RET(crtc, ret)                           if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc) \
+    return ret
+#define E_RANDR_NO_OUTPUT_RET(output, ret)                       if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) \
+    return ret
+#define E_RANDR_NO_MODE_RET(mode, ret)                           if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) \
+    return ret
+#define E_RANDR_NO_CRTC_OUTPUT_RET(crtc, output, ret)            if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) \
+    return ret
+#define E_RANDR_NO_CRTC_OUTPUT_MODE_RET(crtc, output, mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) \
+    return ret
+
+#define E_RANDR_NO_11      (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11)
+#define E_RANDR_NO_12      (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12)
+#define E_RANDR_NO_CRTCS   (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs)
 #define E_RANDR_NO_OUTPUTS (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs)
-#define E_RANDR_NO_MODES (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes)
-#define E_RANDR_NO_CRTC(crtc) (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc)
-#define E_RANDR_NO_OUTPUT(output) (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output)
-#define E_RANDR_NO_CRTC_OUTPUT(crtc, output) (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output)
+#define E_RANDR_NO_MODES   (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes)
+#define E_RANDR_NO_CRTC(crtc)                           (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc)
+#define E_RANDR_NO_OUTPUT(output)                       (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output)
+#define E_RANDR_NO_CRTC_OUTPUT(crtc, output)            (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output)
 #define E_RANDR_NO_CRTC_OUTPUT_MODE(crtc, output, mode) (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode)
 
-static Eina_Bool _e_randr_init(void);
-static void _e_randr_shutdown(void);
-static void _e_randr_event_listeners_add(void);
-static void _e_randr_event_listeners_remove(void);
-static Eina_Bool _e_randr_event_cb(void *data, int type, void *e);
-static E_Randr_Screen_Info *_e_randr_screen_info_new(void);
-static void _e_randr_screen_info_free(E_Randr_Screen_Info *screen_info);
-static E_Randr_Screen_Info_11 *_e_randr_screen_info_11_new(void);
-static Eina_Bool _e_randr_screen_info_11_set(void);
-static void _e_randr_screen_info_11_free(E_Randr_Screen_Info_11 *screen_info_11);
-static E_Randr_Screen_Info_12 *_e_randr_screen_info_12_new(void);
-static Eina_Bool _e_randr_screen_info_12_set(E_Randr_Screen_Info_12 *screen_info_12);
-static void _e_randr_screen_info_12_free(E_Randr_Screen_Info_12 *screen_info_12);
-static E_Randr_Output_Info *_e_randr_output_info_new(int nrequested);
-static void _e_randr_output_info_free(E_Randr_Output_Info *output_info);
-static E_Randr_Crtc_Info *_e_randr_crtc_info_new(int nrequested);
-static void _e_randr_crtc_info_free(E_Randr_Crtc_Info *crtc_info);
-static Eina_Bool _e_randr_screen_outputs_init(void);
-static Eina_Bool _e_randr_screen_crtcs_init(void);
-static Eina_Bool _e_randr_output_modes_add(E_Randr_Output_Info *output_info);
-static void _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info);
-static void _e_randr_notify_output_change(E_Randr_Output_Info *output_info);
+static Eina_Bool                _e_randr_init(void);
+static void                     _e_randr_shutdown(void);
+static void                     _e_randr_event_listeners_add(void);
+static void                     _e_randr_event_listeners_remove(void);
+static Eina_Bool                _e_randr_event_cb(void *data, int type, void *e);
+static E_Randr_Screen_Info     *_e_randr_screen_info_new(void);
+static void                     _e_randr_screen_info_free(E_Randr_Screen_Info *screen_info);
+static E_Randr_Screen_Info_11  *_e_randr_screen_info_11_new(void);
+static Eina_Bool                _e_randr_screen_info_11_set(void);
+static void                     _e_randr_screen_info_11_free(E_Randr_Screen_Info_11 *screen_info_11);
+static E_Randr_Screen_Info_12  *_e_randr_screen_info_12_new(void);
+static Eina_Bool                _e_randr_screen_info_12_set(E_Randr_Screen_Info_12 *screen_info_12);
+static void                     _e_randr_screen_info_12_free(E_Randr_Screen_Info_12 *screen_info_12);
+static E_Randr_Output_Info     *_e_randr_output_info_new(int nrequested);
+static void                     _e_randr_output_info_free(E_Randr_Output_Info *output_info);
+static E_Randr_Crtc_Info       *_e_randr_crtc_info_new(int nrequested);
+static void                     _e_randr_crtc_info_free(E_Randr_Crtc_Info *crtc_info);
+static Eina_Bool                _e_randr_screen_outputs_init(void);
+static Eina_Bool                _e_randr_screen_crtcs_init(void);
+
+static Eina_Bool                _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11);
+static Eina_Bool                _e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12);
+EAPI void                       e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
+EAPI Eina_Bool                  e_randr_try_restore_configuration(E_Randr_Screen_Info *screen_info);
+static Eina_Bool                _e_randr_output_modes_add(E_Randr_Output_Info *output_info);
+static void                     _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info);
+static void                     _e_randr_notify_output_change(E_Randr_Output_Info *output_info);
 static Ecore_X_Randr_Mode_Info *_e_randr_mode_info_get(Ecore_X_Randr_Mode mode);
-static E_Randr_Crtc_Info *_e_randr_crtc_info_get(Ecore_X_Randr_Crtc crtc);
-static E_Randr_Output_Info *_e_randr_output_info_get(Ecore_X_Randr_Output output);
-static void _e_randr_output_info_set(E_Randr_Output_Info *output_info);
-static void _e_randr_crtc_info_set(E_Randr_Crtc_Info *crtc_info);
-static const E_Randr_Crtc_Info *_e_randr_policy_crtc_get(E_Randr_Crtc_Info* but, E_Randr_Crtc_Info *hint, Ecore_X_Randr_Output_Policy policy);
-//static Eina_Bool _e_randr_outputs_connected(Eina_List *outputs_info);
-static Ecore_X_Randr_Output *_e_randr_outputs_to_array(Eina_List *outputs_info);
-//static int _e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11** restore_info);
-static E_Randr_Screen_Restore_Info_12 *        _e_randr_config_find_suiting_config_12(void);
-//static Eina_Bool _e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation);
-//static Eina_Bool _e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info);
-static Eina_Bool _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force);
-static void _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info);
-static void _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info);
-static Eina_Bool _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc);
+static E_Randr_Crtc_Info       *_e_randr_crtc_info_get(Ecore_X_Randr_Crtc crtc);
+static E_Randr_Output_Info     *_e_randr_output_info_get(Ecore_X_Randr_Output output);
+static void                     _e_randr_output_info_set(E_Randr_Output_Info *output_info);
+static void                     _e_randr_crtc_info_set(E_Randr_Crtc_Info *crtc_info);
+static const E_Randr_Crtc_Info *_e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint, Ecore_X_Randr_Output_Policy policy);
+static Ecore_X_Randr_Output    *_e_randr_outputs_to_array(Eina_List *outputs_info);
+static Eina_Bool                _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force);
+static void                     _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info);
+static void                     _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info);
+static Eina_Bool                _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc);
 //static int _crtcs_size_sort_cb(const void *d1, const void *d2);
-static int _outputs_size_sort_cb(const void *d1, const void *d2);
-static int _modes_size_sort_cb(const void *d1, const void *d2);
-static Eina_List *_e_randr_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *max_size_mode);
+static int                      _outputs_size_sort_cb(const void *d1, const void *d2);
+static int                      _modes_size_sort_cb(const void *d1, const void *d2);
+static Eina_List               *_e_randr_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *max_size_mode);
 static Ecore_X_Randr_Mode_Info *_e_randr_outputs_common_mode_max_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *max_size_mode);
 static Ecore_X_Randr_Mode_Info *_e_randr_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode);
-static Eina_Bool _e_randr_crtc_mode_intersects_crtcs(E_Randr_Crtc_Info *crtc_info, Ecore_X_Randr_Mode_Info *mode);
-static Eina_Bool _e_randr_crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info);
-static Eina_Bool _e_randr_crtcs_clone_crtc_removed(E_Randr_Crtc_Info *former_clone);
-static void _e_randr_screen_primary_output_assign(E_Randr_Output_Info *removed);
-static void _e_randr_output_info_hw_info_set(E_Randr_Output_Info *output_info);
-static void _e_randr_output_hw_info_free(E_Randr_Output_Info *output_info);
-static Eina_Bool _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs);
-
-E_Randr_Screen_Info *e_randr_screen_info = NULL;
+static Eina_Bool                _e_randr_crtc_mode_intersects_crtcs(E_Randr_Crtc_Info *crtc_info, Ecore_X_Randr_Mode_Info *mode);
+static Eina_Bool                _e_randr_crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info);
+static Eina_Bool                _e_randr_crtcs_clone_crtc_removed(E_Randr_Crtc_Info *former_clone);
+static void                     _e_randr_screen_primary_output_assign(E_Randr_Output_Info *removed);
+static void                     _e_randr_output_info_hw_info_set(E_Randr_Output_Info *output_info);
+static void                     _e_randr_output_hw_info_free(E_Randr_Output_Info *output_info);
+static Eina_Bool                _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs);
+
+EAPI E_Randr_Screen_Info * e_randr_screen_info = NULL;
 static Eina_List *_e_randr_event_handlers = NULL;
 
 EINTERN Eina_Bool
@@ -113,19 +130,20 @@ _e_randr_init(void)
    Ecore_X_Window *roots;
    Ecore_X_Window root;
 
-   if(!(roots = ecore_x_window_root_list(&n))) return EINA_FALSE;
+   if (!(roots = ecore_x_window_root_list(&n))) return EINA_FALSE;
    /* first (and only) root window */
    root = roots[0];
    free(roots);
 
-   if (!ecore_x_randr_query() || !(e_randr_screen_info = _e_randr_screen_info_new())) 
+   if ((!ecore_x_randr_query()) ||
+       !(e_randr_screen_info = _e_randr_screen_info_new()))
      goto ecore_x_randr_init_fail_free_screen;
 
-   if ((e_randr_screen_info->randr_version = ecore_x_randr_version_get())) 
+   if ((e_randr_screen_info->randr_version = ecore_x_randr_version_get()))
      e_randr_screen_info->root = root;
    if (e_randr_screen_info->randr_version == ECORE_X_RANDR_1_1)
      {
-        if (!(e_randr_screen_info->rrvd_info.randr_info_11 = _e_randr_screen_info_11_new())) 
+        if (!(e_randr_screen_info->rrvd_info.randr_info_11 = _e_randr_screen_info_11_new()))
           goto ecore_x_randr_init_fail_free_screen;
         _e_randr_screen_info_11_set();
         //_e_randr_config_find_and_enable();
@@ -133,13 +151,13 @@ _e_randr_init(void)
      }
    else if (e_randr_screen_info->randr_version >= ECORE_X_RANDR_1_2)
      {
-        if (!(e_randr_screen_info->rrvd_info.randr_info_12 =  _e_randr_screen_info_12_new())) 
+        if (!(e_randr_screen_info->rrvd_info.randr_info_12 = _e_randr_screen_info_12_new()))
           goto ecore_x_randr_init_fail_free_screen;
         _e_randr_screen_info_12_set(e_randr_screen_info->rrvd_info.randr_info_12);
         _e_randr_event_listeners_add();
-        if (!_e_randr_screen_outputs_init()) 
+        if (!_e_randr_screen_outputs_init())
           goto ecore_x_randr_init_fail_free_screen;
-        if (!_e_randr_screen_crtcs_init()) 
+        if (!_e_randr_screen_crtcs_init())
           goto ecore_x_randr_init_fail_free_screen;
         _e_randr_screen_primary_output_assign(NULL);
         return EINA_TRUE;
@@ -148,7 +166,7 @@ _e_randr_init(void)
    //FILO free stack in case we fail to allocate something/can't get hold of
    //necessary information
 ecore_x_randr_init_fail_free_screen:
-   if (e_randr_screen_info) 
+   if (e_randr_screen_info)
      _e_randr_screen_info_free(e_randr_screen_info);
 
    return EINA_FALSE;
@@ -170,11 +188,11 @@ _e_randr_screen_info_new(void)
 {
    E_Randr_Screen_Info *ret = NULL;
    E_Randr_Screen_Info default_info =
-     {
-        .root = Ecore_X_Randr_Unset,
-        .randr_version = Ecore_X_Randr_None,
-        .rrvd_info.randr_info_11 = NULL
-     };
+   {
+      .root = Ecore_X_Randr_Unset,
+      .randr_version = Ecore_X_Randr_None,
+      .rrvd_info.randr_info_11 = NULL
+   };
 
    if (!(ret = malloc(sizeof(E_Randr_Screen_Info)))) return NULL;
 
@@ -195,6 +213,7 @@ _e_randr_screen_info_free(E_Randr_Screen_Info *screen_info)
       case ECORE_X_RANDR_1_1:
         _e_randr_screen_info_11_free(screen_info->rrvd_info.randr_info_11);
         break;
+
       case ECORE_X_RANDR_1_2:
       case ECORE_X_RANDR_1_3:
         _e_randr_screen_info_12_free(screen_info->rrvd_info.randr_info_12);
@@ -213,14 +232,14 @@ _e_randr_screen_info_11_new(void)
 {
    E_Randr_Screen_Info_11 *ret = NULL;
    static const E_Randr_Screen_Info_11 default_info =
-     {
-        .sizes = NULL,
-        .csize_index = Ecore_X_Randr_Unset,
-        .corientation = Ecore_X_Randr_Unset,
-        .orientations = Ecore_X_Randr_Unset,
-        .rates = NULL,
-        .current_rate = Ecore_X_Randr_Unset
-     };
+   {
+      .sizes = NULL,
+      .csize_index = Ecore_X_Randr_Unset,
+      .corientation = Ecore_X_Randr_Unset,
+      .orientations = Ecore_X_Randr_Unset,
+      .rates = NULL,
+      .current_rate = Ecore_X_Randr_Unset
+   };
 
    if (!(ret = malloc(sizeof(E_Randr_Screen_Info_11)))) return NULL;
 
@@ -235,7 +254,7 @@ _e_randr_screen_info_11_new(void)
 static void
 _e_randr_screen_info_11_free(E_Randr_Screen_Info_11 *screen_info)
 {
-   if (!screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1)) 
+   if (!screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1))
      return;
 
    if (screen_info->sizes)
@@ -245,9 +264,9 @@ _e_randr_screen_info_11_free(E_Randr_Screen_Info_11 *screen_info)
      }
    if (screen_info->rates)
      {
-       /* this may be leaking, but at least it will be valid */
-       eina_list_free(eina_list_nth(screen_info->rates, 0));
-       eina_list_free(screen_info->rates);
+        /* this may be leaking, but at least it will be valid */
+        eina_list_free(eina_list_nth(screen_info->rates, 0));
+        eina_list_free(screen_info->rates);
      }
    free(screen_info);
    screen_info = NULL;
@@ -262,16 +281,15 @@ _e_randr_screen_info_12_new(void)
 {
    E_Randr_Screen_Info_12 *ret = NULL;
    static const E_Randr_Screen_Info_12 default_info =
-     {
-        .min_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .max_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .current_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .crtcs = NULL,
-        .outputs = NULL,
-        .primary_output = NULL,
-        .output_policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE,
-        .alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE
-     };
+   {
+      .min_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .max_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .current_size = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .crtcs = NULL,
+      .outputs = NULL,
+      .primary_output = NULL,
+      .alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE
+   };
 
    if (!(ret = malloc(sizeof(E_Randr_Screen_Info_12)))) return NULL;
    ret = memcpy(ret, &default_info, sizeof(default_info));
@@ -284,14 +302,14 @@ _e_randr_screen_info_12_set(E_Randr_Screen_Info_12 *screen_info)
 {
    E_RANDR_NO_12_RET(EINA_FALSE);
 
-   ecore_x_randr_screen_size_range_get(e_randr_screen_info->root, 
-                                       &screen_info->min_size.width, 
-                                       &screen_info->min_size.height, 
-                                       &screen_info->max_size.width , 
+   ecore_x_randr_screen_size_range_get(e_randr_screen_info->root,
+                                       &screen_info->min_size.width,
+                                       &screen_info->min_size.height,
+                                       &screen_info->max_size.width,
                                        &screen_info->max_size.height);
-   ecore_x_randr_screen_current_size_get(e_randr_screen_info->root, 
-                                         &screen_info->current_size.width , 
-                                         &screen_info->current_size.height , 
+   ecore_x_randr_screen_current_size_get(e_randr_screen_info->root,
+                                         &screen_info->current_size.width,
+                                         &screen_info->current_size.height,
                                          NULL, NULL);
 
    return EINA_TRUE;
@@ -301,18 +319,18 @@ static Eina_Bool
 _e_randr_screen_info_11_set(void)
 {
    E_RANDR_NO_11_RET(EINA_FALSE);
-   
+
    E_Randr_Screen_Info_11 *screen_info_11 = e_randr_screen_info->rrvd_info.randr_info_11;
    Ecore_X_Randr_Screen_Size_MM *sizes = NULL;
    Ecore_X_Randr_Refresh_Rate *rates = NULL;
    Eina_List *rates_list;
    int i, j, nsizes, nrates;
 
-   if (!(sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes))) 
-      return EINA_FALSE;
+   if (!(sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes)))
+     return EINA_FALSE;
    for (i = 0; i < nsizes; i++)
-      if (!(screen_info_11->sizes = eina_list_append(screen_info_11->sizes, &sizes[i])))
-         goto _e_randr_screen_info_11_fill_fail_sizes;
+     if (!(screen_info_11->sizes = eina_list_append(screen_info_11->sizes, &sizes[i])))
+       goto _e_randr_screen_info_11_fill_fail_sizes;
    ecore_x_randr_screen_primary_output_current_size_get(e_randr_screen_info->root, NULL, NULL, NULL, NULL, &(screen_info_11->csize_index));
    screen_info_11->corientation = ecore_x_randr_screen_primary_output_orientation_get(e_randr_screen_info->root);
    screen_info_11->orientations = ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info->root);
@@ -320,17 +338,17 @@ _e_randr_screen_info_11_set(void)
      {
         rates_list = NULL;
         if (!(rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
-           return EINA_FALSE;
+          return EINA_FALSE;
         for (j = 0; j < nrates; j++)
-           if (!(rates_list = eina_list_append(rates_list, &rates[j])))
-              goto _e_randr_screen_info_11_fill_fail_rates_list;
+          if (!(rates_list = eina_list_append(rates_list, &rates[j])))
+            goto _e_randr_screen_info_11_fill_fail_rates_list;
         if (!(screen_info_11->rates = eina_list_append(screen_info_11->rates, rates_list)))
-           goto _e_randr_screen_info_11_fill_fail_rates;
+          goto _e_randr_screen_info_11_fill_fail_rates;
      }
    screen_info_11->current_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(e_randr_screen_info->root);
-   
+
    return EINA_TRUE;
-   
+
 _e_randr_screen_info_11_fill_fail_rates_list:
    eina_list_free(rates_list);
 _e_randr_screen_info_11_fill_fail_rates:
@@ -355,21 +373,21 @@ _e_randr_screen_info_12_free(E_Randr_Screen_Info_12 *screen_info)
 
    if (e_randr_screen_info->randr_version >= ECORE_X_RANDR_1_2 && screen_info->crtcs)
      {
-        EINA_LIST_FREE(screen_info->crtcs, crtc_info)
+        EINA_LIST_FREE (screen_info->crtcs, crtc_info)
           _e_randr_crtc_info_free(crtc_info);
         free(eina_list_nth(screen_info->crtcs, 0));
      }
 
    if (e_randr_screen_info->randr_version >= ECORE_X_RANDR_1_2 && screen_info->outputs)
      {
-        EINA_LIST_FREE(screen_info->outputs, output_info)
+        EINA_LIST_FREE (screen_info->outputs, output_info)
           _e_randr_output_info_free(output_info);
         free(eina_list_nth(screen_info->outputs, 0));
      }
 
    if (e_randr_screen_info->randr_version >= ECORE_X_RANDR_1_2 && screen_info->modes)
      {
-        EINA_LIST_FREE(screen_info->modes, mode_info)
+        EINA_LIST_FREE (screen_info->modes, mode_info)
           ecore_x_randr_mode_info_free(mode_info);
      }
 
@@ -391,19 +409,19 @@ _e_randr_crtc_info_new(int nrequested)
 {
    E_Randr_Crtc_Info *ret = NULL;
    static E_Randr_Crtc_Info default_info =
-     {
-        .xid = Ecore_X_Randr_Unset,
-        .geometry = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .panning = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .tracking = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .border = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .current_orientation = ECORE_X_RANDR_ORIENTATION_ROT_0,
-        .orientations = Ecore_X_Randr_Unset,
-        .gamma_ramps = NULL,
-        .gamma_ramp_size = Ecore_X_Randr_Unset,
-        .outputs = NULL,
-        .possible_outputs = NULL
-     };
+   {
+      .xid = Ecore_X_Randr_Unset,
+      .geometry = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .panning = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .tracking = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .border = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .current_orientation = ECORE_X_RANDR_ORIENTATION_ROT_0,
+      .orientations = Ecore_X_Randr_Unset,
+      .gamma_ramps = NULL,
+      .gamma_ramp_size = Ecore_X_Randr_Unset,
+      .outputs = NULL,
+      .possible_outputs = NULL
+   };
 
    if (!(ret = malloc(sizeof(E_Randr_Crtc_Info) * nrequested))) return NULL;
 
@@ -440,26 +458,27 @@ _e_randr_output_info_new(int nrequested)
 {
    E_Randr_Output_Info *ret = NULL;
    static E_Randr_Output_Info default_info =
-     {
-        .xid = Ecore_X_Randr_Unset,
-        .name = NULL,
-        .crtc = NULL,
-        .possible_crtcs = NULL,
-        .preferred_modes = NULL,
-        .max_backlight = Ecore_X_Randr_Unset,
-        .backlight_level = 0.0,
-        .edid = NULL,
-        .edid_length = 0,
-        .size_mm = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
-        .wired_clones = NULL,
-        .signalformats = Ecore_X_Randr_Unset,
-        .signalformat = Ecore_X_Randr_Unset,
-        .connector_number = Ecore_X_Randr_Unset,
-        .connector_type = Ecore_X_Randr_Unset,
-        .connection_status = ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED,
-        .subpixel_order= Ecore_X_Randr_Unset,
-        .compatible_outputs = NULL
-     };
+   {
+      .xid = Ecore_X_Randr_Unset,
+      .name = NULL,
+      .crtc = NULL,
+      .possible_crtcs = NULL,
+      .preferred_modes = NULL,
+      .max_backlight = Ecore_X_Randr_Unset,
+      .backlight_level = 0.0,
+      .edid = NULL,
+      .edid_length = 0,
+      .size_mm = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
+      .wired_clones = NULL,
+      .signalformats = Ecore_X_Randr_Unset,
+      .signalformat = Ecore_X_Randr_Unset,
+      .connector_number = Ecore_X_Randr_Unset,
+      .connector_type = Ecore_X_Randr_Unset,
+      .connection_status = ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED,
+      .subpixel_order = Ecore_X_Randr_Unset,
+      .compatible_outputs = NULL,
+      .policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE
+   };
 
    if (!(ret = malloc(sizeof(E_Randr_Output_Info) * nrequested))) return NULL;
 
@@ -489,7 +508,7 @@ _e_randr_output_info_free(E_Randr_Output_Info *output_info)
      }
    _e_randr_output_hw_info_free(output_info);
 
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         crtc_info->outputs = eina_list_remove(crtc_info->outputs, output_info);
      }
@@ -554,7 +573,7 @@ _e_randr_output_modes_add(E_Randr_Output_Info *output_info)
    while (--nmodes >= 0)
      {
         added_yet = EINA_FALSE;
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->modes, iter, mode_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->modes, iter, mode_info)
           {
              if (mode_info && mode_info->xid == modes[nmodes])
                {
@@ -562,14 +581,13 @@ _e_randr_output_modes_add(E_Randr_Output_Info *output_info)
                   break;
                }
           }
-        if(!added_yet)
+        if (!added_yet)
           {
              mode_info = ecore_x_randr_mode_info_get(e_randr_screen_info->root, modes[nmodes]);
              e_randr_screen_info->rrvd_info.randr_info_12->modes = eina_list_prepend(e_randr_screen_info->rrvd_info.randr_info_12->modes, mode_info);
           }
         output_info->modes = eina_list_prepend(output_info->modes, mode_info);
         if (nmodes < npreferred) output_info->preferred_modes = eina_list_prepend(output_info->preferred_modes, mode_info);
-
      }
 
    free(modes);
@@ -591,7 +609,7 @@ _e_randr_screen_crtcs_init(void)
         fprintf (stderr, "E_RANDR: filling %d/%d (%d)\n", (i + 1), ncrtcs, crtcs[i]);
         crtcs_info[i].xid = crtcs[i];
         _e_randr_crtc_info_set(&crtcs_info[i]);
-        if(!(e_randr_screen_info->rrvd_info.randr_info_12->crtcs = eina_list_append(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, &crtcs_info[i]))) break;
+        if (!(e_randr_screen_info->rrvd_info.randr_info_12->crtcs = eina_list_append(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, &crtcs_info[i]))) break;
      }
    if (i == ncrtcs)
      {
@@ -599,7 +617,7 @@ _e_randr_screen_crtcs_init(void)
         free (crtcs);
         return EINA_TRUE;
      }
-   EINA_LIST_FREE(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, crtc)
+   EINA_LIST_FREE (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, crtc)
      _e_randr_crtc_info_free(crtc);
    if (e_randr_screen_info->rrvd_info.randr_info_12->crtcs)
      {
@@ -624,7 +642,6 @@ _e_randr_screen_outputs_init(void)
      {
         outputs_info[noutputs].xid = outputs[noutputs];
         _e_randr_output_info_set(&outputs_info[noutputs]);
-        outputs_info[noutputs].connection_status = ecore_x_randr_output_connection_status_get(e_randr_screen_info->root, outputs_info[noutputs].xid);
         if (outputs_info[noutputs].connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
           _e_randr_output_info_hw_info_set(&outputs_info[noutputs]);
 
@@ -637,7 +654,7 @@ _e_randr_screen_outputs_init(void)
 _e_randr_screen_outputs_init_fail_free_outputs_list:
    if (e_randr_screen_info->rrvd_info.randr_info_12->outputs)
      {
-        EINA_LIST_FREE(e_randr_screen_info->rrvd_info.randr_info_12->outputs, output_info)
+        EINA_LIST_FREE (e_randr_screen_info->rrvd_info.randr_info_12->outputs, output_info)
           free(output_info);
      }
 _e_randr_screen_outputs_init_fail_free_outputs:
@@ -645,42 +662,42 @@ _e_randr_screen_outputs_init_fail_free_outputs:
    return EINA_FALSE;
 }
 
-static Ecore_X_Randr_Mode_Info*
+static Ecore_X_Randr_Mode_Info *
 _e_randr_mode_info_get(Ecore_X_Randr_Mode mode)
 {
    Eina_List *iter;
-   Ecore_X_Randr_Mode_Infomode_info;
+   Ecore_X_Randr_Mode_Info *mode_info;
 
    E_RANDR_NO_MODE_RET(mode, NULL);
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->modes, iter, mode_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->modes, iter, mode_info)
      {
         if (mode_info && mode_info->xid == mode) return mode_info;
      }
    return NULL;
 }
 
-static E_Randr_Output_Info*
+static E_Randr_Output_Info *
 _e_randr_output_info_get(Ecore_X_Randr_Output output)
 {
    Eina_List *iter;
-   E_Randr_Output_Infooutput_info;
+   E_Randr_Output_Info *output_info;
 
    E_RANDR_NO_OUTPUTS_RET(NULL);
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->outputs, iter, output_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->outputs, iter, output_info)
      {
         if (output_info && output_info->xid == output) return output_info;
      }
    return NULL;
 }
 
-static E_Randr_Crtc_Info*
+static E_Randr_Crtc_Info *
 _e_randr_crtc_info_get(Ecore_X_Randr_Crtc crtc)
 {
    Eina_List *iter;
-   E_Randr_Crtc_Infocrtc_info;
+   E_Randr_Crtc_Info *crtc_info;
 
    E_RANDR_NO_CRTCS_RET(NULL);
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         if (crtc_info && crtc_info->xid == crtc) return crtc_info;
      }
@@ -693,10 +710,15 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
    E_Randr_Crtc_Info *crtc_info;
    Eina_Bool enabled;
 
+   // FIXME: ecore_x_randr_screen_primary_output_orientation_get() should
+   // get regularly called to push x into polling outputs so we get these
+   // event callbacks - maybe do this every 100 mouse move events, or every
+   // mouse release or event mouse in or out, and in addition add a "poller"
+   // that runs every 256 ticks maybe?
    if (!e_randr_screen_info) return ECORE_CALLBACK_RENEW;
    if (type == ECORE_X_EVENT_RANDR_CRTC_CHANGE)
      {
-        Ecore_X_Event_Randr_Crtc_Change *event = (Ecore_X_Event_Randr_Crtc_Change*) ev;
+        Ecore_X_Event_Randr_Crtc_Change *event = (Ecore_X_Event_Randr_Crtc_Change *)ev;
         /* available information:
            struct _Ecore_X_Event_Randr_Crtc_Change
            {
@@ -709,9 +731,9 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
            int                           width;
            int                           height;
            };
-           */
+         */
         crtc_info = _e_randr_crtc_info_get(event->crtc);
-       if (!crtc_info) goto on_exit;
+        if (!crtc_info) return ECORE_CALLBACK_RENEW;
 
         if (event->mode != Ecore_X_Randr_None)
           {
@@ -755,8 +777,7 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
    else if (type == ECORE_X_EVENT_RANDR_OUTPUT_CHANGE)
      {
         Ecore_X_Event_Randr_Output_Change *event = ev;
-        const E_Randr_Screen_Restore_Info_12 *restore_info;
-        E_Randr_Output_Info* output_info = NULL;
+        E_Randr_Output_Info *output_info = NULL;
         /* available information:
            struct _Ecore_X_Event_Randr_Output_Change
            {
@@ -768,33 +789,33 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
            Ecore_X_Randr_Connection_Status connection;
            Ecore_X_Render_Subpixel_Order   subpixel_order;
            };
-           */
+         */
         fprintf(stderr, "E_RANDR: Output connected!: \n \
               E_RANDR: relative to win: %d\n \
               E_RANDR: relative to output: %d\n \
               E_RANDR: relative to crtc: %d\n \
               E_RANDR: relative to mode: %d\n \
               E_RANDR: relative to orientation: %d\n \
-              E_RANDR: relative to connction: %d (connected = %d, disconnected = %d, unknown %d)\n \
+              E_RANDR: relative to connection: %d (connected = %d, disconnected = %d, unknown %d)\n \
               E_RANDR: relative to subpixel_order: %d\n",
                 event->win, event->output, event->crtc, event->mode, event->orientation, event->connection, ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED, ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED, ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN, event->subpixel_order);
 
         output_info = _e_randr_output_info_get(event->output);
-        if (!output_info) goto on_exit;
-        
+        if (!output_info) return ECORE_CALLBACK_RENEW;
+
         if ((output_info->crtc = _e_randr_crtc_info_get(event->crtc)))
           {
              if (!eina_list_data_find(output_info->crtc->outputs, output_info))
-                output_info->crtc->outputs = eina_list_append(output_info->crtc->outputs, output_info);
+               output_info->crtc->outputs = eina_list_append(output_info->crtc->outputs, output_info);
           }
 
         output_info->connection_status = event->connection;
         output_info->subpixel_order = event->subpixel_order;
-        
+
         if (event->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
           {
              if (event->crtc)
-                output_info->crtc = _e_randr_crtc_info_get(event->crtc);
+               output_info->crtc = _e_randr_crtc_info_get(event->crtc);
 
              if (output_info && !output_info->crtc && !event->crtc && !event->mode)
                {
@@ -802,12 +823,14 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
                   _e_randr_output_info_hw_info_set(output_info);
                   //make the crtcs aware of their possibly new output
                   _e_randr_crtcs_possible_output_update(output_info);
-                  if ((restore_info = _e_randr_config_find_suiting_config_12()))
+                  /*
+                     if ((restore_info = _e_randr_config_find_suiting_config_12()))
                      //maybe we have a suiting configuration
                      //_e_randr_config_enable_12(restore_info);
                      ;
-                  else
-                     enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
+                     else
+                   */
+                  enabled = _e_randr_try_enable_output(output_info, EINA_FALSE);    //maybe give a success message?
                }
              _e_randr_notify_output_change(output_info);
           }
@@ -829,18 +852,20 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
                             ecore_x_randr_screen_reset(e_randr_screen_info->root);
                          }
                        else
-                          _e_randr_crtc_outputs_mode_max_set(output_info->crtc);
+                         _e_randr_crtc_outputs_mode_max_set(output_info->crtc);
                     }
-                  
+
                   if (e_randr_screen_info->rrvd_info.randr_info_12->primary_output && (output_info == e_randr_screen_info->rrvd_info.randr_info_12->primary_output))
-                     _e_randr_screen_primary_output_assign(output_info);
+                    _e_randr_screen_primary_output_assign(output_info);
                   //let's try to get a proper config for the new setup and crop the
                   //screen afterwards.
-                  if ((restore_info = _e_randr_config_find_suiting_config_12()))
-                   {
-                      //in case we didn't have, init it anyway...
-                      //_e_randr_config_enable_12(restore_info);
-                    }
+                  /*
+                     if ((restore_info = _e_randr_config_find_suiting_config_12()))
+                     {
+                       //in case we didn't have, init it anyway...
+                       //_e_randr_config_enable_12(restore_info);
+                     }
+                   */
                }
              _e_randr_notify_output_change(output_info);
              _e_randr_output_hw_info_free(output_info);
@@ -858,9 +883,9 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
            Ecore_X_Time                  time;
            Ecore_X_Randr_Property_Change state;
            };
-           */
+         */
      }
- on_exit:
+   e_randr_try_restore_configuration(e_randr_screen_info);
    return ECORE_CALLBACK_RENEW;
 }
 
@@ -869,16 +894,16 @@ _e_randr_event_listeners_add(void)
 {
    if (E_RANDR_NO_12) return;
    ecore_x_randr_events_select(e_randr_screen_info->root, EINA_TRUE);
-   _e_randr_event_handlers= eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_CRTC_CHANGE, _e_randr_event_cb, NULL));
-   _e_randr_event_handlers= eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_CHANGE, _e_randr_event_cb, NULL));
-   _e_randr_event_handlers= eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY, _e_randr_event_cb, NULL));
+   _e_randr_event_handlers = eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_CRTC_CHANGE, _e_randr_event_cb, NULL));
+   _e_randr_event_handlers = eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_CHANGE, _e_randr_event_cb, NULL));
+   _e_randr_event_handlers = eina_list_append(_e_randr_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY, _e_randr_event_cb, NULL));
 }
 
 static void
 _e_randr_event_listeners_remove(void)
 {
    Ecore_Event_Handler *_event_handler = NULL;
-   EINA_LIST_FREE(_e_randr_event_handlers, _event_handler)
+   EINA_LIST_FREE (_e_randr_event_handlers, _event_handler)
      ecore_event_handler_del(_event_handler);
 }
 
@@ -897,6 +922,7 @@ _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info)
         //        e_notification_unref(n);
      }
 }
+
 static void
 _e_randr_notify_output_change(E_Randr_Output_Info *output_info)
 {
@@ -925,7 +951,7 @@ _e_randr_notify_output_change(E_Randr_Output_Info *output_info)
  * instead of trying to fill gaps like tetris. Though this could be done by
  * simply implementing another policy.
  */
-static const E_Randr_Crtc_Info*
+static const E_Randr_Crtc_Info *
 _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSED__, Ecore_X_Randr_Output_Policy policy)
 {
    Eina_List *iter;
@@ -934,7 +960,7 @@ _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSE
    E_RANDR_NO_CRTCS_RET(NULL);
 
    //get any crtc that besides 'but' to start with
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         if (crtc_info != but)
           {
@@ -942,47 +968,47 @@ _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSE
              break;
           }
      }
+
    if (!ret && (policy != ECORE_X_RANDR_OUTPUT_POLICY_CLONE)) return NULL;
 
    switch (policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
           {
-             if (crtc_info && (crtc_info != but) && (crtc_info->geometry.y <= ret->geometry.y))
-               {
-                  ret = crtc_info;
-                }
-           }
+             if (crtc_info && (crtc_info != but) &&
+                 (crtc_info->geometry.y <= ret->geometry.y))
+               ret = crtc_info;
+          }
         break;
+
       case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
           {
-             if (crtc_info && (crtc_info != but) && ((crtc_info->geometry.x + crtc_info->geometry.w) >= (ret->geometry.x + ret->geometry.w)))
-               {
-                  ret = crtc_info;
-                }
-           }
+             if (crtc_info && (crtc_info != but) &&
+                 ((crtc_info->geometry.x + crtc_info->geometry.w) >=
+                  (ret->geometry.x + ret->geometry.w)))
+               ret = crtc_info;
+          }
         break;
 
       case ECORE_X_RANDR_OUTPUT_POLICY_BELOW:
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
           {
-             if (crtc_info && (crtc_info != but) && ((crtc_info->geometry.y + crtc_info->geometry.h) >= (ret->geometry.y + ret->geometry.h)))
-               {
-                  ret = crtc_info;
-                }
-           }
+             if (crtc_info && (crtc_info != but) &&
+                 ((crtc_info->geometry.y + crtc_info->geometry.h) >=
+                  (ret->geometry.y + ret->geometry.h)))
+               ret = crtc_info;
+          }
         break;
 
       case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
           {
-             if (crtc_info && (crtc_info != but) && (crtc_info->geometry.x <= ret->geometry.x))
-               {
-                  ret = crtc_info;
-                }
-           }
+             if (crtc_info && (crtc_info != but) &&
+                 (crtc_info->geometry.x <= ret->geometry.x))
+               ret = crtc_info;
+          }
         break;
 
       case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
@@ -995,145 +1021,585 @@ _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSE
    return ret;
 }
 
-/*
-static Eina_Bool
-_e_randr_outputs_connected(Eina_List *outputs_info)
+// Setup store functions
+Eina_Bool
+_e_randr_copy_mode_info(Ecore_X_Randr_Mode_Info *dest, Ecore_X_Randr_Mode_Info *src)
 {
-   Eina_List *iter;
-   E_Randr_Output_Info *output_info;
+   if (!dest || !src) return EINA_FALSE;
+
+   dest->width = src->width;
+   dest->height = src->height;
+   dest->dotClock = src->dotClock;
+   dest->hSyncStart = src->hSyncStart;
+   dest->hSyncEnd = src->hSyncEnd;
+   dest->hTotal = src->hTotal;
+   dest->hSkew = src->hSkew;
+   dest->vSyncStart = src->vSyncStart;
+   dest->vSyncEnd = src->vSyncEnd;
+   dest->vTotal = src->vTotal;
+   if (src->nameLength > 0)
+     {
+        if (!(dest->name = malloc(src->nameLength + 1))) return EINA_FALSE;
+        if (!strncpy(dest->name, src->name, src->nameLength)) goto _e_randr_copy_mode_info_fail_free_name;
+     }
+   dest->nameLength = src->nameLength;
+   dest->modeFlags = src->modeFlags;
+
+   return EINA_TRUE;
 
-   EINA_LIST_FOREACH(outputs_info, iter, output_info)
-     if (output_info->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) return EINA_TRUE;
+_e_randr_copy_mode_info_fail_free_name:
+   free(dest->name);
    return EINA_FALSE;
 }
 
-static Eina_Bool
-_e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation)
+void
+_e_randr_free_serialized_mode_info(Ecore_X_Randr_Mode_Info *mode_info)
 {
-   E_Randr_Screen_Info_11 *current_info_11;
+   if (mode_info->name) free(mode_info->name);
+}
 
-   if (E_RANDR_NO_11 || (size_index < 0) || (refresh_rate < 0) || 
-       (orientation < 0)) return EINA_FALSE;
+Eina_List *
+_e_randr_create_outputs_policies_list(Eina_List *outputs)
+{
+   Eina_List *iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Output_Policy *sop;
+
+   EINA_LIST_FOREACH (outputs, iter, oi)
+     {
+        if (!oi->name || (oi->name_length <= 0)) continue;
+        if (!(sop = E_NEW(E_Randr_Serialized_Output_Policy, 1))
+            || !(sop->name = malloc(oi->name_length + 1))
+            || !(strncpy(sop->name, oi->name, oi->name_length)))
+          goto _e_randr_create_outputs_policies_list_fail_free_list;
+        sop->name_length = oi->name_length;
+        sop->policy = oi->policy;
+        if (!(list = eina_list_append(list, sop)))
+          goto _e_randr_create_outputs_policies_list_fail_free_list;
+     }
 
-   if (!ecore_x_randr_screen_primary_output_size_set(e_randr_screen_info->root, size_index)
-       || !ecore_x_randr_screen_primary_output_orientation_set(e_randr_screen_info->root, orientation)
-       || !ecore_x_randr_screen_primary_output_refresh_rate_set(e_randr_screen_info->root, size_index, refresh_rate)) return EINA_FALSE;
+   return list;
+_e_randr_create_outputs_policies_list_fail_free_list:
+   EINA_LIST_FREE (list, sop)
+     {
+        if (sop->name) free(sop->name);
+        free(sop);
+     }
+   return NULL;
+}
 
-   //TODO: move this to the screen event later.
-   current_info_11 = e_randr_screen_info->rrvd_info.randr_info_11;
+void
+_e_randr_free_serialized_output_policy(E_Randr_Serialized_Output_Policy *sop)
+{
+   if (!sop) return;
+   if (sop->name) free(sop->name);
+   free(sop);
+}
 
-   current_info_11->csize_index = size_index;
-   current_info_11->corientation = orientation;
-   current_info_11->current_rate = refresh_rate;
+Eina_List *
+_e_randr_update_serialized_outputs_policies(E_Randr_Screen_Info_12 *si_12, Eina_List *sops)
+{
+   E_Randr_Serialized_Output_Policy *sop;
 
-   return EINA_TRUE;
+   EINA_LIST_FREE (sops, sop)
+     {
+        _e_randr_free_serialized_output_policy(sop);
+     }
+
+   return _e_randr_create_outputs_policies_list(si_12->outputs);
 }
 
-static Eina_Bool
-_e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info __UNUSED__)
-{
-      if (E_RANDR_NO_12 || !restore_info) return EINA_FALSE;
-      E_Randr_Screen_Info_12 *current_info_12;
-      E_Randr_Screen_Restore_Info_12 *restore_info_12 = NULL;
-      E_Randr_Crtc_Restore_Info *crtc_restore_info = NULL;
-      E_Randr_Crtc_Info *crtc_info;
-      E_Randr_Output_Info *output_info;
-      Eina_List *crtc_restore_iter;
-
-      current_info_12 = (e_randr_screen_info->rrvd_info).randr_info_12;
-      EINA_LIST_FOREACH(restore_info_12->crtcs, crtc_restore_iter, crtc_restore_info)
-      {
-      ;
-      }
-      current_info_12->alignment = restore_info_12->alignment;
-      current_info_12->output_policy = restore_info_12->output_policy;
-      return EINA_TRUE;
-   return EINA_FALSE;
+Eina_List *
+_e_randr_create_possible_outputs_names_list(Eina_List *outputs)
+{
+   Eina_List *iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   char *name;
+
+   if (!outputs) return NULL;
+
+   EINA_LIST_FOREACH (outputs, iter, oi)
+     {
+        if (!oi->name || (oi->name_length <= 0)) continue;
+        if (!(name = malloc(oi->name_length))
+            || !strncpy(name, oi->name, oi->name_length)
+            || !(list = eina_list_append(list, name))) goto _e_randr_create_possible_outputs_names_list_fail_free_list;
+     }
+   return list;
+
+_e_randr_create_possible_outputs_names_list_fail_free_list:
+   EINA_LIST_FREE (list, name)
+     {
+        if (name) free(name);
+     }
+   return NULL;
 }
 
-static int
-_e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11 **restore_info)
+E_Randr_Edid_Hash *
+_e_randr_create_edid_hash(E_Randr_Output_Info *output_info)
 {
-   E_RANDR_NO_11_RET(Ecore_X_Randr_None);
-   Eina_List *cfg_screen_restore_info_iter;
-   E_Randr_Screen_Restore_Info *screen_restore_info;
+   E_Randr_Edid_Hash *edid_hash;
 
-   E_Randr_Screen_Restore_Info_11 *restore_info_11;
-   Ecore_X_Randr_Screen_Size_MM *sizes;
-   Ecore_X_Randr_Refresh_Rate *rates = NULL;
-   int i = 0, j = 0, nsizes = 0, nrates = 0;
+   if (!output_info || (output_info->edid_hash.hash == 0) || !(edid_hash = malloc(sizeof(E_Randr_Edid_Hash)))) return NULL;
+
+   edid_hash->hash = output_info->edid_hash.hash;
+
+   return edid_hash;
+}
+
+E_Randr_Serialized_Output *
+_e_randr_create_serialized_output(E_Randr_Output_Info *output_info)
+{
+   E_Randr_Serialized_Output *so;
+   char *name;
+
+   if (!output_info || !output_info->name || (output_info->name_length <= 0) || !(so = malloc(sizeof(E_Randr_Serialized_Output)))) return NULL;
+
+   if (!(name = malloc(output_info->name_length))
+       || !strncpy(so->name, output_info->name, output_info->name_length))
+     goto _e_randr_create_serialized_outputs_fail_free_so;
+   so->name_length = output_info->name_length;
+   so->edid_hash.hash = output_info->edid_hash.hash;
+   so->backlight_level = output_info->backlight_level;
+
+   return so;
+
+_e_randr_create_serialized_outputs_fail_free_so:
+   free(so);
+   return NULL;
+}
+
+void
+_e_randr_free_serialized_output(E_Randr_Serialized_Output *so)
+{
+   if (so->name) free(so->name);
+   free(so);
+}
+
+E_Randr_Serialized_Crtc *
+_e_randr_create_serialized_crtc(E_Randr_Crtc_Info *crtc_info)
+{
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Serialized_Output *so;
+   E_Randr_Output_Info *output_info;
+   Eina_List *iter;
+   char *output_name;
+
+   if (!(sc = E_NEW(E_Randr_Serialized_Crtc, 1))) return NULL;
+   if (!_e_randr_copy_mode_info(&sc->mode_info, crtc_info->current_mode)) goto _e_randr_create_serialized_crtc_free_sc;
+   if (!(sc->possible_outputs_names = _e_randr_create_possible_outputs_names_list(crtc_info->possible_outputs))) goto _e_randr_create_serialized_crtc_free_mode_sc;
+   //Create list of serialized outputs
+   EINA_LIST_FOREACH (crtc_info->outputs, iter, output_info)
+     {
+        if (!(so = _e_randr_create_serialized_output(output_info))
+            || !(sc->serialized_outputs = eina_list_append(sc->serialized_outputs, so))) goto _e_randr_create_serialized_crtc_free_outputs_list_sc;
+     }
+   sc->pos.x = crtc_info->geometry.x;
+   sc->pos.y = crtc_info->geometry.y;
+   sc->orientation = crtc_info->current_orientation;
+
+   return sc;
+
+_e_randr_create_serialized_crtc_free_outputs_list_sc:
+   EINA_LIST_FREE (sc->possible_outputs_names, output_name)
+     {
+        if (output_name) free(output_name);
+     }
+   EINA_LIST_FREE (sc->serialized_outputs, so)
+     {
+        if (so) _e_randr_free_serialized_output(so);
+     }
+_e_randr_create_serialized_crtc_free_mode_sc:
+   _e_randr_free_serialized_mode_info(&sc->mode_info);
+_e_randr_create_serialized_crtc_free_sc:
+   E_FREE(sc);
+
+   return NULL;
+}
+
+void
+_e_randr_free_serialized_crtc(E_Randr_Serialized_Crtc *sc)
+{
+   E_Randr_Serialized_Output *so;
+   char *name;
+
+   EINA_LIST_FREE (sc->serialized_outputs, so)
+     _e_randr_free_serialized_output(so);
+   _e_randr_free_serialized_mode_info(&sc->mode_info);
+   EINA_LIST_FREE (sc->possible_outputs_names, name)
+     free(name);
+   free(sc);
+}
+
+E_Randr_Serialized_Setup_11 *
+_e_randr_create_serialized_setup_11(E_Randr_Screen_Info_11 *screen_info_11)
+{
+   E_Randr_Serialized_Setup_11 *ss;
+   Ecore_X_Randr_Screen_Size_MM *size;
+
+   if (!(ss = malloc(sizeof(*ss)))) return NULL;
+   if (!(size = (Ecore_X_Randr_Screen_Size_MM *)eina_list_data_get(eina_list_nth(screen_info_11->sizes, screen_info_11->csize_index)))) goto _e_randr_create_serialized_setup_11_failed_free_ss;
+   ss->size.width = size->width;
+   ss->size.height = size->height;
+   ss->refresh_rate = screen_info_11->current_rate;
+   ss->orientation = screen_info_11->corientation;
+
+   return ss;
+
+_e_randr_create_serialized_setup_11_failed_free_ss:
+   free(ss);
+   return NULL;
+}
+
+E_Randr_Serialized_Setup_11 *
+_e_randr_update_serialized_setup_11(E_Randr_Serialized_Setup_11 *ss_11, E_Randr_Screen_Info_11 *si_11)
+{
+   Ecore_X_Randr_Screen_Size_MM *size;
+
+   if (ss_11)
+     {
+        if (!(size = (Ecore_X_Randr_Screen_Size_MM *)eina_list_data_get(eina_list_nth(si_11->sizes, si_11->csize_index)))) return NULL;
+        if (!memcpy(&ss_11->size, size, sizeof(Ecore_X_Randr_Screen_Size_MM)))
+          goto _e_randr_update_serialized_setup_11_failed_free_ss;
+        ss_11->refresh_rate = si_11->current_rate;
+        ss_11->orientation = si_11->corientation;
+     }
+   else
+     ss_11 = _e_randr_create_serialized_setup_11(si_11);
+
+   return ss_11;
+
+_e_randr_update_serialized_setup_11_failed_free_ss:
+   free(ss_11);
+   return NULL;
+}
+
+E_Randr_Serialized_Setup_12 *
+_e_randr_create_serialized_setup_12(E_Randr_Screen_Info_12 *screen_info_12)
+{
+   E_Randr_Serialized_Setup_12 *ss;
+   Eina_List *iter;
+   E_Randr_Crtc_Info *ci;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Edid_Hash *edid_hash;
+
+   if (!(ss = E_NEW(E_Randr_Serialized_Setup_12, 1))) return NULL;
+
+   ss->timestamp = ecore_time_get();
+
+   //Add CRTCs and their configuration
+   EINA_LIST_FOREACH (screen_info_12->crtcs, iter, ci)
+     {
+        //ignore disabled crtcs for now
+        if (!ci->current_mode) continue;
+
+        if (!(sc = _e_randr_create_serialized_crtc(ci))
+            || !(ss->serialized_crtcs = eina_list_append(ss->serialized_crtcs, sc)))
+          goto _e_randr_create_serialized_setup_12_failed_free_list_ss;
+     }
+
+   /*
+    * Add EDID hashes of connected and enabled
+    * outputs for easier comparison during
+    * setup restoration
+    */
+   EINA_LIST_FOREACH (screen_info_12->outputs, iter, oi)
+     {
+        if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
+          continue;
+        if (!(edid_hash = _e_randr_create_edid_hash(oi)) || !(ss->serialized_edid_hashes = eina_list_append(ss->serialized_edid_hashes, edid_hash)))
+          goto _e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss;
+     }
+
+   return ss;
+
+_e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss:
+   EINA_LIST_FREE (ss->serialized_edid_hashes, edid_hash)
+     {
+        if (edid_hash) free(edid_hash);
+     }
+_e_randr_create_serialized_setup_12_failed_free_list_ss:
+   EINA_LIST_FREE (ss->serialized_crtcs, sc)
+     {
+        _e_randr_free_serialized_crtc(sc);
+     }
+   free(ss);
+   return NULL;
+}
+
+E_Randr_Serialized_Setup_12 *
+_e_randr_find_matching_serialized_setup(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
+   Eina_List *setups_iter, *r_iter, *s_iter;
+   Eina_Bool found = EINA_FALSE;
+   E_Randr_Edid_Hash *edid_hash;
+   E_Randr_Output_Info *oi;
+
+   if (!setups_12 || !si_12) return NULL;
 
-   EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
+   EINA_LIST_FOREACH (setups_12, setups_iter, ss_12)
      {
-        // 'screen_restore_info' should _never_ be NULL, since this functions shouldn't be called due to randr init failing.
-       if (!screen_restore_info) continue;
-        if (screen_restore_info->randr_version != ECORE_X_RANDR_1_1) continue;
-        restore_info_11 = screen_restore_info->rrvd_restore_info.restore_info_11;
-        if((sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes)))
+        EINA_LIST_FOREACH (si_12->outputs, r_iter, oi)
           {
-             for (i = 0; i < nsizes; i++)
+             //skip disconnected/-abled monitors
+             if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
+               continue;
+             found = EINA_FALSE;
+             EINA_LIST_FOREACH (ss_12->serialized_edid_hashes, s_iter, edid_hash)
                {
-                  if ((restore_info_11->size.width == sizes[i].width)
-                      && (restore_info_11->size.height == sizes[i].height))
+                  if (oi->edid_hash.hash == edid_hash->hash)
                     {
-                       if ((rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
-                         {
-                            for (j = 0; j < nrates; j++)
-                              if (rates[j] == restore_info_11->refresh_rate)
-                                {
-                                   if (restore_info) *restore_info = restore_info_11;
-                                   free(rates);
-                                   free(sizes);
-                                   return i;
-                                }
-                            free(rates);
-                         }
+                       found = EINA_TRUE;
+                       break;
                     }
                }
-             if (sizes) free(sizes);
+             if (!found)
+               break;
           }
+        if (found)
+          break;
      }
-   return Ecore_X_Randr_Unset;
+   if (found)
+     return ss_12;
+
+   return NULL;
 }
-*/
 
-/**
- * @Brief find configuration with the most hardware currently available
- */
-static E_Randr_Screen_Restore_Info_12 *
-_e_randr_config_find_suiting_config_12(void)
+void
+_e_randr_free_serialized_setup_12(E_Randr_Serialized_Setup_12 *ss_12)
 {
-   //TODO: write geometry based loading
-   /*
-      Eina_List *cfg_screen_restore_info_iter;
-      E_Randr_Screen_Restore_Info *screen_restore_info;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Edid_Hash *edid_hash;
 
-      E_Randr_Screen_Info_12 *current_info_12;
-      E_Randr_Screen_Restore_Info_12 *restore_info_12, *most_matches = NULL;
-      E_Randr_Output_Info *output_info;
-      E_Randr_Crtc_Restore_Info *crtc_restore_info;
-      Ecore_X_Randr_Output *outputs_xids;
-      Ecore_X_Randr_Crtc *crtcs_xids;
-      Eina_List *restore_info_12_iter,  *output_iter, *restore_crtcs_iter;
+   if (!ss_12) return;
 
-      if (e_randr_screen_info && e_config && e_config->screen_info)
-      {
+   EINA_LIST_FREE (ss_12->serialized_crtcs, sc)
+     {
+        if (!sc) continue;
+        _e_randr_free_serialized_crtc(sc);
+     }
+   EINA_LIST_FREE (ss_12->serialized_edid_hashes, edid_hash)
+     if (edid_hash) free(edid_hash);
 
-      EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
-      {
-      if (screen_restore_info->randr_version < ECORE_X_RANDR_1_2) continue;
+   free(ss_12);
+}
 
-   //HINT: use eina_list_clone and a sort callback to find proper
-   //crtcs and outputs
+Eina_List *
+_e_randr_update_serialized_setup_12(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
 
-   //current_info_12 = e_randr_screen_info->rrvd_info.randr_info_12;
-   }
+   if (setups_12)
+     {
+        /*
+         * try to find the setup with the same monitors
+         * connected in order to replace it
+         */
+        if ((ss_12 = _e_randr_find_matching_serialized_setup(setups_12, si_12)))
+          _e_randr_free_serialized_setup_12(ss_12);
+     }
+   ss_12 = _e_randr_create_serialized_setup_12(si_12);
+   setups_12 = eina_list_append(setups_12, ss_12);
 
-   }
-   */
+   return setups_12;
+}
+
+E_Randr_Serialized_Setup *
+_e_randr_create_serialized_setup(E_Randr_Screen_Info *screen_info)
+{
+   E_Randr_Serialized_Setup *ss;
+   E_Randr_Serialized_Setup_12 *ss_12;
+
+   if (!(ss = E_NEW(E_Randr_Serialized_Setup, 1))) return NULL;
+   if ((screen_info->randr_version == ECORE_X_RANDR_1_1) && !(ss->serialized_setup_11 = _e_randr_create_serialized_setup_11(screen_info->rrvd_info.randr_info_11))) goto _e_randr_create_serialized_setup_failed_free_ss;
+   if ((screen_info->randr_version >= ECORE_X_RANDR_1_2))
+     {
+        if (!(ss_12 = _e_randr_create_serialized_setup_12(screen_info->rrvd_info.randr_info_12))
+            || !(ss->serialized_setups_12 = eina_list_append(ss->serialized_setups_12, ss_12)))
+          goto _e_randr_create_serialized_setup_failed_free_ss;
+     }
+
+   return ss;
+
+_e_randr_create_serialized_setup_failed_free_ss:
+   free(ss);
+   return NULL;
+}
+
+EAPI void
+e_randr_store_configuration(E_Randr_Screen_Info *screen_info)
+{
+   if (E_RANDR_NO_11) return;
+
+   if (!e_config->randr_serialized_setup)
+     {
+        e_config->randr_serialized_setup = _e_randr_create_serialized_setup(screen_info);
+        e_config_save_queue();
+        return;
+     }
+
+   if (screen_info->randr_version == ECORE_X_RANDR_1_1)
+     {
+        e_config->randr_serialized_setup->serialized_setup_11 = _e_randr_update_serialized_setup_11(e_config->randr_serialized_setup->serialized_setup_11, screen_info->rrvd_info.randr_info_11);
+     }
+   else if (screen_info->randr_version >= ECORE_X_RANDR_1_2)
+     {
+        e_config->randr_serialized_setup->serialized_setups_12 = _e_randr_update_serialized_setup_12(e_config->randr_serialized_setup->serialized_setups_12, screen_info->rrvd_info.randr_info_12);
+
+        //Also, update output policies
+        e_config->randr_serialized_setup->serialized_outputs_policies = _e_randr_update_serialized_outputs_policies(screen_info->rrvd_info.randr_info_12, e_config->randr_serialized_setup->serialized_outputs_policies);
+     }
+   e_config_save_queue();
+}
+
+//setup restore functions
+EAPI Eina_Bool
+e_randr_try_restore_configuration(E_Randr_Screen_Info *si)
+{
+   if (!e_config || !e_config->randr_serialized_setup) return EINA_FALSE;
+
+   if (si->randr_version == ECORE_X_RANDR_1_1)
+     return _e_randr_try_restore_11(si->rrvd_info.randr_info_11);
+   else if (si->randr_version >= ECORE_X_RANDR_1_2)
+     return _e_randr_try_restore_12(si->rrvd_info.randr_info_12);
+
+   return EINA_FALSE;
+}
+
+Eina_Bool
+_e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
+{
+   E_Manager *man;
+   Eina_List *iter;
+   Ecore_X_Randr_Screen_Size_MM *stored_size, *size;
+   int i = 0;
+
+   if (!e_config->randr_serialized_setup->serialized_setup_11) return EINA_FALSE;
+   stored_size = &e_config->randr_serialized_setup->serialized_setup_11->size;
+   EINA_LIST_FOREACH (si_11->sizes, iter, size)
+     {
+        if ((stored_size->width == size->width)
+            && (stored_size->height == size->height)
+            && (stored_size->width_mm == size->width_mm)
+            && (stored_size->height_mm == size->height_mm))
+          {
+             man = e_manager_current_get();
+             return ecore_x_randr_screen_primary_output_size_set(man->root, i);
+          }
+        i++;
+     }
+
+   return EINA_FALSE;
+}
+
+E_Randr_Crtc_Info *
+_e_randr_find_matching_crtc(Eina_List *crtcs, E_Randr_Serialized_Crtc *sc)
+{
+   Eina_List *iter, *s_name_iter, *p_output_iter;
+   E_Randr_Crtc_Info *ci;
+   E_Randr_Output_Info *oi;
+   char *s_output_name;
+
+   EINA_LIST_FOREACH (crtcs, iter, ci)
+     {
+        if (eina_list_count(ci->possible_outputs) != eina_list_count(sc->possible_outputs_names))
+          continue;
+        EINA_LIST_FOREACH (sc->possible_outputs_names, s_name_iter, s_output_name)
+          {
+             EINA_LIST_FOREACH (ci->possible_outputs, p_output_iter, oi)
+               {
+                  if (!strncmp(s_output_name, oi->name, oi->name_length))
+                    return ci;
+               }
+          }
+     }
    return NULL;
 }
 
+Eina_List *
+_e_randr_find_matching_outputs(Eina_List *sois, Eina_List *ois)
+{
+   Eina_List *r_output_iter, *s_output_iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Output *so;
+
+   EINA_LIST_FOREACH (sois, s_output_iter, so)
+     {
+        EINA_LIST_FOREACH (ois, r_output_iter, oi)
+          {
+             if (so->edid_hash.hash == oi->edid_hash.hash)
+               {
+                  list = eina_list_append(list, oi);
+                  break;
+               }
+          }
+     }
+   if (list && (eina_list_count(sois) != eina_list_count(list)))
+     {
+        eina_list_free(list);
+        list = NULL;
+     }
+
+   return list;
+}
+
+Ecore_X_Randr_Mode_Info *
+_e_randr_find_matching_mode_info(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
+{
+   Eina_List *iter;
+   Ecore_X_Randr_Mode_Info *mi = NULL;
+
+   EINA_LIST_FOREACH (modes, iter, mi)
+     {
+        if ((mode->width == mi->width)
+            && (mode->height == mi->height)
+            && (mode->dotClock == mi->dotClock)
+            && (mode->hSyncStart == mi->hSyncStart)
+            && (mode->hSyncEnd == mi->hSyncEnd)
+            && (mode->hTotal == mi->hTotal)
+            && (mode->hSkew == mi->hSkew)
+            && (mode->vSyncStart == mi->vSyncStart)
+            && (mode->vSyncEnd == mi->vSyncEnd)
+            && (mode->vTotal == mi->vTotal)
+            && (mode->nameLength == mi->nameLength)
+            && !strncpy(mode->name, mi->name, mode->nameLength)
+            && (mode->modeFlags == mi->modeFlags))
+          return mi;
+     }
+   return NULL;
+}
+
+Eina_Bool
+_e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Crtc_Info *ci;
+   Ecore_X_Randr_Output *outputs_array;
+   Ecore_X_Randr_Mode_Info *mi;
+   Eina_List *iter, *outputs_list;
+   Eina_Bool ret = EINA_TRUE;
+   E_Manager *man;
+
+   if (!(ss_12 = _e_randr_find_matching_serialized_setup(e_config->randr_serialized_setup->serialized_setups_12, si_12))) return EINA_FALSE;
+
+   man = e_manager_current_get();
+
+   EINA_LIST_FOREACH (ss_12->serialized_crtcs, iter, sc)
+     {
+        ci = _e_randr_find_matching_crtc(si_12->crtcs, sc);
+        outputs_list = _e_randr_find_matching_outputs(si_12->outputs, sc->serialized_outputs);
+        outputs_array = _e_randr_outputs_to_array(outputs_list);
+        mi = _e_randr_find_matching_mode_info(si_12->modes, &sc->mode_info);
+        ret &= ecore_x_randr_crtc_mode_set(man->root, ci->xid, outputs_array, eina_list_count(outputs_list), mi->xid);
+        ret &= ecore_x_randr_crtc_pos_set(man->root, ci->xid, sc->pos.x, sc->pos.y);
+     }
+   return ret;
+}
+
+//Utility functions
 static Ecore_X_Randr_Output *
 _e_randr_outputs_to_array(Eina_List *outputs_info)
 {
@@ -1143,7 +1609,7 @@ _e_randr_outputs_to_array(Eina_List *outputs_info)
    int i = 0;
 
    if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL;
-   EINA_LIST_FOREACH(outputs_info, output_iter, output_info)
+   EINA_LIST_FOREACH (outputs_info, output_iter, output_info)
      /* output_info == NULL should _not_ be possible! */
      ret[i++] = output_info ? output_info->xid : Ecore_X_Randr_None;
    return ret;
@@ -1160,7 +1626,8 @@ static Eina_Bool
 _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
 {
    if (!output_info) return EINA_FALSE;
-   else if (output_info->crtc && output_info->crtc->current_mode) return EINA_TRUE;
+   else if (output_info->crtc && output_info->crtc->current_mode)
+     return EINA_TRUE;
 
    Eina_List *iter, *outputs_list = NULL;
    E_Randr_Crtc_Info *crtc_info, *usable_crtc = NULL;
@@ -1172,7 +1639,7 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
    /*
     * Try to find a usable crtc for this output. Either unused or forced.
     */
-   EINA_LIST_FOREACH(output_info->possible_crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (output_info->possible_crtcs, iter, crtc_info)
      {
         if (crtc_info && (!crtc_info->current_mode || force))
           {
@@ -1187,43 +1654,44 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
    if (!usable_crtc) return EINA_FALSE;
 
    //get the CRTC we will refer to, dependend on policy
-   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
+   switch (output_info->policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
-         return EINA_TRUE;
+        return EINA_TRUE;
+
       case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
-         /*
-          * Order of approaches to enable a clone (of the primary output):
-          *
-          * 0.  Get Primary output from Server
-          * 1.  Try to add new Output to primary output's CRTC, using the mode used
-          *     by the primary output
-          * 2.  Try to enable clone in the same
-          * 2a. exact mode or a
-          * 2b. geometrically identical mode
-          * 3.  Find a most high resolution mode in common to enable on primary output's CRTC and the new
-          *     output's CRTC
-          * 4.  fail.
-          */
+        /*
+         * Order of approaches to enable a clone (of the primary output):
+         *
+         * 0.  Get Primary output from Server
+         * 1.  Try to add new Output to primary output's CRTC, using the mode used
+         *     by the primary output
+         * 2.  Try to enable clone in the same
+         * 2a. exact mode or a
+         * 2b. geometrically identical mode
+         * 3.  Find a most high resolution mode in common to enable on primary output's CRTC and the new
+         *     output's CRTC
+         * 4.  fail.
+         */
         if ((primary_output = e_randr_screen_info->rrvd_info.randr_info_12->primary_output))
           {
              if (primary_output->crtc && primary_output->crtc->current_mode && eina_list_data_find(output_info->modes, primary_output->crtc->current_mode))
                {
-                /*
-                 * mode currently used by primary output's CRTC is also supported by the new output
-                 */
+                  /*
+                   * mode currently used by primary output's CRTC is also supported by the new output
+                   */
                   if (_e_randr_outputs_are_clones(output_info, primary_output->crtc->outputs))
                     {
-                     /*
-                      * 1.  Try to add new Output to primary output's CRTC, using the mode used
-                      * by the primary output
-                      * TODO: check with compatibility list in RandRR >= 1.3
-                      * if available
-                      *
-                      * The new output is also usable by the primary output's
-                      * CRTC. Try to enable this output together with the already
-                      * enabled outputs on the CRTC in already used mode.
-                      */
+                       /*
+                        * 1.  Try to add new Output to primary output's CRTC, using the mode used
+                        * by the primary output
+                        * TODO: check with compatibility list in RandRR >= 1.3
+                        * if available
+                        *
+                        * The new output is also usable by the primary output's
+                        * CRTC. Try to enable this output together with the already
+                        * enabled outputs on the CRTC in already used mode.
+                        */
                        outputs_list = eina_list_clone(primary_output->crtc->outputs);
                        outputs_list = eina_list_append(outputs_list, output_info);
                        outputs = _e_randr_outputs_to_array(outputs_list);
@@ -1231,69 +1699,67 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
                        free(outputs);
                        eina_list_free(outputs_list);
                        return ret;
-                  }
+                    }
                   else
                     {
-                     /*
-                      * 2.  Try to enable clone in the same
-                      */
+                       /*
+                        * 2.  Try to enable clone in the same
+                        */
 
-                     /*
-                      * 2a. exact mode.
-                      */
+                       /*
+                        * 2a. exact mode.
+                        */
                        ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid);
-                       return (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
-
-                  }
-             }
+                       return ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
+                    }
+               }
              else
                {
-                /*
-                 * 2b. geometrically identical mode
-                 */
+                  /*
+                   * 2b. geometrically identical mode
+                   */
                   if (primary_output->crtc && (mode_info = _e_randr_mode_geo_identical_find(output_info->modes, primary_output->crtc->current_mode)))
                     {
                        ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
-                       return (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
-                  }
+                       return ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
+                    }
                   /*
                    * 3.  Find the highest resolution mode common to enable on primary output's CRTC and the new one.
                    */
                   if (((outputs_list = eina_list_append(outputs_list, primary_output)) && (outputs_list = eina_list_append(outputs_list, output_info))))
                     {
-                      if (primary_output->crtc)
-                        {
-                           if((mode_info = _e_randr_outputs_common_mode_max_get(outputs_list, primary_output->crtc->current_mode)))
-                             {
-                                fprintf(stderr, "Will try to set mode: %dx%d for primary and clone.\n", mode_info->width, mode_info->height);
-                                ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, primary_output->crtc->xid, ((Ecore_X_Randr_Output*)Ecore_X_Randr_Unset), Ecore_X_Randr_Unset, mode_info->xid);
-                                ret = (ret && ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid));
-                                ret = (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
-                             }
-                        }
+                       if (primary_output->crtc)
+                         {
+                            if ((mode_info = _e_randr_outputs_common_mode_max_get(outputs_list, primary_output->crtc->current_mode)))
+                              {
+                                 fprintf(stderr, "Will try to set mode: %dx%d for primary and clone.\n", mode_info->width, mode_info->height);
+                                 ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, primary_output->crtc->xid, ((Ecore_X_Randr_Output *)Ecore_X_Randr_Unset), Ecore_X_Randr_Unset, mode_info->xid);
+                                 ret = (ret && ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid));
+                                 ret = (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
+                              }
+                         }
                        eina_list_free(outputs_list);
-                  }
-             }
-
-        }
+                    }
+               }
+          }
         else
           fprintf(stderr, "Couldn't get primary output!\n");
-         /*
-          * 4. FAIL
-          */
+        /*
+         * 4. FAIL
+         */
         break;
 
       default:
         if ((usable_crtc && (!usable_crtc->current_mode)) || force)
           {
              //enable and position according to used policies
-             if(!(mode_info = ((Ecore_X_Randr_Mode_Info*)eina_list_nth(output_info->preferred_modes, 0))))
+             if (!(mode_info = ((Ecore_X_Randr_Mode_Info *)eina_list_nth(output_info->preferred_modes, 0))))
                {
                   fprintf(stderr, "E_RANDR: Could not enable output(%d), as it has no preferred (and there for none at all) modes.!\n", output_info->xid);
                   ret = EINA_FALSE;
                   break;
                }
-             if((ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid)))
+             if ((ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid)))
                {
                   usable_crtc->geometry.w = mode_info->width;
                   usable_crtc->geometry.h = mode_info->height;
@@ -1301,8 +1767,8 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
                   usable_crtc->geometry.y = 0;
 
                   ret &= _e_randr_crtc_move_policy(usable_crtc);
-                }
-           }
+               }
+          }
      }
    ecore_x_randr_screen_reset(e_randr_screen_info->root);
    return ret;
@@ -1319,7 +1785,7 @@ _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info)
    Ecore_X_Randr_Output *outputs = NULL;
    int noutputs = 0;
 
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         if (!eina_list_data_find(crtc_info->possible_outputs, output_info))
           {
@@ -1345,17 +1811,17 @@ _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info)
 static void
 _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info)
 {
-   Ecore_X_Randr_Output                *outputs;
-   E_Randr_Output_Info         *output_info;
-   int                         i, noutputs;
+   Ecore_X_Randr_Output *outputs;
+   E_Randr_Output_Info *output_info;
+   int i, noutputs;
 
    //get references to output_info structs which are related to this CRTC
    if (e_randr_screen_info->rrvd_info.randr_info_12->outputs && (outputs = ecore_x_randr_crtc_outputs_get(e_randr_screen_info->root, crtc_info->xid, &noutputs)))
      {
-        for(i = 0; i < noutputs; i++)
+        for (i = 0; i < noutputs; i++)
           {
              if (!(output_info = _e_randr_output_info_get(outputs[i])) || eina_list_data_find(crtc_info->outputs, output_info) || (ecore_x_randr_output_crtc_get(e_randr_screen_info->root, outputs[i]) != crtc_info->xid)) continue;
-             if(!(crtc_info->outputs = eina_list_append(crtc_info->outputs, output_info))) fprintf(stderr, "E_RANDR: could not add output(%d) to CRTC's(%d) output list!\n", output_info->xid, crtc_info->xid);
+             if (!(crtc_info->outputs = eina_list_append(crtc_info->outputs, output_info))) fprintf(stderr, "E_RANDR: could not add output(%d) to CRTC's(%d) output list!\n", output_info->xid, crtc_info->xid);
              output_info->crtc = crtc_info;
           }
         free(outputs);
@@ -1363,10 +1829,10 @@ _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info)
    //get references to possible output_info structs which are related to this CRTC
    if (e_randr_screen_info->rrvd_info.randr_info_12->outputs && (outputs = ecore_x_randr_crtc_possible_outputs_get(e_randr_screen_info->root, crtc_info->xid, &noutputs)))
      {
-        for(i = 0; i < noutputs; i++)
+        for (i = 0; i < noutputs; i++)
           {
              if (!(output_info = _e_randr_output_info_get(outputs[i])) || eina_list_data_find(crtc_info->possible_outputs, output_info)) continue;
-             if(!(crtc_info->possible_outputs = eina_list_append(crtc_info->possible_outputs, output_info))) fprintf(stderr, "E_RANDR: could not add output(%d) to CRTC's(%d) possible output list!\n", output_info->xid, crtc_info->xid);
+             if (!(crtc_info->possible_outputs = eina_list_append(crtc_info->possible_outputs, output_info))) fprintf(stderr, "E_RANDR: could not add output(%d) to CRTC's(%d) possible output list!\n", output_info->xid, crtc_info->xid);
           }
         free(outputs);
      }
@@ -1382,15 +1848,19 @@ static Eina_Bool
 _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
 {
    const E_Randr_Crtc_Info *crtc_rel;
+   E_Randr_Output_Info *last_output = NULL;
    int dx = Ecore_X_Randr_None, dy = Ecore_X_Randr_None;
    Eina_Bool ret = EINA_TRUE;
 
+   //use the policy of the new crtc's last output
+   last_output = (E_Randr_Output_Info *)eina_list_data_get(eina_list_last(new_crtc->outputs));
+   if (!last_output) return EINA_FALSE;
    //get the crtc we will place our's relative to. If it's NULL, this is the
    //only output attached, work done.
-   if(!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, e_randr_screen_info->rrvd_info.randr_info_12->output_policy))) return EINA_TRUE;
+   if (!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, last_output->policy))) return EINA_TRUE;
 
    //following is policy dependend.
-   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
+   switch (last_output->policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
         dy = (crtc_rel->geometry.y - new_crtc->geometry.h);
@@ -1403,8 +1873,9 @@ _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
                                                     1,
                                                     dx,
                                                     dy);
-           }
+          }
         break;
+
       case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
         dx = (crtc_rel->geometry.x - new_crtc->geometry.w);
         if (dx < 0)
@@ -1416,12 +1887,13 @@ _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
                                                     1,
                                                     dx,
                                                     dy);
-           }
+          }
         break;
+
       default:
         break;
      }
-   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, e_randr_screen_info->rrvd_info.randr_info_12->output_policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
+   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, last_output->policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
    return ret;
 }
 
@@ -1438,7 +1910,7 @@ _e_randr_outputs_common_mode_max_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info
    int outputs_mode_found;
 
    //create a list of all available modes
-   EINA_LIST_FOREACH(outputs, iter, output_info)
+   EINA_LIST_FOREACH (outputs, iter, output_info)
      {
         right = eina_list_clone(output_info->modes);
         all_modes = eina_list_merge(all_modes, right);
@@ -1447,19 +1919,19 @@ _e_randr_outputs_common_mode_max_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info
    if (max_size_mode)
      {
         //remove all modes that are larger than max_size_mode
-        EINA_LIST_FOREACH(all_modes, iter, mode_info)
+        EINA_LIST_FOREACH (all_modes, iter, mode_info)
           {
-             if (_modes_size_sort_cb((void*)max_size_mode, (void*)mode_info) < 0)
+             if (_modes_size_sort_cb((void *)max_size_mode, (void *)mode_info) < 0)
                all_modes = eina_list_remove(all_modes, mode_info);
           }
      }
 
    //sort modes by their sizes
    all_modes = eina_list_sort(all_modes, eina_list_count(all_modes), _modes_size_sort_cb);
-   EINA_LIST_REVERSE_FOREACH(all_modes, iter, mode_info)
+   EINA_LIST_REVERSE_FOREACH (all_modes, iter, mode_info)
      {
         outputs_mode_found = 0;
-        EINA_LIST_FOREACH(outputs, output_iter, output_info)
+        EINA_LIST_FOREACH (outputs, output_iter, output_info)
           {
              if (eina_list_data_find(output_info->modes, mode_info))
                outputs_mode_found++;
@@ -1472,19 +1944,19 @@ _e_randr_outputs_common_mode_max_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info
 }
 
 /*
-static int
-_crtcs_size_sort_cb(const void *d1, const void *d2)
-{
+   static int
+   _crtcs_size_sort_cb(const void *d1, const void *d2)
+   {
    E_Randr_Crtc_Info *crtc1 = ((E_Randr_Crtc_Info*)d1), *crtc2 = ((E_Randr_Crtc_Info*)d2);
 
    return ((crtc1->geometry.w * crtc1->geometry.h) - (crtc2->geometry.w * crtc2->geometry.h));
-}
-*/
+   }
+ */
 
 static int
 _outputs_size_sort_cb(const void *d1, const void *d2)
 {
-   E_Randr_Output_Info *output1 = ((E_Randr_Output_Info*)d1), *output2 = ((E_Randr_Output_Info*)d2);
+   E_Randr_Output_Info *output1 = ((E_Randr_Output_Info *)d1), *output2 = ((E_Randr_Output_Info *)d2);
 
    return (output1 && output1->crtc && output1->crtc->current_mode && output2 && output2->crtc && output2->crtc->current_mode) ?  ((output1->crtc->current_mode->width * output1->crtc->current_mode->height) - (output2->crtc->current_mode->width * output2->crtc->current_mode->height)) : 0;
 }
@@ -1492,9 +1964,9 @@ _outputs_size_sort_cb(const void *d1, const void *d2)
 static int
 _modes_size_sort_cb(const void *d1, const void *d2)
 {
-   Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info*)d1), *mode2 = ((Ecore_X_Randr_Mode_Info*)d2);
+   Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info *)d1), *mode2 = ((Ecore_X_Randr_Mode_Info *)d2);
 
-   return ((mode1->width * mode1->height) - (mode2->width * mode2->height));
+   return (mode1->width * mode1->height) - (mode2->width * mode2->height);
 }
 
 /*
@@ -1507,7 +1979,7 @@ _e_randr_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode
    Eina_List *iter;
    Ecore_X_Randr_Mode_Info *mode_info;
 
-   EINA_LIST_FOREACH(modes, iter, mode_info)
+   EINA_LIST_FOREACH (modes, iter, mode_info)
      {
         if ((mode_info->width == mode->width) && (mode_info->height == mode->height))
           return mode_info;
@@ -1529,7 +2001,7 @@ _e_randr_crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info)
 
    if (!crtc_info || !crtc_info->outputs || !crtc_info->outputs_common_modes) return EINA_FALSE;
 
-   EINA_LIST_REVERSE_FOREACH(crtc_info->outputs_common_modes, iter, mode_info)
+   EINA_LIST_REVERSE_FOREACH (crtc_info->outputs_common_modes, iter, mode_info)
      {
         if (!_e_randr_crtc_mode_intersects_crtcs(crtc_info, mode_info))
           break;
@@ -1561,15 +2033,15 @@ _e_randr_crtc_mode_intersects_crtcs(E_Randr_Crtc_Info *crtc_info, Ecore_X_Randr_
    Eina_List *iter;
    E_Randr_Crtc_Info *tmp;
 
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, tmp)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, tmp)
      {
-        if ((tmp == crtc_info) || 
-            ((tmp->geometry.w <= 0) || (tmp->geometry.h <= 0))) 
+        if ((tmp == crtc_info) ||
+            ((tmp->geometry.w <= 0) || (tmp->geometry.h <= 0)))
           continue;
-        if (E_INTERSECTS(crtc_info->geometry.x, crtc_info->geometry.y, 
-                         mode->width, mode->height, tmp->geometry.x, 
+        if (E_INTERSECTS(crtc_info->geometry.x, crtc_info->geometry.y,
+                         mode->width, mode->height, tmp->geometry.x,
                          tmp->geometry.y, tmp->geometry.w, tmp->geometry.h)
-            && ((crtc_info->geometry.x != tmp->geometry.x) && 
+            && ((crtc_info->geometry.x != tmp->geometry.x) &&
                 (crtc_info->geometry.y != tmp->geometry.y)))
           return EINA_TRUE;
      }
@@ -1591,7 +2063,7 @@ _e_randr_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *m
    if (!outputs) return NULL;
 
    //create a list of all available modes
-   EINA_LIST_FOREACH(outputs, iter, output_info)
+   EINA_LIST_FOREACH (outputs, iter, output_info)
      {
         right = eina_list_clone(output_info->modes);
         common_modes = eina_list_merge(common_modes, right);
@@ -1600,18 +2072,20 @@ _e_randr_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *m
    if (max_size_mode)
      {
         //remove all modes that are larger than max_size_mode
-        EINA_LIST_FOREACH(common_modes, iter, mode_info)
+        EINA_LIST_FOREACH (common_modes, iter, mode_info)
           {
-             if (_modes_size_sort_cb((void*)max_size_mode, (void*)mode_info) < 0)
+             if (_modes_size_sort_cb((void *)max_size_mode, (void *)mode_info) < 0)
                common_modes = eina_list_remove(common_modes, mode_info);
           }
      }
 
    //sort modes desc. by their sizes
-   EINA_LIST_REVERSE_FOREACH(common_modes, iter, mode_info)
+   for (iter = eina_list_last(common_modes); iter; )
      {
+        mode_info = iter->data;
+        iter = iter->prev;
         outputs_mode_found = 0;
-        EINA_LIST_FOREACH(outputs, output_iter, output_info)
+        EINA_LIST_FOREACH (outputs, output_iter, output_info)
           {
              if (eina_list_data_find(output_info->modes, mode_info))
                outputs_mode_found++;
@@ -1633,7 +2107,7 @@ _e_randr_crtcs_clone_crtc_removed(E_Randr_Crtc_Info *former_clone)
 
    if (!former_clone) return EINA_FALSE;
 
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         if ((crtc_info == former_clone) || ((crtc_info->geometry.w <= 0) || (crtc_info->geometry.h <= 0))) continue;
         if ((former_clone->geometry.x == crtc_info->geometry.x) && (former_clone->geometry.y == crtc_info->geometry.y) && (former_clone->geometry.w == crtc_info->geometry.w) && (former_clone->geometry.h == crtc_info->geometry.h))
@@ -1643,7 +2117,6 @@ _e_randr_crtcs_clone_crtc_removed(E_Randr_Crtc_Info *former_clone)
      }
 
    return EINA_TRUE;
-
 }
 
 static void
@@ -1659,7 +2132,7 @@ _e_randr_screen_primary_output_assign(E_Randr_Output_Info *removed)
      {
         primary_output = eina_list_data_get(eina_list_last(e_randr_screen_info->rrvd_info.randr_info_12->outputs));
 
-        EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->outputs, iter, output_info)
+        EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->outputs, iter, output_info)
           {
              if (output_info->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED || !output_info->crtc || !output_info->crtc->current_mode) continue;
              if ((!primary_output->crtc || !primary_output->crtc->current_mode) || _outputs_size_sort_cb(output_info, primary_output) > 0) primary_output = output_info;
@@ -1680,6 +2153,8 @@ _e_randr_output_info_hw_info_set(E_Randr_Output_Info *output_info)
 
    _e_randr_output_modes_add(output_info);
    output_info->edid = ecore_x_randr_output_edid_get(e_randr_screen_info->root, output_info->xid, &output_info->edid_length);
+   if (output_info->edid && output_info->edid_length > 0)
+     output_info->edid_hash.hash = eina_hash_superfast((char *)output_info->edid, output_info->edid_length);
    //get the outputs we can use on the same CRTC alongside this one.
    if ((outputs = ecore_x_randr_output_clones_get(e_randr_screen_info->root, output_info->xid, &num)))
      {
@@ -1705,6 +2180,10 @@ _e_randr_output_info_hw_info_set(E_Randr_Output_Info *output_info)
           }
         free(crtcs);
      }
+   else
+     {
+        fprintf(stderr, "E_RANDR: Output %x does not have a single possible CRTC.\n", output_info->xid);
+     }
 }
 
 /*
@@ -1755,7 +2234,7 @@ _e_randr_output_hw_info_free(E_Randr_Output_Info *output_info)
         output_info->clones = NULL;
      }
 
-   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
+   EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
      {
         crtc_info->possible_outputs = eina_list_remove(crtc_info->possible_outputs, output_info);
      }
@@ -1772,10 +2251,11 @@ _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs
 
    if (!outputs || !output_info) return EINA_FALSE;
 
-   EINA_LIST_FOREACH(output_info->clones, iter, output)
+   EINA_LIST_FOREACH (output_info->clones, iter, output)
      {
         if (!eina_list_data_find(output_info->clones, output))
           return EINA_FALSE;
      }
    return EINA_TRUE;
 }
+
index 448fc89..7f04d02 100644 (file)
@@ -1,24 +1,26 @@
 #ifdef E_TYPEDEFS
 
 typedef struct _E_Randr_Crtc_Info E_Randr_Crtc_Info;
+typedef struct _E_Randr_Edid_Hash E_Randr_Edid_Hash;
 typedef struct _E_Randr_Output_Info E_Randr_Output_Info;
 typedef struct _E_Randr_Screen_Info_11 E_Randr_Screen_Info_11;
 typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12;
 typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info;
 typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info;
-typedef struct _E_Randr_Output_Edid_Hash E_Randr_Output_Edid_Hash;
-typedef struct _E_Randr_Output_Restore_Info E_Randr_Output_Restore_Info;
-typedef struct _E_Randr_Crtc_Restore_Info E_Randr_Crtc_Restore_Info;
-typedef struct _E_Randr_Screen_Restore_Info_11 E_Randr_Screen_Restore_Info_11;
-typedef struct _E_Randr_Screen_Restore_Info_12 E_Randr_Screen_Restore_Info_12;
-typedef union _E_Randr_Screen_Restore_Info_Union E_Randr_Screen_Restore_Info_Union;
-typedef struct _E_Randr_Screen_Restore_Info E_Randr_Screen_Restore_Info;
+typedef struct _E_Randr_Serialized_Output_Policy E_Randr_Serialized_Output_Policy;
+typedef struct _E_Randr_Serialized_Output E_Randr_Serialized_Output;
+typedef struct _E_Randr_Serialized_Crtc E_Randr_Serialized_Crtc;
+typedef struct _E_Randr_Serialized_Setup_11 E_Randr_Serialized_Setup_11;
+typedef struct _E_Randr_Serialized_Setup_12 E_Randr_Serialized_Setup_12;
+typedef struct _E_Randr_Serialized_Setup E_Randr_Serialized_Setup;
+
+EAPI void e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
 
 #else
 #ifndef E_RANDR_H
 #define E_RANDR_H
 
-struct _E_Randr_Crtc_Info 
+struct _E_Randr_Crtc_Info
 {
    Ecore_X_ID xid;
    Eina_Rectangle geometry;
@@ -35,7 +37,12 @@ struct _E_Randr_Crtc_Info
    Ecore_X_Randr_Mode_Info *current_mode;
 };
 
-struct _E_Randr_Output_Info 
+struct _E_Randr_Edid_Hash
+{
+   int hash;
+};
+
+struct _E_Randr_Output_Info
 {
    Ecore_X_ID xid;
    char *name;
@@ -47,6 +54,7 @@ struct _E_Randr_Output_Info
    int connector_number;
    Ecore_X_Randr_Connector_Type connector_type;
    Ecore_X_Randr_Connection_Status connection_status;
+   Ecore_X_Randr_Output_Policy policy;
    /*
     * Attached Monitor specific:
     */
@@ -57,6 +65,7 @@ struct _E_Randr_Output_Info
    Ecore_X_Randr_Screen_Size size_mm;
    unsigned char *edid;
    unsigned long edid_length;
+   E_Randr_Edid_Hash edid_hash;
    int max_backlight;
    double backlight_level;
    Ecore_X_Render_Subpixel_Order subpixel_order;
@@ -75,7 +84,7 @@ struct _E_Randr_Screen_Info_11
    Ecore_X_Randr_Refresh_Rate current_rate;
 };
 
-struct _E_Randr_Screen_Info_12 
+struct _E_Randr_Screen_Info_12
 {
    Ecore_X_Randr_Screen_Size min_size;
    Ecore_X_Randr_Screen_Size max_size;
@@ -84,18 +93,17 @@ struct _E_Randr_Screen_Info_12
    Eina_List *crtcs;
    Eina_List *outputs;
    E_Randr_Output_Info *primary_output;
-   Ecore_X_Randr_Output_Policy output_policy;
    Ecore_X_Randr_Relative_Alignment alignment;
 };
 
 //RRVD == RandR(R) Version Depended
-union _E_Randr_Screen_RRVD_Info 
+union _E_Randr_Screen_RRVD_Info
 {
    E_Randr_Screen_Info_11 *randr_info_11;
    E_Randr_Screen_Info_12 *randr_info_12;
 };
 
-struct _E_Randr_Screen_Info 
+struct _E_Randr_Screen_Info
 {
    Ecore_X_Window root;
    int randr_version;
@@ -103,56 +111,67 @@ struct _E_Randr_Screen_Info
 };
 
 //Following stuff is just for configuration purposes
-struct _E_Randr_Output_Edid_Hash {
-   int hash;
-};
 
-struct _E_Randr_Output_Restore_Info
+struct _E_Randr_Serialized_Output_Policy
 {
-   E_Randr_Output_Edid_Hash edid_hash;
-   double backlight_level;
+   char *name;
+   int name_length;
+   Ecore_X_Randr_Output_Policy policy;
 };
 
-struct _E_Randr_Crtc_Restore_Info
+struct _E_Randr_Serialized_Output
 {
-   Eina_Rectangle geometry;
-   Ecore_X_Randr_Orientation orientation;
-   //list of the outputs;
-   Eina_List *outputs;
+   char *name;
+   int name_length;
+   E_Randr_Edid_Hash edid_hash;
+   double backlight_level;
 };
 
-struct _E_Randr_Screen_Restore_Info_11 
+struct _E_Randr_Serialized_Crtc
 {
-   Ecore_X_Randr_Screen_Size size;
-   Ecore_X_Randr_Refresh_Rate refresh_rate;
+   //List of E_Randr_Serialized_Output objects that were used on the same output
+   Eina_List *serialized_outputs;
+   //the serialized mode_info misses its xid value
+   Ecore_X_Randr_Mode_Info mode_info;
+   Evas_Coord_Point pos;
+   //List of all possible outputs' names
+   //e.g. "LVDS", "CRT-0", "VGA"
+   Eina_List *possible_outputs_names;
    Ecore_X_Randr_Orientation orientation;
 };
 
-struct _E_Randr_Screen_Restore_Info_12 
+struct _E_Randr_Serialized_Setup_12
 {
-   Eina_List *outputs_edid_hashes;
-   int noutputs;
-   Eina_List *crtcs;
-   Ecore_X_Randr_Output_Policy output_policy;
-   Ecore_X_Randr_Relative_Alignment alignment;
+   double timestamp;
+   //List of E_Randr_Serialized_Crtc objects
+   Eina_List *serialized_crtcs;
+   /*
+    * List of E_Randr_Edid_Hash elements of monitors,
+    * that were enabled, when the setup was stored
+    */
+   Eina_List *serialized_edid_hashes;
 };
 
-union _E_Randr_Screen_Restore_Info_Union 
+struct _E_Randr_Serialized_Setup_11
 {
-   E_Randr_Screen_Restore_Info_11 *restore_info_11;
-   Eina_List *restore_info_12;
+   Ecore_X_Randr_Screen_Size_MM size;
+   Ecore_X_Randr_Refresh_Rate refresh_rate;
+   Ecore_X_Randr_Orientation orientation;
 };
 
-struct _E_Randr_Screen_Restore_Info 
+struct _E_Randr_Serialized_Setup
 {
-   int randr_version;
-   E_Randr_Screen_Restore_Info_Union rrvd_restore_info;
+   E_Randr_Serialized_Setup_11 *serialized_setup_11;
+   //List of E_Randr_Serialized_Setup_12 objects
+   Eina_List *serialized_setups_12;
+   //List of E_Randr_Serialized_Output_Policy objects
+   Eina_List *serialized_outputs_policies;
 };
 
 EINTERN Eina_Bool e_randr_init(void);
 EINTERN int e_randr_shutdown(void);
 
-extern E_Randr_Screen_Info *e_randr_screen_info;
+EAPI extern E_Randr_Screen_Info *e_randr_screen_info;
 
 #endif
 #endif
index b83e5a1..6229193 100644 (file)
@@ -9,6 +9,7 @@ static Ecore_Event_Handler *_e_screensaver_handler_border_iconify = NULL;
 static Ecore_Event_Handler *_e_screensaver_handler_border_uniconify = NULL;
 static Ecore_Event_Handler *_e_screensaver_handler_border_desk_set = NULL;
 static Ecore_Event_Handler *_e_screensaver_handler_desk_show = NULL;
+static Ecore_Event_Handler *_e_screensaver_handler_powersave = NULL;
 static E_Dialog *_e_screensaver_ask_presentation_dia = NULL;
 static int _e_screensaver_ask_presentation_count = 0;
 
@@ -17,6 +18,9 @@ static int _e_screensaver_interval = 0;
 static int _e_screensaver_blanking = 0;
 static int _e_screensaver_expose = 0;
 
+static Ecore_Timer *_e_screensaver_suspend_timer = NULL;
+static Eina_Bool _e_screensaver_on = EINA_FALSE;
+
 EAPI void
 e_screensaver_update(void)
 {
@@ -159,6 +163,33 @@ _e_screensaver_ask_presentation_mode(void)
 }
 
 static Eina_Bool
+_e_screensaver_suspend_cb(void *data __UNUSED__)
+{
+   _e_screensaver_suspend_timer = NULL;
+   if (e_config->screensaver_suspend)
+     {
+        if ((e_config->screensaver_suspend_on_ac) ||
+            (e_powersave_mode_get() > E_POWERSAVE_MODE_LOW))
+           e_sys_action_do(E_SYS_SUSPEND, NULL);
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_e_screensaver_handler_powersave_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   if ((e_config->screensaver_suspend) && (_e_screensaver_on))
+     {
+        if (_e_screensaver_suspend_timer)
+           ecore_timer_del(_e_screensaver_suspend_timer);
+        _e_screensaver_suspend_timer = 
+           ecore_timer_add(e_config->screensaver_suspend_delay,
+                           _e_screensaver_suspend_cb, NULL);
+     }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
 _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Screensaver_Notify *e = event;
@@ -166,6 +197,29 @@ _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __U
 
    if (e->on)
      {
+        _e_screensaver_on = EINA_TRUE;
+        if (_e_screensaver_suspend_timer)
+          {
+             ecore_timer_del(_e_screensaver_suspend_timer);
+             _e_screensaver_suspend_timer = NULL;
+          }
+        if (e_config->screensaver_suspend)
+           _e_screensaver_suspend_timer = 
+           ecore_timer_add(e_config->screensaver_suspend_delay,
+                           _e_screensaver_suspend_cb, NULL);
+     }
+   else
+     {
+        _e_screensaver_on = EINA_FALSE;
+        if (_e_screensaver_suspend_timer)
+          {
+             ecore_timer_del(_e_screensaver_suspend_timer);
+             _e_screensaver_suspend_timer = NULL;
+          }
+     }
+   
+   if (e->on)
+     {
        last_start = ecore_loop_time_get();
        _e_screensaver_ask_presentation_count = 0;
      }
@@ -234,6 +288,9 @@ e_screensaver_init(void)
    _e_screensaver_handler_desk_show = ecore_event_handler_add
      (E_EVENT_DESK_SHOW, _e_screensaver_handler_desk_show_cb, NULL);
 
+   _e_screensaver_handler_powersave = ecore_event_handler_add
+     (E_EVENT_POWERSAVE_UPDATE, _e_screensaver_handler_powersave_cb, NULL);
+   
    _e_screensaver_timeout = ecore_x_screensaver_timeout_get();
    _e_screensaver_interval = ecore_x_screensaver_interval_get();
    _e_screensaver_blanking = ecore_x_screensaver_blank_get();
@@ -247,6 +304,18 @@ e_screensaver_init(void)
 EINTERN int
 e_screensaver_shutdown(void)
 {
+   if (_e_screensaver_suspend_timer)
+     {
+        ecore_timer_del(_e_screensaver_suspend_timer);
+        _e_screensaver_suspend_timer = NULL;
+     }
+   
+   if (_e_screensaver_handler_powersave)
+     {
+        ecore_event_handler_del(_e_screensaver_handler_powersave);
+        _e_screensaver_handler_powersave = NULL;
+     }
+   
    if (_e_screensaver_handler_config_mode)
      {
         ecore_event_handler_del(_e_screensaver_handler_config_mode);
index d3133ec..2e77db9 100644 (file)
@@ -824,6 +824,7 @@ _e_shelf_free(E_Shelf *es)
    _e_shelf_bindings_del(es);
 
    e_gadcon_location_unregister(es->gadcon->location);
+   e_gadcon_location_free(es->gadcon->location); 
    e_zone_useful_geometry_dirty(es->zone);
    E_FREE_LIST(es->handlers, ecore_event_handler_del);
 
@@ -881,7 +882,7 @@ static void
 _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
 {
    E_Shelf *es;
-   Evas_Coord nx, ny, nw, nh, ww, hh;
+   Evas_Coord nx, ny, nw, nh, ww, hh, wantw, wanth;
 
    es = data;
    nx = es->x;
@@ -918,6 +919,8 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
      }
    e_gadcon_swallowed_min_size_set(gc, w, h);
    edje_object_size_min_calc(es->o_base, &nw, &nh);
+   wantw = nw;
+   wanth = nh;
    switch (gc->orient)
      {
       case E_GADCON_ORIENT_FLOAT:
@@ -1040,6 +1043,9 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
       default:
        break;
      }
+   w -= (wantw - nw);
+   h -= (wanth - nh);
+   e_gadcon_swallowed_min_size_set(gc, w, h);
    e_shelf_move_resize(es, nx, ny, nw, nh);
    e_zone_useful_geometry_dirty(es->zone);
 }
index 9e61cb7..b576d13 100644 (file)
@@ -4,7 +4,6 @@
  * to add backtrace support.
  */
 #include "e.h"
-#include <X11/Xlib.h>
 
 #ifdef HAVE_EXECINFO_H
 # include <execinfo.h> 
@@ -15,14 +14,14 @@ static volatile Eina_Bool _e_x_composite_shutdown_try = 0;
 static void
 _e_x_composite_shutdown(void)
 {
-   Ecore_X_Display *dpy;
+//   Ecore_X_Display *dpy;
    Ecore_X_Window root;
 
    if (_e_x_composite_shutdown_try) return; /* we failed :-( */
    _e_x_composite_shutdown_try = 1;
 
-   dpy = ecore_x_display_get();
-   root = DefaultRootWindow(dpy);
+//   dpy = ecore_x_display_get();
+   root = ecore_x_window_root_first_get();
 
    /* ignore errors, we really don't care at this point */
    ecore_x_composite_unredirect_subwindows(root, ECORE_X_COMPOSITE_UPDATE_MANUAL);
@@ -69,7 +68,7 @@ _e_gdb_print_backtrace(int fd)
    // printf bt and allows e to continue and pop up box, perferably allowing
    // debugging in the gui etc. etc.
    return;
-   
+
    if (getenv("E_NO_GDB_BACKTRACE"))
      return;
 
@@ -89,16 +88,14 @@ _e_gdb_print_backtrace(int fd)
 
 #define _e_backtrace(msg) _e_backtrace_int(2, msg, sizeof(msg))
 static void
-_e_backtrace_int(int fd __UNUSED__, const char *msg __UNUSED__, size_t msg_len __UNUSED__)
+_e_backtrace_int(int fd, const char *msg, size_t msg_len)
 {
-   /*
    char attachmsg[1024];
    void *array[255];
    size_t size;
-    */
 
    return; // disable. causes hangs and problems
-/*
+
    _e_write_safe_int(fd, msg, msg_len);
    _e_write_safe(fd, "\nBEGIN TRACEBACK\n");
    size = backtrace(array, 255);
@@ -111,7 +108,6 @@ _e_backtrace_int(int fd __UNUSED__, const char *msg __UNUSED__, size_t msg_len _
      _e_write_safe_int(fd, attachmsg, size);
 
    _e_gdb_print_backtrace(fd);
- */
 }
 
 /* a tricky little devil, requires e and it's libs to be built
@@ -120,109 +116,49 @@ _e_backtrace_int(int fd __UNUSED__, const char *msg __UNUSED__, size_t msg_len _
 EAPI void
 e_sigseg_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__)
 {
-    char msg[1024];
-
    _e_backtrace("**** SEGMENTATION FAULT ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
    ecore_x_ungrab();
    ecore_x_sync();
-   snprintf(msg, sizeof(msg),
-            "This is very bad. Enlightenment SEGV'd.\n"
-            "\n"
-            "This is not meant to happen and is likely a sign of\n"
-            "a bug in Enlightenment or the libraries it relies\n"
-            "on. You can gdb attach to this process (%d) now\n"
-            "to try debug it or you could exit, or just hit\n"
-            "restart to try and get your desktop back the way\n"
-            "it was.\n"
-            "\n"
-            "Please compile everything with -g in your CFLAGS.\n",
-            getpid());
-   e_alert_show(msg);
-   exit(-11);
+   e_alert_show(SIGSEGV);
 }
 
 EAPI void
 e_sigill_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__)
 {
-    char msg[1024];
-
    _e_backtrace("**** ILLEGAL INSTRUCTION ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
    ecore_x_ungrab();
    ecore_x_sync();
-   snprintf(msg, sizeof(msg),
-            "This is very bad. Enlightenment SIGILL'd.\n"
-            "\n"
-            "This is not meant to happen and is likely a sign of\n"
-            "a bug in Enlightenment or the libraries it relies\n"
-            "on. You can gdb attach to this process (%d) now\n"
-            "to try debug it or you could exit, or just hit\n"
-            "restart to try and get your desktop back the way\n"
-            "it was.\n"
-            "\n"
-            "Please compile everything with -g in your CFLAGS.\n",
-            getpid());
-   e_alert_show(msg);
-   exit(-11);
+   e_alert_show(SIGILL);
 }
 
 EAPI void
 e_sigfpe_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__)
 {
-    char msg[1024];
-
    _e_backtrace("**** FLOATING POINT EXCEPTION ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
    ecore_x_ungrab();
    ecore_x_sync();
-   snprintf(msg, sizeof(msg),
-            "This is very bad. Enlightenment SIGFPE'd.\n"
-            "\n"
-            "This is not meant to happen and is likely a sign of\n"
-            "a bug in Enlightenment or the libraries it relies\n"
-            "on. You can gdb attach to this process (%d) now\n"
-            "to try debug it or you could exit, or just hit\n"
-            "restart to try and get your desktop back the way\n"
-            "it was.\n"
-            "\n"
-            "Please compile everything with -g in your CFLAGS.\n",
-            getpid());
-   e_alert_show(msg);
-   exit(-11);
+   e_alert_show(SIGFPE);
 }
 
 EAPI void
 e_sigbus_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__)
 {
-    char msg[1024];
-
    _e_backtrace("**** BUS ERROR ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
    ecore_x_ungrab();
    ecore_x_sync();
-   snprintf(msg, sizeof(msg),
-            "This is very bad. Enlightenment SIGBUS'd.\n"
-            "\n"
-            "This is not meant to happen and is likely a sign of\n"
-            "a bug in Enlightenment or the libraries it relies\n"
-            "on. You can gdb attach to this process (%d) now\n"
-            "to try debug it or you could exit, or just hit\n"
-            "restart to try and get your desktop back the way\n"
-            "it was.\n"
-            "\n"
-            "Please compile everything with -g in your CFLAGS.\n",
-            getpid());
-   e_alert_show(msg);
-   exit(-11);
+   e_alert_show(SIGBUS);
 }
 
 EAPI void
@@ -234,14 +170,5 @@ e_sigabrt_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED_
    ecore_x_keyboard_ungrab();
    ecore_x_ungrab();
    ecore_x_sync();
-   e_alert_show("This is very bad. Enlightenment SIGABRT'd.\n"
-               "\n"
-               "This is not meant to happen and is likely a sign of\n"
-               "a bug in Enlightenment or the libraries it relies\n"
-               "on. You can gdb attach to this process now to try\n"
-               "debug it or you could exit, or just hit restart to\n"
-               "try and get your desktop back the way it was.\n"
-               "\n"
-               "Please compile everything with -g in your CFLAGS\n");
-   exit(-11);
+   e_alert_show(SIGABRT);
 }
index 7a99a6b..c5991bd 100644 (file)
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #endif
+#include <Eina.h>
 
 static void env_set(const char *var, const char *val);
-static int prefix_determine(char *argv0);
+EAPI int prefix_determine(char *argv0);
 
 static void
 env_set(const char *var, const char *val)
@@ -29,10 +30,8 @@ env_set(const char *var, const char *val)
 
        buf = alloca(strlen(var) + 1 + strlen(val) + 1);
        snprintf(buf, sizeof(buf), "%s=%s", var, val);
-       if (getenv(var))
-         putenv(buf);
-       else
-         putenv(strdup(buf));
+       if (getenv(var)) putenv(buf);
+       else putenv(strdup(buf));
 #endif
      }
    else
@@ -45,216 +44,21 @@ env_set(const char *var, const char *val)
      }
 }
 
-/* local subsystem functions */
-static int _prefix_fallbacks(void);
-static int _prefix_try_proc(void);
-static int _prefix_try_argv(char *argv0);
-
 /* local subsystem globals */
-static char *_exe_path = NULL;
-static char *_prefix_path = NULL;
+static Eina_Prefix *pfx = NULL;
 
 /* externally accessible functions */
-static int
+EAPI int
 prefix_determine(char *argv0)
 {
-   char *p;
-
-   if (!_prefix_try_proc())
-     {
-       if (!_prefix_try_argv(argv0))
-         {
-            _prefix_fallbacks();
-            return 0;
-         }
-     }
-   /* _exe_path is now a full absolute path TO this exe - figure out rest */
-   /*   if
-    * exe        = /blah/whatever/bin/exe
-    *   then
-    * prefix     = /blah/whatever
-    */
-   p = strrchr(_exe_path, '/');
-   if (p)
-     {
-       p--;
-       while (p >= _exe_path)
-         {
-            if (*p == '/')
-              {
-                 _prefix_path = malloc(p - _exe_path + 1);
-                 if (_prefix_path)
-                   {
-                      strncpy(_prefix_path, _exe_path, p - _exe_path);
-                      _prefix_path[p - _exe_path] = 0;
-                      return 1;
-                   }
-                 else
-                   {
-                      free(_exe_path);
-                      _exe_path = NULL;
-                      _prefix_fallbacks();
-                      return 0;
-                   }
-              }
-            p--;
-         }
-     }
-   free(_exe_path);
-   _exe_path = NULL;
-   _prefix_fallbacks();
-   return 0;
-}
-
-static int
-_prefix_fallbacks(void)
-{
-   char *p;
-
-   _prefix_path = strdup(PACKAGE_BIN_DIR);
-   p = strrchr(_prefix_path, '/');
-   if (p) *p = 0;
-   printf("WARNING: Enlightenment could not determine its installed prefix\n"
-         "         and is falling back on the compiled in default:\n"
-         "         %s\n", _prefix_path);
+   pfx = eina_prefix_new(argv0, prefix_determine,
+                         "E", "enlightenment", "AUTHORS",
+                         PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR, LOCALE_DIR);
+   if (!pfx) return 0;
    return 1;
 }
 
-static int
-_prefix_try_proc(void)
-{
-   FILE *f;
-   char buf[4096];
-   void *func = NULL;
-
-   func = (void *)_prefix_try_proc;
-   f = fopen("/proc/self/maps", "r");
-   if (!f) return 0;
-   while (fgets(buf, sizeof(buf), f))
-     {
-       int len;
-       char *p, mode[5] = "";
-       unsigned long ptr1 = 0, ptr2 = 0;
-
-       len = strlen(buf);
-       if (buf[len - 1] == '\n')
-         {
-            buf[len - 1] = 0;
-            len--;
-         }
-       if (sscanf(buf, "%lx-%lx %4s", &ptr1, &ptr2, mode) == 3)
-         {
-            if (!strcmp(mode, "r-xp"))
-              {
-                 if (((void *)ptr1 <= func) && (func < (void *)ptr2))
-                   {
-                      p = strchr(buf, '/');
-                      if (p)
-                        {
-                           if (len > 10)
-                             {
-                                if (!strcmp(buf + len - 10, " (deleted)"))
-                                  buf[len - 10] = 0;
-                             }
-                           _exe_path = strdup(p);
-                           fclose(f);
-                           return 1;
-                        }
-                      else
-                        break;
-                   }
-              }
-         }
-     }
-   fclose(f);
-   return 0;
-}
-
-static int
-_prefix_try_argv(char *argv0)
-{
-   char *path, *p, *cp, *s;
-   int len, lenexe;
-#ifdef PATH_MAX
-   char buf[PATH_MAX], buf2[PATH_MAX], buf3[PATH_MAX];
-#else
-   char buf[4096], buf2[4096], buf3[4096];
-#endif 
-
-   /* 1. is argv0 abs path? */
-   if (argv0[0] == '/')
-     {
-       _exe_path = strdup(argv0);
-       if (access(_exe_path, X_OK) == 0) return 1;
-       free(_exe_path);
-       _exe_path = NULL;
-       return 0;
-     }
-   /* 2. relative path */
-   if (strchr(argv0, '/'))
-     {
-       if (getcwd(buf3, sizeof(buf3)))
-         {
-            snprintf(buf2, sizeof(buf2), "%s/%s", buf3, argv0);
-            if (realpath(buf2, buf))
-              {
-                 _exe_path = strdup(buf);
-                 if (access(_exe_path, X_OK) == 0) return 1;
-                 free(_exe_path);
-                 _exe_path = NULL;
-              }
-         }
-     }
-   /* 3. argv0 no path - look in PATH */
-   path = getenv("PATH");
-   if (!path) return 0;
-   p = path;
-   cp = p;
-   lenexe = strlen(argv0);
-   while ((p = strchr(cp, ':')))
-     {
-       len = p - cp;
-       s = malloc(len + 1 + lenexe + 1);
-       if (s)
-         {
-            strncpy(s, cp, len);
-            s[len] = '/';
-            strcpy(s + len + 1, argv0);
-            if (realpath(s, buf))
-              {
-                 if (access(buf, X_OK) == 0)
-                   {
-                      _exe_path = strdup(buf);
-                      free(s);
-                      return 1;
-                   }
-              }
-            free(s);
-         }
-        cp = p + 1;
-     }
-   len = strlen(cp);
-   s = malloc(len + 1 + lenexe + 1);
-   if (s)
-     {
-       strncpy(s, cp, len);
-       s[len] = '/';
-       strcpy(s + len + 1, argv0);
-       if (realpath(s, buf))
-         {
-            if (access(buf, X_OK) == 0)
-              {
-                 _exe_path = strdup(buf);
-                 free(s);
-                 return 1;
-              }
-         }
-       free(s);
-     }
-   /* 4. big problems. arg[0] != executable - weird execution */
-   return 0;
-}
-
 static void
 precache(void)
 {
@@ -279,8 +83,7 @@ precache(void)
        if (l > 0) buf[l - 1] = 0;
        if (!fork())
          {
-            if (buf[0] == 's')
-               stat(buf + 2, &st);
+            if (buf[0] == 's') stat(buf + 2, &st);
             else if (buf[0] == 'o')
               {
                  fd = open(buf + 2, O_RDONLY);
@@ -321,32 +124,22 @@ static int
 find_valgrind(char *path, size_t path_len)
 {
    const char *env = getenv("PATH");
-
+   
    while (env)
      {
        const char *p = strchr(env, ':');
        ssize_t p_len;
-
-       if (p)
-         p_len = p - env;
-       else
-         p_len = strlen(env);
-
-       if (p_len <= 0)
-         goto next;
-       else if (p_len + sizeof("/valgrind") >= path_len)
-         goto next;
-
+        
+       if (p) p_len = p - env;
+       else p_len = strlen(env);
+       if (p_len <= 0) goto next;
+       else if (p_len + sizeof("/valgrind") >= path_len) goto next;
        memcpy(path, env, p_len);
        memcpy(path + p_len, "/valgrind", sizeof("/valgrind"));
-       if (access(path, X_OK | R_OK) == 0)
-         return 1;
-
-     next:
-       if (p)
-         env = p + 1;
-       else
-         break;
+       if (access(path, X_OK | R_OK) == 0) return 1;
+next:
+       if (p) env = p + 1;
+       else break;
      }
    path[0] = '\0';
    return 0;
@@ -366,51 +159,39 @@ valgrind_append(char **dst, int valgrind_mode, int valgrind_tool, char *valgrind
    if (valgrind_tool)
      {
        dst[i++] = valgrind_path;
-
        switch (valgrind_tool)
          {
           case 1: dst[i++] = "--tool=massif"; break;
           case 2: dst[i++] = "--tool=callgrind"; break;
          }
-
        return i;
      }
-
-   if (!valgrind_mode)
-     return 0;
+   if (!valgrind_mode) return 0;
    dst[i++] = valgrind_path;
    dst[i++] = "--track-origins=yes";
    dst[i++] = "--malloc-fill=13"; /* invalid pointer, make it crash */
-
    if (valgrind_log)
      {
        static char logparam[PATH_MAX + sizeof("--log-file=")];
-
+        
        snprintf(logparam, sizeof(logparam), "--log-file=%s", valgrind_log);
        dst[i++] = logparam;
      }
-
-   if (valgrind_mode & 2)
-     dst[i++] = "--trace-children=yes";
-
+   if (valgrind_mode & 2) dst[i++] = "--trace-children=yes";
    if (valgrind_mode & 4)
      {
        dst[i++] = "--leak-check=full";
        dst[i++] = "--leak-resolution=high";
        dst[i++] = "--track-fds=yes";
      }
-
-   if (valgrind_mode & 8)
-     dst[i++] = "--show-reachable=yes";
-
+   if (valgrind_mode & 8) dst[i++] = "--show-reachable=yes";
    return i;
 }
 
 static void
 copy_args(char **dst, char **src, size_t count)
 {
-   for (; count > 0; count--, dst++, src++)
-     *dst = *src;
+   for (; count > 0; count--, dst++, src++) *dst = *src;
 }
 
 int
@@ -422,18 +203,19 @@ main(int argc, char **argv)
    char valgrind_path[PATH_MAX] = "";
    const char *valgrind_log = NULL;
 
+   eina_init();
    prefix_determine(argv[0]);
 
    env_set("E_START", argv[0]);
 
    p = getenv("PATH");
-   if (p) snprintf(buf, sizeof(buf), "%s/bin:%s", _prefix_path, p);
-   else snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
+   if (p) snprintf(buf, sizeof(buf), "%s:%s", eina_prefix_bin_get(pfx), p);
+   else snprintf(buf, sizeof(buf), "%s", eina_prefix_bin_get(pfx));
    env_set("PATH", buf);
 
    p = getenv("LD_LIBRARY_PATH");
-   if (p) snprintf(buf, sizeof(buf), "%s/lib:%s", _prefix_path, p);
-   else snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
+   if (p) snprintf(buf, sizeof(buf), "%s:%s", eina_prefix_lib_get(pfx), p);
+   else snprintf(buf, sizeof(buf), "%s", eina_prefix_lib_get(pfx));
    env_set("LD_LIBRARY_PATH", buf);
 
    for (i = 1; i < argc; i++)
@@ -443,63 +225,54 @@ main(int argc, char **argv)
          {
             const char *val = argv[i] + sizeof("-valgrind") - 1;
 
-            if (*val == '\0')
-              valgrind_mode = 1;
+            if (*val == '\0') valgrind_mode = 1;
             else if (*val == '-')
               {
                  val++;
                  if (!strncmp(val, "log-file=", sizeof("log-file=") - 1))
                    {
                       valgrind_log = val + sizeof("log-file=") - 1;
-                      if (*valgrind_log == '\0')
-                        valgrind_log = NULL;
+                      if (*valgrind_log == '\0') valgrind_log = NULL;
                    }
               }
             else if (*val == '=')
               {
                  val++;
-                 if (!strcmp(val, "all"))
-                   valgrind_mode = VALGRIND_MODE_ALL;
-                 else
-                   valgrind_mode = atoi(val);
+                 if (!strcmp(val, "all")) valgrind_mode = VALGRIND_MODE_ALL;
+                 else valgrind_mode = atoi(val);
               }
             else
-              printf("Unknown valgrind option: %s\n", argv[i]);
-         }
-       else if (!strcmp(argv[i], "-massif"))
-         {
-            valgrind_tool = 1;
-         }
-       else if (!strcmp(argv[i], "-callgrind"))
-         {
-            valgrind_tool = 2;
+                printf("Unknown valgrind option: %s\n", argv[i]);
          }
+       else if (!strcmp(argv[i], "-massif")) valgrind_tool = 1;
+       else if (!strcmp(argv[i], "-callgrind")) valgrind_tool = 2;
         else if ((!strcmp(argv[i], "-h")) ||
                 (!strcmp(argv[i], "-help")) ||
                 (!strcmp(argv[i], "--help")))
          {
             printf
-              ("Options:\n"
-               "\t-no-precache\n"
-               "\t\tDisable pre-caching of files\n"
-               "\t-valgrind[=MODE]\n"
-               "\t\tRun enlightenment from inside valgrind, mode is OR of:\n"
-               "\t\t   1 = plain valgrind to catch crashes (default)\n"
-               "\t\t   2 = trace children (thumbnailer, efm slaves, ...)\n"
-               "\t\t   4 = check leak\n"
-               "\t\t   8 = show reachable after processes finish.\n"
-               "\t\t all = all of above\n"
-               "\t-massif\n"
-               "\t\tRun enlightenment from inside massif valgrind tool.\n"
-               "\t-callgrind\n"
-               "\t\tRun enlightenment from inside callgrind valgrind tool.\n"
-               "\t-valgrind-log-file=<FILENAME>\n"
-               "\t\tSave valgrind log to file, see valgrind's --log-file for details.\n"
-               "\n"
-               "Please run:\n"
-               "\tenlightenment %s\n"
-               "for more options.\n",
-               argv[i]);
+                (
+                    "Options:\n"
+                    "\t-no-precache\n"
+                    "\t\tDisable pre-caching of files\n"
+                    "\t-valgrind[=MODE]\n"
+                    "\t\tRun enlightenment from inside valgrind, mode is OR of:\n"
+                    "\t\t   1 = plain valgrind to catch crashes (default)\n"
+                    "\t\t   2 = trace children (thumbnailer, efm slaves, ...)\n"
+                    "\t\t   4 = check leak\n"
+                    "\t\t   8 = show reachable after processes finish.\n"
+                    "\t\t all = all of above\n"
+                    "\t-massif\n"
+                    "\t\tRun enlightenment from inside massif valgrind tool.\n"
+                    "\t-callgrind\n"
+                    "\t\tRun enlightenment from inside callgrind valgrind tool.\n"
+                    "\t-valgrind-log-file=<FILENAME>\n"
+                    "\t\tSave valgrind log to file, see valgrind's --log-file for details.\n"
+                    "\n"
+                    "Please run:\n"
+                    "\tenlightenment %s\n"
+                    "for more options.\n",
+                    argv[i]);
             exit(0);
          }
      }
@@ -512,47 +285,105 @@ main(int argc, char **argv)
             valgrind_mode = 0;
          }
      }
-
+   
    printf("E - PID=%i, do_precache=%i, valgrind=%d", getpid(), do_precache, valgrind_mode);
    if (valgrind_mode)
      {
        printf(" valgrind-command='%s'", valgrind_path);
-       if (valgrind_log)
-         printf(" valgrind-log-file='%s'", valgrind_log);
+       if (valgrind_log) printf(" valgrind-log-file='%s'", valgrind_log);
      }
    putchar('\n');
-
+   
    if (do_precache)
      {
        void *lib, *func;
-
+        
        /* sanity checks - if precache might fail - check here first */
-       lib = dlopen("libevas.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!lib) dlopen("libevas.so.1", RTLD_GLOBAL | RTLD_LAZY);
+       lib = dlopen("libeina.so", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) dlopen("libeina.so.1", RTLD_GLOBAL | RTLD_LAZY);
        if (!lib) goto done;
-       func = dlsym(lib, "evas_init");
+       func = dlsym(lib, "eina_init");
        if (!func) goto done;
+
+       lib = dlopen("libecore.so", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) dlopen("libecore.so.1", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) goto done;
+       func = dlsym(lib, "ecore_init");
+       if (!func) goto done;
+
        lib = dlopen("libecore_file.so", RTLD_GLOBAL | RTLD_LAZY);
        if (!lib) dlopen("libecore_file.so.1", RTLD_GLOBAL | RTLD_LAZY);
        if (!lib) goto done;
        func = dlsym(lib, "ecore_file_init");
        if (!func) goto done;
+
+       lib = dlopen("libecore_x.so", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) dlopen("libecore_x.so.1", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) goto done;
+       func = dlsym(lib, "ecore_x_init");
+       if (!func) goto done;
+
+       lib = dlopen("libevas.so", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) dlopen("libevas.so.1", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) goto done;
+       func = dlsym(lib, "evas_init");
+       if (!func) goto done;
+
+       lib = dlopen("libedje.so", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) dlopen("libedje.so.1", RTLD_GLOBAL | RTLD_LAZY);
+       if (!lib) goto done;
+       func = dlsym(lib, "edje_init");
+       if (!func) goto done;
+
        lib = dlopen("libeet.so", RTLD_GLOBAL | RTLD_LAZY);
        if (!lib) dlopen("libeet.so.0", RTLD_GLOBAL | RTLD_LAZY);
        if (!lib) goto done;
        func = dlsym(lib, "eet_init");
        if (!func) goto done;
+
        /* precache SHOULD work */
-       snprintf(buf, sizeof(buf), "%s/lib/enlightenment/preload/e_precache.so", _prefix_path);
+       snprintf(buf, sizeof(buf), "%s/enlightenment/preload/e_precache.so",
+                 eina_prefix_lib_get(pfx));
        env_set("LD_PRELOAD", buf);
        printf("E - PRECACHE GOING NOW...\n");
        fflush(stdout);
        precache();
      }
-   done:
-
+done:
+   
+   /* mtrack memory tracker support */
+   p = getenv("HOME");
+   if (p)
+     {
+        FILE *f;
+
+        /* if you have ~/.e-mtrack, then the tracker will be enabled
+         * using the content of this file as the path to the mtrack.so
+         * shared object that is the mtrack preload */
+        snprintf(buf, sizeof(buf), "%s/.e-mtrack", p);
+        f = fopen(buf, "r");
+        if (f)
+          {
+             if (fgets(buf, sizeof(buf), f))
+               {
+                  int len = strlen(buf);
+                  if ((len > 1) && (buf[len - 1] == '\n'))
+                    {
+                       buf[len - 1] = 0;
+                       len--;
+                    }
+                  env_set("LD_PRELOAD", buf);
+                  env_set("MTRACK", "track");
+                  env_set("E_START_MTRACK", "track");
+                  snprintf(buf, sizeof(buf), "%s/.e-mtrack.log", p);
+                  env_set("MTRACK_TRACE_FILE", buf);
+               }
+             fclose(f);
+          }
+     }
+   
    /* try dbus-launch */
-   snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
+   snprintf(buf, sizeof(buf), "%s/enlightenment", eina_prefix_bin_get(pfx));
 
    args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *));
    if ((!getenv("DBUS_SESSION_BUS_ADDRESS")) &&
@@ -560,14 +391,14 @@ main(int argc, char **argv)
      {
        args[0] = "dbus-launch";
        args[1] = "--exit-with-session";
-
+        
        i = 2 + valgrind_append(args + 2, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log);
        args[i++] = buf;
        copy_args(args + i, argv + 1, argc - 1);
        args[i + argc - 1] = NULL;
        execvp("dbus-launch", args);
      }
-
+   
    /* dbus-launch failed - run e direct */
    i = valgrind_append(args, valgrind_mode, valgrind_tool, valgrind_path, valgrind_log);
    args[i++] = buf;
index 1ef4acc..a2c45e1 100644 (file)
@@ -27,6 +27,7 @@ static int _e_sys_can_hibernate = 0;
 static E_Sys_Action _e_sys_action_current = E_SYS_NONE;
 static E_Sys_Action _e_sys_action_after = E_SYS_NONE;
 static Ecore_Exe *_e_sys_exe = NULL;
+static double _e_sys_begin_time = 0.0;
 static double _e_sys_logout_begin_time = 0.0;
 static Ecore_Timer *_e_sys_logout_timer = NULL;
 static E_Obj_Dialog *_e_sys_dialog = NULL;
@@ -89,7 +90,7 @@ e_sys_action_possible_get(E_Sys_Action a)
 EAPI int
 e_sys_action_do(E_Sys_Action a, char *param)
 {
-   int ret;
+   int ret = 0;
 
    if (_e_sys_action_current != E_SYS_NONE)
      {
@@ -113,9 +114,12 @@ e_sys_action_do(E_Sys_Action a, char *param)
        return 1;
        break;
       default:
-       return 0;
+        break;
      }
-   _e_sys_action_current = a;
+
+   if (ret) _e_sys_action_current = a;
+   else _e_sys_action_current = E_SYS_NONE;
+
    return ret;
 }
 
@@ -169,13 +173,21 @@ _e_sys_cb_timer(void *data __UNUSED__)
    char buf[4096];
    
    e_init_status_set(_("Checking System Permissions"));
-   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t halt", e_prefix_lib_get());
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_sys -t halt", 
+            e_prefix_lib_get());
    _e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t reboot", e_prefix_lib_get());
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_sys -t reboot", 
+            e_prefix_lib_get());
    _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t suspend", e_prefix_lib_get());
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_sys -t suspend", 
+            e_prefix_lib_get());
    _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_sys -t hibernate", 
+            e_prefix_lib_get());
    _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
    return ECORE_CALLBACK_CANCEL;
 }
@@ -307,8 +319,7 @@ _e_sys_logout_confirm_dialog_update(int remaining)
              "Do you want to finish the logout<br>"
              "anyway without closing these<br>"
              "applications first?<br><br>"
-             "Auto logout in %d seconds."),
-           remaining);
+             "Auto logout in %d seconds."), remaining);
 
    e_dialog_text_set(_e_sys_logout_confirm_dialog, txt);
 }
@@ -365,9 +376,12 @@ _e_sys_cb_logout_timer(void *data __UNUSED__)
                  _e_sys_logout_confirm_dialog = dia;
                  e_dialog_title_set(dia, _("Logout problems"));
                  e_dialog_icon_set(dia, "system-log-out", 64);
-                 e_dialog_button_add(dia, _("Logout now"), NULL, _e_sys_cb_logout_logout, NULL);
-                 e_dialog_button_add(dia, _("Wait longer"), NULL, _e_sys_cb_logout_wait, NULL);
-                 e_dialog_button_add(dia, _("Cancel Logout"), NULL, _e_sys_cb_logout_abort, NULL);
+                 e_dialog_button_add(dia, _("Logout now"), NULL, 
+                                      _e_sys_cb_logout_logout, NULL);
+                 e_dialog_button_add(dia, _("Wait longer"), NULL, 
+                                      _e_sys_cb_logout_wait, NULL);
+                 e_dialog_button_add(dia, _("Cancel Logout"), NULL, 
+                                      _e_sys_cb_logout_abort, NULL);
                  e_dialog_button_focus_num(dia, 1);
                  _e_sys_logout_confirm_dialog_update(E_LOGOUT_AUTO_TIME);
                  e_win_centered_set(dia->win, 1);
@@ -432,7 +446,8 @@ _e_sys_current_action(void)
    /* display dialog that currently an action is in progress */
    E_Dialog *dia;
 
-   dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_sys_error_action_busy");
+   dia = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+                      "E", "_sys_error_action_busy");
    if (!dia) return;
 
    e_dialog_title_set(dia, _("Enlightenment is busy with another request"));
@@ -440,45 +455,33 @@ _e_sys_current_action(void)
    switch (_e_sys_action_current)
      {
       case E_SYS_LOGOUT:
-       e_dialog_text_set(dia,
-                         _("Logging out.<br>"
-                           "You cannot perform other system actions<br>"
-                           "once a logout has begun.")
-                         );
+       e_dialog_text_set(dia, _("Logging out.<br>"
+                                 "You cannot perform other system actions<br>"
+                                 "once a logout has begun."));
        break;
       case E_SYS_HALT:
       case E_SYS_HALT_NOW:
-       e_dialog_text_set(dia,
-                         _("Powering off.<br>"
-                           "You cannot do any other system actions<br>"
-                           "once a shutdown has been started.")
-                         );
+       e_dialog_text_set(dia, _("Powering off.<br>"
+                                 "You cannot do any other system actions<br>"
+                                 "once a shutdown has been started."));
        break;
       case E_SYS_REBOOT:
-       e_dialog_text_set(dia,
-                         _("Resetting.<br>"
-                           "You cannot do any other system actions<br>"
-                           "once a reboot has begun.")
-                         );
+       e_dialog_text_set(dia, _("Resetting.<br>"
+                                 "You cannot do any other system actions<br>"
+                                 "once a reboot has begun."));
        break;
       case E_SYS_SUSPEND:
-       e_dialog_text_set(dia,
-                         _("Suspending.<br>"
-                           "Until suspend is complete you cannot perform<br>"
-                           "any other system actions.")
-                         );
+       e_dialog_text_set(dia, _("Suspending.<br>"
+                                 "Until suspend is complete you cannot perform<br>"
+                                 "any other system actions."));
        break;
       case E_SYS_HIBERNATE:
-       e_dialog_text_set(dia,
-                         _("Hibernating.<br>"
-                           "You cannot perform an other system actions<br>"
-                           "until this is complete.")
-                         );
+       e_dialog_text_set(dia, _("Hibernating.<br>"
+                                 "You cannot perform any other system actions<br>"
+                                 "until this is complete."));
        break;
       default:
-       e_dialog_text_set(dia,
-                         _("EEK! This should not happen")
-                         );
+       e_dialog_text_set(dia, _("EEK! This should not happen"));
        break;
      }
    e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
@@ -493,7 +496,8 @@ _e_sys_action_failed(void)
    /* display dialog that the current action failed */
    E_Dialog *dia;
 
-   dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_sys_error_action_failed");
+   dia = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+                      "E", "_sys_error_action_failed");
    if (!dia) return;
 
    e_dialog_title_set(dia, _("Enlightenment is busy with another request"));
@@ -502,29 +506,19 @@ _e_sys_action_failed(void)
      {
       case E_SYS_HALT:
       case E_SYS_HALT_NOW:
-       e_dialog_text_set(dia,
-                         _("Power off failed.")
-                         );
+       e_dialog_text_set(dia, _("Power off failed."));
        break;
       case E_SYS_REBOOT:
-       e_dialog_text_set(dia,
-                         _("Reset failed.")
-                         );
+       e_dialog_text_set(dia, _("Reset failed."));
        break;
       case E_SYS_SUSPEND:
-       e_dialog_text_set(dia,
-                         _("Suspend failed.")
-                         );
+       e_dialog_text_set(dia, _("Suspend failed."));
        break;
       case E_SYS_HIBERNATE:
-       e_dialog_text_set(dia,
-                         _("Hibernate failed.")
-                         );
+       e_dialog_text_set(dia, _("Hibernate failed."));
        break;
       default:
-       e_dialog_text_set(dia,
-                         _("EEK! This should not happen")
-                         );
+       e_dialog_text_set(dia, _("EEK! This should not happen"));
        break;
      }
    e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
@@ -543,15 +537,21 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
      {
       case E_SYS_EXIT:
        // XXX TODO: check for e_fm_op_registry entries and confirm
-       if (!e_util_immortal_check()) ecore_main_loop_quit();
+       if (!e_util_immortal_check()) 
+          ecore_main_loop_quit();
+        else 
+          return 0;
        break;
       case E_SYS_RESTART:
        // XXX TODO: check for e_fm_op_registry entries and confirm
-       if (!e_util_immortal_check())
+        // FIXME: we dont   share out immortal info to restarted e. :(
+//     if (!e_util_immortal_check())
          {
             restart = 1;
             ecore_main_loop_quit();
          }
+//        else
+//          return 0;
        break;
       case E_SYS_EXIT_NOW:
        exit(0);
@@ -564,15 +564,18 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
       case E_SYS_HALT_NOW:
        /* shutdown -h now */
        if (e_util_immortal_check()) return 0;
-       snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys halt",
-                e_prefix_lib_get());
+       snprintf(buf, sizeof(buf), 
+                 "%s/enlightenment/utils/enlightenment_sys halt", 
+                 e_prefix_lib_get());
        if (_e_sys_exe)
          {
-            _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
             return 0;
          }
        else
          {
+             _e_sys_begin_time = ecore_time_get();
             _e_sys_exe = ecore_exe_run(buf, NULL);
             od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
                                   _("Power off"), "E", "_sys_halt");
@@ -591,15 +594,18 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
       case E_SYS_REBOOT:
        /* shutdown -r now */
        if (e_util_immortal_check()) return 0;
-       snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys reboot",
+       snprintf(buf, sizeof(buf), 
+                 "%s/enlightenment/utils/enlightenment_sys reboot",
                 e_prefix_lib_get());
        if (_e_sys_exe)
          {
-            _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
             return 0;
          }
        else
          {
+             _e_sys_begin_time = ecore_time_get();
             _e_sys_exe = ecore_exe_run(buf, NULL);
             od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
                                   _("Resetting"), "E", "_sys_reboot");
@@ -617,17 +623,20 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
        break;
       case E_SYS_SUSPEND:
        /* /etc/acpi/sleep.sh force */
-       snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys suspend",
+       snprintf(buf, sizeof(buf), 
+                 "%s/enlightenment/utils/enlightenment_sys suspend",
                 e_prefix_lib_get());
        if (_e_sys_exe)
          {
-            _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
             return 0;
          }
        else
          {
              if (e_config->desklock_on_suspend) e_desklock_show();
              
+             _e_sys_begin_time = ecore_time_get();
             _e_sys_exe = ecore_exe_run(buf, NULL);
             od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
                                   _("Suspending"), "E", "_sys_suspend");
@@ -645,17 +654,20 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
        break;
       case E_SYS_HIBERNATE:
        /* /etc/acpi/hibernate.sh force */
-       snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys hibernate",
+       snprintf(buf, sizeof(buf), 
+                 "%s/enlightenment/utils/enlightenment_sys hibernate",
                 e_prefix_lib_get());
        if (_e_sys_exe)
          {
-            _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
             return 0;
          }
        else
          {
              if (e_config->desklock_on_suspend) e_desklock_show();
              
+             _e_sys_begin_time = ecore_time_get();
             _e_sys_exe = ecore_exe_run(buf, NULL);
             od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
                                   _("Hibernating"), "E", "_sys_hibernate");
index 8fad45d..f37adfa 100644 (file)
@@ -180,7 +180,7 @@ main(int argc,
              eina_strbuf_append_printf(buf, "%s ", argv[i]);
           }
         ret = system(eina_strbuf_string_get(buf));
-        if ((!strcmp(action, "umount")) && (!ret))
+        if (mp && (!strcmp(action, "umount")) && (!ret))
           {
                if (rmdir(mp))
                  printf("ERROR: COULD NOT UNLINK MOUNT POINT %s\n", mp);
index b07933b..e717c4f 100644 (file)
@@ -291,8 +291,6 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 
    if (!sd->changed) return;
    
-   x = sd->x;
-   y = sd->y;
    w = sd->w;
    h = sd->h;
 
@@ -302,16 +300,8 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
    minh = sd->min.h;
    expandw = 0;
    expandh = 0;
-   if (w < minw)
-     {
-       x = x + ((w - minw) * (1.0 - sd->align.x));
-       w = minw;
-     }
-   if (h < minh)
-     {
-       y = y + ((h - minh) * (1.0 - sd->align.y));
-       h = minh;
-     }
+   if (w < minw) w = minw;
+   if (h < minh) h = minh;
    EINA_LIST_FOREACH(sd->items, l, obj)
      {
        E_Table_Item *ti;
index 4bb12bb..adb6329 100644 (file)
@@ -22,10 +22,6 @@ static Eina_Hash *mappings = NULL;
 static Eina_Hash *group_cache = NULL;
 
 static Eina_List *categories = NULL;
-static Eina_List *transitions = NULL;
-static Eina_List *borders = NULL;
-static Eina_List *shelfs = NULL;
-static Eina_List *comps = NULL;
 static E_Fm2_Mime_Handler *theme_hdl = NULL;
 
 /* externally accessible functions */
@@ -55,11 +51,6 @@ e_theme_init(void)
        e_theme_file_set(buf, et->file);
      }
 
-   /* Find transitions */
-   transitions = _e_theme_collection_items_find("base/theme/transitions", "e/transitions");
-   borders = _e_theme_collection_items_find("base/theme/borders", "e/widgets/border");
-   shelfs = _e_theme_collection_items_find("base/theme/shelf", "e/shelf");
-   comps = _e_theme_collection_items_find("base/theme/borders", "e/comp");
    if (!mappings) mappings = eina_hash_string_superfast_new(NULL);
    group_cache = eina_hash_string_superfast_new(NULL);
 
@@ -89,14 +80,7 @@ e_theme_shutdown(void)
      }
    EINA_LIST_FREE(categories, str)
      eina_stringshare_del(str);
-   EINA_LIST_FREE(transitions, str)
-     eina_stringshare_del(str);
-   EINA_LIST_FREE(borders, str)
-     eina_stringshare_del(str);
-   EINA_LIST_FREE(shelfs, str)
-     eina_stringshare_del(str);
-   EINA_LIST_FREE(comps, str)
-     eina_stringshare_del(str);
+
    return 1;
 }
 
@@ -425,57 +409,102 @@ e_theme_category_list(void)
 EAPI int
 e_theme_transition_find(const char *transition)
 {
-   if (eina_list_search_sorted(transitions, EINA_COMPARE_CB(strcmp), transition))
-     return 1;
-   return 0;
+   Eina_List *trans = NULL;
+   int found = 0;
+   const char *str;
+
+   trans = 
+     _e_theme_collection_items_find("base/theme/transitions", "e/transitions");
+
+   if (eina_list_search_sorted(trans, EINA_COMPARE_CB(strcmp), transition))
+     found = 1;
+
+   EINA_LIST_FREE(trans, str)
+     eina_stringshare_del(str);
+
+   return found;
 }
 
 EAPI Eina_List *
 e_theme_transition_list(void)
 {
-   return transitions;
+   return _e_theme_collection_items_find("base/theme/transitions", 
+                                         "e/transitions");
 }
 
 EAPI int
 e_theme_border_find(const char *border)
 {
-   if (eina_list_search_sorted(borders, EINA_COMPARE_CB(strcmp), border))
-     return 1;
-   return 0;
+   Eina_List *bds = NULL;
+   int found = 0;
+   const char *str;
+
+   bds = 
+     _e_theme_collection_items_find("base/theme/borders", "e/widgets/border");
+
+   if (eina_list_search_sorted(bds, EINA_COMPARE_CB(strcmp), border))
+     found = 1;
+
+   EINA_LIST_FREE(bds, str)
+     eina_stringshare_del(str);
+
+   return found;
 }
 
 EAPI Eina_List *
 e_theme_border_list(void)
 {
-   return borders;
+   return _e_theme_collection_items_find("base/theme/borders", 
+                                         "e/widgets/border");
 }
 
 EAPI int
 e_theme_shelf_find(const char *shelf)
 {
+   Eina_List *shelfs = NULL;
+   int found = 0;
+   const char *str;
+
+   shelfs = 
+     _e_theme_collection_items_find("base/theme/shelf", "e/shelf");
+
    if (eina_list_search_sorted(shelfs, EINA_COMPARE_CB(strcmp), shelf))
-     return 1;
-   return 0;
+     found = 1;
+
+   EINA_LIST_FREE(shelfs, str)
+     eina_stringshare_del(str);
+
+   return found;
 }
 
 EAPI Eina_List *
 e_theme_shelf_list(void)
 {
-   return shelfs;
+   return _e_theme_collection_items_find("base/theme/shelf", "e/shelf");
 }
 
 EAPI int
 e_theme_comp_find(const char *comp)
 {
+   Eina_List *comps = NULL;
+   int found = 0;
+   const char *str;
+
+   comps = _e_theme_collection_items_find("base/theme/borders", "e/comp");
+
    if (eina_list_search_sorted(comps, EINA_COMPARE_CB(strcmp), comp))
-     return 1;
-   return 0;
+     found = 1;
+
+   EINA_LIST_FREE(comps, str)
+     eina_stringshare_del(str);
+
+   return found;
 }
 
 EAPI Eina_List *
 e_theme_comp_list(void)
 {
-   return comps;
+   return _e_theme_collection_items_find("base/theme/borders", "e/comp");
 }
 
 EAPI void
@@ -597,10 +626,8 @@ _e_theme_collection_items_find(const char *base, const char *collname)
 {
    Eina_List *list = NULL;
    E_Theme_Result *res;
-   char *category, *p, *p2;
-   int collname_len;
+   char *category, *p;
 
-   collname_len = strlen(collname);
    category = alloca(strlen(base) + 1);
    strcpy(category, base);
    do
@@ -629,12 +656,14 @@ _e_theme_collection_items_find(const char *base, const char *collname)
                  if (coll)
                    {
                       const char *c;
+                       int collname_len;
 
+                       collname_len = strlen(collname);
                       EINA_LIST_FOREACH(coll, l, c)
                         {
                            if (!strncmp(c, collname, collname_len))
                              {
-                                char *trans;
+                                char *trans, *p2;
 
                                 trans = strdup(c);
                                 p = trans + collname_len + 1;
index 0029ffd..cceccb8 100644 (file)
@@ -259,9 +259,13 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
                       _pending--;
                       eth->done = 1;
                       if (_pending == 0) _e_thumb_thumbnailers_kill();
-                       e_icon_preload_set(obj, 1);
-                      e_icon_file_key_set(obj, icon, "/thumbnail/data");
-                       _e_thumb_key_load(eth, icon);
+                      if (ecore_file_exists(icon))
+                        {
+                           e_icon_preload_set(obj, 1);
+                           e_icon_file_key_set(obj, icon, "/thumbnail/data");
+                           _e_thumb_key_load(eth, icon);
+                        }
+
                       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
                    }
               }
index 09d585e..2dc4eca 100644 (file)
@@ -174,6 +174,8 @@ e_toolbar_resize(E_Toolbar *tbar, int w, int h)
    E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
    tbar->w = w;
    tbar->h = h;
+   if (tbar->gadcon)
+     e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
    evas_object_resize(tbar->o_event, tbar->w, tbar->h);
    evas_object_resize(tbar->o_base, tbar->w, tbar->h);
 }
@@ -187,6 +189,8 @@ e_toolbar_move_resize(E_Toolbar *tbar, int x, int y, int w, int h)
    tbar->y = y;
    tbar->w = w;
    tbar->h = h;
+   if (tbar->gadcon)
+     e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
    evas_object_move(tbar->o_event, x, y);
    evas_object_move(tbar->o_base, x, y);
    evas_object_resize(tbar->o_event, w, h);
index bfea18a..b5128b9 100644 (file)
@@ -8,11 +8,6 @@ EAPI E_Path *path_icons = NULL;
 EAPI E_Path *path_modules = NULL;
 EAPI E_Path *path_backgrounds = NULL;
 EAPI E_Path *path_messages = NULL;
-EAPI int restart = 0;
-EAPI int good = 0;
-EAPI int evil = 0;
-EAPI int starting = 1;
-EAPI int stopping = 0;
 
 typedef struct _E_Util_Fake_Mouse_Up_Info E_Util_Fake_Mouse_Up_Info;
 typedef struct _E_Util_Image_Import_Settings E_Util_Image_Import_Settings;
@@ -990,7 +985,7 @@ EAPI Evas_Object *
 e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
 {
    if (!icon_name) return NULL;
-   if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas);
+   if (icon_name[0] == '/') return _e_util_icon_add(icon_name, evas, size);
    else
      {
        Evas_Object *obj;
@@ -1576,14 +1571,14 @@ _e_util_conf_timer_new(void *data)
 }
 
 EAPI Eina_Bool
-e_util_module_config_check(const char *module_name, int conf, int epoch, int version)
+e_util_module_config_check(const char *module_name, int loaded, int current)
 {
-   if ((conf >> 16) < epoch)
+   if ((loaded >> 16) < (current >> 16))
      {
        ecore_timer_add(1.0, _e_util_conf_timer_old, strdup(module_name));
        return EINA_FALSE;
      }
-   else if (conf > version)
+   else if (loaded > current)
      {
        ecore_timer_add(1.0, _e_util_conf_timer_new, strdup(module_name));
        return EINA_FALSE;
index ba0ef80..835f0d0 100644 (file)
@@ -90,7 +90,9 @@ EAPI int          e_util_dir_check(const char *dir);
 EAPI void         e_util_defer_object_del(E_Object *obj);
 EAPI const char  *e_util_winid_str_get(Ecore_X_Window win);
 EAPI void         e_util_win_auto_resize_fill(E_Win *win);
-EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int conf, int epoch, int version);
+/* check if loaded config version matches the current version, show a
+   dialog warning if loaded version is older or newer than current */
+EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
 
 EAPI E_Dialog                   *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
 EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);
index 8206c91..fdff6b1 100644 (file)
@@ -124,10 +124,27 @@ e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
    if (minh) *minh = sd->minh;
 }
 
+static void
+_sub_obj_del(void        *data,
+             Evas        *e __UNUSED__,
+             Evas_Object *obj,
+             void        *event_info __UNUSED__)
+{
+   E_Smart_Data *sd = data;
+   
+   sd->subobjs = eina_list_remove(sd->subobjs, obj);
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _sub_obj_del);
+}
+
 EAPI void
 e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   
+   if (eina_list_data_find(sd->subobjs, sobj)) return;
+   
+   evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
+   
    sd->subobjs = eina_list_append(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -142,12 +159,14 @@ e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
             sd->parent_obj = obj;
          }
      }
+   evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
 }
 
 EAPI void
 e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
    sd->subobjs = eina_list_remove(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -495,8 +514,14 @@ static void
 _e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
+   
    if (sd->del_func) sd->del_func(obj);
-   E_FREE_LIST(sd->subobjs, evas_object_del);
+   while (sd->subobjs)
+     {
+        Evas_Object *sobj = sd->subobjs->data;
+        evas_object_del(sobj);
+        sd->subobjs = eina_list_remove(sd->subobjs, sobj);
+     }
    free(sd);
 }
 
index 480c421..8066b83 100644 (file)
@@ -120,7 +120,7 @@ _e_wid_disable_hook(Evas_Object *obj)
 /**
  * Add a color well widget to an evas.
  * An optional E_Container may be passed in. 
- If not NULL, when clicked a color dialog will pop up.
If not NULL, when clicked a color dialog will pop up.
  */
 Evas_Object *
 e_widget_color_well_add_full(Evas *evas, E_Color *color, Eina_Bool show_color_dialog, Eina_Bool alpha_enabled)
index c19515f..15a8b13 100644 (file)
@@ -62,8 +62,8 @@ _e_wid_fsel_button_up(void *data1, void *data2 __UNUSED__)
      e_fm2_parent_go(wd->o_files_fm);
    if (wd->o_files_frame)
      e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   e_widget_entry_text_set(wd->o_entry, 
-                          e_fm2_real_path_get(wd->o_files_fm));
+//   e_widget_entry_text_set(wd->o_entry, 
+//                        e_fm2_real_path_get(wd->o_files_fm));
 }
 
 static void
@@ -155,7 +155,7 @@ _e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj __UNUSED__, voi
          }
      }
    done:
-   e_widget_entry_text_set(wd->o_entry, rp);
+//   e_widget_entry_text_set(wd->o_entry, rp);
    E_FREE(p1);
    eina_list_free(icons);
 }
@@ -179,15 +179,14 @@ _e_wid_fsel_favorites_selected(void *data, Evas_Object *obj __UNUSED__, void *ev
      e_fm2_path_set(wd->o_files_fm, NULL, ici->real_link);
    eina_list_free(selected);
    e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   e_widget_entry_text_set(wd->o_entry, 
-                          e_fm2_real_path_get(wd->o_files_fm));
+//   e_widget_entry_text_set(wd->o_entry, 
+//                        e_fm2_real_path_get(wd->o_files_fm));
 }
 
 static void
 _e_wid_fsel_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Widget_Data *wd;
-   struct stat st;
 
    wd = data;
    if (!wd->o_files_fm) return;
@@ -203,8 +202,8 @@ _e_wid_fsel_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_i
      }
    if (wd->o_files_frame)
      e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   if ((wd->path) && (stat(wd->path, &st) == 0))
-     e_widget_entry_text_set(wd->o_entry, wd->path);
+//   if ((wd->path) && (stat(wd->path, &st) == 0))
+//     e_widget_entry_text_set(wd->o_entry, ecore_file_file_get(wd->path));
    E_FREE(wd->path);
    if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
 }
@@ -239,10 +238,10 @@ _e_wid_fsel_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void
    if (stat(wd->path, &st) == 0)
      {
        if (wd->preview) _e_wid_fsel_preview_file(wd);
-//     if (!S_ISDIR(st.st_mode))
-//       e_widget_entry_text_set(wd->o_entry, ici->file);
+       if (!S_ISDIR(st.st_mode))
+         e_widget_entry_text_set(wd->o_entry, ici->file);
 //     else
-         e_widget_entry_text_set(wd->o_entry, wd->path);
+//       e_widget_entry_text_set(wd->o_entry, wd->path);
      }
    eina_list_free(selected);
    if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
@@ -262,7 +261,7 @@ _e_wid_fsel_files_selected(void *data, Evas_Object *obj __UNUSED__, void *event_
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected __UNUSED__, char *filter __UNUSED__, 
+e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter __UNUSED__, 
                  void (*sel_func) (void *data, Evas_Object *obj), void *sel_data,
                  void (*chg_func) (void *data, Evas_Object *obj), void *chg_data,
                  int preview)
@@ -497,9 +496,10 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected
    o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
    wd->o_entry = o;
    e_widget_sub_object_add(obj, o);
+   if (selected) e_widget_entry_text_set(o, selected);
    
-  if (preview)
-    {
+   if (preview)
+     {
        e_widget_frametable_object_append(wd->o_preview_frame, 
                                          wd->o_preview_preview_table,
                                          0, 0, 1, 1, 0, 0, 1, 1);
@@ -509,8 +509,8 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected
         e_widget_table_object_append(wd->o_table2, 
                                     wd->o_preview_frame,
                                      2, 1, 1, 1, 0, 1, 0, 1);
-    }
-
+     }
+   
    e_widget_table_object_append(wd->o_table, wd->o_table2,
                                 0, 0, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(wd->o_table, wd->o_entry,
@@ -562,13 +562,23 @@ EAPI const char *
 e_widget_fsel_selection_path_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   const char *s;
+   const char *s, *dir;
+   char buf[PATH_MAX];
    
    if (!obj) return NULL;
    wd = e_widget_data_get(obj);
    E_FREE(wd->path);
    s = e_widget_entry_text_get(wd->o_entry);
-   if (s) wd->path = strdup(s);
+   dir = e_fm2_real_path_get(wd->o_files_fm);
+   if (s)
+     {
+        snprintf(buf, sizeof(buf), "%s/%s", dir, s);
+        wd->path = strdup(buf);
+     }
+   else
+     {
+        wd->path = strdup(dir);
+     }
    return wd->path;
 }
 
@@ -749,5 +759,6 @@ _e_wid_del_hook(Evas_Object *obj)
    E_FREE(wd->preview_perms_text);
    E_FREE(wd->preview_time_text);
    E_FREE(wd->path);
+
    free(wd);
 }
index 640cefc..6ac93c1 100644 (file)
@@ -53,7 +53,7 @@ static void _queue_queue(Evas_Object *obj);
 static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
 static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
 
-static enum _Queue_Command
+enum
 {
   CMD_ADD,
   CMD_REMOVE,
@@ -69,7 +69,7 @@ static enum _Queue_Command
   CMD_ICON_SET,
   CMD_END_SET,
   CMD_SHOW
-} Queue_Command;
+};
 
 static Eina_Bool
 _queue_timer(void *data)
index dd565f0..591d47a 100644 (file)
@@ -78,6 +78,7 @@ e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key)
    if (wd->o_thumb) evas_object_del(wd->o_thumb);
 
    wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img));
+   e_icon_fill_inside_set(wd->o_thumb, 0);
    e_icon_file_key_set(wd->o_thumb, file, key);
    evas_object_show(wd->o_thumb);
    e_livethumb_thumb_set(wd->img, wd->o_thumb);
@@ -121,6 +122,15 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key _
    return 1;
 }
 
+EAPI void
+e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   E_Widget_Data *wd;
+
+   wd = e_widget_data_get(obj);
+   e_livethumb_vsize_set(wd->img, w, h);
+}
+
 static void
 _e_wid_preview_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
index 4c52e90..d0b51d0 100644 (file)
@@ -9,6 +9,7 @@ EAPI void             e_widget_preview_extern_object_set(Evas_Object *obj, Evas_
 EAPI int              e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key);
 EAPI int             e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h);
 EAPI int              e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group);
-    
+EAPI void             e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+
 #endif
 #endif
index 39be27a..b16d886 100644 (file)
@@ -223,6 +223,7 @@ _e_wid_cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
    if (wd->dval) *(wd->dval) = e_slider_value_get(wd->o_slider);
    else if (wd->ival) *(wd->ival) = e_slider_value_get(wd->o_slider);
    e_widget_change(wd->o_widget);
+   evas_object_smart_callback_call(wd->o_widget, "changed", NULL);
 }
 
 static void
index d606420..80e94c9 100644 (file)
@@ -430,7 +430,9 @@ e_win_border_icon_key_set(E_Win *win, const char *key)
 static void
 _e_win_free(E_Win *win)
 {
-   e_object_del(E_OBJECT(win->pointer));
+   if (win->pointer)
+     e_object_del(E_OBJECT(win->pointer));
+
    e_canvas_del(win->ecore_evas);
    ecore_evas_free(win->ecore_evas);
    if (win->border)
diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
new file mode 100644 (file)
index 0000000..1b1d310
--- /dev/null
@@ -0,0 +1,585 @@
+/* TODO
+   check http://www.pvv.org/~mariusbu/proposal.html
+   for advances in cross toolkit settings */
+
+#include <e.h>
+#include <X11/Xlib.h>
+#include <X11/Xmd.h>            /* For CARD16 */
+
+#define RETRY_TIMEOUT 2.0
+
+#define SETTING_TYPE_INT       0
+#define SETTING_TYPE_STRING    1
+#define SETTING_TYPE_COLOR     2
+
+#define OFFSET_ADD(n) ((n + 4 - 1) & (~(4 - 1)))
+
+#define DBG printf
+
+typedef struct _Settings_Manger Settings_Manager;
+typedef struct _Setting Setting;
+
+struct _Settings_Manger
+{
+   E_Manager *man;
+   Ecore_X_Window selection;
+   Ecore_Timer *timer_retry;
+   unsigned long serial;
+   Ecore_X_Atom _atom_xsettings_screen;
+};
+
+struct _Setting
+{
+  unsigned short type;
+
+  const char *name;
+
+  struct { const char *value; } s;
+  struct { int value; } i;
+  struct { unsigned short red, green, blue, alpha; } c;
+
+  unsigned long length;
+  unsigned long last_change;
+};
+
+static void _e_xsettings_apply(Settings_Manager *sm);
+
+static Ecore_X_Atom _atom_manager = 0;
+static Ecore_X_Atom _atom_xsettings = 0;
+static Eina_List *managers = NULL;
+static Eina_List *handlers = NULL;
+static Eina_List *settings = NULL;
+static Eina_Bool running = EINA_FALSE;
+static const char _setting_icon_theme_name[] = "Net/IconThemeName";
+static const char _setting_theme_name[]      = "Net/ThemeName";
+static const char _setting_font_name[]       = "Gtk/FontName";
+static const char _setting_xft_dpi[]         = "Xft/DPI";
+
+static Ecore_X_Atom
+_e_xsettings_atom_screen_get(int screen_num)
+{
+   char buf[32];
+   snprintf(buf, sizeof(buf), "_XSETTINGS_S%d", screen_num);
+   return ecore_x_atom_get(buf);
+}
+
+static Eina_Bool
+_e_xsettings_selection_owner_set(Settings_Manager *sm)
+{
+   Ecore_X_Atom atom;
+   Ecore_X_Window cur_selection;
+   Eina_Bool ret;
+
+   atom = _e_xsettings_atom_screen_get(sm->man->num);
+   ecore_x_selection_owner_set(sm->selection, atom, ecore_x_current_time_get());
+   ecore_x_sync();
+   cur_selection = ecore_x_selection_owner_get(atom);
+
+   ret = (cur_selection == sm->selection);
+   if (!ret)
+     fprintf(stderr, "XSETTINGS: tried to set selection to %#x, but got %#x\n",
+             sm->selection, cur_selection);
+
+   return ret;
+}
+
+static void
+_e_xsettings_deactivate(Settings_Manager *sm)
+{
+   Ecore_X_Window old;
+
+   if (sm->selection == 0) return;
+
+   old = sm->selection;
+   sm->selection = 0;
+   _e_xsettings_selection_owner_set(sm);
+   ecore_x_sync();
+   ecore_x_window_free(old);
+}
+
+static Eina_Bool
+_e_xsettings_activate(Settings_Manager *sm)
+{
+   Ecore_X_Atom atom;
+   Ecore_X_Window old_win;
+
+   if (sm->selection != 0) return 1;
+
+   atom = _e_xsettings_atom_screen_get(sm->man->num);
+   old_win = ecore_x_selection_owner_get(atom);
+   if (old_win != 0) return 0;
+
+   sm->selection = ecore_x_window_input_new(0, 0, 0, 1, 1);
+   if (sm->selection == 0)
+     return 0;
+
+   if (!_e_xsettings_selection_owner_set(sm))
+     {
+        ecore_x_window_free(sm->selection);
+        sm->selection = 0;
+        return 0;
+     }
+
+   ecore_x_client_message32_send(e_manager_current_get()->root, _atom_manager,
+                                 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
+                                 ecore_x_current_time_get(), atom,
+                                 sm->selection, 0, 0);
+
+   _e_xsettings_apply(sm);
+
+   return 1;
+}
+
+static Eina_Bool
+_e_xsettings_activate_retry(void *data)
+{
+   Settings_Manager *sm = data;
+   Eina_Bool ret;
+
+   fputs("XSETTINGS: reactivate...\n", stderr);
+   ret = _e_xsettings_activate(sm);
+   if (ret)
+     fputs("XSETTINGS: activate success!\n", stderr);
+   else
+     fprintf(stderr, "XSETTINGS: activate failure! retrying in %0.1f seconds\n",
+             RETRY_TIMEOUT);
+
+   if (!ret)
+     return ECORE_CALLBACK_RENEW;
+
+   sm->timer_retry = NULL;
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static void
+_e_xsettings_retry(Settings_Manager *sm)
+{
+   if (sm->timer_retry) return;
+   sm->timer_retry = ecore_timer_add
+     (RETRY_TIMEOUT, _e_xsettings_activate_retry, sm);
+}
+
+static void
+_e_xsettings_string_set(const char *name, const char *value)
+{
+   Setting *s;
+   Eina_List *l;
+
+   if (!name) return;
+   name = eina_stringshare_add(name);
+
+   EINA_LIST_FOREACH(settings, l, s)
+     {
+        if (s->type != SETTING_TYPE_STRING) continue;
+        if (s->name == name) break;
+     }
+   if (!value)
+     {
+        if (!s) return;
+        DBG("remove %s\n", name);
+        eina_stringshare_del(name);
+        eina_stringshare_del(s->name);
+        eina_stringshare_del(s->s.value);
+        settings = eina_list_remove(settings, s);
+        E_FREE(s);
+        return;
+     }
+   if (s)
+     {
+        DBG("update %s %s\n", name, value);
+        eina_stringshare_del(name);
+        eina_stringshare_replace(&s->s.value, value);
+     }
+   else
+     {
+        DBG("add %s %s\n", name, value);
+        s = E_NEW(Setting, 1);
+        s->type = SETTING_TYPE_STRING;
+        s->name = name;
+        s->s.value = eina_stringshare_add(value);
+        settings = eina_list_append(settings, s);
+     }
+
+   /* type + pad + name-len + last-change-serial + str_len */
+   s->length = 12;
+   s->length += OFFSET_ADD(strlen(name));
+   s->length += OFFSET_ADD(strlen(value));
+   s->last_change = ecore_x_current_time_get();
+}
+
+
+static void
+_e_xsettings_int_set(const char *name, int value, Eina_Bool set)
+{
+   Setting *s;
+   Eina_List *l;
+
+   if (!name) return;
+   name = eina_stringshare_add(name);
+
+   EINA_LIST_FOREACH(settings, l, s)
+     {
+        if (s->type != SETTING_TYPE_INT) continue;
+        if (s->name == name) break;
+     }
+   if (!set)
+     {
+        if (!s) return;
+        DBG("remove %s\n", name);
+        eina_stringshare_del(name);
+        eina_stringshare_del(s->name);
+        settings = eina_list_remove(settings, s);
+        E_FREE(s);
+        return;
+     }
+   if (s)
+     {
+        DBG("update %s %d\n", name, value);
+        eina_stringshare_del(name);
+        s->i.value = value;
+     }
+   else
+     {
+        DBG("add %s %d\n", name, value);
+        s = E_NEW(Setting, 1);
+        s->type = SETTING_TYPE_INT;
+        s->name = name;
+        s->i.value = value;
+        settings = eina_list_append(settings, s);
+     }
+
+   // type + pad + name-len + last-change-serial + value
+   s->length = 12;
+   s->length += OFFSET_ADD(strlen(name));
+}
+
+static unsigned char *
+_e_xsettings_copy(unsigned char *buffer, Setting *s)
+{
+   size_t str_len;
+   size_t len;
+
+   buffer[0] = s->type;
+   buffer[1] = 0;
+   buffer += 2;
+
+   str_len = strlen(s->name);
+   *(CARD16 *)(buffer) = str_len;
+   buffer += 2;
+
+   memcpy(buffer, s->name, str_len);
+   buffer += str_len;
+
+   len = OFFSET_ADD(str_len) - str_len;
+   memset(buffer, 0, len);
+   buffer += len;
+
+   *(CARD32 *)(buffer) = s->last_change;
+   buffer += 4;
+
+   switch (s->type)
+     {
+      case SETTING_TYPE_INT:
+         *(CARD32 *)(buffer) = s->i.value;
+         buffer += 4;
+         break;
+
+      case SETTING_TYPE_STRING:
+         str_len = strlen (s->s.value);
+         *(CARD32 *)(buffer) = str_len;
+         buffer += 4;
+
+         memcpy(buffer, s->s.value, str_len);
+         buffer += str_len;
+
+         len = OFFSET_ADD(str_len) - str_len;
+         memset(buffer, 0, len);
+         buffer += len;
+         break;
+
+      case SETTING_TYPE_COLOR:
+         *(CARD16 *)(buffer) = s->c.red;
+         *(CARD16 *)(buffer + 2) = s->c.green;
+         *(CARD16 *)(buffer + 4) = s->c.blue;
+         *(CARD16 *)(buffer + 6) = s->c.alpha;
+         buffer += 8;
+         break;
+     }
+
+   return buffer;
+}
+
+static void
+_e_xsettings_apply(Settings_Manager *sm)
+{
+   unsigned char *data;
+   unsigned char *pos;
+   size_t len = 12;
+   Setting *s;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(settings, l, s)
+     len += s->length;
+
+   pos = data = malloc(len);
+   if (!data) return;
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+   *pos = LSBFirst;
+#else
+   *pos = MSBFirst;
+#endif
+
+   pos += 4;
+   *(CARD32*)pos = sm->serial++;
+   pos += 4;
+   *(CARD32*)pos = eina_list_count(settings);
+   pos += 4;
+
+   EINA_LIST_FOREACH(settings, l, s)
+     pos = _e_xsettings_copy(pos, s);
+
+   ecore_x_window_prop_property_set(sm->selection,
+                                    _atom_xsettings,
+                                    _atom_xsettings,
+                                    8, data, len);
+   free(data);
+}
+
+static void
+_e_xsettings_update(void)
+{
+   Settings_Manager *sm;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(managers, l, sm)
+     if (sm->selection) _e_xsettings_apply(sm);
+}
+
+static Eina_Bool
+_cb_icon_theme_change(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Config_Icon_Theme *ev = event;
+
+   if (e_config->xsettings.match_e17_icon_theme)
+     {
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                              ev->icon_theme);
+        _e_xsettings_update();
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+
+static void
+_e_xsettings_icon_theme_set(void)
+{
+   if (e_config->xsettings.match_e17_icon_theme)
+     {
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                                e_config->icon_theme);
+        return;
+     }
+
+   if (e_config->xsettings.net_icon_theme_name)
+     {
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                              e_config->xsettings.net_icon_theme_name);
+        return;
+     }
+
+   _e_xsettings_string_set(_setting_icon_theme_name, NULL);
+}
+
+static void
+_e_xsettings_theme_set(void)
+{
+   if (e_config->xsettings.match_e17_theme)
+     {
+        E_Config_Theme *ct;
+        if ((ct = e_theme_config_get("theme")))
+          {
+             char *theme;
+
+             if ((theme = edje_file_data_get(ct->file, "gtk-theme")))
+               {
+                  char buf[4096], *dir;
+                  Eina_List *xdg_dirs, *l;
+
+                  e_user_homedir_snprintf(buf, sizeof(buf), ".themes/%s", theme);
+                  if (ecore_file_exists(buf))
+                    {
+                       _e_xsettings_string_set(_setting_theme_name, theme);
+                       return;
+                    }
+
+                  xdg_dirs = efreet_data_dirs_get();
+                  EINA_LIST_FOREACH(xdg_dirs, l, dir)
+                    {
+                       snprintf(buf, sizeof(buf), "%s/themes/%s", dir, theme);
+                       if (ecore_file_exists(buf))
+                         {
+                            _e_xsettings_string_set(_setting_theme_name, theme);
+                            return;
+                         }
+                    }
+               }
+          }
+     }
+
+   if (e_config->xsettings.net_theme_name)
+     {
+        _e_xsettings_string_set(_setting_theme_name,
+                              e_config->xsettings.net_theme_name);
+        return;
+     }
+
+   _e_xsettings_string_set(_setting_theme_name, NULL);
+}
+
+static void
+_e_xsettings_font_set(void)
+{
+   E_Font_Default *efd;
+   E_Font_Properties *efp;
+
+   efd = e_font_default_get("application");
+
+   if (efd && efd->font)
+     {
+        efp = e_font_fontconfig_name_parse(efd->font);
+        if (efp->name)
+          {
+             int size = efd->size;
+             char buf[128];
+             /* TODO better way to convert evas font sizes? */
+             if (size < 0) size /= -10;
+             if (size < 5) size = 5;
+             if (size > 25) size = 25;
+
+             snprintf(buf, sizeof(buf), "%s %d", efp->name, size);
+             _e_xsettings_string_set(_setting_font_name, buf);
+             e_font_properties_free(efp);
+             return;
+          }
+
+        e_font_properties_free(efp);
+     }
+
+   _e_xsettings_string_set(_setting_font_name, NULL);
+}
+
+static void
+_e_xsettings_xft_set(void)
+{
+
+   if (e_config->scale.use_dpi)
+     _e_xsettings_int_set(_setting_xft_dpi, e_config->scale.base_dpi, EINA_TRUE);
+   else
+     _e_xsettings_int_set(_setting_xft_dpi, 0, EINA_FALSE);
+
+}
+
+static void
+_e_xsettings_start(void)
+{
+   Eina_List *l;
+   E_Manager *man;
+
+   if (running) return;
+
+   _e_xsettings_theme_set();
+   _e_xsettings_icon_theme_set();
+   _e_xsettings_font_set();
+
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     {
+        Settings_Manager *sm = E_NEW(Settings_Manager, 1);
+        sm->man = man;
+
+        if (!_e_xsettings_activate(sm))
+          _e_xsettings_retry(sm);
+
+        managers = eina_list_append(managers, sm);
+     }
+
+   handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME,
+                                                                 _cb_icon_theme_change, NULL));
+
+   running = EINA_TRUE;
+}
+
+static void
+_e_xsettings_stop(void)
+{
+   Settings_Manager *sm;
+   Ecore_Event_Handler *h;
+   Setting *s;
+
+   if (!running) return;
+
+   EINA_LIST_FREE(managers, sm)
+     {
+        if (sm->timer_retry)
+          ecore_timer_del(sm->timer_retry);
+
+        _e_xsettings_deactivate(sm);
+
+        E_FREE(sm);
+     }
+
+   EINA_LIST_FREE(settings, s)
+     {
+        if (s->name) eina_stringshare_del(s->name);
+        if (s->s.value) eina_stringshare_del(s->s.value);
+        E_FREE(s);
+     }
+
+   EINA_LIST_FREE(handlers, h)
+     ecore_event_handler_del(h);
+
+   running = EINA_FALSE;
+}
+
+EINTERN int
+e_xsettings_init(void)
+{
+   _atom_manager = ecore_x_atom_get("MANAGER");
+   _atom_xsettings = ecore_x_atom_get("_XSETTINGS_SETTINGS");
+
+   if (e_config->xsettings.enabled)
+     _e_xsettings_start();
+
+   return 1;
+}
+
+EINTERN int
+e_xsettings_shutdown(void)
+{
+   _e_xsettings_stop();
+
+   return 1;
+}
+
+EAPI void
+e_xsettings_config_update(void)
+{
+   if (!e_config->xsettings.enabled)
+     {
+        _e_xsettings_stop();
+        return;
+     }
+
+   if (!running)
+     {
+        _e_xsettings_start();
+     }
+   else
+     {
+        _e_xsettings_theme_set();
+        _e_xsettings_icon_theme_set();
+        _e_xsettings_font_set();
+        _e_xsettings_update();
+     }
+}
diff --git a/src/bin/e_xsettings.h b/src/bin/e_xsettings.h
new file mode 100644 (file)
index 0000000..a5198ed
--- /dev/null
@@ -0,0 +1,13 @@
+#ifdef E_TYPEDEFS
+
+#else
+# ifndef E_XSETTINGS_H
+#  define E_XSETTINGS_H
+
+EINTERN int e_xsettings_init(void);
+EINTERN int e_xsettings_shutdown(void);
+
+EAPI void e_xsettings_config_update(void);
+
+# endif
+#endif
index 645b697..4229361 100644 (file)
@@ -81,6 +81,26 @@ e_zone_shutdown(void)
    return 1;
 }
 
+EAPI void
+e_zone_all_edge_flip_eval(void)
+{
+   Eina_List *l, *ll, *lll;
+   E_Manager *man;
+   E_Container *con;
+   E_Zone *zone;
+
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     {
+        EINA_LIST_FOREACH(man->containers, ll, con)
+          {
+             EINA_LIST_FOREACH(con->zones, lll, zone)
+               {
+                  e_zone_edge_flip_eval(zone);
+               }
+          }
+     }
+}
+
 static void
 _e_zone_black_new(E_Zone *zone)
 {
@@ -233,6 +253,7 @@ e_zone_new(E_Container *con,
    e_object_ref(E_OBJECT(ev->zone));
    ecore_event_add(E_EVENT_ZONE_ADD, ev, _e_zone_event_add_free, NULL);
 
+   e_zone_all_edge_flip_eval();
    return zone;
 }
 
@@ -261,8 +282,6 @@ e_zone_move(E_Zone *zone,
    zone->x = x;
    zone->y = y;
    evas_object_move(zone->bg_object, x, y);
-   if (zone->bg_scrollframe)
-     evas_object_move(zone->bg_scrollframe, x, y);
    evas_object_move(zone->bg_event_object, x, y);
    evas_object_move(zone->bg_clip_object, x, y);
 
@@ -294,8 +313,6 @@ e_zone_resize(E_Zone *zone,
    zone->w = w;
    zone->h = h;
    evas_object_resize(zone->bg_object, w, h);
-   if (zone->bg_scrollframe)
-     evas_object_resize(zone->bg_scrollframe, w, h);
    evas_object_resize(zone->bg_event_object, w, h);
    evas_object_resize(zone->bg_clip_object, w, h);
 
@@ -335,13 +352,9 @@ e_zone_move_resize(E_Zone *zone,
    zone->h = h;
 
    evas_object_move(zone->bg_object, x, y);
-   if (zone->bg_scrollframe)
-     evas_object_move(zone->bg_scrollframe, x, y);
    evas_object_move(zone->bg_event_object, x, y);
    evas_object_move(zone->bg_clip_object, x, y);
    evas_object_resize(zone->bg_object, w, h);
-   if (zone->bg_scrollframe)
-     evas_object_resize(zone->bg_scrollframe, w, h);
    evas_object_resize(zone->bg_event_object, w, h);
    evas_object_resize(zone->bg_clip_object, w, h);
 
@@ -466,7 +479,6 @@ e_zone_flip_coords_handle(E_Zone *zone,
    else
      {
 noflip:
-
         if (zone->flip.es)
           e_shelf_toggle(zone->flip.es, 0);
         zone->flip.es = NULL;
@@ -475,7 +487,7 @@ noflip:
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
         if (es->zone != zone) continue;
-        switch(es->gadcon->orient)
+        switch (es->gadcon->orient)
           {
            case E_GADCON_ORIENT_TOP:
            case E_GADCON_ORIENT_CORNER_TL:
@@ -516,7 +528,7 @@ noflip:
         zone->flip.es = es;
         e_shelf_toggle(es, 1);
      }
-   switch(edge)
+   switch (edge)
      {
       case E_ZONE_EDGE_LEFT:
         if (E_ZONE_FLIP_LEFT(zone)) ok = 1;
@@ -540,6 +552,7 @@ noflip:
      }
    if (!ok) return;
    bind = e_bindings_edge_get("desk_flip_in_direction", edge, 0);
+   if (!bind) bind = e_bindings_edge_get("desk_flip_by", edge, 0);
    if (bind)
      {
         zev = E_NEW(E_Event_Zone_Edge, 1);
@@ -661,6 +674,8 @@ e_zone_desk_count_set(E_Zone *zone,
         e_desk_show(desk);
      }
 
+   e_zone_edge_flip_eval(zone);
+   
    ev = E_NEW(E_Event_Zone_Desk_Count_Set, 1);
    if (!ev) return;
    ev->zone = zone;
@@ -692,6 +707,7 @@ e_zone_desk_flip_by(E_Zone *zone,
    dx = zone->desk_x_current + dx;
    dy = zone->desk_y_current + dy;
    e_zone_desk_flip_to(zone, dx, dy);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -722,6 +738,7 @@ e_zone_desk_flip_to(E_Zone *zone,
      }
    desk = e_desk_at_xy_get(zone, x, y);
    if (desk) e_desk_show(desk);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -737,6 +754,7 @@ e_zone_desk_linear_flip_by(E_Zone *zone,
    while (dx < 0)
      dx += (zone->desk_x_count * zone->desk_y_count);
    e_zone_desk_linear_flip_to(zone, dx);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -751,6 +769,7 @@ e_zone_desk_linear_flip_to(E_Zone *zone,
    y = x / zone->desk_x_count;
    x = x - (y * zone->desk_x_count);
    e_zone_desk_flip_to(zone, x, y);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -779,6 +798,7 @@ e_zone_edge_enable(void)
                   if (zone->corner.bottom_right) ecore_x_window_show(zone->corner.bottom_right);
                   if (zone->corner.bottom_left) ecore_x_window_show(zone->corner.bottom_left);
                   if (zone->corner.left_bottom) ecore_x_window_show(zone->corner.left_bottom);
+                  e_zone_edge_flip_eval(zone);
                }
           }
      }
@@ -816,6 +836,201 @@ e_zone_edge_disable(void)
 }
 
 EAPI void
+e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b)
+{
+   if (l)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_LEFT))
+          {
+             if (zone->edge.left) ecore_x_window_show(zone->edge.left);
+          }
+     }
+   else
+     {
+        if (zone->edge.left) ecore_x_window_hide(zone->edge.left);
+     }
+   if (r)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_RIGHT))
+          {
+             if (zone->edge.right) ecore_x_window_show(zone->edge.right);
+          }
+     }
+   else
+     {
+        if (zone->edge.right) ecore_x_window_hide(zone->edge.right);
+     }
+   if (t)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP))
+          {
+             if (zone->edge.top) ecore_x_window_show(zone->edge.top);
+          }
+     }
+   else
+     {
+        if (zone->edge.top) ecore_x_window_hide(zone->edge.top);
+     }
+   if (b)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM))
+          {
+             if (zone->edge.bottom) ecore_x_window_show(zone->edge.bottom);
+          }
+     }
+   else
+     {
+        if (zone->edge.bottom) ecore_x_window_hide(zone->edge.bottom);
+     }
+   if ((!l) && (!t))
+     {
+        if (zone->corner.left_top) ecore_x_window_hide(zone->corner.left_top);
+        if (zone->corner.top_left) ecore_x_window_hide(zone->corner.top_left);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP_LEFT))
+          {
+             if (zone->corner.left_top) ecore_x_window_show(zone->corner.left_top);
+             if (zone->corner.top_left) ecore_x_window_show(zone->corner.top_left);
+          }
+     }
+   if ((!r) && (!t))
+     {
+        if (zone->corner.right_top) ecore_x_window_hide(zone->corner.right_top);
+        if (zone->corner.top_right) ecore_x_window_hide(zone->corner.top_right);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP_RIGHT))
+          {
+             if (zone->corner.right_top) ecore_x_window_show(zone->corner.right_top);
+             if (zone->corner.top_right) ecore_x_window_show(zone->corner.top_right);
+          }
+     }
+   if ((!l) && (!b))
+     {
+        if (zone->corner.left_bottom) ecore_x_window_hide(zone->corner.left_bottom);
+        if (zone->corner.bottom_left) ecore_x_window_hide(zone->corner.bottom_left);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM_LEFT))
+          {
+             if (zone->corner.left_bottom) ecore_x_window_show(zone->corner.left_bottom);
+             if (zone->corner.bottom_left) ecore_x_window_show(zone->corner.bottom_left);
+          }
+     }
+   if ((!r) && (!b))
+     {
+        if (zone->corner.right_bottom) ecore_x_window_hide(zone->corner.right_bottom);
+        if (zone->corner.bottom_right) ecore_x_window_hide(zone->corner.bottom_right);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM_RIGHT))
+          {
+             if (zone->corner.right_bottom) ecore_x_window_show(zone->corner.right_bottom);
+             if (zone->corner.bottom_right) ecore_x_window_show(zone->corner.bottom_right);
+          }
+     }
+}
+
+EAPI Eina_Bool
+e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
+{
+   Eina_List *l;
+   E_Zone *z2;
+   
+   EINA_LIST_FOREACH(zone->container->zones, l, z2)
+     {
+        if (zone == z2) continue;
+        
+        switch (edge)
+          {
+           case E_ZONE_EDGE_TOP_LEFT:
+             if (((E_SPANS_COMMON(0, zone->x + zone->w, z2->x, z2->w)) &&
+                  (z2->y < zone->y)) ||
+                 ((E_SPANS_COMMON(0, zone->y + zone->h, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_TOP:
+             if ((E_SPANS_COMMON(zone->x, zone->w, z2->x, z2->w)) &&
+                 (z2->y < zone->y))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_TOP_RIGHT:
+             if (((E_SPANS_COMMON(zone->x, 99999, z2->x, z2->w)) &&
+                  (z2->y < zone->y)) ||
+                 ((E_SPANS_COMMON(0, zone->y + zone->h, z2->y, z2->h)) &&
+                  (z2->x >= (zone->x + zone->w))))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_LEFT:
+             if ((E_SPANS_COMMON(zone->y, zone->h, z2->y, z2->h)) &&
+                 (z2->x < zone->x))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_RIGHT:
+             if ((E_SPANS_COMMON(zone->y, zone->h, z2->y, z2->h)) &&
+                 (z2->x >= (zone->x + zone->w)))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_BOTTOM_LEFT:
+             if (((E_SPANS_COMMON(0, zone->x + zone->w, z2->x, z2->w)) &&
+                  (z2->y >= (zone->y + zone->h))) ||
+                 ((E_SPANS_COMMON(zone->y, 99999, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_BOTTOM:
+             if ((E_SPANS_COMMON(zone->x, zone->w, z2->x, z2->w)) &&
+                 (z2->y >= (zone->y + zone->h)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_BOTTOM_RIGHT:
+             if (((E_SPANS_COMMON(zone->x, 99999, z2->x, z2->w)) &&
+                  (z2->y >= (zone->y + zone->h))) ||
+                 ((E_SPANS_COMMON(zone->y, 99999, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+             
+           default:
+             break;
+          }
+     }
+      
+   return EINA_FALSE;
+}
+
+
+EAPI void
+e_zone_edge_flip_eval(E_Zone *zone)
+{
+   Eina_Bool lf, rf, tf, bf;
+   
+   lf = rf = tf = bf = EINA_TRUE;
+   if (zone->desk_x_count <= 1) lf = rf = EINA_FALSE;
+   else if (!e_config->desk_flip_wrap)
+     {
+        if (zone->desk_x_current == 0) lf = EINA_FALSE;
+        if (zone->desk_x_current == (zone->desk_x_count - 1)) rf = EINA_FALSE;
+     }
+   if (zone->desk_y_count <= 1) tf = bf = EINA_FALSE;
+   else if (!e_config->desk_flip_wrap)
+     {
+        if (zone->desk_y_current == 0) tf = EINA_FALSE;
+        if (zone->desk_y_current == (zone->desk_y_count - 1)) bf = EINA_FALSE;
+     }
+   e_zone_edges_desk_flip_capable(zone, lf, rf, tf, bf);
+}
+
+EAPI void
 e_zone_edge_new(E_Zone_Edge edge)
 {
    Eina_List *l, *ll, *lll;
@@ -824,18 +1039,25 @@ e_zone_edge_new(E_Zone_Edge edge)
    E_Zone *zone;
    int cw, ch;
 
+   // explicitly disallow edge bindings when we have more than 1 root
+   // window (ie pure old multihead) since we don't know which direction
+   // other root windows are in
+   if (eina_list_count(e_manager_list()) > 1) return;
    EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
         EINA_LIST_FOREACH(man->containers, ll, con)
           {
              EINA_LIST_FOREACH(con->zones, lll, zone)
                {
+                  // don't allow bindings on edges that are on the boundary
+                  // between zones
+                  if (e_zone_exists_direction(zone, edge)) continue;
                   cw = zone->w * E_ZONE_CORNER_RATIO;
                   ch = zone->h * E_ZONE_CORNER_RATIO;
                   switch (edge)
                     {
                      case E_ZONE_EDGE_NONE:
-     /* noop */
+                       /* noop */
                        break;
 
                      case E_ZONE_EDGE_LEFT:
@@ -971,7 +1193,7 @@ e_zone_edge_free(E_Zone_Edge edge)
                   switch (edge)
                     {
                      case E_ZONE_EDGE_NONE:
-     /* noop */
+                       /* noop */
                        break;
 
                      case E_ZONE_EDGE_LEFT:
@@ -1207,8 +1429,6 @@ static void
 _e_zone_free(E_Zone *zone)
 {
    E_Container *con;
-   Ecore_Animator *anim;
-   void *data;
    int x, y;
 
    /* Delete the edge windows if they exist */
@@ -1250,14 +1470,9 @@ _e_zone_free(E_Zone *zone)
    con = zone->container;
    if (zone->name) eina_stringshare_del(zone->name);
    con->zones = eina_list_remove(con->zones, zone);
-   anim = evas_object_data_get(zone->bg_object, "switch_animator");
-   if (anim) ecore_animator_del(anim);
-   data = evas_object_data_get(zone->bg_object, "switch_animator_params");
-   if (data) E_FREE(data);
    evas_object_del(zone->bg_event_object);
    evas_object_del(zone->bg_clip_object);
    evas_object_del(zone->bg_object);
-   evas_object_del(zone->bg_scrollframe);
    if (zone->prev_bg_object) evas_object_del(zone->prev_bg_object);
    if (zone->transition_object) evas_object_del(zone->transition_object);
 
@@ -1528,7 +1743,7 @@ _e_zone_cb_edge_timer(void *data)
    zone->flip.bind->timer = NULL;
 
    E_FREE(zone->flip.ev);
-   return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
index 4929779..be902c6 100644 (file)
@@ -45,7 +45,6 @@ struct _E_Zone
    Evas_Object         *bg_event_object;
    Evas_Object         *bg_clip_object;
    Evas_Object         *prev_bg_object;
-   Evas_Object        *bg_scrollframe;
    Evas_Object         *transition_object;
    
    int                  desk_x_count, desk_y_count;
@@ -139,10 +138,13 @@ EAPI void       e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
 EAPI void       e_zone_desk_flip_to(E_Zone *zone, int x, int y);
 EAPI void       e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
 EAPI void       e_zone_desk_linear_flip_to(E_Zone *zone, int x);
+EAPI void       e_zone_edge_flip_eval(E_Zone *zone);
 EAPI void       e_zone_edge_new(E_Zone_Edge edge);
 EAPI void       e_zone_edge_free(E_Zone_Edge edge);
 EAPI void       e_zone_edge_enable(void);
 EAPI void       e_zone_edge_disable(void);
+EAPI void       e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b);
+EAPI Eina_Bool  e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge);
 EAPI void      e_zone_edge_win_layer_set(E_Zone *zone, int layer);
 
 EAPI void       e_zone_useful_geometry_dirty(E_Zone *zone);
diff --git a/src/modules/.cvsignore b/src/modules/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
index fb2c937..56498e7 100644 (file)
@@ -26,6 +26,10 @@ if USE_MODULE_TEMPERATURE
 SUBDIRS += temperature
 endif
 
+if USE_MODULE_NOTIFICATION
+SUBDIRS += notification
+endif
+
 if USE_MODULE_CPUFREQ
 SUBDIRS += cpufreq
 endif
@@ -122,6 +126,10 @@ if USE_MODULE_CONF_INTERACTION
 SUBDIRS += conf_interaction
 endif
 
+if USE_MODULE_CONF_RANDR
+SUBDIRS += conf_randr
+endif
+
 if USE_MODULE_GADMAN
 SUBDIRS += gadman
 endif
@@ -175,3 +183,10 @@ if USE_MODULE_SHOT
 SUBDIRS += shot
 endif
 
+if USE_MODULE_BACKLIGHT
+SUBDIRS += backlight
+endif
+
+if USE_MODULE_TASKS
+SUBDIRS += tasks
+endif
diff --git a/src/modules/backlight/Makefile.am b/src/modules/backlight/Makefile.am
new file mode 100644 (file)
index 0000000..6c994b8
--- /dev/null
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = backlight
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_builddir)/src/bin \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/backlight/e-module-backlight.edj b/src/modules/backlight/e-module-backlight.edj
new file mode 100644 (file)
index 0000000..c16263f
Binary files /dev/null and b/src/modules/backlight/e-module-backlight.edj differ
diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
new file mode 100644 (file)
index 0000000..628a282
--- /dev/null
@@ -0,0 +1,518 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+/* gadcon requirements */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+
+/* and actually define the gadcon class that this module provides (just 1) */
+static const E_Gadcon_Client_Class _gadcon_class =
+{
+   GADCON_CLIENT_CLASS_VERSION,
+     "backlight",
+     {
+        _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, NULL
+     },
+   E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+/* actual module specifics */
+typedef struct _Instance Instance;
+
+struct _Instance
+{
+   E_Gadcon_Client *gcc;
+   Evas_Object     *o_backlight, *o_table, *o_slider;
+   E_Gadcon_Popup  *popup;
+   E_Menu          *menu;
+   double           val;
+   Ecore_X_Window   input_win;
+   Ecore_Event_Handler *hand_mouse_down;
+   Ecore_Event_Handler *hand_key_down;
+};
+
+static Eina_List *backlight_instances = NULL;
+static E_Module *backlight_module = NULL;
+static E_Action *act = NULL;
+
+static void _backlight_popup_free(Instance *inst);
+
+static void
+_backlight_gadget_update(Instance *inst)
+{
+   Edje_Message_Float msg;
+   
+   msg.val = inst->val;
+   if (msg.val < 0.0) msg.val = 0.0;
+   else if (msg.val > 1.0) msg.val = 1.0;
+   edje_object_message_send(inst->o_backlight, EDJE_MESSAGE_FLOAT, 0, &msg);
+}
+
+static void
+_backlight_input_win_del(Instance *inst)
+{
+   e_grabinput_release(0, inst->input_win);
+   ecore_x_window_free(inst->input_win);
+   inst->input_win = 0;
+   ecore_event_handler_del(inst->hand_mouse_down);
+   inst->hand_mouse_down = NULL;
+   ecore_event_handler_del(inst->hand_key_down);
+   inst->hand_key_down = NULL;
+}
+
+static Eina_Bool
+_backlight_input_win_mouse_down_cb(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_Event_Mouse_Button *ev = event;
+   Instance *inst = data;
+   
+   if (ev->window != inst->input_win) return ECORE_CALLBACK_PASS_ON;
+   _backlight_popup_free(inst);
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_Event_Key *ev = event;
+   Instance *inst = data;
+   const char *keysym;
+   
+   if (ev->window != inst->input_win) return ECORE_CALLBACK_PASS_ON;
+   
+   keysym = ev->key;
+   if (!strcmp(keysym, "Escape"))
+      _backlight_popup_free(inst);
+   else if ((!strcmp(keysym, "Up")) ||
+            (!strcmp(keysym, "Left")) ||
+            (!strcmp(keysym, "KP_Up")) ||
+            (!strcmp(keysym, "KP_Left")) ||
+            (!strcmp(keysym, "w")) ||
+            (!strcmp(keysym, "d")) ||
+            (!strcmp(keysym, "bracketright")) ||
+            (!strcmp(keysym, "Prior")))
+     {
+        double v = inst->val + 0.1;
+        if (v > 1.0) v = 1.0;
+        e_widget_slider_value_double_set(inst->o_slider, v);
+        inst->val = v;
+        e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
+        e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
+        _backlight_gadget_update(inst);
+     }
+   else if ((!strcmp(keysym, "Down")) ||
+            (!strcmp(keysym, "Right")) ||
+            (!strcmp(keysym, "KP_Down")) ||
+            (!strcmp(keysym, "KP_Right")) ||
+            (!strcmp(keysym, "s")) ||
+            (!strcmp(keysym, "a")) ||
+            (!strcmp(keysym, "bracketleft")) ||
+            (!strcmp(keysym, "Next")))
+     {
+        double v = inst->val - 0.1;
+        if (v < 0.0) v = 0.0;
+        e_widget_slider_value_double_set(inst->o_slider, v);
+        inst->val = v;
+        e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
+        e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
+        _backlight_gadget_update(inst);
+     }
+   else if ((!strcmp(keysym, "0")) ||
+            (!strcmp(keysym, "1")) ||
+            (!strcmp(keysym, "2")) ||
+            (!strcmp(keysym, "3")) ||
+            (!strcmp(keysym, "4")) ||
+            (!strcmp(keysym, "5")) ||
+            (!strcmp(keysym, "6")) ||
+            (!strcmp(keysym, "7")) ||
+            (!strcmp(keysym, "8")) ||
+            (!strcmp(keysym, "9")))
+     {
+        double v = (double)atoi(keysym) / 9.0;
+        e_widget_slider_value_double_set(inst->o_slider, v);
+        inst->val = v;
+        e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
+        e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
+        _backlight_gadget_update(inst);
+     }
+   else
+     {
+        Eina_List *l;
+        E_Config_Binding_Key *bind;
+        E_Binding_Modifier mod;
+        
+        for (l = e_config->key_bindings; l; l = l->next)
+          {
+             bind = l->data;
+             
+             if (bind->action && strcmp(bind->action, "backlight")) continue;
+             
+             mod = 0;
+             
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+                mod |= E_BINDING_MODIFIER_SHIFT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
+                mod |= E_BINDING_MODIFIER_CTRL;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
+                mod |= E_BINDING_MODIFIER_ALT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
+                mod |= E_BINDING_MODIFIER_WIN;
+             
+             if (bind->key && (!strcmp(bind->key, ev->keyname)) &&
+                 ((bind->modifiers == (int)mod) || (bind->any_mod)))
+               {
+                  _backlight_popup_free(inst);
+                  break;
+               }
+          }
+     }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_backlight_input_win_new(Instance *inst)
+{
+   Ecore_X_Window_Configure_Mask mask;
+   Ecore_X_Window w, popup_w;
+   E_Manager *man;
+   
+   man = inst->gcc->gadcon->zone->container->manager;
+   
+   w = ecore_x_window_input_new(man->root, 0, 0, man->w, man->h);
+   mask = (ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE |
+           ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING);
+   popup_w = inst->popup->win->evas_win;
+   ecore_x_window_configure(w, mask, 0, 0, 0, 0, 0, popup_w,
+                            ECORE_X_WINDOW_STACK_BELOW);
+   ecore_x_window_show(w);
+   
+   inst->hand_mouse_down =
+      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
+                              _backlight_input_win_mouse_down_cb, inst);
+   inst->hand_key_down =
+      ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
+                              _backlight_input_win_key_down_cb, inst);
+   inst->input_win = w;
+   e_grabinput_get(0, 0, inst->input_win);
+}
+
+static void
+_backlight_settings_cb(void *d1, void *d2 __UNUSED__)
+{
+   Instance *inst = d1;
+   e_configure_registry_call("screen/power_management",
+                             inst->gcc->gadcon->zone->container, NULL);
+   _backlight_popup_free(inst);
+}
+
+static void
+_slider_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Instance *inst = data;
+   e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
+   e_backlight_level_set(inst->gcc->gadcon->zone, inst->val, 0.0);
+   _backlight_gadget_update(inst);
+}
+
+static void
+_backlight_popup_new(Instance *inst)
+{
+   Evas *evas;
+   Evas_Object *o;
+   
+   if (inst->popup) return;
+
+   e_backlight_update();
+   e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
+   inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
+   _backlight_gadget_update(inst);
+   
+   inst->popup = e_gadcon_popup_new(inst->gcc);
+   evas = inst->popup->win->evas;
+   
+   inst->o_table = e_widget_table_add(evas, 0);
+
+   o = e_widget_slider_add(evas, 0, 0, NULL, 0.0, 1.0, 0.05, 0, &(inst->val), NULL, 100);
+   evas_object_smart_callback_add(o, "changed", _slider_cb, inst);
+   inst->o_slider = o;
+   e_widget_table_object_align_append(inst->o_table, o, 
+                                      0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
+   
+   o = e_widget_button_add(evas, NULL, "preferences-system",
+                           _backlight_settings_cb, inst, NULL);
+   e_widget_table_object_align_append(inst->o_table, o, 
+                                      0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0);
+   
+   e_gadcon_popup_content_set(inst->popup, inst->o_table);
+   e_gadcon_popup_show(inst->popup);
+   _backlight_input_win_new(inst);
+}
+
+static void
+_backlight_popup_free(Instance *inst)
+{
+   if (!inst->popup) return;
+   if (inst->popup)
+     {
+        _backlight_input_win_del(inst);
+        e_object_del(E_OBJECT(inst->popup));
+        inst->popup = NULL;
+     }
+}
+
+static void
+_backlight_menu_cb_post(void *data, E_Menu *menu __UNUSED__)
+{
+   Instance *inst = data;
+   if ((!inst) || (!inst->menu))
+      return;
+   if (inst->menu)
+     {
+        e_object_del(E_OBJECT(inst->menu));
+        inst->menu = NULL;
+     }
+}
+
+static void
+_backlight_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__)
+{
+   Instance *inst = data;
+
+   _backlight_popup_free(inst);
+   e_configure_registry_call("screen/power_management",
+                             inst->gcc->gadcon->zone->container, NULL);
+}
+
+static void
+_backlight_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+{
+   Instance *inst = data;
+   Evas_Event_Mouse_Down *ev = event;
+   
+   if (ev->button == 1)
+     {
+        if (inst->popup) _backlight_popup_free(inst);
+        else _backlight_popup_new(inst);
+     }
+   else if ((ev->button == 3) && (!inst->menu))
+     {
+        E_Zone *zone;
+        E_Menu *m;
+        E_Menu_Item *mi;
+        int x, y;
+        
+        zone = e_util_zone_current_get(e_manager_current_get());
+        
+        m = e_menu_new();
+        
+        mi = e_menu_item_new(m);
+        e_menu_item_label_set(mi, _("Settings"));
+        e_util_menu_item_theme_icon_set(mi, "configure");
+        e_menu_item_callback_set(mi, _backlight_menu_cb_cfg, inst);
+        
+        m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
+        e_menu_post_deactivate_callback_set(m, _backlight_menu_cb_post, inst);
+        inst->menu = m;
+        
+        e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
+        e_menu_activate_mouse(m, zone, x + ev->output.x, y + ev->output.y,
+                              1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+        evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
+                                 EVAS_BUTTON_NONE, ev->timestamp, NULL);
+     }
+}
+
+static void
+_backlight_level_decrease(Instance *inst)
+{
+   double v = inst->val - 0.1;
+   if (v < 0.0) v = 0.0;
+   e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
+}
+
+static void
+_backlight_level_increase(Instance *inst)
+{
+   double v = inst->val + 0.1;
+   if (v > 1.0) v = 1.0;
+   e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
+}
+
+static void
+_backlight_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+{
+   Eina_List *l;
+   Evas_Event_Mouse_Wheel *ev = event;
+   double v;
+   Instance *inst = data;
+
+   inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
+   if (ev->z > 0)
+     _backlight_level_decrease(inst);
+   else if (ev->z < 0)
+     _backlight_level_increase(inst);
+   v = inst->val;
+
+   EINA_LIST_FOREACH(backlight_instances, l, inst)
+     {
+        inst->val = v;
+        _backlight_gadget_update(inst);
+     }
+}
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+{
+   Evas_Object *o;
+   E_Gadcon_Client *gcc;
+   Instance *inst;
+   
+   inst = E_NEW(Instance, 1);
+
+   o = edje_object_add(gc->evas);
+   e_theme_edje_object_set(o, "base/theme/modules/backlight",
+                           "e/modules/backlight/main");
+   evas_object_show(o);
+   
+   gcc = e_gadcon_client_new(gc, name, id, style, o);
+   gcc->data = inst;
+   
+   inst->gcc = gcc;
+   inst->o_backlight = o;
+
+   e_backlight_update();
+   inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
+   _backlight_gadget_update(inst);
+   
+   evas_object_event_callback_add(inst->o_backlight, 
+                                  EVAS_CALLBACK_MOUSE_DOWN,
+                                  _backlight_cb_mouse_down,
+                                  inst);
+   evas_object_event_callback_add(inst->o_backlight, 
+                                  EVAS_CALLBACK_MOUSE_WHEEL,
+                                  _backlight_cb_mouse_wheel,
+                                  inst);
+   
+   backlight_instances = eina_list_append(backlight_instances, inst);
+   return gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   Instance *inst;
+   
+   inst = gcc->data;
+   if (inst->menu)
+     {
+        e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
+        _backlight_input_win_del(inst);
+        e_object_del(E_OBJECT(inst->menu));
+        inst->menu = NULL;
+     }
+   _backlight_popup_free(inst);
+   backlight_instances = eina_list_remove(backlight_instances, inst);
+   evas_object_del(inst->o_backlight);
+   free(inst);
+}
+
+static void
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
+{
+   Instance *inst;
+   Evas_Coord mw, mh;
+   
+   inst = gcc->data;
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_backlight, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_backlight, &mw, &mh);
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+   e_gadcon_client_aspect_set(gcc, mw, mh);
+   e_gadcon_client_min_size_set(gcc, mw, mh);
+}
+
+static const char *
+_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _("Backlight");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+{
+   Evas_Object *o;
+   char buf[4096];
+   
+   o = edje_object_add(evas);
+   snprintf(buf, sizeof(buf), "%s/e-module-backlight.edj",
+           e_module_dir_get(backlight_module));
+   edje_object_file_set(o, buf, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _gadcon_class.name;
+}
+
+static void
+_e_mod_action_cb(E_Object *obj __UNUSED__,
+                 const char *params __UNUSED__)
+{
+   Eina_List *l;
+   Instance *inst;
+   
+   EINA_LIST_FOREACH(backlight_instances, l, inst)
+     {
+        if (inst->popup) _backlight_popup_free(inst);
+        else _backlight_popup_new(inst);
+     }
+}
+
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Backlight"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   backlight_module = m;
+   e_gadcon_provider_register(&_gadcon_class);
+   act = e_action_add("backlight");
+   if (act)
+     {
+        act->func.go = _e_mod_action_cb;
+        e_action_predef_name_set(_("Screen"), _("Backlight Controls"), "backlight", NULL, NULL, 0);
+     }
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m __UNUSED__)
+{
+   if (act)
+     {
+        e_action_predef_name_del(_("Screen"), _("Backlight Controls"));
+        e_action_del("backlight");
+        act = NULL;
+     }
+   backlight_module = NULL;
+   e_gadcon_provider_unregister(&_gadcon_class);
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/backlight/e_mod_main.h b/src/modules/backlight/e_mod_main.h
new file mode 100644 (file)
index 0000000..4adf2f1
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+
+#endif
diff --git a/src/modules/backlight/module.desktop.in b/src/modules/backlight/module.desktop.in
new file mode 100644 (file)
index 0000000..d860dbe
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Link
+Name=Backlight
+Name[fr]=Rétroéclairage
+Name[pt]=Iluminação
+Icon=e-module-backlight
+X-Enlightenment-ModuleType=utils
+Comment=Backlight control slider gadget
+Comment[fr]=Slider de contrôle du rétroéclairage.
+Comment[it]=Fornisce un cursore per il controllo della retroilluminazione.
+Comment[pt]=Um cursor para controlar a iluminação do monitor
diff --git a/src/modules/battery/.cvsignore b/src/modules/battery/.cvsignore
deleted file mode 100644 (file)
index 2ea45e8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-e_mod_main.lo
-module.la
-*.lo
-*.la
-module.desktop
-batget
index afb87b8..d2789f2 100644 (file)
@@ -2,9 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
 MODULE = battery
 
 if HAVE_EEZE
-  DEVICE_FILE = e_mod_udev.c
+DEVICE_FILE = e_mod_udev.c
 else
-  DEVICE_FILE = e_mod_dbus.c
+if HAVE_OPENBSD
+DEVICE_FILE = e_mod_openbsd.c
+else
+DEVICE_FILE = e_mod_dbus.c
+endif
 endif
 
 # data files for the module
index 44ec473..ee155b2 100644 (file)
@@ -30,6 +30,7 @@
 # include <ps/IOPowerSources.h>
 #endif
 
+#include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_File.h>
 #include <Ecore_Con.h>
@@ -46,6 +47,8 @@
 #define CHECK_PMU                    3
 #define CHECK_SYS_CLASS_POWER_SUPPLY 4
 
+#define SYS_PWR
+
 static void      init(void);
 static Eina_Bool poll_cb(void *data);
 
@@ -59,6 +62,8 @@ static int battery_full = -2;
 static int have_battery = -2;
 static int have_power = -2;
 
+static const char *sys_power_dir = "/sys/class/power_supply";
+
 /* UTILS */
 static int
 int_file_get(const char *file)
@@ -533,83 +538,84 @@ static void
 linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev)
 {
    char buf[4096];
+   const char *dir = sys_power_dir;
 
    sysev->basis = 0;
    sysev->have_current_avg = 0;
    sysev->have_current_now = 0;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/present", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/present", dir, sysev->name);
    sysev->present = int_file_get(buf);
    if (!sysev->present) return;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_avg", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/current_avg", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->have_current_avg = 1;
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_now", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/current_now", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->have_current_now = 1;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_full", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/voltage_max", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_VOLTAGE;
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_full_design", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/voltage_max_design", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_VOLTAGE;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_full", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/energy_full", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_ENERGY;
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_full_design", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/energy_full_design", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_ENERGY;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_full", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/charge_full", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_CHARGE;
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_full_design", sysev->name);
+   snprintf(buf, sizeof(buf), "%s/%s/charge_full_design", dir, sysev->name);
    if (ecore_file_exists(buf)) sysev->basis = BASIS_CHARGE;
 
    if (sysev->basis == BASIS_CHARGE)
      {
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_full", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/charge_full", dir, sysev->name);
         sysev->basis_full = int_file_get(buf);
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_empty", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/charge_empty", dir, sysev->name);
         sysev->basis_empty = int_file_get(buf);
         if (sysev->basis_full < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_full_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/charge_full_design", dir, sysev->name);
              sysev->basis_full = int_file_get(buf);
           }
         if (sysev->basis_empty < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_empty_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/charge_empty_design", dir, sysev->name);
              sysev->basis_empty = int_file_get(buf);
           }
      }
    else if (sysev->basis == BASIS_ENERGY)
      {
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_full", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/energy_full", dir, sysev->name);
         sysev->basis_full = int_file_get(buf);
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_empty", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/energy_empty", dir, sysev->name);
         sysev->basis_empty = int_file_get(buf);
         if (sysev->basis_full < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_full_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/energy_full_design", dir, sysev->name);
              sysev->basis_full = int_file_get(buf);
           }
         if (sysev->basis_empty < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_empty_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/energy_empty_design", dir, sysev->name);
              sysev->basis_empty = int_file_get(buf);
           }
      }
    else if (sysev->basis == BASIS_VOLTAGE)
      {
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_full", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/voltage_max", dir, sysev->name);
         sysev->basis_full = int_file_get(buf);
-        snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_empty", sysev->name);
+        snprintf(buf, sizeof(buf), "%s/%s/voltage_min", dir, sysev->name);
         sysev->basis_empty = int_file_get(buf);
         if (sysev->basis_full < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_full_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/voltage_max_design", dir, sysev->name);
              sysev->basis_full = int_file_get(buf);
           }
         if (sysev->basis_empty < 0)
           {
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_empty_design", sysev->name);
+             snprintf(buf, sizeof(buf), "%s/%s/voltage_min_design", dir, sysev->name);
              sysev->basis_empty = int_file_get(buf);
           }
      }
@@ -621,8 +627,9 @@ linux_sys_class_power_supply_is_battery(char *name)
    int fd;
    int ret = 0;
    char buf[256];
+   const char *dir = sys_power_dir;
 
-   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/type", name);
+   snprintf(buf, sizeof(buf), "%s/%s/type", dir, name);
    fd = open(buf, O_RDONLY);
    if (fd < 0)
      {
@@ -659,6 +666,7 @@ linux_sys_class_power_supply_init(void)
 //     char buf[4096];
 
         bats = ecore_file_ls("/sys/class/power_supply/");
+//        bats = ecore_file_ls("./TST");
         if (bats)
           {
              events = NULL;
@@ -696,6 +704,7 @@ linux_sys_class_power_supply_check(void)
    Eina_List *l;
    char *name;
    char buf[4096];
+   const char *dir = sys_power_dir;
 
    battery_full = -1;
    time_left = -1;
@@ -734,22 +743,22 @@ linux_sys_class_power_supply_check(void)
              present = sysev->present;
              if (!present) continue;
 
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/capacity", name);
+             snprintf(buf, sizeof(buf), "%s/%s/capacity", dir, name);
              capacity = int_file_get(buf);
              if (sysev->have_current_avg)
                {
-                  snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_avg", name);
+                  snprintf(buf, sizeof(buf), "%s/%s/current_avg", dir, name);
                   current = int_file_get(buf);
                }
              else if (sysev->have_current_now)
                {
-                  snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_now", name);
+                  snprintf(buf, sizeof(buf), "%s/%s/current_now", dir, name);
                   current = int_file_get(buf);
                }
 
              /* FIXME: do we get a uevent on going from charging to full?
               * if so, move this to init */
-             snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/status", name);
+             snprintf(buf, sizeof(buf), "%s/%s/status", dir, name);
              tmp = str_file_get(buf);
              if (tmp)
                {
@@ -776,12 +785,12 @@ linux_sys_class_power_supply_check(void)
                   nofull++;
                   if (charging)
                     {
-                       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/time_to_full_now", name);
+                       snprintf(buf, sizeof(buf), "%s/%s/time_to_full_now", dir, name);
                        time_to_full = int_file_get(buf);
                     }
                   else
                     {
-                       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/time_to_empty_now", name);
+                       snprintf(buf, sizeof(buf), "%s/%s/time_to_empty_now", dir, name);
                        time_to_empty = int_file_get(buf);
                     }
                }
@@ -789,64 +798,85 @@ linux_sys_class_power_supply_check(void)
              /* now get charge, energy and voltage. take the one that provides
               * the best info (charge first, then energy, then voltage */
              if (sysev->basis == BASIS_CHARGE)
-               snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_now", name);
+               snprintf(buf, sizeof(buf), "%s/%s/charge_now", dir, name);
              else if (sysev->basis == BASIS_ENERGY)
-               snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_now", name);
+               snprintf(buf, sizeof(buf), "%s/%s/energy_now", dir, name);
              else if (sysev->basis == BASIS_VOLTAGE)
-               snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_now", name);
+                snprintf(buf, sizeof(buf), "%s/%s/voltage_now", dir, name);
              pwr_now = int_file_get(buf);
              pwr_empty = sysev->basis_empty;
              pwr_full = sysev->basis_full;
-
-             if (pwr_empty < 0) pwr_empty = 0;
-
-             if (full) pwr_now = pwr_full;
-             else
+             if ((sysev->basis == BASIS_VOLTAGE) &&
+                 (capacity >= 0))
                {
-                  if (pwr_now < 0)
-                    pwr_now = (((long long)capacity * ((long long)pwr_full - (long long)pwr_empty)) / 100) + pwr_empty;
+                  /* if we use voltage as basis.. we're not very accurate
+                   * so we should prefer capacity readings */
+                  pwr_empty = -1;
+                  pwr_full = -1;
+                  pwr_now = -1;
                }
 
-             if (sysev->present) have_battery = 1;
-             if (charging)
+             if (pwr_empty < 0) pwr_empty = 0;
+
+             if ((pwr_full > 0) && (pwr_full > pwr_empty))
                {
-                  pwr_now = pwr_now;
-                  have_power = 1;
-                  if (time_to_full >= 0)
+                  if (full) pwr_now = pwr_full;
+                  else
                     {
-                       if (time_to_full > time_left)
-                         time_left = time_to_full;
+                       if (pwr_now < 0)
+                          pwr_now = (((long long)capacity * ((long long)pwr_full - (long long)pwr_empty)) / 100) + pwr_empty;
                     }
-                  else
+                  
+                  if (sysev->present) have_battery = 1;
+                  if (charging)
                     {
-                       if (current == 0) time_left = 0;
-                       else if (current < 0)
-                         time_left = -1;
+                       pwr_now = pwr_now;
+                       have_power = 1;
+                       if (time_to_full >= 0)
+                         {
+                            if (time_to_full > time_left)
+                               time_left = time_to_full;
+                         }
                        else
                          {
-                            pwr = (((long long)pwr_full - (long long)pwr_now) * 3600) / -current;
-                            if (pwr > time_left) time_left = pwr;
+                            if (current == 0) time_left = 0;
+                            else if (current < 0)
+                               time_left = -1;
+                            else
+                              {
+                                 pwr = (((long long)pwr_full - (long long)pwr_now) * 3600) / -current;
+                                 if (pwr > time_left) time_left = pwr;
+                              }
                          }
                     }
-               }
-             else
-               {
-                  have_power = 0;
-                  if (time_to_empty >= 0) time_left += time_to_empty;
                   else
                     {
-                       if (time_to_empty < 0)
+                       have_power = 0;
+                       if (time_to_empty >= 0) time_left += time_to_empty;
+                       else
                          {
-                            if (current > 0)
+                            if (time_to_empty < 0)
                               {
-                                 pwr = (((long long)pwr_now - (long long)pwr_empty) * 3600) / current;
-                                 time_left += pwr;
+                                 if (current > 0)
+                                   {
+                                      pwr = (((long long)pwr_now - (long long)pwr_empty) * 3600) / current;
+                                      time_left += pwr;
+                                   }
                               }
                          }
                     }
+                  total_pwr_now += pwr_now - pwr_empty;
+                  total_pwr_max += pwr_full - pwr_empty;
+               }
+             /* simple current battery fallback */
+             else
+               {
+                  if (sysev->present) have_battery = 1;
+                  if (charging) have_power = 1;
+                  total_pwr_max = 100;
+                  total_pwr_now = capacity;
+                  if (total_pwr_now < 100) nofull = 1;
                }
-             total_pwr_now += pwr_now - pwr_empty;
-             total_pwr_max += pwr_full - pwr_empty;
           }
         if (total_pwr_max > 0)
           battery_full = ((long long)total_pwr_now * 100) / total_pwr_max;
@@ -1191,11 +1221,7 @@ linux_apm_check(void)
    fclose(f);
 
    bat_val = strtol(s1, &endptr, 10);
-   if (*endptr != '%')
-     {
-        bat_val = -1;
-        return;
-     }
+   if (*endptr != '%') return;
 
    if (!strcmp(s3, "sec")) time_val = atoi(s2);
    else if (!strcmp(s3, "min"))
@@ -1427,8 +1453,7 @@ init(void)
 #elif defined(HAVE_CFBASE_H) /* OS X */
    darwin_init();
 #else
-   if ((ecore_file_is_dir("/sys/class/power_supply")) &&
-       (dir_has_contents("/sys/class/power_supply")))
+   if ((ecore_file_is_dir(sys_power_dir)) && (dir_has_contents(sys_power_dir)))
      {
         mode = CHECK_SYS_CLASS_POWER_SUPPLY;
         linux_sys_class_power_supply_init();
index 73fda6a..b861ae1 100644 (file)
Binary files a/src/modules/battery/e-module-battery.edj and b/src/modules/battery/e-module-battery.edj differ
index 0011a6b..37c5c81 100644 (file)
@@ -12,6 +12,7 @@ struct _E_Config_Dialog_Data
    int alert_percent;
    int dismiss_alert;
    int alert_timeout;
+   int suspend_below;
    int force_mode; // 0 == auto, 1 == batget, 2 == subsystem
    struct 
      {
@@ -71,6 +72,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->alert_percent = battery_config->alert_p;
    cfdata->poll_interval = battery_config->poll_interval;
    cfdata->alert_timeout = battery_config->alert_timeout;
+   cfdata->suspend_below = battery_config->suspend_below;
    cfdata->force_mode = battery_config->force_mode;
 #ifdef HAVE_EEZE
    cfdata->fuzzy = battery_config->fuzzy;
@@ -211,6 +213,13 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 256, 4, 0, 
                             NULL, &(cfdata->poll_interval), 100);
    e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+   
+   ob = e_widget_label_add(evas, _("Hibernate when below:"));
+   e_widget_table_object_append(o, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f %%"), 0, 50, 1, 0, 
+                            NULL, &(cfdata->suspend_below), 100);
+   e_widget_table_object_append(o, ob, 0, 3, 1, 1, 1, 0, 1, 0);
+   
    e_widget_toolbook_page_append(otb, NULL, _("Polling"), o, 1, 0, 1, 0, 
                                  0.5, 0.0);
 
@@ -302,6 +311,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
      battery_config->alert_timeout = 0;
 
    battery_config->force_mode = cfdata->force_mode;
+   battery_config->suspend_below = cfdata->suspend_below;
 
    _battery_config_updated();
    e_config_save_queue();
@@ -319,6 +329,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
           (cfdata->alert_percent != battery_config->alert_p) ||
           (cfdata->poll_interval != battery_config->poll_interval) ||
           (cfdata->alert_timeout != battery_config->alert_timeout) ||
+          (cfdata->suspend_below != battery_config->suspend_below) ||
 #ifdef HAVE_EEZE
            (cfdata->fuzzy != battery_config->fuzzy) ||
 #endif           
index f63f041..6885083 100644 (file)
@@ -224,14 +224,13 @@ _battery_dbus_battery_add(const char *udi)
 static void
 _battery_dbus_battery_del(const char *udi)
 {
-   Eina_List *l;
    Battery *bat;
    
    bat = _battery_battery_find(udi);
    if (bat)
      {
         e_dbus_signal_handler_del(e_dbus_conn, bat->prop_change);
-        l = eina_list_data_find(device_batteries, bat);
+       device_batteries = eina_list_remove(device_batteries, bat);
         eina_stringshare_del(bat->udi);
         eina_stringshare_del(bat->technology);
         eina_stringshare_del(bat->type);
@@ -239,7 +238,6 @@ _battery_dbus_battery_del(const char *udi)
         eina_stringshare_del(bat->model);
         eina_stringshare_del(bat->vendor);
         free(bat);
-        device_batteries = eina_list_remove_list(device_batteries, l);
         return;
      }
    _battery_device_update();
@@ -268,18 +266,16 @@ _battery_dbus_ac_adapter_add(const char *udi)
 static void
 _battery_dbus_ac_adapter_del(const char *udi)
 {
-   Eina_List *l;
    Ac_Adapter *ac;
    
    ac = _battery_ac_adapter_find(udi);
    if (ac)
      {
         e_dbus_signal_handler_del(e_dbus_conn, ac->prop_change);
-        l = eina_list_data_find(device_ac_adapters, ac);
+       device_ac_adapters = eina_list_remove(device_ac_adapters, ac);
         eina_stringshare_del(ac->udi);
         eina_stringshare_del(ac->product);
         free(ac);
-        device_ac_adapters = eina_list_remove_list(device_ac_adapters, l);
         return;
      }
    _battery_device_update();
index 37f1202..e6366a3 100644 (file)
@@ -5,7 +5,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 
@@ -82,7 +82,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
 
 #ifdef HAVE_EEZE
    eeze_init();
-#else
+#elif !defined __OpenBSD__
    e_dbus_init();
    e_hal_init();
 #endif
@@ -103,7 +103,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
 
 #ifdef HAVE_EEZE
    eeze_shutdown();
-#else
+#elif !defined __OpenBSD__
    e_hal_shutdown();
    e_dbus_shutdown();
 #endif
@@ -139,7 +139,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Battery");
@@ -364,6 +364,8 @@ _battery_config_updated(void)
      {
 #ifdef HAVE_EEZE
         ok = _battery_udev_start();
+#elif defined __OpenBSD__
+       ok = _battery_openbsd_start();
 #else
         ok = _battery_dbus_start();
 #endif
@@ -561,13 +563,19 @@ _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery,
           }
         else if (have_power || ((time_left / 60) > battery_config->alert))
           _battery_warning_popup_destroy(inst);
+        if ((have_battery) && (!have_power) && (full >= 0) &&
+            (battery_config->suspend_below > 0) &&
+            (full < battery_config->suspend_below))
+           e_sys_action_do(E_SYS_HIBERNATE, NULL);
      }
    if (!have_battery)
      e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
    else
      {
-        if ((have_power) || (full > 95))
+        if (have_power)
           e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+        else if (full > 95)
+          e_powersave_mode_set(E_POWERSAVE_MODE_MEDIUM);
         else if (full > 30)
           e_powersave_mode_set(E_POWERSAVE_MODE_HIGH);
         else
@@ -624,9 +632,9 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
                   int have_power = 0;
            
                   if (sscanf(ev->lines[i].line, "%i %i %i %i %i", &full, &time_left, &time_full, 
-                                    &have_battery, &have_power) == 5)
+                             &have_battery, &have_power) == 5)
                     _battery_update(full, time_left, time_full,
-                                           have_battery, have_power);
+                                    have_battery, have_power);
                   else
                     e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
                }
@@ -666,8 +674,9 @@ e_modapi_init(E_Module *m)
    E_CONFIG_VAL(D, T, alert, INT);
    E_CONFIG_VAL(D, T, alert_p, INT);
    E_CONFIG_VAL(D, T, alert_timeout, INT);
+   E_CONFIG_VAL(D, T, suspend_below, INT);
    E_CONFIG_VAL(D, T, force_mode, INT);
-#ifdef HAVE_EEZE
+#if defined HAVE_EEZE || defined __OpenBSD__
    E_CONFIG_VAL(D, T, fuzzy, INT);
 #endif
 
@@ -679,8 +688,9 @@ e_modapi_init(E_Module *m)
        battery_config->alert = 30;
        battery_config->alert_p = 10;
        battery_config->alert_timeout = 0;
+       battery_config->suspend_below = 0;
        battery_config->force_mode = 0;
-#ifdef HAVE_EEZE
+#if defined HAVE_EEZE || defined __OpenBSD__
        battery_config->fuzzy = 0;
 #endif
      }
@@ -688,6 +698,7 @@ e_modapi_init(E_Module *m)
    E_CONFIG_LIMIT(battery_config->alert, 0, 60);
    E_CONFIG_LIMIT(battery_config->alert_p, 0, 100);
    E_CONFIG_LIMIT(battery_config->alert_timeout, 0, 300);
+   E_CONFIG_LIMIT(battery_config->suspend_below, 0, 50);
    E_CONFIG_LIMIT(battery_config->force_mode, 0, 2);
 
    battery_config->module = m;
@@ -754,6 +765,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    
 #ifdef HAVE_EEZE
    _battery_udev_stop();
+#elif defined __OpenBSD__
+   _battery_openbsd_stop();
 #else
    _battery_dbus_stop();
 #endif
index 62e44e5..754facd 100644 (file)
@@ -28,6 +28,7 @@ struct _Config
    int              alert;     /* Alert on minutes remaining */
    int             alert_p;    /* Alert on percentage remaining */
    int              alert_timeout;  /* Popup dismissal timeout */
+   int              suspend_below;  /* Suspend if batter drops below this level */
    int              force_mode; /* force use of batget or hal */
    /* just config state */
    E_Module        *module;
@@ -46,6 +47,8 @@ struct _Config
 #ifdef HAVE_EEZE
    Eeze_Udev_Watch     *acwatch;
    Eeze_Udev_Watch     *batwatch;
+#endif
+#if defined HAVE_EEZE || defined __OpenBSD__
    Eina_Bool            fuzzy;
    int                  fuzzcount;
 #else
@@ -66,7 +69,7 @@ typedef struct _Ac_Adapter Ac_Adapter;
 struct _Battery
 {
    const char *udi;
-#ifdef HAVE_EEZE
+#if defined HAVE_EEZE || defined __OpenBSD__
    Ecore_Poller *poll;
 #else
    E_DBus_Signal_Handler *prop_change;
@@ -74,7 +77,7 @@ struct _Battery
 #endif
    Eina_Bool present:1;
    Eina_Bool charging:1;
-#ifdef HAVE_EEZE
+#if defined HAVE_EEZE || defined __OpenBSD__
    double last_update;
    double percent;
    double current_charge;
@@ -98,6 +101,9 @@ struct _Battery
    const char *model;
    const char *vendor;
    Eina_Bool got_prop:1;
+#ifdef __OpenBSD__
+   int * mib;
+#endif
 };
 
 struct _Ac_Adapter
@@ -108,6 +114,9 @@ struct _Ac_Adapter
 #endif
    Eina_Bool present:1;
    const char *product;
+#ifdef __OpenBSD__
+   int * mib;
+#endif
 };
 
 Battery *_battery_battery_find(const char *udi);
@@ -118,11 +127,16 @@ void _battery_device_update(void);
 int  _battery_udev_start(void);
 void _battery_udev_stop(void);
 /* end e_mod_udev.c */
-#else
+#elif !defined __OpenBSD__
 /* in e_mod_dbus.c */
 int  _battery_dbus_start(void);
 void _battery_dbus_stop(void);
 /* end e_mod_dbus.c */
+#else
+/* in e_mod_openbsd.c */
+int _battery_openbsd_start(void);
+void _battery_openbsd_stop(void);
+/* end e_mod_openbsd.c */
 #endif
 
 EAPI extern E_Module_Api e_modapi;
diff --git a/src/modules/battery/e_mod_openbsd.c b/src/modules/battery/e_mod_openbsd.c
new file mode 100644 (file)
index 0000000..5c4eae3
--- /dev/null
@@ -0,0 +1,180 @@
+
+#include <err.h>
+
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+
+#include "e.h"
+#include "e_mod_main.h"
+
+static Eina_Bool _battery_openbsd_battery_update_poll(void *data);
+static void _battery_openbsd_battery_update();
+
+extern Eina_List *device_batteries;
+extern Eina_List *device_ac_adapters;
+extern double init_time;
+
+Ac_Adapter *ac;
+Battery *bat;
+
+int 
+_battery_openbsd_start(void)
+{
+   Eina_List *devices;
+   int mib[] = {CTL_HW, HW_SENSORS, 0, 0 ,0};
+   int devn;
+   struct sensordev snsrdev;
+   size_t sdlen = sizeof(struct sensordev);
+   struct sensor s;
+   size_t slen = sizeof(struct sensor);
+
+   for (devn = 0 ; ; devn++) {
+       mib[2] = devn;
+       if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1) {
+               if (errno == ENXIO)
+                       continue;
+               if (errno == ENOENT)
+                       break;
+       }
+
+       if (!strcmp("acpibat0", snsrdev.xname)) {
+               if (!(bat = E_NEW(Battery, 1)))
+                       return 0;
+               bat->udi = eina_stringshare_add("acpibat0"),
+               bat->mib = malloc(sizeof(int) * 5);
+               bat->mib[0] = mib[0];
+               bat->mib[1] = mib[1];
+               bat->mib[2] = mib[2];   
+               bat->technology = eina_stringshare_add("Unknow");
+                bat->model = eina_stringshare_add("Unknow");
+                bat->vendor = eina_stringshare_add("Unknow");
+                bat->last_update = ecore_time_get();
+                bat->poll = ecore_poller_add(ECORE_POLLER_CORE, 
+                               battery_config->poll_interval, 
+                               _battery_openbsd_battery_update_poll, NULL);
+                device_batteries = eina_list_append(device_batteries, bat);
+       }
+       else if (!strcmp("acpiac0", snsrdev.xname)) {
+               if (!(ac = E_NEW(Ac_Adapter, 1)))
+                  return 0;
+               ac->udi = eina_stringshare_add("acpiac0");
+               ac->mib = malloc(sizeof(int) * 5);
+               ac->mib[0] = mib[0];
+               ac->mib[1] = mib[1];
+               ac->mib[2] = mib[2];    
+                device_ac_adapters = eina_list_append(device_ac_adapters, ac);
+       }
+   }
+
+   _battery_openbsd_battery_update();
+
+   init_time = ecore_time_get();
+   return 1;
+}
+
+void 
+_battery_openbsd_stop(void)
+{
+   if (ac)
+      free(ac);
+   if (bat) {
+      eina_stringshare_del(bat->udi);
+      eina_stringshare_del(bat->technology);
+      eina_stringshare_del(bat->model);
+      eina_stringshare_del(bat->vendor);
+      ecore_poller_del(bat->poll);
+      free(bat->mib);
+      free(bat);
+   }
+}
+
+static Eina_Bool 
+_battery_openbsd_battery_update_poll(void *data)
+{
+       _battery_openbsd_battery_update();
+       return EINA_TRUE;
+}
+
+static void 
+_battery_openbsd_battery_update()
+{
+       double time, charge;
+       struct sensor s;
+       size_t slen = sizeof(struct sensor);
+   
+       /* update the poller interval */
+       ecore_poller_poller_interval_set(bat->poll,
+           battery_config->poll_interval);
+
+       /* last full capacity */
+       bat->mib[3] = 8;
+       bat->mib[4] = 0;
+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1) {
+               bat->last_full_charge = (double)s.value;
+       }
+               
+       /* remaining capcity */
+       bat->mib[3] = 8;
+       bat->mib[4] = 3;
+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1) {
+               charge = (double)s.value;
+       }
+
+        time = ecore_time_get();
+        if ((bat->got_prop) && (charge != bat->current_charge))
+          bat->charge_rate = ((charge - bat->current_charge) / (time - bat->last_update));
+        bat->last_update = time;
+        bat->current_charge = charge;
+        bat->percent = 100 * (bat->current_charge / bat->last_full_charge);
+        if (bat->got_prop)
+          {
+             if (bat->charge_rate > 0)
+               {
+                  if (battery_config->fuzzy && (++battery_config->fuzzcount <= 10) && (bat->time_full > 0))
+                    bat->time_full = (((bat->last_full_charge - bat->current_charge) / bat->charge_rate) + bat->time_full) / 2;
+                  else
+                    bat->time_full = (bat->last_full_charge - bat->current_charge) / bat->charge_rate;
+                  bat->time_left = -1;
+               }
+             else
+               {
+                  if (battery_config->fuzzy && (battery_config->fuzzcount <= 10) && (bat->time_left > 0))
+                    bat->time_left = (((0 - bat->current_charge) / bat->charge_rate) + bat->time_left) / 2;
+                  else
+                    bat->time_left = (0 - bat->current_charge) / bat->charge_rate;
+                  bat->time_full = -1;
+               }
+          }
+        else
+          {
+             bat->time_full = -1;
+             bat->time_left = -1;
+          }
+
+       /* battery state 1: discharge, 2: charge */
+       bat->mib[3] = 10;
+       bat->mib[4] = 0;
+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) == -1) {
+               if (s.value == 2)
+                       bat->charging = 1;
+               else
+                       bat->charging = 0;
+       }
+
+       /* AC State */
+       ac->mib[3] = 9;
+       ac->mib[4] = 0;
+       if (sysctl(ac->mib, 5, &s, &slen, NULL, 0) == -1) {
+               if (s.value)
+                       ac->present = 1;
+               else
+                       ac->present = 0;
+       }
+
+       
+
+       if (bat->got_prop)
+               _battery_device_update();
+       bat->got_prop = 1;
+}
index 5e0009c..6fe9a29 100644 (file)
@@ -142,7 +142,6 @@ _battery_udev_ac_add(const char *syspath)
 static void 
 _battery_udev_battery_del(const char *syspath)
 {
-   Eina_List *l;
    Battery *bat;
 
    if (!(bat = _battery_battery_find(syspath)))
@@ -152,20 +151,18 @@ _battery_udev_battery_del(const char *syspath)
         return;
      }
 
-   l = eina_list_data_find(device_batteries, bat);
+   device_batteries = eina_list_remove(device_batteries, bat);
    eina_stringshare_del(bat->udi);
    eina_stringshare_del(bat->technology);
    eina_stringshare_del(bat->model);
    eina_stringshare_del(bat->vendor);
    ecore_poller_del(bat->poll);
    free(bat);
-   device_batteries = eina_list_remove_list(device_batteries, l);
 }
 
 static void 
 _battery_udev_ac_del(const char *syspath)
 {
-   Eina_List *l;
    Ac_Adapter *ac;
 
    if (!(ac = _battery_ac_adapter_find(syspath)))
@@ -175,10 +172,9 @@ _battery_udev_ac_del(const char *syspath)
         return;
      }
 
-   l = eina_list_data_find(device_ac_adapters, ac);
+   device_ac_adapters = eina_list_remove(device_ac_adapters, ac);
    eina_stringshare_del(ac->udi);
    free(ac);
-   device_ac_adapters = eina_list_remove_list(device_ac_adapters, l);
 }
 
 static Eina_Bool 
old mode 100755 (executable)
new mode 100644 (file)
index e1b8c18..6562c06 100644 (file)
@@ -575,7 +575,7 @@ _bluez_popup_device_selected(void *data)
 static Eina_Bool
 _bluez_event_devicefound(void       *data,
                          int type    __UNUSED__,
-                         void *event __UNUSED__)
+                         void *event)
 {
    E_Bluez_Module_Context *ctxt = data;
    E_Bluez_Device_Found *device = event;
@@ -1066,7 +1066,7 @@ _gc_orient(E_Gadcon_Client       *gcc,
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_bluez_Name);
diff --git a/src/modules/clock/.cvsignore b/src/modules/clock/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 1b680ed..bc71f53 100644 (file)
@@ -3,7 +3,7 @@
 
 struct _E_Config_Dialog_Data
 {
-   Config cfg;
+   Config_Item cfg;
 };
 
 /* Protos */
@@ -16,15 +16,14 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog      *cfd,
 static int _basic_apply_data(E_Config_Dialog      *cfd,
                              E_Config_Dialog_Data *cfdata);
 
-E_Config_Dialog *
-e_int_config_clock_module(E_Container       *con,
-                          const char *params __UNUSED__)
+void
+e_int_config_clock_module(E_Container *con, Config_Item *ci)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    char buf[4096];
 
-   if (e_config_dialog_find("E", "utils/clock")) return NULL;
+   if (e_config_dialog_find("E", "utils/clock")) return;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -33,22 +32,23 @@ e_int_config_clock_module(E_Container       *con,
    v->basic.create_widgets = _basic_create_widgets;
 
    snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
-            e_module_dir_get(clock_module));
-   cfd = e_config_dialog_new(con, _("Clock Settings"),
-                             "E", "utils/clock", buf, 0, v, clock_module);
-   clock_config = cfd;
-   return cfd;
+            e_module_dir_get(clock_config->module));
+   cfd = e_config_dialog_new(con,_("Clock Settings"),
+                             "E", "utils/clock", buf, 0, v, ci);
+   clock_config->config_dialog = cfd;
 }
 
 static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
+   Config_Item *ci;
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   ci = cfd->data;
+
+   memcpy(&(cfdata->cfg), ci, sizeof(Config_Item));
 
-   memcpy(&(cfdata->cfg), clock_cfg, sizeof(Config));
-   
    return cfdata;
 }
 
@@ -56,7 +56,7 @@ static void
 _free_data(E_Config_Dialog *cfd  __UNUSED__,
            E_Config_Dialog_Data *cfdata)
 {
-   clock_config = NULL;
+   clock_config->config_dialog = NULL;
    free(cfdata);
 }
 
@@ -69,9 +69,9 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    E_Radio_Group *rg;
 
    tab = e_widget_table_add(evas, 0);
-   
+
    of = e_widget_frametable_add(evas, _("Clock"), 0);
-   
+
    rg = e_widget_radio_group_new(&(cfdata->cfg.digital_clock));
    ob = e_widget_radio_add(evas, _("Analogue"), 0, rg);
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
@@ -86,13 +86,11 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
    ob = e_widget_check_add(evas, _("Seconds"), &(cfdata->cfg.show_seconds));
    e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
-   
+
    e_widget_table_object_append(tab, of, 0, 0, 1, 1, 1, 1, 1, 1);
-   
-   of = e_widget_frametable_add(evas, _("Weekend"), 0);
-   
+
    of = e_widget_frametable_add(evas, _("Week"), 0);
-   
+
    ob = e_widget_label_add(evas, _("Start"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.week.start));
@@ -110,11 +108,11 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
    ob = e_widget_radio_add(evas, _("Sat"), 6, rg);
    e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 0, 0);
-   
+
    e_widget_table_object_append(tab, of, 1, 0, 1, 1, 1, 1, 1, 1);
-   
+
    of = e_widget_frametable_add(evas, _("Weekend"), 0);
-   
+
    ob = e_widget_label_add(evas, _("Start"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.weekend.start));
@@ -132,7 +130,7 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
    ob = e_widget_radio_add(evas, _("Sat"), 6, rg);
    e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 0, 0);
-   
+
    ob = e_widget_label_add(evas, _("Days"));
    e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.weekend.len));
@@ -150,7 +148,7 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 0, 0);
    ob = e_widget_radio_add(evas, "6", 6, rg);
    e_widget_frametable_object_append(of, ob, 1, 7, 1, 1, 1, 1, 0, 0);
-   
+
    e_widget_table_object_append(tab, of, 2, 0, 1, 1, 1, 1, 1, 1);
    return tab;
 }
@@ -159,7 +157,10 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd  __UNUSED__,
                   E_Config_Dialog_Data *cfdata)
 {
-   memcpy(clock_cfg, &(cfdata->cfg), sizeof(Config));
+   Config_Item *ci;
+
+   ci = cfd->data;
+   memcpy(ci, &(cfdata->cfg), sizeof(Config_Item));
    e_int_clock_instances_redo();
    e_config_save_queue();
    return 1;
index 7387cc9..c68ac9d 100644 (file)
@@ -8,9 +8,11 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static Config_Item *_conf_item_get(const char *id);
+
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
@@ -32,9 +34,9 @@ struct _Instance
    Evas_Object     *o_clock, *o_table, *o_popclock, *o_cal;
    E_Gadcon_Popup  *popup;
    E_Menu          *menu;
-   
+
    int madj;
-   
+
    char year[8];
    char month[32];
    const char *daynames[7];
@@ -42,21 +44,22 @@ struct _Instance
    Eina_Bool dayweekends[7][6];
    Eina_Bool dayvalids[7][6];
    Eina_Bool daytoday[7][6];
+   Config_Item *cfg;
 };
 
-E_Module *clock_module = NULL;
-E_Config_Dialog *clock_config = NULL;
-Config *clock_cfg = NULL;
+Config *clock_config = NULL;
 
-static E_Config_DD *clock_cfg_edd = NULL;
+static E_Config_DD *conf_edd = NULL;
+static E_Config_DD *conf_item_edd = NULL;
 static Eina_List *clock_instances = NULL;
 static E_Action *act = NULL;
+static Ecore_Timer *update_today = NULL;
 
 static void
 _clear_timestrs(Instance *inst)
 {
    int x;
-   
+
    for (x = 0; x < 7; x++)
      {
         if (inst->daynames[x])
@@ -74,17 +77,17 @@ _time_eval(Instance *inst)
    struct tm          *tm, tms, tmm, tm2;
    time_t              tt;
    int                 started = 0, num, i;
-   
+
    tzset();
    gettimeofday(&timev, NULL);
    tt = (time_t)(timev.tv_sec);
    tm = localtime(&tt);
-   
+
    _clear_timestrs(inst);
    if (tm)
      {
         int day;
-        
+
         // tms == current date time "saved"
         // tm2 == date to look at adjusting for madj
         // tm2 == month baseline @ 1st
@@ -104,36 +107,36 @@ _time_eval(Instance *inst)
              tt = mktime(&tmm);
              tm = localtime(&tt);
              memcpy(&tm2, tm, sizeof(struct tm));
-             
+
              tt = mktime(&tmm);
              tt += (day * 60 * 60 * 24);
              tm = localtime(&tt);
              memcpy(&tmm, tm, sizeof(struct tm));
              if (!started)
                {
-                  if (tm->tm_wday == clock_cfg->week.start) started = 1;
+                  if (tm->tm_wday == inst->cfg->week.start) started = 1;
                }
              if (started)
                {
                   int y = num / 7;
                   int x = num % 7;
-                  
+
                   if (y < 6)
                     {
                        inst->daynums[x][y] = tmm.tm_mday;
-                       
+
                        inst->dayvalids[x][y] = 0;
                        if (tmm.tm_mon == tm2.tm_mon) inst->dayvalids[x][y] = 1;
-                       
+
                        inst->daytoday[x][y] = 0;
                        if ((tmm.tm_mon == tms.tm_mon) &&
                            (tmm.tm_year == tms.tm_year) &&
                            (tmm.tm_mday == tms.tm_mday))
                           inst->daytoday[x][y] = 1;
-                       
+
                        inst->dayweekends[x][y] = 0;
-                       for (i = clock_cfg->weekend.start; 
-                            i < (clock_cfg->weekend.start + clock_cfg->weekend.len);
+                       for (i = inst->cfg->weekend.start;
+                            i < (inst->cfg->weekend.start + inst->cfg->weekend.len);
                             i++)
                          {
                             if (tmm.tm_wday == (i % 7))
@@ -145,7 +148,7 @@ _time_eval(Instance *inst)
                        if (!inst->daynames[x])
                          {
                             char buf[32];
-                            
+
                             buf[sizeof(buf) - 1] = 0;
                             strftime(buf, sizeof(buf) - 1, "%a", (const struct tm *)&tmm); // %A full weekeday
                             inst->daynames[x] = eina_stringshare_add(buf);
@@ -154,7 +157,7 @@ _time_eval(Instance *inst)
                   num++;
                }
           }
-        
+
         memcpy(&tmm, &tms, sizeof(struct tm));
         tmm.tm_sec = 0;
         tmm.tm_min = 0;
@@ -188,13 +191,13 @@ _clock_month_update(Instance *inst)
         od = edje_object_part_table_child_get(oi, "e.table.daynames", x, 0);
         edje_object_part_text_set(od, "e.text.label", inst->daynames[x]);
      }
-   
+
    for (y = 0; y < 6; y++)
      {
         for (x = 0; x < 7; x++)
           {
              char buf[32];
-             
+
              od = edje_object_part_table_child_get(oi, "e.table.days", x, y);
              snprintf(buf, sizeof(buf), "%i", (int)inst->daynums[x][y]);
              edje_object_part_text_set(od, "e.text.label", buf);
@@ -236,112 +239,242 @@ static void
 _clock_settings_cb(void *d1, void *d2 __UNUSED__)
 {
    Instance *inst = d1;
-   e_int_config_clock_module(inst->popup->win->zone->container, NULL);
+   e_int_config_clock_module(inst->popup->win->zone->container, inst->cfg);
    e_object_del(E_OBJECT(inst->popup));
    inst->popup = NULL;
 }
-   
+
 static void
 _clock_popup_new(Instance *inst)
 {
    Evas *evas;
    Evas_Object *o, *oi;
    Evas_Coord mw = 128, mh = 128;
-   
+   char todaystr[32];
+   time_t t;
+   struct tm *tm;
+
+   t = time(NULL);
+   tm = localtime(&t);
+   strftime(todaystr, sizeof(todaystr) - 1, "%a, %x", tm);
+
    if (inst->popup) return;
 
    inst->madj = 0;
-   
+
    _time_eval(inst);
-   
+
    inst->popup = e_gadcon_popup_new(inst->gcc);
    evas = inst->popup->win->evas;
-   
+
    inst->o_table = e_widget_table_add(evas, 0);
 
    oi = edje_object_add(evas);
    inst->o_popclock = oi;
-   if (clock_cfg->digital_clock)
+   if (inst->cfg->digital_clock)
       e_theme_edje_object_set(oi, "base/theme/modules/clock",
                               "e/modules/clock/digital");
    else
       e_theme_edje_object_set(oi, "base/theme/modules/clock",
                               "e/modules/clock/main");
-   if (clock_cfg->digital_24h)
+   if (inst->cfg->digital_24h)
       edje_object_signal_emit(oi, "e,state,24h,on", "e");
    else
       edje_object_signal_emit(oi, "e,state,24h,off", "e");
-   if (clock_cfg->show_seconds)
+   if (inst->cfg->show_seconds)
       edje_object_signal_emit(oi, "e,state,seconds,on", "e");
    else
       edje_object_signal_emit(oi, "e,state,seconds,off", "e");
+
+   edje_object_part_text_set(oi, "e.text.today", todaystr);
+
    o = e_widget_image_add_from_object(evas, oi, 128, 128);
    evas_object_show(oi);
-   e_widget_table_object_align_append(inst->o_table, o, 
+   e_widget_table_object_align_append(inst->o_table, o,
                                       0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
 
    o = e_widget_button_add(evas, _("Settings"), "preferences-system",
                            _clock_settings_cb, inst, NULL);
-   e_widget_table_object_align_append(inst->o_table, o, 
+   e_widget_table_object_align_append(inst->o_table, o,
                                       0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0);
-   
+
    oi = edje_object_add(evas);
    inst->o_cal = oi;
    e_theme_edje_object_set(oi, "base/theme/modules/clock",
                            "e/modules/clock/calendar");
    _clock_month_update(inst);
-   
-   edje_object_signal_callback_add(oi, "e,action,prev", "*", 
+
+   edje_object_signal_callback_add(oi, "e,action,prev", "*",
                                    _clock_month_prev_cb, inst);
-   edje_object_signal_callback_add(oi, "e,action,next", "*", 
+   edje_object_signal_callback_add(oi, "e,action,next", "*",
                                    _clock_month_next_cb, inst);
    evas_object_resize(oi, 500, 500);
    edje_object_size_min_restricted_calc(oi, &mw, &mh, 128, 128);
-   
+
    o = e_widget_image_add_from_object(evas, oi, mw, mh);
    evas_object_show(oi);
-   e_widget_table_object_align_append(inst->o_table, o, 
+   e_widget_table_object_align_append(inst->o_table, o,
                                       1, 0, 1, 2, 0, 0, 0, 0, 0.5, 0.5);
-   
+
    e_gadcon_popup_content_set(inst->popup, inst->o_table);
    e_gadcon_popup_show(inst->popup);
 }
 
+static void
+_eval_instance_size(Instance *inst)
+{
+   Evas_Coord mw, mh, omw, omh;
+
+   edje_object_size_min_get(inst->o_clock, &mw, &mh);
+   omw = mw;
+   omh = mh;
+
+   if ((mw < 1) || (mh < 1))
+     {
+        Evas_Coord x, y, sw = 0, sh = 0, ow, oh;
+        Eina_Bool horiz;
+        const char *orient;
+
+        switch (inst->gcc->gadcon->orient)
+          {
+           case E_GADCON_ORIENT_TOP:
+           case E_GADCON_ORIENT_CORNER_TL:
+           case E_GADCON_ORIENT_CORNER_TR:
+           case E_GADCON_ORIENT_BOTTOM:
+           case E_GADCON_ORIENT_CORNER_BL:
+           case E_GADCON_ORIENT_CORNER_BR:
+           case E_GADCON_ORIENT_HORIZ:
+              horiz = EINA_TRUE;
+              orient = "e,state,horizontal";
+              break;
+
+           case E_GADCON_ORIENT_LEFT:
+           case E_GADCON_ORIENT_CORNER_LB:
+           case E_GADCON_ORIENT_CORNER_LT:
+           case E_GADCON_ORIENT_RIGHT:
+           case E_GADCON_ORIENT_CORNER_RB:
+           case E_GADCON_ORIENT_CORNER_RT:
+           case E_GADCON_ORIENT_VERT:
+              horiz = EINA_FALSE;
+              orient = "e,state,vertical";
+              break;
+
+           default:
+              horiz = EINA_TRUE;
+              orient = "e,state,float";
+          }
+
+        if (inst->gcc->gadcon->shelf)
+          {
+             if (horiz)
+               sh = inst->gcc->gadcon->shelf->h;
+             else
+               sw = inst->gcc->gadcon->shelf->w;
+          }
+
+        evas_object_geometry_get(inst->o_clock, NULL, NULL, &ow, &oh);
+        if (orient)
+          edje_object_signal_emit(inst->o_clock, orient, "e");
+        evas_object_resize(inst->o_clock, sw, sh);
+        edje_object_message_signal_process(inst->o_clock);
+
+        edje_object_parts_extends_calc(inst->o_clock, &x, &y, &mw, &mh);
+        evas_object_resize(inst->o_clock, ow, oh);
+     }
+
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+
+   if (mw < omw) mw = omw;
+   if (mh < omh) mh = omh;
+
+   e_gadcon_client_aspect_set(inst->gcc, mw, mh);
+   e_gadcon_client_min_size_set(inst->gcc, mw, mh);
+}
+
 void
 e_int_clock_instances_redo(void)
 {
    Eina_List *l;
    Instance *inst;
-   
+   char todaystr[32];
+   time_t t;
+   struct tm *tm;
+
+   t = time(NULL);
+   tm = localtime(&t);
+   strftime(todaystr, sizeof(todaystr) - 1, "%a, %x", tm);
+
    EINA_LIST_FOREACH(clock_instances, l, inst)
      {
         Evas_Object *o = inst->o_clock;
-        Evas_Coord mw, mh;
 
-        if (clock_cfg->digital_clock)
+        if (inst->cfg->digital_clock)
            e_theme_edje_object_set(o, "base/theme/modules/clock",
                                    "e/modules/clock/digital");
         else
            e_theme_edje_object_set(o, "base/theme/modules/clock",
                                    "e/modules/clock/main");
-        if (clock_cfg->digital_24h)
+        if (inst->cfg->digital_24h)
            edje_object_signal_emit(o, "e,state,24h,on", "e");
         else
            edje_object_signal_emit(o, "e,state,24h,off", "e");
-        if (clock_cfg->show_seconds)
+        if (inst->cfg->show_seconds)
            edje_object_signal_emit(o, "e,state,seconds,on", "e");
         else
            edje_object_signal_emit(o, "e,state,seconds,off", "e");
-        edje_object_message_signal_process(o);
-        mw = 0, mh = 0;
-        edje_object_size_min_get(o, &mw, &mh);
-        if ((mw < 1) || (mh < 1))
-           edje_object_size_min_calc(o, &mw, &mh);
-        if (mw < 4) mw = 4;
-        if (mh < 4) mh = 4;
-        e_gadcon_client_aspect_set(inst->gcc, mw, mh);
-        e_gadcon_client_min_size_set(inst->gcc, mw, mh);
+
+        edje_object_part_text_set(o, "e.text.today", todaystr);
+        _eval_instance_size(inst);
+
+        if (inst->o_popclock)
+          {
+             o = inst->o_popclock;
+
+             if (inst->cfg->digital_clock)
+               e_theme_edje_object_set(o, "base/theme/modules/clock",
+                                       "e/modules/clock/digital");
+             else
+               e_theme_edje_object_set(o, "base/theme/modules/clock",
+                                       "e/modules/clock/main");
+             if (inst->cfg->digital_24h)
+               edje_object_signal_emit(o, "e,state,24h,on", "e");
+             else
+               edje_object_signal_emit(o, "e,state,24h,off", "e");
+             if (inst->cfg->show_seconds)
+               edje_object_signal_emit(o, "e,state,seconds,on", "e");
+             else
+               edje_object_signal_emit(o, "e,state,seconds,off", "e");
+
+             edje_object_part_text_set(o, "e.text.today", todaystr);
+          }
+     }
+}
+
+static Eina_Bool
+_update_today_timer(void *data __UNUSED__)
+{
+   time_t t, t_tomorrow;
+   const struct tm *now;
+   struct tm today;
+
+   e_int_clock_instances_redo();
+   if (!clock_instances)
+     {
+        update_today = NULL;
+        return EINA_FALSE;
      }
+
+   t = time(NULL);
+   now = localtime(&t);
+   memcpy(&today, now, sizeof(today));
+   today.tm_sec = 1;
+   today.tm_min = 0;
+   today.tm_hour = 0;
+
+   t_tomorrow = mktime(&today) + 24 * 60 * 60;
+   update_today = ecore_timer_add(t_tomorrow - t, _update_today_timer, NULL);
+   return EINA_FALSE;
 }
 
 static void
@@ -350,6 +483,7 @@ _clock_popup_free(Instance *inst)
    if (!inst->popup) return;
    if (inst->popup) e_object_del(E_OBJECT(inst->popup));
    inst->popup = NULL;
+   inst->o_popclock = NULL;
 }
 
 static void
@@ -370,14 +504,14 @@ _clock_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED
 {
    Instance *inst = data;
    E_Container *con;
-   
+
    if (inst->popup)
      {
         e_object_del(E_OBJECT(inst->popup));
         inst->popup = NULL;
      }
    con = e_container_current_get(e_manager_current_get());
-   e_int_config_clock_module(con, NULL);
+   e_int_config_clock_module(con, inst->cfg);
 }
 
 static void
@@ -385,7 +519,7 @@ _clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
 {
    Instance *inst = data;
    Evas_Event_Mouse_Down *ev = event;
-   
+
    if (ev->button == 1)
      {
         if (inst->popup) _clock_popup_free(inst);
@@ -397,20 +531,20 @@ _clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
         E_Menu *m;
         E_Menu_Item *mi;
         int x, y;
-        
+
         zone = e_util_zone_current_get(e_manager_current_get());
-        
+
         m = e_menu_new();
-        
+
         mi = e_menu_item_new(m);
         e_menu_item_label_set(mi, _("Settings"));
         e_util_menu_item_theme_icon_set(mi, "configure");
         e_menu_item_callback_set(mi, _clock_menu_cb_cfg, inst);
-        
+
         m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
         e_menu_post_deactivate_callback_set(m, _clock_menu_cb_post, inst);
         inst->menu = m;
-        
+
         e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
         e_menu_activate_mouse(m, zone, x + ev->output.x, y + ev->output.y,
                               1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
@@ -418,20 +552,11 @@ _clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
                                  EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
+
 static void
 _clock_sizing_changed_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-   Instance *inst = data;
-   Evas_Coord mw, mh;
-   
-   mw = 0, mh = 0;
-   edje_object_size_min_get(inst->o_clock, &mw, &mh);
-   if ((mw < 1) || (mh < 1))
-     edje_object_size_min_calc(inst->o_clock, &mw, &mh);
-   if (mw < 4) mw = 4;
-   if (mh < 4) mh = 4;
-   e_gadcon_client_aspect_set(inst->gcc, mw, mh);
-   e_gadcon_client_min_size_set(inst->gcc, mw, mh);
+   _eval_instance_size(data);
 }
 
 static E_Gadcon_Client *
@@ -440,42 +565,53 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Object *o;
    E_Gadcon_Client *gcc;
    Instance *inst;
-   
+   char todaystr[32];
+   time_t t;
+   struct tm *tm;
+
+   t = time(NULL);
+   tm = localtime(&t);
+   strftime(todaystr, sizeof(todaystr) - 1, "%a, %x", tm);
+
    inst = E_NEW(Instance, 1);
-   
+   inst->cfg = _conf_item_get(id);
+
    o = edje_object_add(gc->evas);
-   edje_object_signal_callback_add(o, "e,state,sizing,changed", "*", 
+   edje_object_signal_callback_add(o, "e,state,sizing,changed", "*",
                                    _clock_sizing_changed_cb, inst);
-   if (clock_cfg->digital_clock)
+   if (inst->cfg->digital_clock)
       e_theme_edje_object_set(o, "base/theme/modules/clock",
                               "e/modules/clock/digital");
    else
       e_theme_edje_object_set(o, "base/theme/modules/clock",
                               "e/modules/clock/main");
-   if (clock_cfg->digital_24h)
+   if (inst->cfg->digital_24h)
       edje_object_signal_emit(o, "e,state,24h,on", "e");
    else
       edje_object_signal_emit(o, "e,state,24h,off", "e");
-   if (clock_cfg->show_seconds)
+   if (inst->cfg->show_seconds)
       edje_object_signal_emit(o, "e,state,seconds,on", "e");
    else
       edje_object_signal_emit(o, "e,state,seconds,off", "e");
+
+   edje_object_part_text_set(o, "e.text.today", todaystr);
    evas_object_show(o);
-   
+
    gcc = e_gadcon_client_new(gc, name, id, style, o);
    gcc->data = inst;
-   
+
    inst->gcc = gcc;
    inst->o_clock = o;
-   
-   evas_object_event_callback_add(inst->o_clock, 
+
+   evas_object_event_callback_add(inst->o_clock,
                                   EVAS_CALLBACK_MOUSE_DOWN,
                                   _clock_cb_mouse_down,
                                   inst);
-   
-   e_gadcon_client_util_menu_attach(gcc);
 
    clock_instances = eina_list_append(clock_instances, inst);
+
+   if (!update_today) _update_today_timer(NULL);
+
    return gcc;
 }
 
@@ -483,10 +619,11 @@ static void
 _gc_shutdown(E_Gadcon_Client *gcc)
 {
    Instance *inst;
-   
+
    inst = gcc->data;
    if (inst->menu)
      {
+        e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
         e_object_del(E_OBJECT(inst->menu));
         inst->menu = NULL;
      }
@@ -495,26 +632,21 @@ _gc_shutdown(E_Gadcon_Client *gcc)
    _clock_popup_free(inst);
    _clear_timestrs(inst);
    free(inst);
+
+   if ((!clock_instances) && (update_today))
+     {
+        ecore_timer_del(update_today);
+        update_today = NULL;
+     }
 }
 
 static void
 _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 {
-   Instance *inst;
-   Evas_Coord mw, mh;
-   
-   inst = gcc->data;
-   mw = 0, mh = 0;
-   edje_object_size_min_get(inst->o_clock, &mw, &mh);
-   if ((mw < 1) || (mh < 1))
-     edje_object_size_min_calc(inst->o_clock, &mw, &mh);
-   if (mw < 4) mw = 4;
-   if (mh < 4) mh = 4;
-   e_gadcon_client_aspect_set(gcc, mw, mh);
-   e_gadcon_client_min_size_set(gcc, mw, mh);
+   _eval_instance_size(gcc->data);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Clock");
@@ -525,18 +657,44 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
-   
+
    o = edje_object_add(evas);
    snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
-           e_module_dir_get(clock_module));
+           e_module_dir_get(clock_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
 }
 
+
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   return _gadcon_class.name;
+   Config_Item *ci = NULL;
+
+   ci = _conf_item_get(NULL);
+   return ci->id;
+}
+
+static Config_Item *
+_conf_item_get(const char *id)
+{
+   Config_Item *ci;
+
+   GADCON_CLIENT_CONFIG_GET(Config_Item, clock_config->items, _gadcon_class, id);
+
+   ci = E_NEW(Config_Item, 1);
+   ci->id = eina_stringshare_add(id);
+   ci->weekend.start = 6;
+   ci->weekend.len = 2;
+   ci->week.start = 1;
+   ci->digital_clock = 0;
+   ci->digital_24h = 0;
+   ci->show_seconds = 1;
+
+   clock_config->items = eina_list_append(clock_config->items, ci);
+   e_config_save_queue();
+
+   return ci;
 }
 
 static void
@@ -556,31 +714,25 @@ _e_mod_action(const char *params)
 }
 
 static void
-_e_mod_action_cb_edge(E_Object *obj,
-                     const char *params,
-                      E_Event_Zone_Edge *ev)
+_e_mod_action_cb_edge(E_Object *obj __UNUSED__, const char *params, E_Event_Zone_Edge *ev __UNUSED__)
 {
    _e_mod_action(params);
 }
 
 static void
-_e_mod_action_cb(E_Object *obj, const char *params)
+_e_mod_action_cb(E_Object *obj __UNUSED__, const char *params)
 {
    _e_mod_action(params);
 }
 
 static void
-_e_mod_action_cb_key(E_Object *obj,
-                     const char *params,
-                     Ecore_Event_Key *ev)
+_e_mod_action_cb_key(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev __UNUSED__)
 {
    _e_mod_action(params);
 }
 
 static void
-_e_mod_action_cb_mouse(E_Object *obj,
-                       const char *params,
-                       Ecore_Event_Mouse_Button *ev)
+_e_mod_action_cb_mouse(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Mouse_Button *ev __UNUSED__)
 {
    _e_mod_action(params);
 }
@@ -595,11 +747,12 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   clock_cfg_edd = E_CONFIG_DD_NEW("Config", Config);
+   conf_item_edd = E_CONFIG_DD_NEW("Config_Item", Config_Item);
 #undef T
 #undef D
-#define T Config
-#define D clock_cfg_edd
+#define T Config_Item
+#define D conf_item_edd
+   E_CONFIG_VAL(D, T, id, STR);
    E_CONFIG_VAL(D, T, weekend.start, INT);
    E_CONFIG_VAL(D, T, weekend.len, INT);
    E_CONFIG_VAL(D, T, week.start, INT);
@@ -607,18 +760,17 @@ e_modapi_init(E_Module *m)
    E_CONFIG_VAL(D, T, digital_24h, INT);
    E_CONFIG_VAL(D, T, show_seconds, INT);
 
-   clock_cfg = e_config_domain_load("module.clock", clock_cfg_edd);
-   if (!clock_cfg)
-     {
-        clock_cfg = E_NEW(Config, 1);
-        clock_cfg->weekend.start = 6;
-        clock_cfg->weekend.len = 2;
-        clock_cfg->week.start = 1;
-        clock_cfg->digital_clock = 0;
-        clock_cfg->digital_24h = 0;
-        clock_cfg->show_seconds = 1;
-        e_config_save_queue();
-     }
+   conf_edd = E_CONFIG_DD_NEW("Config", Config);
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
+   E_CONFIG_LIST(D, T, items, conf_item_edd);
+
+   clock_config = e_config_domain_load("module.clock", conf_edd);
+
+   if (!clock_config)
+     clock_config = E_NEW(Config, 1);
 
    act = e_action_add("clock");
    if (act)
@@ -631,7 +783,8 @@ e_modapi_init(E_Module *m)
        e_action_predef_name_set(_("Clock"), _("Show calendar"), "clock", "show_calendar", NULL, 0);
      }
 
-   clock_module = m;
+   clock_config->module = m;
+
    e_gadcon_provider_register(&_gadcon_class);
    return m;
 }
@@ -639,26 +792,47 @@ e_modapi_init(E_Module *m)
 EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
+   if (act)
+     {
+        e_action_predef_name_del(_("Clock"), _("Show calendar"));
+        e_action_del("clock");
+        act = NULL;
+     }
    if (clock_config)
      {
-        e_object_del(E_OBJECT(clock_config));
+       Config_Item *ci;
+
+       if (clock_config->config_dialog)
+         e_object_del(E_OBJECT(clock_config->config_dialog));
+
+       EINA_LIST_FREE(clock_config->items, ci)
+         {
+            eina_stringshare_del(ci->id);
+            free(ci);
+         }
+
+        free(clock_config);
         clock_config = NULL;
      }
-   if (clock_cfg)
+   E_CONFIG_DD_FREE(conf_edd);
+   E_CONFIG_DD_FREE(conf_item_edd);
+   conf_item_edd = NULL;
+   conf_edd = NULL;
+
+   e_gadcon_provider_unregister(&_gadcon_class);
+
+   if (update_today)
      {
-        free(clock_cfg);
-        clock_cfg = NULL;
+        ecore_timer_del(update_today);
+        update_today = NULL;
      }
-   E_CONFIG_DD_FREE(clock_cfg_edd);
-   clock_cfg_edd = NULL;
-   clock_module = NULL;
-   e_gadcon_provider_unregister(&_gadcon_class);
+
    return 1;
 }
 
 EAPI int
 e_modapi_save(E_Module *m __UNUSED__)
 {
-   e_config_domain_save("module.clock", clock_cfg_edd, clock_cfg);
+   e_config_domain_save("module.clock", conf_edd, clock_config);
    return 1;
 }
index bcaa936..a3cfa7a 100644 (file)
@@ -8,25 +8,33 @@ EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
 
 typedef struct _Config Config;
+typedef struct _Config_Item Config_Item;
 
 struct _Config
 {
-   struct {
-      int           start, len; // 0->6 0 == sun, 6 == sat, number of days
+  Eina_List *items;
+
+  E_Module *module;
+  E_Config_Dialog *config_dialog;
+};
+
+struct _Config_Item
+{
+  const char *id;
+  struct {
+      int start, len; // 0->6 0 == sun, 6 == sat, number of days
    } weekend;
    struct {
-      int           start; // 0->6 0 == sun, 6 == sat
+      int start; // 0->6 0 == sun, 6 == sat
    } week;
    int digital_clock;
    int digital_24h;
    int show_seconds;
 };
 
-extern E_Module *clock_module;
-extern E_Config_Dialog *clock_config;
-extern Config *clock_cfg;
-
-E_Config_Dialog *e_int_config_clock_module(E_Container *con, const char *params);
+void e_int_config_clock_module(E_Container *con, Config_Item *ci);
 void e_int_clock_instances_redo(void);
 
+extern Config *clock_config;
+
 #endif
diff --git a/src/modules/comp/.cvsignore b/src/modules/comp/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index a98c1d0..8ebeebe 100644 (file)
@@ -26,7 +26,9 @@ module_la_SOURCES      = e_mod_main.c \
                          e_mod_comp.c \
                          e_mod_comp.h \
                          e_mod_comp_update.c \
-                         e_mod_comp_update.h
+                         e_mod_comp_update.h \
+                         e_mod_comp_cfdata.c \
+                         e_mod_comp_cfdata.h
                          
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
index 62f01c3..b56397d 100644 (file)
@@ -3,7 +3,7 @@
 #include "e_mod_comp.h"
 #include "e_mod_comp_update.h"
 
-#define OVER_FLOW 4
+#define OVER_FLOW 2
 
 //////////////////////////////////////////////////////////////////////////
 //
@@ -99,7 +99,7 @@ struct _E_Comp_Win
    Ecore_X_Window_Type  primary_type;  // fetched for override-redirect windowa
 
    unsigned char        misses; // number of sync misses
-   
+
    Eina_Bool            delete_pending : 1;  // delete pendig
    Eina_Bool            hidden_override : 1;  // hidden override
    Eina_Bool            animating : 1;  // it's busy animating - defer hides/dels
@@ -162,6 +162,48 @@ static void _e_mod_comp_win_configure(E_Comp_Win *cw,
                                       int         border);
 
 static void
+_e_mod_comp_child_show(E_Comp_Win *cw)
+{
+   evas_object_show(cw->shobj);
+   if (cw->bd)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
+          {
+             E_Comp_Win *tcw;
+
+             tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
+             if (!tcw) continue ;
+
+             evas_object_show(tcw->shobj);
+          }
+     }
+}
+
+static void
+_e_mod_comp_child_hide(E_Comp_Win *cw)
+{
+   evas_object_hide(cw->shobj);
+   if (cw->bd)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
+          {
+             E_Comp_Win *tcw;
+
+             tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
+             if (!tcw) continue ;
+
+             evas_object_hide(tcw->shobj);
+          }
+     }
+}
+
+static void
 _e_mod_comp_cb_pending_after(void *data             __UNUSED__,
                              E_Manager *man         __UNUSED__,
                              E_Manager_Comp_Source *src)
@@ -207,7 +249,7 @@ _e_mod_comp_shaped_check(int                      w,
    if ((!rects) || (num < 1)) return EINA_FALSE;
    if (num > 1) return EINA_TRUE;
    if ((rects[0].x == 0) && (rects[0].y == 0) &&
-       (rects[0].width == w) && (rects[0].height == h))
+       ((int)rects[0].width == w) && ((int)rects[0].height == h))
      return EINA_FALSE;
    return EINA_TRUE;
 }
@@ -592,7 +634,8 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
           }
         else
           {
-             cw->update = 1;
+             DBG("UPDATE [0x%x] NO RECTS!!! %i %i - %i %i\n", cw->win, cw->up->w, cw->up->h, cw->up->tw, cw->up->th);
+//             cw->update = 1;
           }
      }
    else
@@ -692,13 +735,13 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
      }
 // FIXME: below cw update check screws with show
    if (/*(!cw->update) &&*/ (cw->visible) && (cw->dmg_updates >= 1) &&
-                            (cw->show_ready))
+       (cw->show_ready) && (!cw->bd || cw->bd->visible))
      {
         if (!evas_object_visible_get(cw->shobj))
           {
             if (!cw->hidden_override)
               {
-                 evas_object_show(cw->shobj);
+                  _e_mod_comp_child_show(cw);
                  _e_mod_comp_win_render_queue(cw);
               }
 
@@ -900,7 +943,7 @@ _e_mod_comp_cb_update(E_Comp *c)
    if (_comp_mod->conf->lock_fps)
      {
         DBG("MANUAL RENDER...\n");
-        ecore_evas_manual_render(c->ee);
+//        ecore_evas_manual_render(c->ee);
      }
    if (_comp_mod->conf->efl_sync)
      {
@@ -1092,7 +1135,7 @@ nocomp:
 //                  _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
                   if (cw->visible)
                     {
-                       if (!cw->hidden_override) evas_object_show(cw->shobj);
+                       if (!cw->hidden_override) _e_mod_comp_child_show(cw);
                        cw->pending_count++;
                        e_manager_comp_event_src_visibility_send
                          (cw->c->man, (E_Manager_Comp_Source *)cw,
@@ -1141,6 +1184,9 @@ _e_mod_comp_cb_animator(void *data)
 static void
 _e_mod_comp_render_queue(E_Comp *c)
 {
+   /* FIXME workaround */
+   if (!c) return;
+
    if (_comp_mod->conf->lock_fps)
      {
         if (c->render_animator)
@@ -1417,7 +1463,7 @@ _e_mod_comp_win_shadow_setup(E_Comp_Win *cw)
           continue;
         if ((primary_type != ECORE_X_WINDOW_TYPE_UNKNOWN) &&
             (m->primary_type != ECORE_X_WINDOW_TYPE_UNKNOWN) &&
-            (primary_type != m->primary_type))
+            ((int)primary_type != m->primary_type))
           continue;
         if (cw->bd)
           {
@@ -1508,6 +1554,13 @@ _e_mod_comp_win_shadow_setup(E_Comp_Win *cw)
              if (ok) break;
           }
      }
+   if (!ok)
+     {
+        if (cw->bd && cw->bd->client.e.state.video)
+          ok = e_theme_edje_object_set(cw->shobj,
+                                       "base/theme/borders",
+                                       "e/comp/none");
+     }
    // use different shadow objects/group per window type?
    if (!ok)
      {
@@ -1535,13 +1588,19 @@ _e_mod_comp_win_shadow_setup(E_Comp_Win *cw)
         ok = edje_object_file_set(cw->shobj, buf, "shadow");
      }
    edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->obj);
-   if (_comp_mod->conf->use_shadow)
+   if (!_comp_mod->conf->use_shadow
+       || (cw->bd && cw->bd->client.e.state.video))
+     {
+        edje_object_signal_emit(cw->shobj, "e,state,shadow,off", "e");
+     }
+   else
      {
         if (_e_mod_comp_win_do_shadow(cw))
           edje_object_signal_emit(cw->shobj, "e,state,shadow,on", "e");
         else
           edje_object_signal_emit(cw->shobj, "e,state,shadow,off", "e");
      }
+
    if (cw->bd)
      {
         if (cw->bd->focused)
@@ -1640,79 +1699,9 @@ _e_mod_comp_win_add(E_Comp        *c,
    if (_comp_mod->conf->grab) ecore_x_grab();
    if (cw->bd)
      {
-#if 0
-        E_Comp_Win *cw2;
-
-        EINA_INLIST_FOREACH(c->wins, cw2)
-          if (cw->bd == cw2->bd) break;
-
-        if (cw2)
-          {
-             E_FREE(cw);
+       eina_hash_add(borders, e_util_winid_str_get(cw->bd->client.win), cw);
+       cw->dfn = e_object_delfn_add(E_OBJECT(cw->bd), _e_mod_comp_object_del, cw);
 
-             cw = cw2;
-
-             if (cw->inhash)
-               eina_hash_del(windows, e_util_winid_str_get(cw->win), cw);
-
-             if (cw->damage)
-               {
-                  Ecore_X_Region parts;
-
-                  eina_hash_del(damages, e_util_winid_str_get(cw->damage), cw);
-                  parts = ecore_x_region_new(NULL, 0);
-                  ecore_x_damage_subtract(cw->damage, 0, parts);
-                  ecore_x_region_free(parts);
-                  ecore_x_damage_free(cw->damage);
-                  cw->damage = 0;
-               }
-
-             if (cw->update_timeout)
-               {
-                  ecore_timer_del(cw->update_timeout);
-                  cw->update_timeout = NULL;
-               }
-
-             if (cw->ready_timeout)
-               {
-                  ecore_timer_del(cw->ready_timeout);
-                  cw->ready_timeout = NULL;
-               }
-             cw->win = win;
-
-             memset((&att), 0, sizeof(Ecore_X_Window_Attributes));
-             if (!ecore_x_window_attributes_get(cw->win, &att))
-               {
-                  if (_comp_mod->conf->grab) ecore_x_ungrab();
-                  return NULL;
-               }
-
-             cw->vis = att.visual;
-             cw->depth = att.depth;
-             cw->argb = (cw->bd->argb || cw->bd->client.argb);
-
-             eina_hash_add(windows, e_util_winid_str_get(cw->win), cw);
-             cw->inhash = 1;
-
-             cw->damage = ecore_x_damage_new
-                 (cw->win, ECORE_X_DAMAGE_REPORT_DELTA_RECTANGLES);
-             eina_hash_add(damages, e_util_winid_str_get(cw->damage), cw);
-
-             cw->needpix = 1;
-             cw->dmg_updates = 0;
-             cw->redirected = 1;
-
-             evas_object_image_alpha_set(cw->obj, cw->argb);
-
-             if (_comp_mod->conf->grab) ecore_x_ungrab();
-             return cw;
-          }
-        else
-#endif
-        {
-           eina_hash_add(borders, e_util_winid_str_get(cw->bd->client.win), cw);
-           cw->dfn = e_object_delfn_add(E_OBJECT(cw->bd), _e_mod_comp_object_del, cw);
-        }
         // setup on show
         // _e_mod_comp_win_sync_setup(cw, cw->bd->client.win);
      }
@@ -1786,7 +1775,7 @@ _e_mod_comp_win_add(E_Comp        *c,
         if (cw->argb) evas_object_image_alpha_set(cw->obj, 1);
         else evas_object_image_alpha_set(cw->obj, 0);
 
-        if (att.override && !(att.event_mask.mine & ECORE_X_EVENT_MASK_WINDOW_PROPERTY))
+        if (cw->override && !(att.event_mask.mine & ECORE_X_EVENT_MASK_WINDOW_PROPERTY))
           ecore_x_event_mask_set(cw->win, ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
 
         _e_mod_comp_win_shadow_setup(cw);
@@ -1802,25 +1791,15 @@ _e_mod_comp_win_add(E_Comp        *c,
           {
              int i;
 
-             if (rects)
-               {
-                  for (i = 0; i < num; i++)
-                    {
-                       E_RECTS_CLIP_TO_RECT(rects[i].x, rects[i].y,
-                                            rects[i].width, rects[i].height,
-                                            0, 0, att.w, att.h);
-                    }
-               }
-             if (!_e_mod_comp_shaped_check(att.w, att.h, rects, num))
-               {
-                  free(rects);
-                  rects = NULL;
-               }
-             if (rects)
-               {
-                  cw->shape_changed = 1;
-                  free(rects);
-               }
+            for (i = 0; i < num; i++)
+              E_RECTS_CLIP_TO_RECT(rects[i].x, rects[i].y,
+                                   rects[i].width, rects[i].height,
+                                   0, 0, att.w, att.h);
+
+             if (_e_mod_comp_shaped_check(att.w, att.h, rects, num))
+              cw->shape_changed = 1;
+
+            free(rects);
           }
 
         if (cw->bd) evas_object_data_set(cw->shobj, "border", cw->bd);
@@ -1856,8 +1835,8 @@ _e_mod_comp_win_add(E_Comp        *c,
    if (((!cw->input_only) && (!cw->invalid)) && (cw->override))
      {
           cw->redirected = 1;
-// we redirect all subwindows anyway
-//        ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
+         // we redirect all subwindows anyway
+         // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
           cw->dmg_updates = 0;
      }
    DBG("  [0x%x] add\n", cw->win);
@@ -2102,7 +2081,7 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
    if ((cw->dmg_updates >= 1) && (cw->show_ready))
      {
         cw->defer_hide = 0;
-        if (!cw->hidden_override) evas_object_show(cw->shobj);
+        if (!cw->hidden_override) _e_mod_comp_child_show(cw);
         edje_object_signal_emit(cw->shobj, "e,state,visible,on", "e");
         if (!cw->animating)
           {
@@ -2160,7 +2139,7 @@ _e_mod_comp_win_hide(E_Comp_Win *cw)
      }
    cw->defer_hide = 0;
    cw->force = 0;
-   evas_object_hide(cw->shobj);
+   _e_mod_comp_child_hide(cw);
 
    if (cw->update_timeout)
      {
@@ -2249,6 +2228,22 @@ _e_mod_comp_win_raise_above(E_Comp_Win *cw,
                                              EINA_INLIST_GET(cw),
                                              EINA_INLIST_GET(cw2));
    evas_object_stack_above(cw->shobj, cw2->shobj);
+   if (cw->bd)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
+          {
+             E_Comp_Win *tcw;
+
+             tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
+             if (!tcw) continue ;
+
+             evas_object_stack_below(tcw->shobj, cw->shobj);
+          }
+     }
+
    _e_mod_comp_win_render_queue(cw);
    cw->pending_count++;
    e_manager_comp_event_src_config_send
@@ -2264,6 +2259,22 @@ _e_mod_comp_win_raise(E_Comp_Win *cw)
    cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw));
    cw->c->wins = eina_inlist_append(cw->c->wins, EINA_INLIST_GET(cw));
    evas_object_raise(cw->shobj);
+   if (cw->bd)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
+          {
+             E_Comp_Win *tcw;
+
+             tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
+             if (!tcw) continue ;
+
+             evas_object_stack_below(tcw->shobj, cw->shobj);
+          }
+     }
+
    _e_mod_comp_win_render_queue(cw);
    cw->pending_count++;
    e_manager_comp_event_src_config_send
@@ -2279,6 +2290,22 @@ _e_mod_comp_win_lower(E_Comp_Win *cw)
    cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw));
    cw->c->wins = eina_inlist_prepend(cw->c->wins, EINA_INLIST_GET(cw));
    evas_object_lower(cw->shobj);
+   if (cw->bd)
+     {
+        Eina_List *l;
+        E_Border *tmp;
+
+        EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
+          {
+             E_Comp_Win *tcw;
+
+             tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
+             if (!tcw) continue ;
+
+             evas_object_stack_below(tcw->shobj, cw->shobj);
+          }
+     }
+
    _e_mod_comp_win_render_queue(cw);
    cw->pending_count++;
    e_manager_comp_event_src_config_send
@@ -2612,13 +2639,13 @@ _e_mod_comp_message(void *data __UNUSED__,
    if (cw)
      {
         if (!cw->bd) return ECORE_CALLBACK_PASS_ON;
-        if (ev->data.l[0] != cw->bd->client.win) return ECORE_CALLBACK_PASS_ON;
+        if (ev->data.l[0] != (int)cw->bd->client.win) return ECORE_CALLBACK_PASS_ON;
      }
    else
      {
         cw = _e_mod_comp_win_find(ev->data.l[0]);
         if (!cw) return ECORE_CALLBACK_PASS_ON;
-        if (ev->data.l[0] != cw->win) return ECORE_CALLBACK_PASS_ON;
+        if (ev->data.l[0] != (int)cw->win) return ECORE_CALLBACK_PASS_ON;
      }
    if (version == 1) // v 0 was first, v1 added size params
      {
@@ -2744,9 +2771,9 @@ _e_mod_comp_damage_win(void *data __UNUSED__,
         if (ev->win == c->ee_win)
           {
              // expose on comp win - init win or some other bypass win did it
-               DBG("JOB4...\n");
-               _e_mod_comp_render_queue(c);
-               break;
+             DBG("JOB4...\n");
+             _e_mod_comp_render_queue(c);
+             break;
           }
      }
    return ECORE_CALLBACK_PASS_ON;
@@ -2988,6 +3015,14 @@ _e_mod_comp_update_func(void          *data,
    _e_mod_comp_render_queue(c);
 }
 
+static E_Manager_Comp_Source *
+_e_mod_comp_src_get_func(void           *data __UNUSED__,
+                         E_Manager      *man __UNUSED__,
+                         Ecore_X_Window  win)
+{
+   return (E_Manager_Comp_Source *) _e_mod_comp_win_find(win);
+}
+
 static const Eina_List *
 _e_mod_comp_src_list_get_func(void          *data,
                               E_Manager *man __UNUSED__)
@@ -3068,12 +3103,14 @@ _e_mod_comp_src_hidden_set_func(void *data             __UNUSED__,
      if (cw->bd) e_border_comp_hidden_set(cw->bd, cw->hidden_override);
      if (cw->visible)
        {
-          if (cw->hidden_override) evas_object_hide(cw->shobj);
-          else evas_object_show(cw->shobj);
+          if (cw->hidden_override)
+           _e_mod_comp_child_hide(cw);
+          else if (!cw->bd || cw->bd->visible)
+           _e_mod_comp_child_show(cw);
        }
      else
        {
-          if (cw->hidden_override) evas_object_hide(cw->shobj);
+          if (cw->hidden_override) _e_mod_comp_child_hide(cw);
        }
 }
 
@@ -3088,6 +3125,39 @@ _e_mod_comp_src_hidden_get_func(void *data             __UNUSED__,
      return cw->hidden_override;
 }
 
+static E_Popup *
+_e_mod_comp_src_popup_get_func(void *data             __UNUSED__,
+                             E_Manager *man         __UNUSED__,
+                             E_Manager_Comp_Source *src)
+{
+   //   E_Comp *c = data;
+   E_Comp_Win *cw = (E_Comp_Win *)src;
+   if (!cw->c) return 0;
+   return cw->pop;
+}
+
+static E_Border *
+_e_mod_comp_src_border_get_func(void *data             __UNUSED__,
+                              E_Manager *man         __UNUSED__,
+                              E_Manager_Comp_Source *src)
+{
+   //   E_Comp *c = data;
+   E_Comp_Win *cw = (E_Comp_Win *)src;
+   if (!cw->c) return 0;
+   return cw->bd;
+}
+
+static Ecore_X_Window
+_e_mod_comp_src_window_get_func(void *data             __UNUSED__,
+                                E_Manager *man         __UNUSED__,
+                                E_Manager_Comp_Source *src)
+{
+   //   E_Comp *c = data;
+   E_Comp_Win *cw = (E_Comp_Win *)src;
+   if (!cw->c) return 0;
+   return cw->win;
+}
+
 static E_Comp *
 _e_mod_comp_add(E_Manager *man)
 {
@@ -3098,16 +3168,7 @@ _e_mod_comp_add(E_Manager *man)
 
    c = calloc(1, sizeof(E_Comp));
    if (!c) return NULL;
-
-   if (_comp_mod->conf->vsync)
-     {
-        e_util_env_set("__GL_SYNC_TO_VBLANK", "1");
-     }
-   else
-     {
-        e_util_env_set("__GL_SYNC_TO_VBLANK", NULL);
-     }
-
+   
    ecore_x_e_comp_sync_supported_set(man->root, _comp_mod->conf->efl_sync);
 
    c->man = man;
@@ -3198,7 +3259,7 @@ _e_mod_comp_add(E_Manager *man)
      }
 
    ecore_evas_comp_sync_set(c->ee, 0);
-   ecore_evas_manual_render_set(c->ee, _comp_mod->conf->lock_fps);
+//   ecore_evas_manual_render_set(c->ee, _comp_mod->conf->lock_fps);
    c->evas = ecore_evas_get(c->ee);
    ecore_evas_show(c->ee);
 
@@ -3256,6 +3317,7 @@ _e_mod_comp_add(E_Manager *man)
    c->comp.data = c;
    c->comp.func.evas_get = _e_mod_comp_evas_get_func;
    c->comp.func.update = _e_mod_comp_update_func;
+   c->comp.func.src_get = _e_mod_comp_src_get_func;
    c->comp.func.src_list_get = _e_mod_comp_src_list_get_func;
    c->comp.func.src_image_get = _e_mod_comp_src_image_get_func;
    c->comp.func.src_shadow_get = _e_mod_comp_src_shadow_get_func;
@@ -3263,6 +3325,9 @@ _e_mod_comp_add(E_Manager *man)
    c->comp.func.src_visible_get = _e_mod_comp_src_visible_get_func;
    c->comp.func.src_hidden_set = _e_mod_comp_src_hidden_set_func;
    c->comp.func.src_hidden_get = _e_mod_comp_src_hidden_get_func;
+   c->comp.func.src_window_get = _e_mod_comp_src_window_get_func;
+   c->comp.func.src_border_get = _e_mod_comp_src_border_get_func;
+   c->comp.func.src_popup_get = _e_mod_comp_src_popup_get_func;
 
    e_manager_comp_set(c->man, &(c->comp));
    return c;
@@ -3431,7 +3496,7 @@ e_mod_comp_shadow_set(void)
      {
         E_Comp_Win *cw;
 
-        ecore_evas_manual_render_set(c->ee, _comp_mod->conf->lock_fps);
+//        ecore_evas_manual_render_set(c->ee, _comp_mod->conf->lock_fps);
         _e_mod_comp_fps_update(c);
         EINA_INLIST_FOREACH(c->wins, cw)
           {
diff --git a/src/modules/comp/e_mod_comp_cfdata.c b/src/modules/comp/e_mod_comp_cfdata.c
new file mode 100644 (file)
index 0000000..42e896c
--- /dev/null
@@ -0,0 +1,171 @@
+#include "e.h"
+#include "e_mod_comp_cfdata.h"
+
+EAPI void
+e_mod_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
+{
+   *match_edd = E_CONFIG_DD_NEW("Comp_Match", Match);
+#undef T
+#undef D
+#define T Match
+#define D *match_edd
+   E_CONFIG_VAL(D, T, title, STR);
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, clas, STR);
+   E_CONFIG_VAL(D, T, role, STR);
+   E_CONFIG_VAL(D, T, primary_type, INT);
+   E_CONFIG_VAL(D, T, borderless, CHAR);
+   E_CONFIG_VAL(D, T, dialog, CHAR);
+   E_CONFIG_VAL(D, T, accepts_focus, CHAR);
+   E_CONFIG_VAL(D, T, vkbd, CHAR);
+   E_CONFIG_VAL(D, T, quickpanel, CHAR);
+   E_CONFIG_VAL(D, T, argb, CHAR);
+   E_CONFIG_VAL(D, T, fullscreen, CHAR);
+   E_CONFIG_VAL(D, T, modal, CHAR);
+   E_CONFIG_VAL(D, T, shadow_style, STR);
+
+   *conf_edd = E_CONFIG_DD_NEW("Comp_Config", Config);
+#undef T
+#undef D
+#define T Config
+#define D *conf_edd
+   E_CONFIG_VAL(D, T, shadow_file, STR);
+   E_CONFIG_VAL(D, T, shadow_style, STR);
+   E_CONFIG_VAL(D, T, engine, INT);
+   E_CONFIG_VAL(D, T, max_unmapped_pixels, INT);
+   E_CONFIG_VAL(D, T, max_unmapped_time, INT);
+   E_CONFIG_VAL(D, T, min_unmapped_time, INT);
+   E_CONFIG_VAL(D, T, fps_average_range, INT);
+   E_CONFIG_VAL(D, T, fps_corner, UCHAR);
+   E_CONFIG_VAL(D, T, fps_show, UCHAR);
+   E_CONFIG_VAL(D, T, use_shadow, UCHAR);
+   E_CONFIG_VAL(D, T, indirect, UCHAR);
+   E_CONFIG_VAL(D, T, texture_from_pixmap, UCHAR);
+   E_CONFIG_VAL(D, T, lock_fps, UCHAR);
+   E_CONFIG_VAL(D, T, efl_sync, UCHAR);
+   E_CONFIG_VAL(D, T, loose_sync, UCHAR);
+   E_CONFIG_VAL(D, T, grab, UCHAR);
+   E_CONFIG_VAL(D, T, vsync, UCHAR);
+   E_CONFIG_VAL(D, T, keep_unmapped, UCHAR);
+   E_CONFIG_VAL(D, T, send_flush, UCHAR);
+   E_CONFIG_VAL(D, T, send_dump, UCHAR);
+   E_CONFIG_VAL(D, T, nocomp_fs, UCHAR);
+   E_CONFIG_VAL(D, T, smooth_windows, UCHAR);
+   E_CONFIG_VAL(D, T, first_draw_delay, DOUBLE);
+   E_CONFIG_LIST(D, T, match.popups, *match_edd);
+   E_CONFIG_LIST(D, T, match.borders, *match_edd);
+   E_CONFIG_LIST(D, T, match.overrides, *match_edd);
+   E_CONFIG_LIST(D, T, match.menus, *match_edd);
+}
+
+EAPI Config *
+e_mod_comp_cfdata_config_new(void)
+{
+   Config *cfg;
+   Match *mat;
+
+   cfg = E_NEW(Config, 1);
+   cfg->shadow_file = NULL;
+   cfg->shadow_style = eina_stringshare_add("default");
+   cfg->engine = E_EVAS_ENGINE_SOFTWARE_X11;
+   cfg->max_unmapped_pixels = 32 * 1024;  // implement
+   cfg->max_unmapped_time = 10 * 3600; // implement
+   cfg->min_unmapped_time = 5 * 60; // implement
+   cfg->fps_average_range = 30;
+   cfg->fps_corner = 0;
+   cfg->fps_show = 0;
+   cfg->use_shadow = 1;
+   cfg->indirect = 0;
+   cfg->texture_from_pixmap = 1;
+   cfg->lock_fps = 1;
+   cfg->efl_sync = 1;
+   cfg->loose_sync = 1;
+   cfg->grab = 0;
+   cfg->vsync = 1;
+   cfg->keep_unmapped = 1;
+   cfg->send_flush = 1; // implement
+   cfg->send_dump = 1; // implement
+   cfg->nocomp_fs = 1; // buggy
+   cfg->smooth_windows = 0; // 1 if gl, 0 if not
+   cfg->first_draw_delay = 0.15;
+
+   cfg->match.popups = NULL;
+   mat = E_NEW(Match, 1);
+   cfg->match.popups = eina_list_append(cfg->match.popups, mat);
+   mat->name = eina_stringshare_add("shelf");
+   mat->shadow_style = eina_stringshare_add("popup");
+   mat = E_NEW(Match, 1);
+   cfg->match.popups = eina_list_append(cfg->match.popups, mat);
+   mat->shadow_style = eina_stringshare_add("popup");
+
+   cfg->match.borders = NULL;
+
+   cfg->match.overrides = NULL;
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->name = eina_stringshare_add("E");
+   mat->clas = eina_stringshare_add("Background_Window");
+   mat->shadow_style = eina_stringshare_add("none");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->name = eina_stringshare_add("E");
+   mat->clas = eina_stringshare_add("everything");
+   mat->shadow_style = eina_stringshare_add("everything");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->primary_type = ECORE_X_WINDOW_TYPE_DROPDOWN_MENU;
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->primary_type = ECORE_X_WINDOW_TYPE_POPUP_MENU;
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->primary_type = ECORE_X_WINDOW_TYPE_COMBO;
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->primary_type = ECORE_X_WINDOW_TYPE_TOOLTIP;
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat = E_NEW(Match, 1);
+   cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
+   mat->shadow_style = eina_stringshare_add("popup");
+
+   cfg->match.menus = NULL;
+   mat = E_NEW(Match, 1);
+   cfg->match.menus = eina_list_append(cfg->match.menus, mat);
+   mat->shadow_style = eina_stringshare_add("menu");
+   
+   return cfg;
+}
+
+static void
+_match_list_free(Eina_List *list)
+{
+   Match *m;
+
+   EINA_LIST_FREE(list, m)
+     {
+        if (m->title) eina_stringshare_del(m->title);
+        if (m->name) eina_stringshare_del(m->name);
+        if (m->clas) eina_stringshare_del(m->clas);
+        if (m->role) eina_stringshare_del(m->role);
+        if (m->shadow_style) eina_stringshare_del(m->shadow_style);
+        free(m);
+     }
+}
+
+EAPI void
+e_mod_cfdata_config_free(Config *cfg)
+{
+   if (cfg->shadow_file) eina_stringshare_del(cfg->shadow_file);
+   if (cfg->shadow_style) eina_stringshare_del(cfg->shadow_style);
+
+   _match_list_free(cfg->match.popups);
+   _match_list_free(cfg->match.borders);
+   _match_list_free(cfg->match.overrides);
+   _match_list_free(cfg->match.menus);
+
+   free(cfg);
+}
+
diff --git a/src/modules/comp/e_mod_comp_cfdata.h b/src/modules/comp/e_mod_comp_cfdata.h
new file mode 100644 (file)
index 0000000..fb87d65
--- /dev/null
@@ -0,0 +1,66 @@
+#ifndef E_MOD_COMP_CFDATA_H
+#define E_MOD_COMP_CFDATA_H
+
+typedef struct _Config Config;
+typedef struct _Match  Match;
+
+struct _Config
+{
+   const char   *shadow_file;
+   const char   *shadow_style;
+   int           engine;
+   int           max_unmapped_pixels;
+   int           max_unmapped_time;
+   int           min_unmapped_time;
+   int           fps_average_range;
+   unsigned char fps_corner;
+   unsigned char fps_show;
+   unsigned char use_shadow;
+   unsigned char indirect;
+   unsigned char texture_from_pixmap;
+   unsigned char lock_fps;
+   unsigned char loose_sync;
+   unsigned char efl_sync;
+   unsigned char grab;
+   unsigned char vsync;
+   unsigned char keep_unmapped;
+   unsigned char send_flush;
+   unsigned char send_dump;
+   unsigned char nocomp_fs;
+   unsigned char smooth_windows;
+   double        first_draw_delay;
+
+   struct
+   {
+      Eina_List *popups;    // used for e popups
+      Eina_List *borders;    // used for borders
+      Eina_List *overrides;    // used for client menus, tooltips etc.
+      Eina_List *menus;    // used for e menus
+   } match;
+};
+
+struct _Match
+{
+   const char *title; // glob - used for borders, NULL if not to be used
+   const char *name; // glob - used for borders, overrides, popups, NULL if not to be used
+   const char *clas; // glob - used for borders, overrides, NULL if not to be used
+   const char *role; // glob - used for borders
+
+   const char *shadow_style; // shadow style to use
+
+   int         primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used
+   char        borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless
+   char        dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog
+   char        accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus
+   char        vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd
+   char        quickpanel; // used for borders, 0 == don't use, 1 == is quickpanel, -1 == not quickpanel
+   char        argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb
+   char        fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen
+   char        modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal
+};
+
+EAPI void    e_mod_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd);
+EAPI Config *e_mod_comp_cfdata_config_new(void);
+EAPI void    e_mod_cfdata_config_free(Config *cfg);
+
+#endif
index 7aa5315..8913e26 100644 (file)
@@ -353,6 +353,7 @@ _style_selector(Evas        *evas,
    Evas_Object *oi, *ob, *oo, *obd, *orec, *oly, *orec0;
    Eina_List *styles, *l, *style_shadows = NULL, *style_list;
    char *style;
+   const char *str;
    int n, sel;
    Evas_Coord wmw, wmh;
    Ecore_Timer *timer;
@@ -435,6 +436,9 @@ _style_selector(Evas        *evas,
    e_widget_ilist_selected_set(oi, sel);
    e_widget_ilist_go(oi);
 
+   EINA_LIST_FREE(styles, str)
+     eina_stringshare_del(str);
+
    return oi;
 }
 
@@ -1205,18 +1209,23 @@ _basic_create_widgets(E_Config_Dialog      *cfd,
    rg = e_widget_radio_group_new(&(cfdata->engine));
    ob = e_widget_radio_add(evas, _("Software"), E_EVAS_ENGINE_SOFTWARE_X11, rg);
    e_widget_list_object_append(ol, ob, 1, 1, 0.5);
-   if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
+   if (!getenv("ECORE_X_NO_XLIB")) 
      {
-        ob = e_widget_radio_add(evas, _("OpenGL"), E_EVAS_ENGINE_GL_X11, rg);
-        e_widget_list_object_append(ol, ob, 1, 1, 0.5);
-
-        of = e_widget_framelist_add(evas, _("OpenGL options"), 0);
-        e_widget_framelist_content_align_set(of, 0.5, 0.0);
-        ob = e_widget_check_add(evas, _("Texture from pixmap"), &(cfdata->texture_from_pixmap));
-        e_widget_framelist_object_append(of, ob);
-        ob = e_widget_check_add(evas, _("Indirect OpenGL"), &(cfdata->indirect));
-        e_widget_framelist_object_append(of, ob);
-        e_widget_list_object_append(ol, of, 1, 1, 0.5);
+        if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
+          {
+             ob = e_widget_radio_add(evas, _("OpenGL"), E_EVAS_ENGINE_GL_X11, rg);
+             e_widget_list_object_append(ol, ob, 1, 1, 0.5);
+
+             of = e_widget_framelist_add(evas, _("OpenGL options"), 0);
+             e_widget_framelist_content_align_set(of, 0.5, 0.0);
+             ob = e_widget_check_add(evas, _("Texture from pixmap"), &(cfdata->texture_from_pixmap));
+             e_widget_framelist_object_append(of, ob);
+            ob = e_widget_label_add(evas, _("Ctrl+Alt+Shift+Home resets compositor"));
+            e_widget_framelist_object_append(of, ob);
+             ob = e_widget_check_add(evas, _("Indirect OpenGL (EXPERIMENTAL)"), &(cfdata->indirect));
+             e_widget_framelist_object_append(of, ob);
+             e_widget_list_object_append(ol, of, 1, 1, 0.5);
+          }
      }
    e_widget_toolbook_page_append(otb, NULL, _("Engine"), ol, 0, 0, 0, 0, 0.5, 0.0);
 
index 6e1027a..058ab13 100644 (file)
@@ -43,58 +43,9 @@ e_modapi_init(E_Module *m)
    e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL,
                                  buf, e_int_config_comp_module);
 
-   mod->conf_match_edd = E_CONFIG_DD_NEW("Comp_Match", Match);
-#undef T
-#undef D
-#define T Match
-#define D mod->conf_match_edd
-   E_CONFIG_VAL(D, T, title, STR);
-   E_CONFIG_VAL(D, T, name, STR);
-   E_CONFIG_VAL(D, T, clas, STR);
-   E_CONFIG_VAL(D, T, role, STR);
-   E_CONFIG_VAL(D, T, primary_type, INT);
-   E_CONFIG_VAL(D, T, borderless, CHAR);
-   E_CONFIG_VAL(D, T, dialog, CHAR);
-   E_CONFIG_VAL(D, T, accepts_focus, CHAR);
-   E_CONFIG_VAL(D, T, vkbd, CHAR);
-   E_CONFIG_VAL(D, T, quickpanel, CHAR);
-   E_CONFIG_VAL(D, T, argb, CHAR);
-   E_CONFIG_VAL(D, T, fullscreen, CHAR);
-   E_CONFIG_VAL(D, T, modal, CHAR);
-   E_CONFIG_VAL(D, T, shadow_style, STR);
-
-   mod->conf_edd = E_CONFIG_DD_NEW("Comp_Config", Config);
-#undef T
-#undef D
-#define T Config
-#define D mod->conf_edd
-   E_CONFIG_VAL(D, T, shadow_file, STR);
-   E_CONFIG_VAL(D, T, shadow_style, STR);
-   E_CONFIG_VAL(D, T, engine, INT);
-   E_CONFIG_VAL(D, T, max_unmapped_pixels, INT);
-   E_CONFIG_VAL(D, T, max_unmapped_time, INT);
-   E_CONFIG_VAL(D, T, min_unmapped_time, INT);
-   E_CONFIG_VAL(D, T, fps_average_range, INT);
-   E_CONFIG_VAL(D, T, fps_corner, UCHAR);
-   E_CONFIG_VAL(D, T, fps_show, UCHAR);
-   E_CONFIG_VAL(D, T, use_shadow, UCHAR);
-   E_CONFIG_VAL(D, T, indirect, UCHAR);
-   E_CONFIG_VAL(D, T, texture_from_pixmap, UCHAR);
-   E_CONFIG_VAL(D, T, lock_fps, UCHAR);
-   E_CONFIG_VAL(D, T, efl_sync, UCHAR);
-   E_CONFIG_VAL(D, T, loose_sync, UCHAR);
-   E_CONFIG_VAL(D, T, grab, UCHAR);
-   E_CONFIG_VAL(D, T, vsync, UCHAR);
-   E_CONFIG_VAL(D, T, keep_unmapped, UCHAR);
-   E_CONFIG_VAL(D, T, send_flush, UCHAR);
-   E_CONFIG_VAL(D, T, send_dump, UCHAR);
-   E_CONFIG_VAL(D, T, nocomp_fs, UCHAR);
-   E_CONFIG_VAL(D, T, smooth_windows, UCHAR);
-   E_CONFIG_VAL(D, T, first_draw_delay, DOUBLE);
-   E_CONFIG_LIST(D, T, match.popups, mod->conf_match_edd);
-   E_CONFIG_LIST(D, T, match.borders, mod->conf_match_edd);
-   E_CONFIG_LIST(D, T, match.overrides, mod->conf_match_edd);
-   E_CONFIG_LIST(D, T, match.menus, mod->conf_match_edd);
+   e_mod_comp_cfdata_edd_init(&(mod->conf_edd),
+                              &(mod->conf_match_edd));
+                              
 
    mod->conf = e_config_domain_load("module.comp", mod->conf_edd);
    if (!mod->conf) _e_mod_config_new(m);
@@ -118,7 +69,7 @@ e_modapi_init(E_Module *m)
 
    /* XXX: update old configs. add config versioning */
    if (mod->conf->first_draw_delay == 0)
-     mod->conf->first_draw_delay = 0.05;
+     mod->conf->first_draw_delay = 0.20;
 
    _comp_mod = mod;
 
@@ -136,95 +87,8 @@ void
 _e_mod_config_new(E_Module *m)
 {
    Mod *mod = m->data;
-   Match *mat;
-
-   mod->conf = E_NEW(Config, 1);
-   mod->conf->shadow_file = NULL;
-   mod->conf->shadow_style = eina_stringshare_add("default");
-   mod->conf->engine = E_EVAS_ENGINE_SOFTWARE_X11;
-   mod->conf->max_unmapped_pixels = 32 * 1024;  // implement
-   mod->conf->max_unmapped_time = 10 * 3600; // implement
-   mod->conf->min_unmapped_time = 5 * 60; // implement
-   mod->conf->fps_average_range = 30;
-   mod->conf->fps_corner = 0;
-   mod->conf->fps_show = 0;
-   mod->conf->use_shadow = 1;
-   mod->conf->indirect = 0;
-   mod->conf->texture_from_pixmap = 0;
-   mod->conf->lock_fps = 0;
-   mod->conf->efl_sync = 1;
-   mod->conf->loose_sync = 1;
-   mod->conf->grab = 0;
-   mod->conf->vsync = 1;
-   mod->conf->keep_unmapped = 1;
-   mod->conf->send_flush = 1; // implement
-   mod->conf->send_dump = 0; // implement
-   mod->conf->nocomp_fs = 0; // buggy
-   mod->conf->smooth_windows = 0;
-   mod->conf->first_draw_delay = 0.05;
-
-   mod->conf->match.popups = NULL;
-   mat = E_NEW(Match, 1);
-   mod->conf->match.popups = eina_list_append(mod->conf->match.popups, mat);
-   mat->name = eina_stringshare_add("shelf");
-   mat->shadow_style = eina_stringshare_add("still");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.popups = eina_list_append(mod->conf->match.popups, mat);
-   mat->shadow_style = eina_stringshare_add("popup");
-
-   mod->conf->match.borders = NULL;
 
-   mod->conf->match.overrides = NULL;
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->name = eina_stringshare_add("E");
-   mat->clas = eina_stringshare_add("Background_Window");
-   mat->shadow_style = eina_stringshare_add("none");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->name = eina_stringshare_add("E");
-   mat->clas = eina_stringshare_add("everything");
-   mat->shadow_style = eina_stringshare_add("everything");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->primary_type = ECORE_X_WINDOW_TYPE_DROPDOWN_MENU;
-   mat->shadow_style = eina_stringshare_add("menu");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->primary_type = ECORE_X_WINDOW_TYPE_POPUP_MENU;
-   mat->shadow_style = eina_stringshare_add("menu");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->primary_type = ECORE_X_WINDOW_TYPE_COMBO;
-   mat->shadow_style = eina_stringshare_add("menu");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->primary_type = ECORE_X_WINDOW_TYPE_TOOLTIP;
-   mat->shadow_style = eina_stringshare_add("menu");
-   mat = E_NEW(Match, 1);
-   mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
-   mat->shadow_style = eina_stringshare_add("popup");
-
-   mod->conf->match.menus = NULL;
-   mat = E_NEW(Match, 1);
-   mod->conf->match.menus = eina_list_append(mod->conf->match.menus, mat);
-   mat->shadow_style = eina_stringshare_add("menu");
-}
-
-static void
-_match_list_free(Eina_List *list)
-{
-   Match *m;
-
-   EINA_LIST_FREE(list, m)
-     {
-        if (m->title) eina_stringshare_del(m->title);
-        if (m->name) eina_stringshare_del(m->name);
-        if (m->clas) eina_stringshare_del(m->clas);
-        if (m->role) eina_stringshare_del(m->role);
-        if (m->shadow_style) eina_stringshare_del(m->shadow_style);
-        free(m);
-     }
+   mod->conf = e_mod_comp_cfdata_config_new();
 }
 
 void
@@ -232,15 +96,7 @@ _e_mod_config_free(E_Module *m)
 {
    Mod *mod = m->data;
 
-   if (mod->conf->shadow_file) eina_stringshare_del(mod->conf->shadow_file);
-   if (mod->conf->shadow_style) eina_stringshare_del(mod->conf->shadow_style);
-
-   _match_list_free(mod->conf->match.popups);
-   _match_list_free(mod->conf->match.borders);
-   _match_list_free(mod->conf->match.overrides);
-   _match_list_free(mod->conf->match.menus);
-
-   free(mod->conf);
+   e_mod_cfdata_config_free(mod->conf);
    mod->conf = NULL;
 }
 
index a773a4e..a79f652 100644 (file)
@@ -1,45 +1,9 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-typedef struct _Config Config;
-typedef struct _Mod    Mod;
-
-typedef struct _Match  Match;
-
-struct _Config
-{
-   const char   *shadow_file;
-   const char   *shadow_style;
-   int           engine;
-   int           max_unmapped_pixels;
-   int           max_unmapped_time;
-   int           min_unmapped_time;
-   int           fps_average_range;
-   unsigned char fps_corner;
-   unsigned char fps_show;
-   unsigned char use_shadow;
-   unsigned char indirect;
-   unsigned char texture_from_pixmap;
-   unsigned char lock_fps;
-   unsigned char loose_sync;
-   unsigned char efl_sync;
-   unsigned char grab;
-   unsigned char vsync;
-   unsigned char keep_unmapped;
-   unsigned char send_flush;
-   unsigned char send_dump;
-   unsigned char nocomp_fs;
-   unsigned char smooth_windows;
-   double        first_draw_delay;
+#include "e_mod_comp_cfdata.h"
 
-   struct
-   {
-      Eina_List *popups;    // used for e popups
-      Eina_List *borders;    // used for borders
-      Eina_List *overrides;    // used for client menus, tooltips etc.
-      Eina_List *menus;    // used for e menus
-   } match;
-};
+typedef struct _Mod    Mod;
 
 struct _Mod
 {
@@ -52,26 +16,6 @@ struct _Mod
    E_Config_Dialog *config_dialog;
 };
 
-struct _Match
-{
-   const char *title; // glob - used for borders, NULL if not to be used
-   const char *name; // glob - used for borders, overrides, popups, NULL if not to be used
-   const char *clas; // glob - used for borders, overrides, NULL if not to be used
-   const char *role; // glob - used for borders
-
-   const char *shadow_style; // shadow style to use
-
-   int         primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used
-   char        borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless
-   char        dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog
-   char        accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus
-   char        vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd
-   char        quickpanel; // used for borders, 0 == don't use, 1 == is quickpanel, -1 == not quickpanel
-   char        argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb
-   char        fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen
-   char        modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal
-};
-
 extern Mod *_comp_mod;
 
 EAPI extern E_Module_Api e_modapi;
index 8720a36..31bfc91 100644 (file)
Binary files a/src/modules/comp/shadow.edj and b/src/modules/comp/shadow.edj differ
diff --git a/src/modules/conf/.cvsignore b/src/modules/conf/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 6de1b70..819b8c5 100644 (file)
@@ -157,27 +157,7 @@ e_configure_show(E_Container *con)
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, 
                                   _e_configure_keydown_cb, eco->win);
 
-   /* Category List */
-   eco->cat_list = e_widget_toolbar_add(eco->evas, 32 * e_scale, 32 * e_scale);
-   e_widget_toolbar_scrollable_set(eco->cat_list, 1);
-   /***--- fill ---***/
    _e_configure_fill_cat_list(eco);
-   e_widget_on_focus_hook_set(eco->cat_list, _e_configure_focus_cb, eco->win);
-   e_widget_list_object_append(eco->o_list, eco->cat_list, 1, 0, 0.5);
-
-   /* Item List */
-   eco->item_list = e_widget_ilist_add(eco->evas, 32 * e_scale, 32 * e_scale, NULL);
-   e_widget_ilist_selector_set(eco->item_list, 1);
-   e_widget_ilist_go(eco->item_list);
-   e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win);
-   e_widget_size_min_get(eco->item_list, &mw, &mh);
-   if (mw < (200 * e_scale)) mw = 200 * e_scale;
-   if (mh < (120 * e_scale)) mh = 120 * e_scale;
-   e_widget_size_min_set(eco->item_list, mw, mh);
-   e_widget_list_object_append(eco->o_list, eco->item_list, 1, 1, 0.5);
-
-   e_widget_size_min_get(eco->o_list, &mw, &mh);
-   edje_extern_object_min_size_set(eco->o_list, mw, mh);
 
    /* Close Button */
    eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, 
@@ -249,11 +229,11 @@ _e_configure_free(E_Configure *eco)
        eco->cats = eina_list_remove_list(eco->cats, eco->cats);
        E_FREE(cat);
      }
-   evas_object_del(eco->close);
-   evas_object_del(eco->cat_list);
-   evas_object_del(eco->item_list);
-   evas_object_del(eco->o_list);
-   evas_object_del(eco->edje);
+//   evas_object_del(eco->close);
+//   evas_object_del(eco->cat_list);
+//   evas_object_del(eco->item_list);
+//   evas_object_del(eco->o_list);
+//   evas_object_del(eco->edje);
    e_object_del(E_OBJECT(eco->win));
    E_FREE(eco);
 }
@@ -479,10 +459,15 @@ _e_configure_fill_cat_list(void *data)
 
    if (!(eco = data)) return;
 
-   e_widget_toolbar_clear(eco->cat_list);
-   evas_event_freeze(evas_object_evas_get(eco->cat_list));
-   edje_freeze();
-
+   if (eco->cat_list) evas_object_del(eco->cat_list);
+   if (eco->item_list) evas_object_del(eco->item_list);
+   eco->cat_list = NULL;
+   eco->item_list = NULL;
+   
+   /* Category List */
+   eco->cat_list = e_widget_toolbar_add(eco->evas, 32 * e_scale, 32 * e_scale);
+   e_widget_toolbar_scrollable_set(eco->cat_list, 1);
+   /***--- fill ---***/
    for (l = e_configure_registry; l; l = l->next)
      {
        Eina_List *ll;
@@ -509,11 +494,22 @@ _e_configure_fill_cat_list(void *data)
               }
          }
      }
+   e_widget_on_focus_hook_set(eco->cat_list, _e_configure_focus_cb, eco->win);
+   e_widget_list_object_append(eco->o_list, eco->cat_list, 1, 0, 0.5);
 
-   e_widget_size_min_get(eco->cat_list, &mw, &mh);
-   e_widget_size_min_set(eco->cat_list, mw, mh);
-   edje_thaw();
-   evas_event_thaw(evas_object_evas_get(eco->cat_list));
+   /* Item List */
+   eco->item_list = e_widget_ilist_add(eco->evas, 32 * e_scale, 32 * e_scale, NULL);
+   e_widget_ilist_selector_set(eco->item_list, 1);
+   e_widget_ilist_go(eco->item_list);
+   e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win);
+   e_widget_size_min_get(eco->item_list, &mw, &mh);
+   if (mw < (200 * e_scale)) mw = 200 * e_scale;
+   if (mh < (120 * e_scale)) mh = 120 * e_scale;
+   e_widget_size_min_set(eco->item_list, mw, mh);
+   e_widget_list_object_append(eco->o_list, eco->item_list, 1, 1, 0.5);
+
+   e_widget_size_min_get(eco->o_list, &mw, &mh);
+   edje_extern_object_min_size_set(eco->o_list, mw, mh);
 }
 
 static Eina_Bool
index a92b8bd..ba5109a 100644 (file)
@@ -20,7 +20,7 @@ static void _config_pre_activate_cb(void *data, E_Menu *m);
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 static void _cb_action_conf(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -96,7 +96,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Settings");
diff --git a/src/modules/conf_applications/.cvsignore b/src/modules/conf_applications/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 3c97ccf..8cadb7d 100644 (file)
@@ -21,7 +21,13 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
                         e_int_config_apps.c \
-                         e_int_config_apps.h
+                         e_int_config_apps.h \
+                        e_int_config_defapps.c \
+                         e_int_config_defapps.h \
+                        e_int_config_deskenv.c \
+                        e_int_config_deskenv.h \
+                        e_int_config_delapps.c \
+                         e_int_config_delapps.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
index bb64cec..d5e5c11 100644 (file)
@@ -39,7 +39,7 @@ static void _fill_order_list(E_Config_Dialog_Data *cfdata);
 static void _cb_apps_list_selected(void *data);
 static void _cb_order_list_selected(void *data);
 static int _cb_desks_sort(const void *data1, const void *data2);
-static int _cb_desks_name(const void *data1, const void *data2) ;
+static int _cb_desks_name(const void *data1, const void *data2);
 static int _cb_desks_sort(const void *data1, const void *data2);
 static void _cb_add(void *data, void *data2 __UNUSED__);
 static void _cb_del(void *data, void *data2 __UNUSED__);
diff --git a/src/modules/conf_applications/e_int_config_defapps.c b/src/modules/conf_applications/e_int_config_defapps.c
new file mode 100644 (file)
index 0000000..a108376
--- /dev/null
@@ -0,0 +1,762 @@
+#include "e.h"
+
+typedef struct _Config_Glob Config_Glob;
+typedef struct _Config_Mime Config_Mime;
+
+struct _Config_Glob
+{
+   const char *name;
+};
+
+struct _Config_Mime
+{
+   const char *mime;
+   Eina_List *globs;
+};
+
+struct _E_Config_Dialog_Data
+{
+   struct {
+      Evas_Object *deflist, *mimelist, *entry;
+   } obj;
+   Efreet_Ini *ini;
+   Eina_List *mimes;
+   Eina_List *desks;
+
+   const char *selmime;
+   const char *selapp;
+   
+   const char **seldest;
+   
+   char *browser_custom;
+   
+   const char *browser_desktop;
+   const char *mailto_desktop;
+   const char *file_desktop;
+   const char *trash_desktop;
+   
+   Ecore_Event_Handler *desk_change_handler;
+   int gen;
+};
+
+/* local function prototypes */
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
+
+static Eina_Bool _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__);
+static void _load_mimes(E_Config_Dialog_Data *cfdata, char *file);
+static void _load_globs(E_Config_Dialog_Data *cfdata, char *file);
+static int _sort_mimes(const void *data1, const void *data2);
+static Config_Mime *_find_mime(E_Config_Dialog_Data *cfdata, char *mime);
+static Config_Glob *_find_glob(Config_Mime *mime, char *glob);
+static int _cb_desks_sort(const void *data1, const void *data2);
+static void _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il, const char **desktop, int general);
+
+E_Config_Dialog *
+e_int_config_defapps(E_Container *con, const char *params __UNUSED__)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+   
+   if (e_config_dialog_find("E", "applications/default_applications"))
+      return NULL;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create;
+   v->basic.apply_cfdata = _basic_apply;
+
+   cfd = e_config_dialog_new(con, _("Default Applications"),
+                             "E", "applications/default_applications",
+                            "preferences-applications-default", 0, v, NULL);
+   return cfd;
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata;
+   Efreet_Ini *ini, *myini;
+   Eina_Iterator *it;
+   char buf[PATH_MAX];
+   const char *key, *s, *homedir;
+   Eina_List *l;
+   E_Config_Env_Var *evr;
+   
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   if (!cfdata) return NULL;
+   
+   cfdata->desk_change_handler = ecore_event_handler_add
+      (EFREET_EVENT_DESKTOP_CACHE_UPDATE, _desks_update, cfdata);
+   
+   snprintf(buf, sizeof(buf), "%s/applications/defaults.list",
+            efreet_data_home_get());
+   myini = efreet_ini_new(buf);
+   if (myini)
+     {
+        cfdata->ini = myini;
+        if (!efreet_ini_section_set(myini, "Default Applications"))
+          {
+             efreet_ini_section_add(myini, "Default Applications");
+             efreet_ini_section_set(myini, "Default Applications");
+          }
+        EINA_LIST_FOREACH(efreet_data_dirs_get(), l, s)
+          {
+             snprintf(buf, sizeof(buf), "%s/applications/defaults.list", s);
+             ini = efreet_ini_new(buf);
+             if ((ini) &&
+                 (efreet_ini_section_set(ini, "Default Applications")) &&
+                 (ini->section) &&
+                 (it = eina_hash_iterator_key_new(ini->section)))
+               {
+                  EINA_ITERATOR_FOREACH(it, key)
+                    {
+                       if (!efreet_ini_string_get(myini, key))
+                         {
+                            s = efreet_ini_string_get(ini, key);
+                            if (s) efreet_ini_string_set(myini, key, s);
+                         }
+                    }
+                  eina_iterator_free(it);
+               }
+             if (ini) efreet_ini_free(ini);
+          }
+        s = efreet_ini_string_get(myini, "x-scheme-handler/http");
+        if (!s) s = efreet_ini_string_get(myini, "x-scheme-handler/https");
+        if (s) cfdata->browser_desktop = eina_stringshare_add(s);
+        s = efreet_ini_string_get(myini, "x-scheme-handler/mailto");
+        if (s) cfdata->mailto_desktop = eina_stringshare_add(s);
+        s = efreet_ini_string_get(myini, "x-scheme-handler/file");
+        if (s) cfdata->file_desktop = eina_stringshare_add(s);
+        s = efreet_ini_string_get(myini, "x-scheme-handler/trash");
+        if (s) cfdata->trash_desktop = eina_stringshare_add(s);
+     }
+
+   EINA_LIST_FOREACH(e_config->env_vars, l, evr)
+     {
+        if (!strcmp(evr->var, "BROWSER"))
+          {
+             if ((evr->val) && (!evr->unset))
+                cfdata->browser_custom = strdup(evr->val);
+             break;
+          }
+     }
+   
+   homedir = e_user_homedir_get();
+   
+   snprintf(buf, sizeof(buf), "/usr/local/etc/mime.types");
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
+   snprintf(buf, sizeof(buf), "/etc/mime.types");
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
+   
+   EINA_LIST_FOREACH(efreet_config_dirs_get(), l, s)
+     {
+        snprintf(buf, sizeof(buf), "%s/mime/globs", s);
+        if (ecore_file_exists(buf)) _load_globs(cfdata, buf);
+     }
+   
+   snprintf(buf, sizeof(buf), "%s/.mime.types", homedir);
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
+   
+   snprintf(buf, sizeof(buf), "%s/mime/globs", efreet_data_home_get());
+   if (ecore_file_exists(buf)) _load_globs(cfdata, buf);
+   
+   cfdata->mimes = eina_list_sort(cfdata->mimes, 0, _sort_mimes);
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   Config_Mime *m;
+   Efreet_Desktop *desk;
+
+   if (cfdata->selmime) eina_stringshare_del(cfdata->selmime);
+   if (cfdata->selapp) eina_stringshare_del(cfdata->selapp);
+   free(cfdata->browser_custom);
+   if (cfdata->browser_desktop) eina_stringshare_del(cfdata->browser_desktop);
+   if (cfdata->mailto_desktop) eina_stringshare_del(cfdata->mailto_desktop);
+   if (cfdata->file_desktop) eina_stringshare_del(cfdata->file_desktop);
+   if (cfdata->trash_desktop) eina_stringshare_del(cfdata->trash_desktop);
+   EINA_LIST_FREE(cfdata->mimes, m)
+     {
+        Config_Glob *g;
+        
+        if (!m) continue;
+        EINA_LIST_FREE(m->globs, g)
+          {
+             if (!g) continue;
+             eina_stringshare_del(g->name);
+             E_FREE(g);
+          }
+        eina_stringshare_del(m->mime);
+        E_FREE(m);
+     }
+   if (cfdata->ini) efreet_ini_free(cfdata->ini);
+   EINA_LIST_FREE(cfdata->desks, desk)
+      efreet_desktop_free(desk);
+   if (cfdata->desk_change_handler)
+      ecore_event_handler_del(cfdata->desk_change_handler);
+   E_FREE(cfdata);
+}
+
+static Eina_Bool
+_desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   Efreet_Desktop *desk;
+   EINA_LIST_FREE(cfdata->desks, desk)
+      efreet_desktop_free(desk);
+   if (cfdata->gen)
+      _fill_apps_list(cfdata, cfdata->obj.deflist, &(cfdata->selapp), 1);
+   else
+      _fill_apps_list(cfdata, cfdata->obj.deflist, cfdata->seldest, 0);
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_def_browser_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->seldest = &(cfdata->browser_desktop);
+   _fill_apps_list(cfdata, cfdata->obj.deflist, cfdata->seldest, 0);
+   cfdata->gen = 0;
+}
+
+static void
+_def_mailto_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->seldest = &(cfdata->mailto_desktop);
+   _fill_apps_list(cfdata, cfdata->obj.deflist, cfdata->seldest, 0);
+   cfdata->gen = 0;
+}
+
+static void
+_def_file_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->seldest = &(cfdata->file_desktop);
+   _fill_apps_list(cfdata, cfdata->obj.deflist, cfdata->seldest, 0);
+   cfdata->gen = 0;
+}
+
+static void
+_def_trash_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->seldest = &(cfdata->trash_desktop);
+   _fill_apps_list(cfdata, cfdata->obj.deflist, cfdata->seldest, 0);
+   cfdata->gen = 0;
+}
+
+static void
+_sel_mime_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   if (cfdata->selapp) eina_stringshare_del(cfdata->selapp);
+   cfdata->selapp = NULL;
+   if (cfdata->selmime)
+     {
+        const char *s = efreet_ini_string_get(cfdata->ini, cfdata->selmime);
+        if (s) cfdata->selapp = eina_stringshare_add(s);
+     }
+   _fill_apps_list(cfdata, cfdata->obj.mimelist, &(cfdata->selapp), 1);
+   cfdata->gen = 1;
+}
+
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *otb, *ot, *ob, *of, *il;
+   Eina_List *l;
+   Config_Mime *m;
+   
+   otb = e_widget_toolbook_add(evas, 24, 24);
+   
+   ot = e_widget_table_add(evas, EINA_FALSE);
+   
+   ob = e_widget_label_add(evas, _("Custom Browser Command"));
+   e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0);
+   
+   ob = e_widget_entry_add(evas, &(cfdata->browser_custom), NULL, NULL, NULL);
+   cfdata->obj.entry = ob;
+   e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 1, 1, 0);
+   
+   of = e_widget_framelist_add(evas, _("Default Applications"), 0);
+   il = e_widget_ilist_add(evas, 24, 24, NULL);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(il);
+   e_widget_ilist_selector_set(il, 1);
+   e_widget_ilist_append(il, NULL, _("Browser"), _def_browser_cb, cfdata, NULL);
+   e_widget_ilist_append(il, NULL, _("E-Mail"), _def_mailto_cb, cfdata, NULL);
+   e_widget_ilist_append(il, NULL, _("File"), _def_file_cb, cfdata, NULL);
+   e_widget_ilist_append(il, NULL, _("Trash"), _def_trash_cb, cfdata, NULL);
+   e_widget_ilist_go(il);
+   e_widget_ilist_thaw(il);
+   edje_thaw();
+   evas_event_thaw(evas);
+   e_widget_framelist_object_append_full(of, il, 1, 1, 1, 1, 0.5, 0.5, 120, 200, 9999, 9999);
+   e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 0, 1);
+   
+   of = e_widget_framelist_add(evas, _("Selected Application"), 0);
+   il = e_widget_ilist_add(evas, 24, 24, &(cfdata->selapp));
+   cfdata->obj.deflist = il;
+   e_widget_ilist_selector_set(il, 1);
+   e_widget_ilist_go(il);
+   e_widget_framelist_object_append_full(of, il, 1, 1, 1, 1, 0.5, 0.5, 120, 200, 9999, 9999);
+   e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
+
+   e_widget_toolbook_page_append(otb, NULL, _("Core"), ot,
+                                 1, 1, 1, 1, 0.5, 0.0);
+   
+   ot = e_widget_table_add(evas, EINA_FALSE);
+   
+   of = e_widget_framelist_add(evas, _("Types"), 0);
+   il = e_widget_ilist_add(evas, 24, 24, &(cfdata->selmime));
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(il);
+   e_widget_ilist_selector_set(il, 1);
+   EINA_LIST_FOREACH(cfdata->mimes, l, m)
+      e_widget_ilist_append(il, NULL, m->mime, _sel_mime_cb, cfdata, m->mime);
+   e_widget_ilist_go(il);
+   e_widget_ilist_thaw(il);
+   edje_thaw();
+   evas_event_thaw(evas);
+   e_widget_framelist_object_append_full(of, il, 1, 1, 1, 1, 0.5, 0.5, 120, 200, 9999, 9999);
+   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
+   
+   of = e_widget_framelist_add(evas, _("Selected Application"), 0);
+   il = e_widget_ilist_add(evas, 24, 24, &(cfdata->selapp));
+   cfdata->obj.mimelist = il;
+   e_widget_ilist_selector_set(il, 1);
+   e_widget_ilist_go(il);
+   e_widget_framelist_object_append_full(of, il, 1, 1, 1, 1, 0.5, 0.5, 120, 200, 9999, 9999);
+   e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
+
+   e_widget_toolbook_page_append(otb, NULL, _("General"), ot,
+                                 1, 1, 1, 1, 0.5, 0.0);
+   
+   e_widget_toolbook_page_show(otb, 0);
+
+   e_dialog_resizable_set(cfd->dia, 1);
+   e_win_centered_set(cfd->dia->win, 1);
+   return otb;
+}
+
+static int
+_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   Eina_List *l;
+   E_Config_Env_Var *evr = NULL;
+
+   if (cfdata->ini)
+     {
+        char buf[PATH_MAX];
+        
+        if ((cfdata->browser_desktop) && (cfdata->browser_desktop[0]))
+          {
+             efreet_ini_string_set(cfdata->ini, "x-scheme-handler/http", 
+                                   cfdata->browser_desktop);
+             efreet_ini_string_set(cfdata->ini, "x-scheme-handler/https", 
+                                   cfdata->browser_desktop);
+          }
+        if ((cfdata->mailto_desktop) && (cfdata->mailto_desktop[0]))
+           efreet_ini_string_set(cfdata->ini, "x-scheme-handler/mailto", 
+                                 cfdata->mailto_desktop);
+        if ((cfdata->file_desktop) && (cfdata->file_desktop[0]))
+           efreet_ini_string_set(cfdata->ini, "x-scheme-handler/file",
+                                 cfdata->file_desktop);
+        if ((cfdata->trash_desktop) && (cfdata->trash_desktop[0]))
+           efreet_ini_string_set(cfdata->ini, "x-scheme-handler/trash",
+                                 cfdata->trash_desktop);
+        snprintf(buf, sizeof(buf), "%s/applications/defaults.list",
+                 efreet_data_home_get());
+        efreet_ini_save(cfdata->ini, buf);
+     }
+   if ((cfdata->browser_custom) && (cfdata->browser_custom[0]))
+     {
+        EINA_LIST_FOREACH(e_config->env_vars, l, evr)
+          {
+             if (!strcmp(evr->var, "BROWSER")) break;
+             evr = NULL;
+          }
+        if (evr)
+          {
+             evr->unset =0;
+             if (evr->val) eina_stringshare_del(evr->val);
+          }
+        else
+          {
+             evr = E_NEW(E_Config_Env_Var, 1);
+             if (evr)
+               {
+                  evr->var = eina_stringshare_add("BROWSER");
+                  evr->unset = 0;
+                  e_config->env_vars = eina_list_append(e_config->env_vars, evr);
+               }
+          }
+        if (evr)
+          {
+             evr->val = eina_stringshare_add(cfdata->browser_custom);
+             e_env_set(evr->var, evr->val);
+          }
+     }
+   else
+     {
+        EINA_LIST_FOREACH(e_config->env_vars, l, evr)
+          {
+             if (!strcmp(evr->var, "BROWSER"))
+               {
+                  e_config->env_vars = eina_list_remove_list(e_config->env_vars, l);
+                  if (evr->val) eina_stringshare_del(evr->val);
+                  if (evr->var) eina_stringshare_del(evr->var);
+                  free(evr);
+                  break;
+               }
+          }
+        e_env_unset("BROWSER");
+     }
+   e_config_save_queue();
+   return 1;
+}
+
+static void
+_load_mimes(E_Config_Dialog_Data *cfdata, char *file)
+{
+   FILE *f;
+   char buf[4096], mimetype[4096], ext[4096];
+   char *p, *pp;
+   Config_Mime *mime;
+   Config_Glob *glob;
+   
+   if (!cfdata) return;
+   
+   f = fopen(file, "rb");
+   if (!f) return;
+   while (fgets(buf, sizeof(buf), f))
+     {
+        p = buf;
+        while (isblank(*p) && (*p != 0) && (*p != '\n')) p++;
+        if (*p == '#') continue;
+        if ((*p == '\n') || (*p == 0)) continue;
+        pp = p;
+        while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++;
+        if ((*p == '\n') || (*p == 0)) continue;
+        strncpy(mimetype, pp, (p - pp));
+        mimetype[p - pp] = 0;
+        do
+          {
+             while (isblank(*p) && (*p != 0) && (*p != '\n')) p++;
+             if ((*p == '\n') || (*p == 0)) continue;
+             pp = p;
+             while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++;
+             strncpy(ext, pp, (p - pp));
+             ext[p - pp] = 0;
+             mime = _find_mime(cfdata, mimetype);
+             if (!mime)
+               {
+                  mime = E_NEW(Config_Mime, 1);
+                  if (mime)
+                    {
+                       mime->mime = eina_stringshare_add(mimetype);
+                       if (!mime->mime)
+                          free(mime);
+                       else
+                         {
+                            glob = E_NEW(Config_Glob, 1);
+                            glob->name = eina_stringshare_add(ext);
+                            mime->globs = eina_list_append(mime->globs, glob);
+                            cfdata->mimes = eina_list_append(cfdata->mimes, mime);
+                         }
+                    }
+               }
+             else
+               {
+                  glob = _find_glob(mime, ext);
+                  if (!glob)
+                    {
+                       glob = E_NEW(Config_Glob, 1);
+                       glob->name = eina_stringshare_add(ext);
+                       mime->globs = eina_list_append(mime->globs, glob);
+                    }
+               }
+          }
+        while ((*p != '\n') && (*p != 0));
+     }
+   fclose(f);
+}
+
+static void
+_load_globs(E_Config_Dialog_Data *cfdata, char *file)
+{
+   FILE *f;
+   char buf[4096], mimetype[4096], ext[4096];
+   char *p, *pp;
+   Config_Mime *mime;
+   Config_Glob *glob;
+   
+   if (!cfdata) return;
+   
+   f = fopen(file, "rb");
+   if (!f) return;
+   while (fgets(buf, sizeof(buf), f))
+     {
+        p = buf;
+        while (isblank(*p) && (*p != 0) && (*p != '\n')) p++;
+        if (*p == '#') continue;
+        if ((*p == '\n') || (*p == 0)) continue;
+        pp = p;
+        while ((*p != ':') && (*p != 0) && (*p != '\n')) p++;
+        if ((*p == '\n') || (*p == 0)) continue;
+        strncpy(mimetype, pp, (p - pp));
+        mimetype[p - pp] = 0;
+        p++;
+        pp = ext;
+        while ((*p != 0) && (*p != '\n'))
+          {
+             *pp = *p;
+             pp++;
+             p++;
+          }
+        *pp = 0;
+        mime = _find_mime(cfdata, mimetype);
+        if (!mime)
+          {
+             mime = E_NEW(Config_Mime, 1);
+             if (mime)
+               {
+                  mime->mime = eina_stringshare_add(mimetype);
+                  if (!mime->mime)
+                     free(mime);
+                  else
+                    {
+                       glob = E_NEW(Config_Glob, 1);
+                       glob->name = eina_stringshare_add(ext);
+                       mime->globs = eina_list_append(mime->globs, glob);
+                       cfdata->mimes = eina_list_append(cfdata->mimes, mime);
+                    }
+               }
+          }
+        else
+          {
+             glob = _find_glob(mime, ext);
+             if (!glob)
+               {
+                  glob = E_NEW(Config_Glob, 1);
+                  glob->name = eina_stringshare_add(ext);
+                  mime->globs = eina_list_append(mime->globs, glob);
+               }
+          }
+     }
+   fclose(f);
+}
+
+static int
+_sort_mimes(const void *data1, const void *data2)
+{
+   const Config_Mime *m1 = data1, *m2 = data2;
+   if (!m1) return 1;
+   if (!m2) return -1;
+   return (strcmp(m1->mime, m2->mime));
+}
+
+static Config_Mime *
+_find_mime(E_Config_Dialog_Data *cfdata, char *mime)
+{
+   Config_Mime *cm;
+   Eina_List *l;
+   
+   if (!cfdata) return NULL;
+   EINA_LIST_FOREACH(cfdata->mimes, l, cm)
+     {
+        if (!cm) continue;
+        if (!strcmp(cm->mime, mime)) return cm;
+     }
+   return NULL;
+}
+
+static Config_Glob *
+_find_glob(Config_Mime *mime, char *glob)
+{
+   Config_Glob *g;
+   Eina_List *l;
+   
+   if (!mime) return NULL;
+   EINA_LIST_FOREACH(mime->globs, l, g)
+     {
+        if (!g) continue;
+        if (strcmp(g->name, glob)) continue;
+        return g;
+     }
+   return NULL;
+}
+
+static int
+_cb_desks_sort(const void *data1, const void *data2)
+{
+   const Efreet_Desktop *d1, *d2;
+   
+   if (!(d1 = data1)) return 1;
+   if (!d1->name) return 1;
+   if (!(d2 = data2)) return -1;
+   if (!d2->name) return -1;
+   return strcmp(d1->name, d2->name);
+}
+
+static void
+_sel_desk_gen_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   const char *s = e_widget_ilist_selected_value_get(cfdata->obj.mimelist);
+   if ((s) && (cfdata->selmime))
+     {
+        if (cfdata->ini)
+           efreet_ini_string_set(cfdata->ini, cfdata->selmime, s);
+     }
+}
+
+static void
+_sel_desk_cb(void *data)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   if (cfdata->seldest)
+     {
+        const char *s = e_widget_ilist_selected_value_get(cfdata->obj.deflist);
+        if (*(cfdata->seldest)) eina_stringshare_del(*(cfdata->seldest));
+        *(cfdata->seldest) = NULL;
+        if (s) *(cfdata->seldest) = eina_stringshare_add(s);
+        if ((*(cfdata->seldest)) &&
+            (cfdata->seldest == &(cfdata->browser_desktop)))
+          {
+             Eina_List *l;
+             Efreet_Desktop *desk;
+             
+             EINA_LIST_FOREACH(cfdata->desks, l, desk)
+               {
+                  if ((!strcmp(desk->orig_path, *(cfdata->seldest))) ||
+                      (!strcmp(ecore_file_file_get(desk->orig_path), *(cfdata->seldest))))
+                    {
+                       if (desk->exec)
+                         {
+                            char *p;
+                            
+                            free(cfdata->browser_custom);
+                            cfdata->browser_custom = strdup(desk->exec);
+                            for (p = cfdata->browser_custom; *p; p++)
+                              {
+                                 if (p > cfdata->browser_custom)
+                                   {
+                                      if ((isspace(*p)) &&
+                                          (p[-1] != '\\'))
+                                        {
+                                           *p = 0;
+                                           break;
+                                        }
+                                   }
+                              }
+                            p = strdup(cfdata->browser_custom);
+                            if (p)
+                              {
+                                 e_widget_entry_text_set(cfdata->obj.entry, p);
+                                 free(p);
+                              }
+                         }
+                       break;
+                    }
+               }
+          }
+     }
+}
+
+static void
+_fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il, const char **desktop, int general)
+{
+   Eina_List *desks = NULL, *l;
+   Efreet_Desktop *desk = NULL;
+   Evas *evas;
+   int sel, i;
+   
+   if (!cfdata->desks)
+     {
+        desks = efreet_util_desktop_name_glob_list("*");
+        EINA_LIST_FREE(desks, desk)
+          {
+             Eina_List *ll;
+             
+             if (desk->no_display)
+               {
+                  efreet_desktop_free(desk);
+                  continue;
+               }
+             ll = eina_list_search_unsorted_list(cfdata->desks, _cb_desks_sort, desk);
+             if (ll)
+               {
+                  Efreet_Desktop *old;
+                  
+                  old = eina_list_data_get(ll);
+                  /*
+                   * This fixes when we have several .desktop with the same name,
+                   * and the only difference is that some of them are for specific
+                   * desktops.
+                   */
+                  if ((old->only_show_in) && (!desk->only_show_in))
+                    {
+                       efreet_desktop_free(old);
+                       eina_list_data_set(ll, desk);
+                    }
+                  else
+                     efreet_desktop_free(desk);
+               }
+             else
+                cfdata->desks = eina_list_append(cfdata->desks, desk);
+          }
+        cfdata->desks = eina_list_sort(cfdata->desks, -1, _cb_desks_sort);
+     }
+   
+   evas = evas_object_evas_get(il);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(il);
+   e_widget_ilist_clear(il);
+
+   sel = -1;
+   i = 0;
+   EINA_LIST_FOREACH(cfdata->desks, l, desk)
+     {
+        Evas_Object *icon = NULL;
+        
+        if ((desktop) && (*desktop))
+          {
+             if ((!strcmp(desk->orig_path, *desktop)) ||
+                 (!strcmp(ecore_file_file_get(desk->orig_path), *desktop)))
+                sel = i;
+          }
+        
+        icon = e_util_desktop_icon_add(desk, 24, evas);
+        if (general)
+           e_widget_ilist_append(il, icon, desk->name,
+                                 _sel_desk_gen_cb, cfdata,
+                                 ecore_file_file_get(desk->orig_path));
+        else
+           e_widget_ilist_append(il, icon, desk->name,
+                                 _sel_desk_cb, cfdata,
+                                 ecore_file_file_get(desk->orig_path));
+        i++;
+     }
+   
+   e_widget_ilist_go(il);
+   e_widget_ilist_thaw(il);
+   edje_thaw();
+   evas_event_thaw(evas);
+   if (sel >= 0)
+     {
+        e_widget_ilist_selected_set(il, sel);
+        e_widget_ilist_nth_show(il, sel, 0);
+     }
+}
diff --git a/src/modules/conf_applications/e_int_config_defapps.h b/src/modules/conf_applications/e_int_config_defapps.h
new file mode 100644 (file)
index 0000000..4ede68d
--- /dev/null
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_DEFAPPS_H
+#define E_INT_CONFIG_DEFAPPS_H
+
+E_Config_Dialog *e_int_config_defapps(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
diff --git a/src/modules/conf_applications/e_int_config_delapps.c b/src/modules/conf_applications/e_int_config_delapps.c
new file mode 100644 (file)
index 0000000..8e92e74
--- /dev/null
@@ -0,0 +1,205 @@
+#include "e.h"
+
+struct _E_Config_Dialog_Data
+{
+   Eina_List *desks;
+   Ecore_Event_Handler *desk_change_handler;
+   
+   struct {
+      Evas_Object *list, *del;
+   } obj;
+};
+
+/* local function prototypes */
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Eina_Bool _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__);
+static int _cb_desks_sort(const void *data1, const void *data2);
+static void _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il);
+static void _btn_cb_del(void *data, void *data2);
+static void _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__);
+
+E_Config_Dialog *
+e_int_config_delapps(E_Container *con, const char *params __UNUSED__)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+   
+   if (e_config_dialog_find("E", "applications/del_applications"))
+      return NULL;
+   
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create;
+
+   cfd = e_config_dialog_new(con, _("Delete Launchers"),
+                             "E", "applications/del_applications",
+                             "preferences-applications-del", 0, v, NULL);
+   return cfd;
+}
+
+/* local function prototypes */
+static void *
+_create_data(E_Config_Dialog *cfd __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   cfdata->desk_change_handler = ecore_event_handler_add
+      (EFREET_EVENT_DESKTOP_CACHE_UPDATE, _desks_update, cfdata);
+   
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   Efreet_Desktop *desk;
+   
+   EINA_LIST_FREE(cfdata->desks, desk) efreet_desktop_free(desk);
+   if (cfdata->desk_change_handler)
+      ecore_event_handler_del(cfdata->desk_change_handler);
+   E_FREE(cfdata);
+}
+
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *of, *li, *ob;
+   Evas_Coord mw, mh;
+   
+   of = e_widget_table_add(evas, 0);
+   
+   li = e_widget_ilist_add(evas, 24, 24, NULL);
+   cfdata->obj.list = li;
+   e_widget_ilist_multi_select_set(li, EINA_TRUE);
+   e_widget_size_min_get(li, &mw, &mh);
+   if (mw < (200 * e_scale)) mw = 200 * e_scale;
+   if (mh < (160 * e_scale)) mh = 160 * e_scale;
+   e_widget_size_min_set(li, mw, mh);
+   e_widget_on_change_hook_set(li, _widget_list_selection_changed, cfdata);
+   e_widget_table_object_append(of, li, 0, 1, 1, 1, 1, 1, 1, 1);
+   
+   _fill_apps_list(cfdata, cfdata->obj.list);
+   e_widget_ilist_go(li);
+   
+   ob = e_widget_button_add(evas, _("Delete"), NULL, _btn_cb_del, cfdata, NULL);
+   cfdata->obj.del = ob;
+   e_widget_disabled_set(ob, 1);
+   e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
+   
+   e_dialog_resizable_set(cfd->dia, 1);
+   e_win_centered_set(cfd->dia->win, 1);
+   return of;
+}
+
+static Eina_Bool
+_desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   Efreet_Desktop *desk;
+   
+   EINA_LIST_FREE(cfdata->desks, desk) efreet_desktop_free(desk);
+   _fill_apps_list(cfdata, cfdata->obj.list);
+   return ECORE_CALLBACK_PASS_ON;
+}         
+
+static int
+_cb_desks_sort(const void *data1, const void *data2)
+{
+   const Efreet_Desktop *d1, *d2;
+   
+   if (!(d1 = data1)) return 1;
+   if (!d1->name) return 1;
+   if (!(d2 = data2)) return -1;
+   if (!d2->name) return -1;
+   return strcmp(d1->name, d2->name);
+}
+
+static void
+_fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il)
+{
+   Eina_List *desks = NULL, *l;
+   Efreet_Desktop *desk = NULL;
+   Evas *evas;
+   const char *desktop_dir = e_user_desktop_dir_get();
+   int n = 0;
+   
+   if (!desktop_dir) return;
+   
+   n = strlen(desktop_dir);
+   
+   if (!cfdata->desks)
+     {
+        desks = efreet_util_desktop_name_glob_list("*");
+        EINA_LIST_FREE(desks, desk)
+          {
+             if (desk->no_display)
+               {
+                  efreet_desktop_free(desk);
+                  continue;
+               }
+             if (!strncmp(desk->orig_path, desktop_dir, n))
+                cfdata->desks = eina_list_append(cfdata->desks, desk);
+             else
+                efreet_desktop_free(desk);
+          }
+        cfdata->desks = eina_list_sort(cfdata->desks, -1, _cb_desks_sort);
+     }
+
+   evas = evas_object_evas_get(il);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(il);
+   e_widget_ilist_clear(il);
+   
+   EINA_LIST_FOREACH(cfdata->desks, l, desk)
+     {
+        Evas_Object *icon = e_util_desktop_icon_add(desk, 24, evas);
+        
+        e_widget_ilist_append(il, icon, desk->name,
+                              NULL, desk->orig_path,
+                              desk->orig_path);
+     }
+   
+   e_widget_ilist_go(il);
+   e_widget_ilist_thaw(il);
+   edje_thaw();
+   evas_event_thaw(evas);
+}
+
+static void
+_btn_cb_del(void *data, void *data2 __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   const Eina_List *l;
+   const E_Ilist_Item *it;
+   
+   EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->obj.list), l, it)
+     {
+        const char *file;
+        
+        if (!it->selected) continue;
+        file = e_widget_ilist_item_data_get(it);
+        if (file) ecore_file_unlink(file);
+     }
+}
+
+static void
+_widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   const Eina_List *l;
+   const E_Ilist_Item *it;
+   int selnum = 0;
+   
+   EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->obj.list), l, it)
+     {
+        if (!it->selected) continue;
+        selnum++;
+     }
+   if (selnum == 0) e_widget_disabled_set(cfdata->obj.del, 1);
+   else e_widget_disabled_set(cfdata->obj.del, 0);
+}
diff --git a/src/modules/conf_applications/e_int_config_delapps.h b/src/modules/conf_applications/e_int_config_delapps.h
new file mode 100644 (file)
index 0000000..f642f80
--- /dev/null
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_DELAPPS_H
+#define E_INT_CONFIG_DELAPPS_H
+
+E_Config_Dialog *e_int_config_delapps(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
diff --git a/src/modules/conf_applications/e_int_config_deskenv.c b/src/modules/conf_applications/e_int_config_deskenv.c
new file mode 100644 (file)
index 0000000..b27922b
--- /dev/null
@@ -0,0 +1,102 @@
+#include "e.h"
+
+/* PROTOTYPES - same all the time */
+
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+
+/* Actual config data we will be playing with whil the dialog is active */
+struct _E_Config_Dialog_Data
+{
+   int load_xrdb;
+   int load_xmodmap;
+   int load_gnome;
+   int load_kde;
+};
+
+/* a nice easy setup function that does the dirty work */
+E_Config_Dialog *
+e_int_config_deskenv(E_Container *con, const char *params __UNUSED__)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "windows/desktop_environments")) 
+     return NULL;
+   v = E_NEW(E_Config_Dialog_View, 1);
+   
+   /* methods */
+   v->create_cfdata  = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply;
+   v->basic.create_widgets = _basic_create;
+
+   /* create config diaolg for NULL object/data */
+   cfd = e_config_dialog_new(con, _("Desktop Environments"), "E", 
+                             "windows/desktop_environments", 
+                             "preferences-desktop-environments", 0, v, NULL);
+   return cfd;
+}
+
+/**--CREATE--**/
+static void
+_fill_data(E_Config_Dialog_Data *cfdata)
+{
+   cfdata->load_xrdb = e_config->deskenv.load_xrdb;
+   cfdata->load_xmodmap = e_config->deskenv.load_xmodmap;
+   cfdata->load_gnome = e_config->deskenv.load_gnome;
+   cfdata->load_kde = e_config->deskenv.load_kde;
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata;
+   
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(cfdata);
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   E_FREE(cfdata);
+}
+
+/**--APPLY--**/
+static int
+_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   e_config->deskenv.load_xrdb = cfdata->load_xrdb;
+   e_config->deskenv.load_xmodmap = cfdata->load_xmodmap;
+   e_config->deskenv.load_gnome = cfdata->load_gnome;
+   e_config->deskenv.load_kde = cfdata->load_kde;
+   e_config_save_queue();
+   return 1; /* Apply was OK */
+}
+
+/**--GUI--**/
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+{
+   /* generate the core widget layout for a basic dialog */
+   Evas_Object *o, *ob;
+
+   o = e_widget_list_add(evas, 0, 0);
+   ob = e_widget_check_add(evas, _("Load X Resources"), 
+                           &(cfdata->load_xrdb));
+   e_widget_list_object_append(o, ob, 1, 0, 0.0);
+   ob = e_widget_check_add(evas, _("Load X Modifier Map"), 
+                           &(cfdata->load_xmodmap));
+   e_widget_list_object_append(o, ob, 1, 0, 0.0);
+   ob = e_widget_check_add(evas, _("Start GNOME services on login"), 
+                           &(cfdata->load_gnome));
+   e_widget_list_object_append(o, ob, 1, 0, 0.0);
+   ob = e_widget_check_add(evas, _("Start KDE services on login"), 
+                           &(cfdata->load_kde));
+   e_widget_list_object_append(o, ob, 1, 0, 0.0);
+   return o;
+}
diff --git a/src/modules/conf_applications/e_int_config_deskenv.h b/src/modules/conf_applications/e_int_config_deskenv.h
new file mode 100644 (file)
index 0000000..981d756
--- /dev/null
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_DESKENV_H
+#define E_INT_CONFIG_DESKENV_H
+
+E_Config_Dialog *e_int_config_deskenv(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
index d813cdf..a9f721c 100644 (file)
@@ -18,24 +18,37 @@ e_modapi_init(E_Module *m)
    e_configure_registry_category_add("applications", 20, _("Apps"), NULL, 
                                      "preferences-applications");
    e_configure_registry_item_add("applications/new_application", 10, 
-                                 _("New Application"), NULL, 
+                                 _("Create Launcher"), NULL, 
                                  "preferences-applications-add", 
                                  e_int_config_apps_add);
-   e_configure_registry_item_add("applications/favorite_applications", 10, 
+   e_configure_registry_item_add("applications/del_application", 20,
+                                 _("Delete Personal Launchers"), NULL, 
+                                 "preferences-applications-del", 
+                                 e_int_config_delapps);
+   e_configure_registry_item_add("applications/favorite_applications", 30,
                                  _("Favorite Applications"), NULL, 
-                                 "user-bookmarks", e_int_config_apps_favs);
-   e_configure_registry_item_add("applications/ibar_applications", 20, 
+                                 "user-bookmarks",
+                                 e_int_config_apps_favs);
+   e_configure_registry_item_add("applications/ibar_applications", 40, 
                                  _("IBar Applications"), NULL, 
                                  "preferences-applications-ibar", 
                                  e_int_config_apps_ibar);
-   e_configure_registry_item_add("applications/restart_applications", 30, 
+   e_configure_registry_item_add("applications/restart_applications", 50, 
                                  _("Restart Applications"), NULL, 
                                  "preferences-applications-restart", 
                                  e_int_config_apps_restart);
-   e_configure_registry_item_add("applications/startup_applications", 40, 
+   e_configure_registry_item_add("applications/startup_applications", 60, 
                                  _("Startup Applications"), NULL, 
                                  "preferences-applications-startup", 
                                  e_int_config_apps_startup);
+   e_configure_registry_item_add("applications/default_applications", 70,
+                                 _("Default Applications"), NULL, 
+                                 "preferences-desktop-default-applications", 
+                                 e_int_config_defapps);
+   e_configure_registry_item_add("applications/desktop_environments", 80,
+                                 _("Desktop Environments"), NULL, 
+                                 "preferences-desktop-environments", 
+                                 e_int_config_deskenv);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, 
                                      "enlightenment/internal");
    e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), 
@@ -58,9 +71,12 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    e_configure_registry_category_del("internal");
    e_configure_registry_item_del("applications/favorite_applications");
    e_configure_registry_item_del("applications/new_application");
+   e_configure_registry_item_del("applications/del_application");
    e_configure_registry_item_del("applications/ibar_applications");
    e_configure_registry_item_del("applications/restart_applications");
    e_configure_registry_item_del("applications/startup_applications");
+   e_configure_registry_item_del("applications/default_applications");
+   e_configure_registry_item_del("applications/desktop_environments");
    e_configure_registry_category_del("applications");
    conf_module = NULL;
    return 1;
index 740b7e3..95f3a8f 100644 (file)
@@ -3,10 +3,15 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_apps.h"
+#include "e_int_config_defapps.h"
+#include "e_int_config_deskenv.h"
+#include "e_int_config_delapps.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_apps.h"
-
+#include "e_int_config_defapps.h"
+#include "e_int_config_deskenv.h"
+#include "e_int_config_delapps.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_dialogs/.cvsignore b/src/modules/conf_dialogs/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_display/.cvsignore b/src/modules/conf_display/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index eafa701..9b918fa 100644 (file)
@@ -74,7 +74,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
-                            "screen/screen_lock", "preferences-desklock",
+                            "screen/screen_lock", "preferences-system-lock-screen",
                             0, v, NULL);
    return cfd;
 }
@@ -189,14 +189,12 @@ _basic_screensaver_lock_cb_changed(void *data, Evas_Object *o __UNUSED__)
 }
 
 static Evas_Object *
-_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
+_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *otb, *ol, *ow, *of;
    E_Radio_Group *rg;
-   E_Zone *zone;
    int screen_count;
 
-   zone = e_zone_current_get(cfd->con);
    screen_count = ecore_x_xinerama_screen_count_get();
 
    otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
index f4f3bc7..1aa6833 100644 (file)
@@ -19,10 +19,7 @@ struct _E_Config_Dialog_Data
    int flip_wrap;
    int flip_mode;
    int flip_interp;
-   int flip_pan_bg;
    double flip_speed;
-   double x_axis_pan;
-   double y_axis_pan;
 
    /*- GUI -*/
    Evas_Object *preview;
@@ -65,10 +62,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->flip_wrap = e_config->desk_flip_wrap;
    cfdata->flip_mode = e_config->desk_flip_animate_mode;
    cfdata->flip_interp = e_config->desk_flip_animate_interpolation;
-   cfdata->flip_pan_bg = e_config->desk_flip_pan_bg;
    cfdata->flip_speed = e_config->desk_flip_animate_time;
-   cfdata->x_axis_pan = e_config->desk_flip_pan_x_axis_factor;
-   cfdata->y_axis_pan = e_config->desk_flip_pan_y_axis_factor;
 }
 
 static void *
@@ -106,10 +100,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 
    e_config->desk_flip_animate_mode = cfdata->flip_mode;
    e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
-   e_config->desk_flip_pan_bg = cfdata->flip_pan_bg;
    e_config->desk_flip_animate_time = cfdata->flip_speed;
-   e_config->desk_flip_pan_x_axis_factor = cfdata->x_axis_pan;
-   e_config->desk_flip_pan_y_axis_factor = cfdata->y_axis_pan;
    
    e_config->edge_flip_dragging = cfdata->edge_flip_dragging;
    e_config->desk_flip_wrap = cfdata->flip_wrap;
@@ -139,10 +130,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
 
    return ((e_config->desk_flip_animate_mode != cfdata->flip_mode) ||
           (e_config->desk_flip_animate_interpolation != cfdata->flip_interp) ||
-          (e_config->desk_flip_pan_bg != cfdata->flip_pan_bg) ||
           (e_config->desk_flip_animate_time != cfdata->flip_speed) ||
-          (e_config->desk_flip_pan_x_axis_factor != cfdata->x_axis_pan) ||
-          (e_config->desk_flip_pan_y_axis_factor != cfdata->y_axis_pan) ||
           (e_config->edge_flip_dragging != cfdata->edge_flip_dragging) ||
           (e_config->desk_flip_wrap != cfdata->flip_wrap));
 }
@@ -202,13 +190,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
    ob = e_widget_radio_add(evas, _("Zoom"), 2, rg);
    e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
    e_widget_list_object_append(o, ob, 1, 0, 0.5);
-
-   ob = e_widget_check_add(evas, _("Background panning"), 
-                           &(cfdata->flip_pan_bg));
-   e_widget_disabled_set(ob, !cfdata->flip_mode);
-   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
-   e_widget_list_object_append(o, ob, 1, 0, 0.5);
-
+   
    ob = e_widget_label_add(evas, _("Animation speed"));
    cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
    e_widget_list_object_append(o, ob, 1, 0, 0.5);
@@ -217,25 +199,6 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
    e_widget_disabled_set(ob, !cfdata->flip_mode);
    cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
    e_widget_list_object_append(o, ob, 1, 0, 0.5);
-
-   ob = e_widget_label_add(evas, _("X-Axis pan factor"));
-   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
-   e_widget_list_object_append(o, ob, 1, 0, 0.5);
-   ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0, 
-                            &(cfdata->x_axis_pan), NULL, 150);
-   e_widget_disabled_set(ob, !cfdata->flip_mode);
-   e_widget_list_object_append(o, ob, 1, 0, 0.5);
-   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
-
-   ob = e_widget_label_add(evas, _("Y-Axis pan factor"));
-   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
-   e_widget_list_object_append(o, ob, 1, 0, 0.5);
-   ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0, 
-                            &(cfdata->y_axis_pan), NULL, 150);
-   e_widget_disabled_set(ob, !cfdata->flip_mode);
-   e_widget_list_object_append(o, ob, 1, 0, 0.5);
-   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
-
    e_widget_toolbook_page_append(otb, NULL, _("Flip Animation"), o, 
                                  1, 0, 1, 0, 0.5, 0.0);
 
index 27b6284..60ac4c5 100644 (file)
@@ -23,8 +23,6 @@ static int        _sort_resolutions        (const void *d1, const void *d2);
 typedef struct _Resolution Resolution;
 typedef struct _SureBox SureBox;
 
-static E_Randr_Screen_Restore_Info_11 *e_screen_config_11 = NULL;
-
 struct _Resolution
 {
    int id;
@@ -88,21 +86,14 @@ _surebox_dialog_cb_yes(void *data, E_Dialog *dia)
 {
    SureBox *sb;
    Ecore_X_Randr_Screen_Size c_size;
-   Ecore_X_Randr_Refresh_Rate c_rate;
    E_Manager *man;
 
    sb = data;
    man = e_manager_current_get();
    ecore_x_randr_screen_primary_output_current_size_get(man->root, &c_size.width, &c_size.height, NULL, NULL, NULL);
-   c_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(man->root);
 
-   if (e_screen_config_11)
-     {
-       e_screen_config_11->size.width = c_size.width;
-       e_screen_config_11->size.height = c_size.height;
-       e_screen_config_11->refresh_rate = c_rate;
-       e_config_save_queue();
-     }
+   e_randr_store_configuration(e_randr_screen_info);
+
    _fill_data(sb->cfdata);
    _load_resolutions(sb->cfdata);
    /* No need to load rates as the currently selected resolution has not been
@@ -242,44 +233,12 @@ static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
    E_Manager *man;
-   E_Randr_Screen_Restore_Info *restore_info;
-   Eina_List *iter;
    int rots;
 
    man = e_manager_current_get();
    ecore_x_randr_screen_primary_output_current_size_get(man->root, &cfdata->orig_size.width, &cfdata->orig_size.height, NULL, NULL, &cfdata->orig_size_index);
    cfdata->orig_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(man->root);
 
-   EINA_LIST_FOREACH(e_config->screen_info, iter, restore_info)
-     {
-        if (restore_info->randr_version == RANDR_11)
-          {
-             e_screen_config_11 = restore_info->rrvd_restore_info.restore_info_11;
-             break;
-          }
-     }
-
-   if(!e_screen_config_11)
-     {
-        if ((restore_info = E_NEW(E_Randr_Screen_Restore_Info, 1)))
-          {
-             restore_info->randr_version = RANDR_11;
-             if ((e_screen_config_11 = E_NEW(E_Randr_Screen_Restore_Info_11, 1)))
-               {
-                  restore_info->rrvd_restore_info.restore_info_11 = e_screen_config_11;
-                  if (!(e_config->screen_info = eina_list_append(e_config->screen_info, restore_info)))
-                    {
-                       free(e_screen_config_11);
-                       free(restore_info);
-                    }
-               }
-             else
-               {
-                  free (restore_info);
-               }
-          }
-     }
-
    rots = ecore_x_randr_screen_primary_output_orientations_get(man->root);
    if ((rots) && (rots != ECORE_X_RANDR_ORIENTATION_ROT_0))
      {
@@ -352,7 +311,6 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
    rt = eina_list_nth(res->rates, r);
    if (!rt) return 0;
 
-   if (!e_screen_config_11) return EINA_FALSE;
    return ((res->size.width != cfdata->orig_size.width) ||
          (res->size.height != cfdata->orig_size.height) ||
          (cfdata->has_rates && (*rt != cfdata->orig_rate)) ||
@@ -414,14 +372,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
                                          (cfdata->orientation | cfdata->flip));
        cfdata->orig_orientation = cfdata->orientation;
        cfdata->orig_flip = cfdata->flip;
-       if (e_screen_config_11)
-         e_screen_config_11->orientation = (cfdata->orientation | cfdata->flip);
      }
-   else
-     if (e_screen_config_11)
-       e_screen_config_11->orientation = 0;
-
-   e_config_save_queue();
 
    return 1;
 }
index bebf017..2d4afba 100644 (file)
@@ -36,20 +36,30 @@ struct _E_Config_Dialog_Data
    double suspend_timeout;
    double off_timeout;
    Eina_List *dpms_list;
+   
+   double backlight_normal;
+   double backlight_dim;
+   double backlight_transition;
 };
 
-static E_Dialog *dpms_dialog = NULL;
+/* static E_Dialog *dpms_dialog = NULL; */
 
+/* always allow as dmps now has backlight too
 static void
 _cb_dpms_dialog_ok(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(dpms_dialog));
    dpms_dialog = NULL;
 }
+*/
 
 static int
 _e_int_config_dpms_capable(void)
 {
+   return 1;
+/* always allow as dmps now has backlight too 
+ * this all needs to merge with screensaver too into a simple screen blank+
+ * dim+brightness etc. config
    if (ecore_x_dpms_capable_get()) return 1;
 
    if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
@@ -65,12 +75,15 @@ _e_int_config_dpms_capable(void)
    e_dialog_button_focus_num(dpms_dialog, 1);
    e_win_centered_set(dpms_dialog->win, 1);
    e_dialog_show(dpms_dialog);
+ */
    return 0;
 }
 
 static int
 _e_int_config_dpms_available(void)
 {
+   return 1;
+/* always allow as dmps now has backlight too
    if (ecore_x_dpms_query()) return 1;
 
    if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
@@ -87,6 +100,7 @@ _e_int_config_dpms_available(void)
    e_win_centered_set(dpms_dialog->win, 1);
    e_dialog_show(dpms_dialog);
    return 0;
+ */
 }
 
 E_Config_Dialog *
@@ -125,6 +139,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->suspend_timeout = e_config->dpms_suspend_timeout / 60;
    cfdata->enable_off = e_config->dpms_off_enable;
    cfdata->off_timeout = e_config->dpms_off_timeout / 60;
+   cfdata->backlight_normal = e_config->backlight.normal * 100.0;
+   cfdata->backlight_dim = e_config->backlight.dim * 100.0;
+   cfdata->backlight_transition = e_config->backlight.transition;
 }
 
 static void
@@ -156,8 +173,8 @@ _create_data(E_Config_Dialog *cfd)
 static void
 _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
-  eina_list_free(cfdata->dpms_list);
-  E_FREE(cfdata);
+   eina_list_free(cfdata->dpms_list);
+   E_FREE(cfdata);
 }
 
 static int
@@ -171,7 +188,14 @@ _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    e_config->dpms_standby_timeout = cfdata->standby_timeout * 60;
    e_config->dpms_suspend_timeout = cfdata->suspend_timeout * 60;
    e_config->dpms_off_timeout = cfdata->off_timeout * 60;
-
+   
+   e_config->backlight.normal = cfdata->backlight_normal / 100.0;
+   e_config->backlight.dim = cfdata->backlight_dim / 100.0;
+   e_config->backlight.transition = cfdata->backlight_transition;
+
+   e_backlight_mode_set(NULL, E_BACKLIGHT_MODE_NORMAL);
+   e_backlight_level_set(NULL, e_config->backlight.normal, -1.0);
+   
    e_config_save_queue();
    e_dpms_update();
    return 1;
@@ -187,7 +211,10 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
          (e_config->dpms_off_enable != cfdata->enable_off) ||
          (e_config->dpms_standby_timeout / 60 != cfdata->standby_timeout) ||
          (e_config->dpms_suspend_timeout / 60 != cfdata->suspend_timeout) ||
-         (e_config->dpms_off_timeout / 60 != cfdata->off_timeout);
+         (e_config->dpms_off_timeout / 60 != cfdata->off_timeout) ||
+          (e_config->backlight.normal * 100.0 != cfdata->backlight_normal) ||
+          (e_config->backlight.dim * 100.0 != cfdata->backlight_dim) ||
+          (e_config->backlight.transition != cfdata->backlight_transition);
 }
 
 static int
@@ -200,9 +227,12 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object *o, *of, *ob;
+   Evas_Object *o, *of, *ob, *otb;
    Evas_Object *dpms_check;
 
+   otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
+   
+   /* dpms */
    o = e_widget_list_add(evas, 0, 0);
 
    dpms_check = e_widget_check_add(evas, _("Enable Display Power Management"),
@@ -253,7 +283,36 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
    _list_disabled_state_apply(cfdata->dpms_list, !cfdata->enable_dpms);
 
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   return o;
+   
+   e_widget_toolbook_page_append(otb, NULL, _("DPMS"), o,
+                                 1, 0, 1, 0, 0.5, 0.0);
+
+   o = e_widget_list_add(evas, 0, 0);
+
+   ob = e_widget_label_add(evas, _("Normal Backlight"));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_slider_add(evas, 1, 0, _("%3.0f"), 0.0, 100.0, 1.0, 0,
+                           &(cfdata->backlight_normal), NULL, 100);
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   
+   ob = e_widget_label_add(evas, _("Dim Backlight"));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_slider_add(evas, 1, 0, _("%3.0f"), 0.0, 100.0, 1.0, 0,
+                           &(cfdata->backlight_dim), NULL, 100);
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   
+   ob = e_widget_label_add(evas, _("Fade Time"));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.1f sec"), 0.0, 5.0, 0.1, 0,
+                           &(cfdata->backlight_transition), NULL, 100);
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   
+   e_widget_toolbook_page_append(otb, NULL, _("Backlight"), o,
+                                 1, 0, 1, 0, 0.5, 0.0);
+   
+   e_widget_toolbook_page_show(otb, 0);
+   
+   return otb;
 }
 
 /* general functionality/callbacks */
index c97a8bf..5c5b3c8 100644 (file)
@@ -27,6 +27,10 @@ struct _E_Config_Dialog_Data
    int exposures;
    int ask_presentation;
    double ask_presentation_timeout;
+   
+   int screensaver_suspend;
+   int screensaver_suspend_on_ac;
+   double screensaver_suspend_delay;
 
    Eina_List *disable_list;
 
@@ -68,8 +72,10 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->blanking = e_config->screensaver_blanking;
    cfdata->exposures = e_config->screensaver_expose;
    cfdata->ask_presentation = e_config->screensaver_ask_presentation;
-   cfdata->ask_presentation_timeout = 
-     e_config->screensaver_ask_presentation_timeout;
+   cfdata->ask_presentation_timeout = e_config->screensaver_ask_presentation_timeout;
+   cfdata->screensaver_suspend = e_config->screensaver_suspend;
+   cfdata->screensaver_suspend_on_ac = e_config->screensaver_suspend_on_ac;
+   cfdata->screensaver_suspend_delay = e_config->screensaver_suspend_delay;
 }
 
 static void *
@@ -99,9 +105,11 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    e_config->screensaver_blanking = cfdata->blanking;
    e_config->screensaver_expose = cfdata->exposures;
    e_config->screensaver_ask_presentation = cfdata->ask_presentation;
-   e_config->screensaver_ask_presentation_timeout = 
-     cfdata->ask_presentation_timeout;
-
+   e_config->screensaver_ask_presentation_timeout = cfdata->ask_presentation_timeout;
+   e_config->screensaver_suspend = cfdata->screensaver_suspend;
+   e_config->screensaver_suspend_on_ac = cfdata->screensaver_suspend_on_ac;
+   e_config->screensaver_suspend_delay = cfdata->screensaver_suspend_delay;
+   
    /* Apply settings */
    e_screensaver_update();
 
@@ -118,7 +126,10 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
           (e_config->screensaver_blanking != cfdata->blanking) ||
           (e_config->screensaver_expose != cfdata->exposures) ||
           (e_config->screensaver_ask_presentation != cfdata->ask_presentation) ||
-          (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout));
+          (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout) ||
+          (e_config->screensaver_suspend != cfdata->screensaver_suspend) ||
+          (e_config->screensaver_suspend_on_ac != cfdata->screensaver_suspend_on_ac) ||
+          (e_config->screensaver_suspend_delay != cfdata->screensaver_suspend_delay));
 }
 
 static Evas_Object *
@@ -135,6 +146,23 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
                            &(cfdata->enable_screensaver));
    e_widget_on_change_hook_set(ow, _cb_disable, cfdata);
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_check_add(evas, _("Suspend on blank"), 
+                           &(cfdata->screensaver_suspend));
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Even if on power"), 
+                           &(cfdata->screensaver_suspend_on_ac));
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Delay until suspend"));
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"),
+                           1.0, 20.0, 1.0, 0, &(cfdata->screensaver_suspend_delay), NULL, 100);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
    e_widget_toolbook_page_append(otb, NULL, _("Screensaver"), ol, 
                                  1, 0, 1, 0, 0.5, 0.0);
 
index 914855e..39d767f 100644 (file)
@@ -26,7 +26,7 @@ e_modapi_init(E_Module *m)
                                  e_int_config_display);
    e_configure_registry_item_add("screen/screen_lock", 30,
                                  _("Screen Lock"), NULL,
-                                 "preferences-desklock",
+                                 "preferences-system-lock-screen",
                                  e_int_config_desklock);
    e_configure_registry_item_add("screen/screen_saver", 40, 
                                  _("Screen Saver"), NULL, 
old mode 100755 (executable)
new mode 100644 (file)
index 72befbe..088e4d9
@@ -15,7 +15,7 @@ Name[pt_BR]=
 Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
-Icon=preferences-desktop-screensaver
+Icon=preferences-desktop-display
 Comment=Used to configure your screen.
 Comment[ru]=Используется для настройки резолюции Вашего экрана.
 Comment[cs]=
diff --git a/src/modules/conf_edgebindings/.cvsignore b/src/modules/conf_edgebindings/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 356d04f..8d6cbbc 100644 (file)
@@ -201,8 +201,6 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 
    EINA_LIST_FOREACH(cfdata->binding.edge, l, bi2)
      {
-       if (bi2->edge < 0) continue;
-
        bi = E_NEW(E_Config_Binding_Edge, 1);
        bi->context = bi2->context;
        bi->edge = bi2->edge;
diff --git a/src/modules/conf_interaction/.cvsignore b/src/modules/conf_interaction/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_intl/.cvsignore b/src/modules/conf_intl/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index d9e9881..705f0fc 100644 (file)
@@ -35,6 +35,7 @@ static const char *_intl_charset_upper_get  (const char *charset);
 struct _E_Intl_Pair
 {
    const char *locale_key;
+   const char *locale_icon;
    const char *locale_translation;
 };
 
@@ -68,7 +69,7 @@ struct _E_Config_Dialog_Data
 
    /* Current data */
    char        *cur_language;
-   
+
    const char *cur_blang;
 
    const char *cur_lang;
@@ -91,472 +92,485 @@ struct _E_Config_Dialog_Data
        Evas_Object     *reg_list;
        Evas_Object     *cs_list;
        Evas_Object     *mod_list;
-       
+
        Evas_Object     *locale_entry;
-     } 
+     }
    gui;
 };
 
 const E_Intl_Pair basic_language_predefined_pairs[ ] = {
-     {"bg_BG.UTF-8", "Български"},
-     {"ca_ES.UTF-8", "Català"},
-     {"zh_CN.UTF-8", "Chinese (Simplified)"},
-     {"zh_TW.UTF-8", "Chinese (Traditional)"},
-     {"cs_CZ.UTF-8", "Čeština"},
-     {"da_DK.UTF-8", "Dansk"},
-     {"nl_NL.UTF-8", "Nederlands"},
-     {"en_US.UTF-8", "English"},
-     {"en_GB.UTF-8", "British English"},
-     {"fi_FI.UTF-8", "Suomi"},
-     {"fr_FR.UTF-8", "Français"},
-     {"de_DE.UTF-8", "Deutsch"},
-     {"hu_HU.UTF-8", "Magyar"},
-     {"it_IT.UTF-8", "Italiano"},
-     {"ja_JP.UTF-8", "日本語"},
-     {"ko_KR.UTF-8", "한국어"},
-     {"nb_NO.UTF-8", "Norsk Bokmål"},
-     {"pl_PL.UTF-8", "Polski"},
-     {"pt_BR.UTF-8", "Português"},
-     {"ru_RU.UTF-8", "Русский"},
-     {"sk_SK.UTF-8", "Slovenčina"},
-     {"sl_SI.UTF-8", "Slovenščina"},
-     {"es_AR.UTF-8", "Español"},
-     {"sv_SE.UTF-8", "Svenska"},
-     {"el_GR.UTF-8", "Ελληνικά"},
-     { NULL, NULL }
+       {"ar_AE.UTF-8", NULL,             "العربية"},
+       {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
+       {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
+       {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"},
+       {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"},
+       {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"},
+       {"en_US.UTF-8", "lang-en_US.png", "English"},
+       {"en_GB.UTF-8", NULL,             "British English"},
+       {"el_GR.UTF-8", "lang-el_GR.png", "Ελληνικά"},
+       {"eo.UTF-8",    NULL,             "Esperanto"},
+       {"es_AR.UTF-8", "lang-es_AR.png", "Español"},
+       {"et_ET.UTF-8", NULL,             "Eesti keel"},
+       {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"},
+       {"fo_FO.UTF-8", NULL,             "Føroyskt"},
+       {"fr_CH.UTF-8", NULL,             "Français (Suisse)"},
+       {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"},
+       {"he_HE.UTF-8", NULL,             "עברית"},
+       {"hr_HR.UTF-8", NULL,             "Hrvatski"},
+       {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"},
+       {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"},
+       {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"},
+       {"km_KM.UTF-8", NULL,             "ភាសាខ្មែរ"},
+       {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"},
+       {"ku.UTF-8",    NULL,             "یدروك"},
+       {"lt_LT.UTF-8", NULL,             "Lietuvių kalba"},
+       {"ms_MY.UTF-8", NULL,             "Bahasa Melayu"},
+       {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"},
+       {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"},
+       {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"},
+       {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"},
+       {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"},
+       {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"},
+       {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"},
+       {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"},
+       {"tr_TR.UTF-8", NULL,             "Türkçe"},
+       {"uk_UK.UTF-8", NULL,             "Українська мова"},
+       {"zh_CN.UTF-8", "lang-zh_CN.png", "中文 (繁体)"},
+       {"zh_TW.UTF-8", "lang-zh_TW.png", "中文 (繁體)"},
+       { NULL, NULL, NULL }
 };
 
 const E_Intl_Pair language_predefined_pairs[ ] = {
-       {"aa", "Qafár af"},
-       {"af", "Afrikaans"},
-       {"ak", "Akan"},
-       {"am", "አማርኛ"},
-       {"an", "Aragonés"},
-       {"ar", "ةيبرعلا"},
-       {"as", "অসমীয়া"},
-       {"az", "Azərbaycan dili"},
-       {"be", "Беларуская мова"},
-       {"bg", "Български"},
-       {"bn", "বাংলা"},
-       {"br", "Brezhoneg"},
-       {"bs", "Bosanski"},
-       {"byn", "ብሊና"},
-       {"ca", "Català"},
-       {"cch", "Atsam"},
-       {"cs", "Čeština"},
-       {"cy", "Cymraeg"},
-       {"da", "Dansk"},
-       {"de", "Deutsch"},
-       {"dv", "ދިވެހި"},
-       {"dz", "Dzongkha"},
-       {"ee", "Eʋegbe"},
-       {"el", "Ελληνικά"},
-       {"en", "English"},
-       {"eo", "Esperanto"},
-       {"es", "Español"},
-       {"et", "Eesti keel"},
-       {"eu", "Euskara"},
-       {"fa", "یسراف"},
-       {"fi", "Suomi"},
-       {"fo", "Føroyskt"},
-       {"fr", "Français"},
-       {"fur", "Furlan"},
-       {"ga", "Gaeilge"},
-       {"gaa", "Gã"},
-       {"gez", "ግዕዝ"},
-       {"gl", "Galego"},
-       {"gu", "Gujarati"},
-       {"gv", "Yn Ghaelg"},
-       {"ha", "Hausa"},
-       {"haw", "ʻŌlelo Hawaiʻi"},
-       {"he", "תירבע"},
-       {"hi", "Hindi"},
-       {"hr", "Hrvatski"},
-       {"hu", "Magyar"},
-       {"hy", "Հայերեն"},
-       {"ia", "Interlingua"},
-       {"id", "Indonesian"},
-       {"ig", "Igbo"},
-       {"is", "Íslenska"},
-       {"it", "Italiano"},
-       {"iu", "ᐃᓄᒃᑎᑐᑦ"},
-       {"iw", "תירבע"},
-       {"ja", "日本語"},
-       {"ka", "ქართული"},
-       {"kaj", "Jju"},
-       {"kam", "Kikamba"},
-       {"kcg", "Tyap"},
-       {"kfo", "Koro"},
-       {"kk", "Qazaq"},
-       {"kl", "Kalaallisut"},
-       {"km", "Khmer"},
-       {"kn", "ಕನ್ನಡ"},
-       {"ko", "한국어"},
-       {"kok", "Konkani"},
-       {"ku", "یدروك"},
-       {"kw", "Kernowek"},
-       {"ky", "Кыргыз тили"},
-       {"ln", "Lingála"},
-       {"lo", "ພາສາລາວ"},
-       {"lt", "Lietuvių kalba"},
-       {"lv", "Latviešu"},
-       {"mi", "Te Reo Māori"},
-       {"mk", "Македонски"},
-       {"ml", "മലയാളം"},
-       {"mn", "Монгол"},
-       {"mr", "मराठी"},
-       {"ms", "Bahasa Melayu"},
-       {"mt", "Malti"},
-       {"nb", "Norsk Bokmål"},
-       {"ne", "नेपाली"},
-       {"nl", "Nederlands"},
-       {"nn", "Norsk Nynorsk"},
-       {"no", "Norsk"},
-       {"nr", "isiNdebele"},
-       {"nso", "Sesotho sa Leboa"},
-       {"ny", "Chicheŵa"},
-       {"oc", "Occitan"},
-       {"om", "Oromo"},
-       {"or", "ଓଡ଼ିଆ"},
-       {"pa", "ਪੰਜਾਬੀ"},
-       {"pl", "Polski"},
-       {"ps", "وتښپ"},
-       {"pt", "Português"},
-       {"ro", "Română"},
-       {"ru", "Русский"},
-       {"rw", "Kinyarwanda"},
-       {"sa", "संस्कृतम्"},
-       {"se", "Davvisápmi"},
-       {"sh", "Srpskohrvatski/Српскохрватски"},
-       {"sid", "Sidámo 'Afó"},
-       {"sk", "Slovenčina"},
-       {"sl", "Slovenščina"},
-       {"so", "af Soomaali"},
-       {"sq", "Shqip"},
-       {"sr", "Српски"},
-       {"ss", "Swati"},
-       {"st", "Southern Sotho"},
-       {"sv", "Svenska"},
-       {"sw", "Swahili"},
-       {"syr", "Syriac"},
-       {"ta", "தமிழ்"},
-       {"te", "తెలుగు"},
-       {"tg", "Тоҷикӣ"},
-       {"th", "ภาษาไทย"},
-       {"ti", "ትግርኛ"},
-       {"tig", "ቲግሬ"},
-       {"tl", "Tagalog"},
-       {"tn", "Setswana"},
-       {"tr", "Türkçe"},
-       {"ts", "Tsonga"},
-       {"tt", "Татарча"},
-       {"uk", "Українська мова"},
-       {"ur", "ودراُ"},
-       {"uz", "O‘zbek"},
-       {"ve", "Venda"},
-       {"vi", "Tiếng Việt"},
-       {"wa", "Walon"},
-       {"wal", "Walamo"},
-       {"xh", "Xhosa"},
-       {"yi", "שידיִי"},
-       {"yo", "èdèe Yorùbá"},
-       {"zh", "汉语/漢語"},
-       {"zu", "Zulu"},
-       { NULL, NULL}
+       {"aa", NULL, "Qafár af"},
+       {"af", NULL, "Afrikaans"},
+       {"ak", NULL, "Akan"},
+       {"am", NULL, "አማርኛ"},
+       {"an", NULL, "Aragonés"},
+       {"ar", NULL, "ةيبرعلا"},
+       {"as", NULL, "অসমীয়া"},
+       {"az", NULL, "Azərbaycan dili"},
+       {"be", NULL, "Беларуская мова"},
+       {"bg", NULL, "Български"},
+       {"bn", NULL, "বাংলা"},
+       {"br", NULL, "Brezhoneg"},
+       {"bs", NULL, "Bosanski"},
+       {"byn", NULL, "ብሊና"},
+       {"ca", NULL, "Català"},
+       {"cch", NULL, "Atsam"},
+       {"cs", NULL, "Čeština"},
+       {"cy", NULL, "Cymraeg"},
+       {"da", NULL, "Dansk"},
+       {"de", NULL, "Deutsch"},
+       {"dv", NULL, "ދިވެހި"},
+       {"dz", NULL, "Dzongkha"},
+       {"ee", NULL, "Eʋegbe"},
+       {"el", NULL, "Ελληνικά"},
+       {"en", NULL, "English"},
+       {"eo", NULL, "Esperanto"},
+       {"es", NULL, "Español"},
+       {"et", NULL, "Eesti keel"},
+       {"eu", NULL, "Euskara"},
+       {"fa", NULL, "یسراف"},
+       {"fi", NULL, "Suomi"},
+       {"fo", NULL, "Føroyskt"},
+       {"fr", NULL, "Français"},
+       {"fur", NULL, "Furlan"},
+       {"ga", NULL, "Gaeilge"},
+       {"gaa", NULL, "Gã"},
+       {"gez", NULL, "ግዕዝ"},
+       {"gl", NULL, "Galego"},
+       {"gu", NULL, "Gujarati"},
+       {"gv", NULL, "Yn Ghaelg"},
+       {"ha", NULL, "Hausa"},
+       {"haw", NULL, "ʻŌlelo Hawaiʻi"},
+       {"he", NULL, "עברית"},
+       {"hi", NULL, "Hindi"},
+       {"hr", NULL, "Hrvatski"},
+       {"hu", NULL, "Magyar"},
+       {"hy", NULL, "Հայերեն"},
+       {"ia", NULL, "Interlingua"},
+       {"id", NULL, "Indonesian"},
+       {"ig", NULL, "Igbo"},
+       {"is", NULL, "Íslenska"},
+       {"it", NULL, "Italiano"},
+       {"iu", NULL, "ᐃᓄᒃᑎᑐᑦ"},
+       {"iw", NULL, "עברית"},
+       {"ja", NULL, "日本語"},
+       {"ka", NULL, "ქართული"},
+       {"kaj", NULL, "Jju"},
+       {"kam", NULL, "Kikamba"},
+       {"kcg", NULL, "Tyap"},
+       {"kfo", NULL, "Koro"},
+       {"kk", NULL, "Qazaq"},
+       {"kl", NULL, "Kalaallisut"},
+       {"km", NULL, "ភាសាខ្មែរ"},
+       {"kn", NULL, "ಕನ್ನಡ"},
+       {"ko", NULL, "한국어"},
+       {"kok", NULL, "Konkani"},
+       {"ku", NULL, "یدروك"},
+       {"kw", NULL, "Kernowek"},
+       {"ky", NULL, "Кыргыз тили"},
+       {"ln", NULL, "Lingála"},
+       {"lo", NULL, "ພາສາລາວ"},
+       {"lt", NULL, "Lietuvių kalba"},
+       {"lv", NULL, "Latviešu"},
+       {"mi", NULL, "Te Reo Māori"},
+       {"mk", NULL, "Македонски"},
+       {"ml", NULL, "മലയാളം"},
+       {"mn", NULL, "Монгол"},
+       {"mr", NULL, "मराठी"},
+       {"ms", NULL, "Bahasa Melayu"},
+       {"mt", NULL, "Malti"},
+       {"nb", NULL, "Norsk Bokmål"},
+       {"ne", NULL, "नेपाली"},
+       {"nl", NULL, "Nederlands"},
+       {"nn", NULL, "Norsk Nynorsk"},
+       {"no", NULL, "Norsk"},
+       {"nr", NULL, "isiNdebele"},
+       {"nso", NULL, "Sesotho sa Leboa"},
+       {"ny", NULL, "Chicheŵa"},
+       {"oc", NULL, "Occitan"},
+       {"om", NULL, "Oromo"},
+       {"or", NULL, "ଓଡ଼ିଆ"},
+       {"pa", NULL, "ਪੰਜਾਬੀ"},
+       {"pl", NULL, "Polski"},
+       {"ps", NULL, "وتښپ"},
+       {"pt", NULL, "Português"},
+       {"ro", NULL, "Română"},
+       {"ru", NULL, "Русский"},
+       {"rw", NULL, "Kinyarwanda"},
+       {"sa", NULL, "संस्कृतम्"},
+       {"se", NULL, "Davvisápmi"},
+       {"sh", NULL, "Srpskohrvatski/Српскохрватски"},
+       {"sid", NULL, "Sidámo 'Afó"},
+       {"sk", NULL, "Slovenčina"},
+       {"sl", NULL, "Slovenščina"},
+       {"so", NULL, "af Soomaali"},
+       {"sq", NULL, "Shqip"},
+       {"sr", NULL, "Српски"},
+       {"ss", NULL, "Swati"},
+       {"st", NULL, "Southern Sotho"},
+       {"sv", NULL, "Svenska"},
+       {"sw", NULL, "Swahili"},
+       {"syr", NULL, "Syriac"},
+       {"ta", NULL, "தமிழ்"},
+       {"te", NULL, "తెలుగు"},
+       {"tg", NULL, "Тоҷикӣ"},
+       {"th", NULL, "ภาษาไทย"},
+       {"ti", NULL, "ትግርኛ"},
+       {"tig", NULL, "ቲግሬ"},
+       {"tl", NULL, "Tagalog"},
+       {"tn", NULL, "Setswana"},
+       {"tr", NULL, "Türkçe"},
+       {"ts", NULL, "Tsonga"},
+       {"tt", NULL, "Татарча"},
+       {"uk", NULL, "Українська мова"},
+       {"ur", NULL, "ودراُ"},
+       {"uz", NULL, "O‘zbek"},
+       {"ve", NULL, "Venda"},
+       {"vi", NULL, "Tiếng Việt"},
+       {"wa", NULL, "Walon"},
+       {"wal", NULL, "Walamo"},
+       {"xh", NULL, "Xhosa"},
+       {"yi", NULL, "שידיִי"},
+       {"yo", NULL, "èdèe Yorùbá"},
+       {"zh", NULL, "汉语/漢語"},
+       {"zu", NULL, "Zulu"},
+       { NULL, NULL, NULL}
 };
 
 const E_Intl_Pair region_predefined_pairs[ ] = {
-       { "AF", "Afghanistan"},
-       { "AX", "Åland"},
-       { "AL", "Shqipëria"},
-       { "DZ", "Algeria"},
-       { "AS", "Amerika Sāmoa"},
-       { "AD", "Andorra"},
-       { "AO", "Angola"},
-       { "AI", "Anguilla"},
-       { "AQ", "Antarctica"},
-       { "AG", "Antigua and Barbuda"},
-       { "AR", "Argentina"},
-       { "AM", "Հայաստան"},
-       { "AW", "Aruba"},
-       { "AU", "Australia"},
-       { "AT", "Österreich"},
-       { "AZ", "Azərbaycan"},
-       { "BS", "Bahamas"},
-       { "BH", "Bahrain"},
-       { "BD", "বাংলাদেশ"},
-       { "BB", "Barbados"},
-       { "BY", "Беларусь"},
-       { "BE", "Belgium"},
-       { "BZ", "Belize"},
-       { "BJ", "Bénin"},
-       { "BM", "Bermuda"},
-       { "BT", "Bhutan"},
-       { "BO", "Bolivia"},
-       { "BA", "Bosnia and Herzegovina"},
-       { "BW", "Botswana"},
-       { "BV", "Bouvetøya"},
-       { "BR", "Brazil"},
-       { "IO", "British Indian Ocean Territory"},
-       { "BN", "Brunei Darussalam"},
-       { "BG", "България"},
-       { "BF", "Burkina Faso"},
-       { "BI", "Burundi"},
-       { "KH", "Cambodia"},
-       { "CM", "Cameroon"},
-       { "CA", "Canada"},
-       { "CV", "Cape Verde"},
-       { "KY", "Cayman Islands"},
-       { "CF", "Central African Republic"},
-       { "TD", "Chad"},
-       { "CL", "Chile"},
-       { "CN", "中國"},
-       { "CX", "Christmas Island"},
-       { "CC", "Cocos (keeling) Islands"},
-       { "CO", "Colombia"},
-       { "KM", "Comoros"},
-       { "CG", "Congo"},
-       { "CD", "Congo"},
-       { "CK", "Cook Islands"},
-       { "CR", "Costa Rica"},
-       { "CI", "Cote d'Ivoire"},
-       { "HR", "Hrvatska"},
-       { "CU", "Cuba"},
-       { "CY", "Cyprus"},
-       { "CZ", "Česká republika"},
-       { "DK", "Danmark"},
-       { "DJ", "Djibouti"},
-       { "DM", "Dominica"},
-       { "DO", "República Dominicana"},
-       { "EC", "Ecuador"},
-       { "EG", "Egypt"},
-       { "SV", "El Salvador"},
-       { "GQ", "Equatorial Guinea"},
-       { "ER", "Eritrea"},
-       { "EE", "Eesti"},
-       { "ET", "Ethiopia"},
-       { "FK", "Falkland Islands (malvinas)"},
-       { "FO", "Faroe Islands"},
-       { "FJ", "Fiji"},
-       { "FI", "Finland"},
-       { "FR", "France"},
-       { "GF", "French Guiana"},
-       { "PF", "French Polynesia"},
-       { "TF", "French Southern Territories"},
-       { "GA", "Gabon"},
-       { "GM", "Gambia"},
-       { "GE", "Georgia"},
-       { "DE", "Deutschland"},
-       { "GH", "Ghana"},
-       { "GI", "Gibraltar"},
-       { "GR", "Greece"},
-       { "GL", "Greenland"},
-       { "GD", "Grenada"},
-       { "GP", "Guadeloupe"},
-       { "GU", "Guam"},
-       { "GT", "Guatemala"},
-       { "GG", "Guernsey"},
-       { "GN", "Guinea"},
-       { "GW", "Guinea-Bissau"},
-       { "GY", "Guyana"},
-       { "HT", "Haiti"},
-       { "HM", "Heard Island and Mcdonald Islands"},
-       { "VA", "Holy See (Vatican City State)"},
-       { "HN", "Honduras"},
-       { "HK", "Hong Kong"},
-       { "HU", "Magyarország"},
-       { "IS", "Iceland"},
-       { "IN", "India"},
-       { "ID", "Indonesia"},
-       { "IR", "Iran"},
-       { "IQ", "Iraq"},
-       { "IE", "Éire"},
-       { "IM", "Isle Of Man"},
-       { "IL", "Israel"},
-       { "IT", "Italia"},
-       { "JM", "Jamaica"},
-       { "JP", "日本"},
-       { "JE", "Jersey"},
-       { "JO", "Jordan"},
-       { "KZ", "Kazakhstan"},
-       { "KE", "Kenya"},
-       { "KI", "Kiribati"},
-       { "KP", "Korea"},
-       { "KR", "Korea"},
-       { "KW", "Kuwait"},
-       { "KG", "Kyrgyzstan"},
-       { "LA", "Lao People's Democratic Republic"},
-       { "LV", "Latvija"},
-       { "LB", "Lebanon"},
-       { "LS", "Lesotho"},
-       { "LR", "Liberia"},
-       { "LY", "Libyan Arab Jamahiriya"},
-       { "LI", "Liechtenstein"},
-       { "LT", "Lietuva"},
-       { "LU", "Lëtzebuerg"},
-       { "MO", "Macao"},
-       { "MK", "Македонија"},
-       { "MG", "Madagascar"},
-       { "MW", "Malawi"},
-       { "MY", "Malaysia"},
-       { "MV", "Maldives"},
-       { "ML", "Mali"},
-       { "MT", "Malta"},
-       { "MH", "Marshall Islands"},
-       { "MQ", "Martinique"},
-       { "MR", "Mauritania"},
-       { "MU", "Mauritius"},
-       { "YT", "Mayotte"},
-       { "MX", "Mexico"},
-       { "FM", "Micronesia"},
-       { "MD", "Moldova"},
-       { "MC", "Monaco"},
-       { "MN", "Mongolia"},
-       { "MS", "Montserrat"},
-       { "MA", "Morocco"},
-       { "MZ", "Mozambique"},
-       { "MM", "Myanmar"},
-       { "NA", "Namibia"},
-       { "NR", "Nauru"},
-       { "NP", "Nepal"},
-       { "NL", "Nederland"},
-       { "AN", "Netherlands Antilles"},
-       { "NC", "New Caledonia"},
-       { "NZ", "New Zealand"},
-       { "NI", "Nicaragua"},
-       { "NE", "Niger"},
-       { "NG", "Nigeria"},
-       { "NU", "Niue"},
-       { "NF", "Norfolk Island"},
-       { "MP", "Northern Mariana Islands"},
-       { "NO", "Norge"},
-       { "OM", "Oman"},
-       { "PK", "Pakistan"},
-       { "PW", "Palau"},
-       { "PS", "Palestinian Territory"},
-       { "PA", "Panama"},
-       { "PG", "Papua New Guinea"},
-       { "PY", "Paraguay"},
-       { "PE", "Peru"},
-       { "PH", "Philippines"},
-       { "PN", "Pitcairn"},
-       { "PL", "Poland"},
-       { "PT", "Portugal"},
-       { "PR", "Puerto Rico"},
-       { "QA", "Qatar"},
-       { "RE", "Reunion"},
-       { "RO", "Romania"},
-       { "RU", "Russian Federation"},
-       { "RW", "Rwanda"},
-       { "SH", "Saint Helena"},
-       { "KN", "Saint Kitts and Nevis"},
-       { "LC", "Saint Lucia"},
-       { "PM", "Saint Pierre and Miquelon"},
-       { "VC", "Saint Vincent and the Grenadines"},
-       { "WS", "Samoa"},
-       { "SM", "San Marino"},
-       { "ST", "Sao Tome and Principe"},
-       { "SA", "Saudi Arabia"},
-       { "SN", "Senegal"},
-       { "CS", "Serbia and Montenegro"},
-       { "SC", "Seychelles"},
-       { "SL", "Sierra Leone"},
-       { "SG", "Singapore"},
-       { "SK", "Slovakia"},
-       { "SI", "Slovenia"},
-       { "SB", "Solomon Islands"},
-       { "SO", "Somalia"},
-       { "ZA", "South Africa"},
-       { "GS", "South Georgia and the South Sandwich Islands"},
-       { "ES", "Spain"},
-       { "LK", "Sri Lanka"},
-       { "SD", "Sudan"},
-       { "SR", "Suriname"},
-       { "SJ", "Svalbard and Jan Mayen"},
-       { "SZ", "Swaziland"},
-       { "SE", "Sweden"},
-       { "CH", "Switzerland"},
-       { "SY", "Syrian Arab Republic"},
-       { "TW", "Taiwan"},
-       { "TJ", "Tajikistan"},
-       { "TZ", "Tanzania"},
-       { "TH", "Thailand"},
-       { "TL", "Timor-Leste"},
-       { "TG", "Togo"},
-       { "TK", "Tokelau"},
-       { "TO", "Tonga"},
-       { "TT", "Trinidad and Tobago"},
-       { "TN", "Tunisia"},
-       { "TR", "Turkey"},
-       { "TM", "Turkmenistan"},
-       { "TC", "Turks and Caicos Islands"},
-       { "TV", "Tuvalu"},
-       { "UG", "Uganda"},
-       { "UA", "Ukraine"},
-       { "AE", "United Arab Emirates"},
-       { "GB", "United Kingdom"},
-       { "US", "United States"},
-       { "UM", "United States Minor Outlying Islands"},
-       { "UY", "Uruguay"},
-       { "UZ", "Uzbekistan"},
-       { "VU", "Vanuatu"},
-       { "VE", "Venezuela"},
-       { "VN", "Viet Nam"},
-       { "VG", "Virgin Islands"},
-       { "VI", "Virgin Islands"},
-       { "WF", "Wallis and Futuna"},
-       { "EH", "Western Sahara"},
-       { "YE", "Yemen"},
-       { "ZM", "Zambia"},
-       { "ZW", "Zimbabwe"},
-       { NULL, NULL}
+       { "AF", NULL, "Afghanistan"},
+       { "AX", NULL, "Åland"},
+       { "AL", NULL, "Shqipëria"},
+       { "DZ", NULL, "Algeria"},
+       { "AS", NULL, "Amerika Sāmoa"},
+       { "AD", NULL, "Andorra"},
+       { "AO", NULL, "Angola"},
+       { "AI", NULL, "Anguilla"},
+       { "AQ", NULL, "Antarctica"},
+       { "AG", NULL, "Antigua and Barbuda"},
+       { "AR", NULL, "Argentina"},
+       { "AM", NULL, "Հայաստան"},
+       { "AW", NULL, "Aruba"},
+       { "AU", NULL, "Australia"},
+       { "AT", NULL, "Österreich"},
+       { "AZ", NULL, "Azərbaycan"},
+       { "BS", NULL, "Bahamas"},
+       { "BH", NULL, "Bahrain"},
+       { "BD", NULL, "বাংলাদেশ"},
+       { "BB", NULL, "Barbados"},
+       { "BY", NULL, "Беларусь"},
+       { "BE", NULL, "Belgium"},
+       { "BZ", NULL, "Belize"},
+       { "BJ", NULL, "Bénin"},
+       { "BM", NULL, "Bermuda"},
+       { "BT", NULL, "Bhutan"},
+       { "BO", NULL, "Bolivia"},
+       { "BA", NULL, "Bosnia and Herzegovina"},
+       { "BW", NULL, "Botswana"},
+       { "BV", NULL, "Bouvetøya"},
+       { "BR", NULL, "Brazil"},
+       { "IO", NULL, "British Indian Ocean Territory"},
+       { "BN", NULL, "Brunei Darussalam"},
+       { "BG", NULL, "България"},
+       { "BF", NULL, "Burkina Faso"},
+       { "BI", NULL, "Burundi"},
+       { "KH", NULL, "Cambodia"},
+       { "CM", NULL, "Cameroon"},
+       { "CA", NULL, "Canada"},
+       { "CV", NULL, "Cape Verde"},
+       { "KY", NULL, "Cayman Islands"},
+       { "CF", NULL, "Central African Republic"},
+       { "TD", NULL, "Chad"},
+       { "CL", NULL, "Chile"},
+       { "CN", NULL, "中國"},
+       { "CX", NULL, "Christmas Island"},
+       { "CC", NULL, "Cocos (keeling) Islands"},
+       { "CO", NULL, "Colombia"},
+       { "KM", NULL, "Comoros"},
+       { "CG", NULL, "Congo"},
+       { "CD", NULL, "Congo"},
+       { "CK", NULL, "Cook Islands"},
+       { "CR", NULL, "Costa Rica"},
+       { "CI", NULL, "Cote d'Ivoire"},
+       { "HR", NULL, "Hrvatska"},
+       { "CU", NULL, "Cuba"},
+       { "CY", NULL, "Cyprus"},
+       { "CZ", NULL, "Česká republika"},
+       { "DK", NULL, "Danmark"},
+       { "DJ", NULL, "Djibouti"},
+       { "DM", NULL, "Dominica"},
+       { "DO", NULL, "República Dominicana"},
+       { "EC", NULL, "Ecuador"},
+       { "EG", NULL, "Egypt"},
+       { "SV", NULL, "El Salvador"},
+       { "GQ", NULL, "Equatorial Guinea"},
+       { "ER", NULL, "Eritrea"},
+       { "EE", NULL, "Eesti"},
+       { "ET", NULL, "Ethiopia"},
+       { "FK", NULL, "Falkland Islands (malvinas)"},
+       { "FO", NULL, "Faroe Islands"},
+       { "FJ", NULL, "Fiji"},
+       { "FI", NULL, "Finland"},
+       { "FR", NULL, "France"},
+       { "GF", NULL, "French Guiana"},
+       { "PF", NULL, "French Polynesia"},
+       { "TF", NULL, "French Southern Territories"},
+       { "GA", NULL, "Gabon"},
+       { "GM", NULL, "Gambia"},
+       { "GE", NULL, "Georgia"},
+       { "DE", NULL, "Deutschland"},
+       { "GH", NULL, "Ghana"},
+       { "GI", NULL, "Gibraltar"},
+       { "GR", NULL, "Greece"},
+       { "GL", NULL, "Greenland"},
+       { "GD", NULL, "Grenada"},
+       { "GP", NULL, "Guadeloupe"},
+       { "GU", NULL, "Guam"},
+       { "GT", NULL, "Guatemala"},
+       { "GG", NULL, "Guernsey"},
+       { "GN", NULL, "Guinea"},
+       { "GW", NULL, "Guinea-Bissau"},
+       { "GY", NULL, "Guyana"},
+       { "HT", NULL, "Haiti"},
+       { "HM", NULL, "Heard Island and Mcdonald Islands"},
+       { "VA", NULL, "Holy See (Vatican City State)"},
+       { "HN", NULL, "Honduras"},
+       { "HK", NULL, "Hong Kong"},
+       { "HU", NULL, "Magyarország"},
+       { "IS", NULL, "Iceland"},
+       { "IN", NULL, "India"},
+       { "ID", NULL, "Indonesia"},
+       { "IR", NULL, "Iran"},
+       { "IQ", NULL, "Iraq"},
+       { "IE", NULL, "Éire"},
+       { "IM", NULL, "Isle Of Man"},
+       { "IL", NULL, "Israel"},
+       { "IT", NULL, "Italia"},
+       { "JM", NULL, "Jamaica"},
+       { "JP", NULL, "日本"},
+       { "JE", NULL, "Jersey"},
+       { "JO", NULL, "Jordan"},
+       { "KZ", NULL, "Kazakhstan"},
+       { "KE", NULL, "Kenya"},
+       { "KI", NULL, "Kiribati"},
+       { "KP", NULL, "Korea"},
+       { "KR", NULL, "Korea"},
+       { "KW", NULL, "Kuwait"},
+       { "KG", NULL, "Kyrgyzstan"},
+       { "LA", NULL, "Lao People's Democratic Republic"},
+       { "LV", NULL, "Latvija"},
+       { "LB", NULL, "Lebanon"},
+       { "LS", NULL, "Lesotho"},
+       { "LR", NULL, "Liberia"},
+       { "LY", NULL, "Libyan Arab Jamahiriya"},
+       { "LI", NULL, "Liechtenstein"},
+       { "LT", NULL, "Lietuva"},
+       { "LU", NULL, "Lëtzebuerg"},
+       { "MO", NULL, "Macao"},
+       { "MK", NULL, "Македонија"},
+       { "MG", NULL, "Madagascar"},
+       { "MW", NULL, "Malawi"},
+       { "MY", NULL, "Malaysia"},
+       { "MV", NULL, "Maldives"},
+       { "ML", NULL, "Mali"},
+       { "MT", NULL, "Malta"},
+       { "MH", NULL, "Marshall Islands"},
+       { "MQ", NULL, "Martinique"},
+       { "MR", NULL, "Mauritania"},
+       { "MU", NULL, "Mauritius"},
+       { "YT", NULL, "Mayotte"},
+       { "MX", NULL, "Mexico"},
+       { "FM", NULL, "Micronesia"},
+       { "MD", NULL, "Moldova"},
+       { "MC", NULL, "Monaco"},
+       { "MN", NULL, "Mongolia"},
+       { "MS", NULL, "Montserrat"},
+       { "MA", NULL, "Morocco"},
+       { "MZ", NULL, "Mozambique"},
+       { "MM", NULL, "Myanmar"},
+       { "NA", NULL, "Namibia"},
+       { "NR", NULL, "Nauru"},
+       { "NP", NULL, "Nepal"},
+       { "NL", NULL, "Nederland"},
+       { "AN", NULL, "Netherlands Antilles"},
+       { "NC", NULL, "New Caledonia"},
+       { "NZ", NULL, "New Zealand"},
+       { "NI", NULL, "Nicaragua"},
+       { "NE", NULL, "Niger"},
+       { "NG", NULL, "Nigeria"},
+       { "NU", NULL, "Niue"},
+       { "NF", NULL, "Norfolk Island"},
+       { "MP", NULL, "Northern Mariana Islands"},
+       { "NO", NULL, "Norge"},
+       { "OM", NULL, "Oman"},
+       { "PK", NULL, "Pakistan"},
+       { "PW", NULL, "Palau"},
+       { "PS", NULL, "Palestinian Territory"},
+       { "PA", NULL, "Panama"},
+       { "PG", NULL, "Papua New Guinea"},
+       { "PY", NULL, "Paraguay"},
+       { "PE", NULL, "Peru"},
+       { "PH", NULL, "Philippines"},
+       { "PN", NULL, "Pitcairn"},
+       { "PL", NULL, "Poland"},
+       { "PT", NULL, "Portugal"},
+       { "PR", NULL, "Puerto Rico"},
+       { "QA", NULL, "Qatar"},
+       { "RE", NULL, "Reunion"},
+       { "RO", NULL, "Romania"},
+       { "RU", NULL, "Russian Federation"},
+       { "RW", NULL, "Rwanda"},
+       { "SH", NULL, "Saint Helena"},
+       { "KN", NULL, "Saint Kitts and Nevis"},
+       { "LC", NULL, "Saint Lucia"},
+       { "PM", NULL, "Saint Pierre and Miquelon"},
+       { "VC", NULL, "Saint Vincent and the Grenadines"},
+       { "WS", NULL, "Samoa"},
+       { "SM", NULL, "San Marino"},
+       { "ST", NULL, "Sao Tome and Principe"},
+       { "SA", NULL, "Saudi Arabia"},
+       { "SN", NULL, "Senegal"},
+       { "CS", NULL, "Serbia and Montenegro"},
+       { "SC", NULL, "Seychelles"},
+       { "SL", NULL, "Sierra Leone"},
+       { "SG", NULL, "Singapore"},
+       { "SK", NULL, "Slovakia"},
+       { "SI", NULL, "Slovenia"},
+       { "SB", NULL, "Solomon Islands"},
+       { "SO", NULL, "Somalia"},
+       { "ZA", NULL, "South Africa"},
+       { "GS", NULL, "South Georgia and the South Sandwich Islands"},
+       { "ES", NULL, "Spain"},
+       { "LK", NULL, "Sri Lanka"},
+       { "SD", NULL, "Sudan"},
+       { "SR", NULL, "Suriname"},
+       { "SJ", NULL, "Svalbard and Jan Mayen"},
+       { "SZ", NULL, "Swaziland"},
+       { "SE", NULL, "Sweden"},
+       { "CH", NULL, "Switzerland"},
+       { "SY", NULL, "Syrian Arab Republic"},
+       { "TW", NULL, "Taiwan"},
+       { "TJ", NULL, "Tajikistan"},
+       { "TZ", NULL, "Tanzania"},
+       { "TH", NULL, "Thailand"},
+       { "TL", NULL, "Timor-Leste"},
+       { "TG", NULL, "Togo"},
+       { "TK", NULL, "Tokelau"},
+       { "TO", NULL, "Tonga"},
+       { "TT", NULL, "Trinidad and Tobago"},
+       { "TN", NULL, "Tunisia"},
+       { "TR", NULL, "Turkey"},
+       { "TM", NULL, "Turkmenistan"},
+       { "TC", NULL, "Turks and Caicos Islands"},
+       { "TV", NULL, "Tuvalu"},
+       { "UG", NULL, "Uganda"},
+       { "UA", NULL, "Ukraine"},
+       { "AE", NULL, "United Arab Emirates"},
+       { "GB", NULL, "United Kingdom"},
+       { "US", NULL, "United States"},
+       { "UM", NULL, "United States Minor Outlying Islands"},
+       { "UY", NULL, "Uruguay"},
+       { "UZ", NULL, "Uzbekistan"},
+       { "VU", NULL, "Vanuatu"},
+       { "VE", NULL, "Venezuela"},
+       { "VN", NULL, "Viet Nam"},
+       { "VG", NULL, "Virgin Islands"},
+       { "VI", NULL, "Virgin Islands"},
+       { "WF", NULL, "Wallis and Futuna"},
+       { "EH", NULL, "Western Sahara"},
+       { "YE", NULL, "Yemen"},
+       { "ZM", NULL, "Zambia"},
+       { "ZW", NULL, "Zimbabwe"},
+       { NULL, NULL, NULL}
 };
 
-/* This comes from 
+/* This comes from
    $ man charsets
- * and 
+ * and
    $ locale -a | grep -v @ | grep "\." | cut -d . -f 2 | sort -u
  *
  * On some machines is complains if codesets don't look like this
- * On linux its not really a problem but BSD has issues. So we neet to 
+ * On linux its not really a problem but BSD has issues. So we neet to
  * make sure that locale -a output gets converted to upper-case form in
- * all situations just to be safe. 
+ * all situations just to be safe.
  */
 const E_Intl_Pair charset_predefined_pairs[ ] = {
        /* These are in locale -a but not in charsets */
-       {"cp1255", "CP1255"},
-       {"euc", "EUC"},
-       {"georgianps", "GEORGIAN-PS"},
-       {"iso885914", "ISO-8859-14"},
-       {"koi8t", "KOI8-T"},
-       {"tcvn", "TCVN"},
-       {"ujis", "UJIS"},
+       {"cp1255", NULL, "CP1255"},
+       {"euc", NULL, "EUC"},
+       {"georgianps", NULL, "GEORGIAN-PS"},
+       {"iso885914", NULL, "ISO-8859-14"},
+       {"koi8t", NULL, "KOI8-T"},
+       {"tcvn", NULL, "TCVN"},
+       {"ujis", NULL, "UJIS"},
 
        /* These are from charsets man page */
-       {"big5", "BIG5"},
-       {"big5hkscs", "BIG5-HKSCS"},
-       {"cp1251", "CP1251"},
-       {"eucjp", "EUC-JP"},
-       {"euckr", "EUC-KR"},
-       {"euctw", "EUC-TW"},
-       {"gb18030", "GB18030"},
-       {"gb2312", "GB2312"},
-       {"gbk", "GBK"},
-       {"iso88591", "ISO-8859-1"},
-       {"iso885913", "ISO-8859-13"},
-       {"iso885915", "ISO-8859-15"},
-       {"iso88592", "ISO-8859-2"},
-       {"iso88593", "ISO-8859-3"},
-       {"iso88595", "ISO-8859-5"},
-       {"iso88596", "ISO-8859-6"},
-       {"iso88597", "ISO-8859-7"},
-       {"iso88598", "ISO-8859-8"},
-       {"iso88599", "ISO-8859-9"},
-       {"koi8r", "KOI8-R"},
-       {"koi8u", "KOI8-U"},
-       {"tis620", "TIS-620"},
-       {"utf8", "UTF-8"},
-       { NULL, NULL }
+       {"big5", NULL, "BIG5"},
+       {"big5hkscs", NULL, "BIG5-HKSCS"},
+       {"cp1251", NULL, "CP1251"},
+       {"eucjp", NULL, "EUC-JP"},
+       {"euckr", NULL, "EUC-KR"},
+       {"euctw", NULL, "EUC-TW"},
+       {"gb18030", NULL, "GB18030"},
+       {"gb2312", NULL, "GB2312"},
+       {"gbk", NULL, "GBK"},
+       {"iso88591", NULL, "ISO-8859-1"},
+       {"iso885913", NULL, "ISO-8859-13"},
+       {"iso885915", NULL, "ISO-8859-15"},
+       {"iso88592", NULL, "ISO-8859-2"},
+       {"iso88593", NULL, "ISO-8859-3"},
+       {"iso88595", NULL, "ISO-8859-5"},
+       {"iso88596", NULL, "ISO-8859-6"},
+       {"iso88597", NULL, "ISO-8859-7"},
+       {"iso88598", NULL, "ISO-8859-8"},
+       {"iso88599", NULL, "ISO-8859-9"},
+       {"koi8r", NULL, "KOI8-R"},
+       {"koi8u", NULL, "KOI8-U"},
+       {"tis620", NULL, "TIS-620"},
+       {"utf8", NULL, "UTF-8"},
+       { NULL, NULL, NULL }
 };
 
 E_Config_Dialog *
@@ -567,14 +581,14 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
 
    if (e_config_dialog_find("E", "language/language_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->advanced.create_widgets = _advanced_create_widgets;
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
    v->basic.apply_cfdata = _basic_apply_data;
-   
+
    cfd = e_config_dialog_new(con,
                             _("Language Settings"),
                             "E", "language/language_settings",
@@ -582,8 +596,8 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
    return cfd;
 }
 
-/* Build hash tables used for locale navigation. The locale information is 
- * gathered using the locale -a command. 
+/* Build hash tables used for locale navigation. The locale information is
+ * gathered using the locale -a command.
  *
  * Below the following terms are used:
  * ll - Locale Language Code (Example en)
@@ -596,12 +610,16 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 {
    Eina_List    *e_lang_list;
    FILE                *output;
-   
+
    e_lang_list = e_intl_language_list();
-   
+
    /* Get list of all locales and start making map */
+#ifdef __OpenBSD__
+   output = popen("ls /usr/share/locale", "r");
+#else
    output = popen("locale -a", "r");
-   if ( output ) 
+#endif
+   if ( output )
      {
        char line[32];
        while (fscanf(output, "%[^\n]\n", line) == 1)
@@ -618,12 +636,12 @@ _fill_data(E_Config_Dialog_Data *cfdata)
                  if (basic_language)
                    {
                       int i;
-                      
+
                       i = 0;
                       while (basic_language_predefined_pairs[i].locale_key)
                         {
                            /* if basic language is supported by E and System*/
-                           if (!strncmp(basic_language_predefined_pairs[i].locale_key, 
+                           if (!strncmp(basic_language_predefined_pairs[i].locale_key,
                                     basic_language, strlen(basic_language)))
                              {
                                 if (!eina_list_data_find(cfdata->blang_list, &basic_language_predefined_pairs[i]))
@@ -657,18 +675,18 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 
                            /* Check if the language list exists */
                            /* Linear Search */
-                           for (next = e_lang_list; next; next = next->next) 
+                           for (next = e_lang_list; next; next = next->next)
                              {
                                 char *e_lang;
 
                                 e_lang = next->data;
-                                if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang)) 
+                                if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang))
                                   {
                                      lang_node->lang_available = 1;
                                      break;
                                   }
                              }
-                      
+
                            /* Search for translation */
                            /* Linear Search */
                            i = 0;
@@ -724,19 +742,20 @@ _fill_data(E_Config_Dialog_Data *cfdata)
                            /* Add codeset to the region hash node if it exists */
                            if (locale_parts->codeset)
                              {
-                                const char * cs;
+                                const char * cs = NULL;
                                 const char * cs_trans;
-                           
+
                                 cs_trans = _intl_charset_upper_get(locale_parts->codeset);
-                                if (!cs_trans) 
+                                if (!cs_trans)
                                   cs = eina_stringshare_add(locale_parts->codeset);
-                                else 
+                                else
                                   cs = eina_stringshare_add(cs_trans);
-                           
+
                                 /* Exclusive */
                                 /* Linear Search */
                                 if (!eina_list_data_find(region_node->available_codesets, cs))
                                   region_node->available_codesets = eina_list_append(region_node->available_codesets, cs);
+                                 else eina_stringshare_del(cs);
                              }
 
                            /* Add modifier to the region hash node if it exists */
@@ -746,7 +765,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 
                                 mod = eina_stringshare_add(locale_parts->modifier);
                                 /* Find only works here because we are using stringshare*/
-                           
+
                                 /* Exclusive */
                                 /* Linear Search */
                                 if (!eina_list_data_find(region_node->available_modifiers, mod))
@@ -855,6 +874,33 @@ _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_
    return 1;
 }
 
+static void
+_lc_check(void)
+{
+   char buf[8192];
+
+   buf[0] = 0;
+
+   if (getenv("LC_CTYPE"))    strcat(buf, "<br>LC_CTYPE");
+   if (getenv("LC_NUMERIC"))  strcat(buf, "<br>LC_NUMERIC");
+   if (getenv("LC_TIME"))     strcat(buf, "<br>LC_TIME");
+   if (getenv("LC_COLLATE"))  strcat(buf, "<br>LC_COLLATE");
+   if (getenv("LC_MONETARY")) strcat(buf, "<br>LC_MONETARY");
+   if (getenv("LC_MESSAGES")) strcat(buf, "<br>LC_MESSAGES");
+   if (getenv("LC_ALL"))      strcat(buf, "<br>LC_ALL");
+
+   if (buf[0] != 0)
+      e_util_dialog_show(_("Possible Locale problems"),
+                         _("You have some extra locale environment<br>"
+                           "variables set that may interfere with<br>"
+                           "correct display of your chosen language.<br>"
+                           "If you don't want these affected, use the<br>"
+                           "Environment variable settings to unset them.<br>"
+                           "The variables that may affect you are<br>"
+                           "as follows:<br>"
+                           "%s"), buf);
+}
+
 static int
 _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
@@ -865,6 +911,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
         if ((cfdata->cur_language) && (cfdata->cur_language[0]))
            e_config->language = eina_stringshare_add(cfdata->cur_language);
        e_intl_language_set(e_config->language);
+        _lc_check();
      }
 
    e_config_save_queue();
@@ -881,6 +928,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
         if ((cfdata->cur_language) && (cfdata->cur_language[0]))
            e_config->language = eina_stringshare_add(cfdata->cur_language);
        e_intl_language_set(e_config->language);
+        _lc_check();
      }
 
    e_config_save_queue();
@@ -890,11 +938,12 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
 static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object *o, *of, *ob;
+   Evas_Object *o, *of, *ob, *ic;
    char *cur_sig_loc;
    Eina_List *next;
    int i = 0;
-   
+   char buf[PATH_MAX];
+
    cfdata->evas = evas;
    o = e_widget_table_add(evas, 0);
    of = e_widget_framelist_add(evas, _("Language Selector"), 0);
@@ -926,12 +975,14 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    else
      cur_sig_loc = NULL;
 
-   e_widget_ilist_append(cfdata->gui.blang_list, NULL, _("System Default"), NULL, NULL, "");
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   ic = e_util_icon_add(buf, evas);
+   e_widget_ilist_append(cfdata->gui.blang_list, ic, _("System Default"), NULL, NULL, "");
    if ((!cur_sig_loc) || (!cfdata->cur_language))
       e_widget_ilist_selected_set(cfdata->gui.blang_list, i);
    i++;
-   
-   for (next = cfdata->blang_list; next; next = next->next) 
+
+   for (next = cfdata->blang_list; next; next = next->next)
      {
        E_Intl_Pair *pair;
        const char *key;
@@ -940,14 +991,21 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
        pair = next->data;
        key = pair->locale_key;
        trans = _(pair->locale_translation);
-       e_widget_ilist_append(cfdata->gui.blang_list, NULL, trans, NULL, NULL, key);
-       if ((cur_sig_loc) && 
+       if (pair->locale_icon)
+         {
+            e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", pair->locale_icon);
+            ic = e_util_icon_add(buf, evas);
+         }
+        else
+         ic = NULL;
+       e_widget_ilist_append(cfdata->gui.blang_list, ic, trans, NULL, NULL, key);
+       if ((cur_sig_loc) &&
             (!strncmp(key, cur_sig_loc, strlen(cur_sig_loc))))
          e_widget_ilist_selected_set(cfdata->gui.blang_list, i);
-       
+
        i++;
      }
-   E_FREE(cur_sig_loc);   
+   E_FREE(cur_sig_loc);
    e_widget_ilist_go(ob);
    e_widget_ilist_thaw(ob);
    edje_thaw();
@@ -960,20 +1018,20 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    cfdata->gui.locale_entry = ob;
    e_widget_disabled_set(cfdata->gui.locale_entry, 1);
    e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
-   e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 
+   e_widget_frametable_object_append(of, cfdata->gui.locale_entry,
                                     1, 0, 1, 1, 1, 1, 1, 0);
    e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
 
    e_dialog_resizable_set(cfd->dia, 1);
    return o;
 }
-   
+
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *of, *ob;
    const char *lang, *reg, *cs, *mod;
-   
+
    cfdata->evas = evas;
 
    _intl_current_locale_setup(cfdata);
@@ -1019,7 +1077,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_ilist_go(ob);
    e_widget_size_min_set(ob, 100, 100);
    e_widget_framelist_object_append(of, ob);
-   
+
    /* Modified List */
    ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_mod));
    cfdata->gui.mod_list = ob;
@@ -1029,7 +1087,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_framelist_object_append(of, ob);
 
    e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
-   
+
    /* Locale selector */
    of = e_widget_frametable_add(evas, _("Locale Selected"), 0);
    ob = e_widget_label_add(evas, _("Locale"));
@@ -1038,29 +1096,29 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->gui.locale_entry = ob;
    e_widget_disabled_set(cfdata->gui.locale_entry, 1);
    e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
-   e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 
+   e_widget_frametable_object_append(of, cfdata->gui.locale_entry,
                                     0, 1, 1, 1, 1, 1, 1, 0);
    e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
 
    /* all these cur_* values are not guaranteed to be const so we need to
-    * copy them. 
+    * copy them.
     */
    lang = eina_stringshare_ref(cfdata->cur_lang);
    reg = eina_stringshare_ref(cfdata->cur_reg);
    cs = eina_stringshare_ref(cfdata->cur_cs);
    mod = eina_stringshare_ref(cfdata->cur_mod);
-   
+
    _cfdata_language_go(lang, reg, cs, mod, cfdata);
-   
+
    eina_stringshare_del(lang);
    eina_stringshare_del(reg);
    eina_stringshare_del(cs);
    eina_stringshare_del(mod);
-   
+
    e_widget_on_change_hook_set(cfdata->gui.lang_list, _ilist_language_cb_change, cfdata);
-   e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata); 
-   e_widget_on_change_hook_set(cfdata->gui.cs_list, _ilist_codeset_cb_change, cfdata); 
-   e_widget_on_change_hook_set(cfdata->gui.mod_list, _ilist_modifier_cb_change, cfdata); 
+   e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata);
+   e_widget_on_change_hook_set(cfdata->gui.cs_list, _ilist_codeset_cb_change, cfdata);
+   e_widget_on_change_hook_set(cfdata->gui.mod_list, _ilist_modifier_cb_change, cfdata);
 
    e_dialog_resizable_set(cfd->dia, 1);
    return o;
@@ -1085,6 +1143,8 @@ _ilist_language_cb_change(void *data, Evas_Object *obj __UNUSED__)
    e_widget_entry_text_set(cfdata->gui.locale_entry, cfdata->cur_lang);
    eina_stringshare_del(cfdata->cur_cs);
    eina_stringshare_del(cfdata->cur_mod);
+   cfdata->cur_cs = NULL;
+   cfdata->cur_mod = NULL;
 }
 
 static void
@@ -1092,11 +1152,11 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data * cfdata;
    char locale[32];
-    
+
    cfdata = data;
-    
+
    _cfdata_language_go(cfdata->cur_lang, cfdata->cur_reg, NULL, NULL, cfdata);
-   
+
    if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
      {
         sprintf(locale, "%s_%s", cfdata->cur_lang, cfdata->cur_reg);
@@ -1106,16 +1166,18 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
       e_widget_entry_text_set(cfdata->gui.locale_entry, "");
    eina_stringshare_del(cfdata->cur_cs);
    eina_stringshare_del(cfdata->cur_mod);
+   cfdata->cur_cs = NULL;
+   cfdata->cur_mod = NULL;
 }
 
-static void 
+static void
 _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data * cfdata;
    char locale[32];
-   
+
    cfdata = data;
-   
+
    if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
      {
         if (cfdata->cur_mod)
@@ -1128,14 +1190,14 @@ _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
       e_widget_entry_text_set(cfdata->gui.locale_entry, "");
 }
 
-static void 
+static void
 _ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data * cfdata;
    char locale[32];
-   
+
    cfdata = data;
-   
+
    if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
      {
         if (cfdata->cur_cs)
@@ -1148,13 +1210,13 @@ _ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
       e_widget_entry_text_set(cfdata->gui.locale_entry, "");
 }
 
-static void 
+static void
 _cfdata_language_go(const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata)
 {
-   E_Intl_Language_Node *lang_node;    
+   E_Intl_Language_Node *lang_node;
    int lang_update;
    int region_update;
-   
+
    /* Check what changed */
    lang_update = 0;
    region_update = 0;
@@ -1229,14 +1291,14 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
                                 e_widget_ilist_selected_set(cfdata->gui.cs_list, count - 1);
                              }
                         }
-                      
-                      for (next = reg_node->available_modifiers; next; next = next->next) 
+
+                      for (next = reg_node->available_modifiers; next; next = next->next)
                         {
                            const char * mod;
-                           
+
                            mod = next->data;
                            e_widget_ilist_append(cfdata->gui.mod_list, NULL, mod, NULL, NULL, mod);
-                           if (modifier && !strcmp(mod, modifier)) 
+                           if (modifier && !strcmp(mod, modifier))
                              {
                                 int count;
 
@@ -1286,7 +1348,7 @@ _region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, vo
    return 1;
 }
 
-void 
+void
 _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
 {
    eina_stringshare_del(cfdata->cur_lang);
@@ -1298,20 +1360,20 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
    cfdata->cur_reg = NULL;
    cfdata->cur_cs = NULL;
    cfdata->cur_mod = NULL;
+
    if (cfdata->cur_language)
      {
        E_Locale_Parts *locale_parts;
+
        locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
        if (locale_parts)
          {
             cfdata->cur_lang = eina_stringshare_add(locale_parts->lang);
             cfdata->cur_reg = eina_stringshare_add(locale_parts->region);
-            if (locale_parts->codeset) 
+            if (locale_parts->codeset)
               {
                  const char *cs_trans;
-       
+
                  cs_trans = _intl_charset_upper_get(locale_parts->codeset);
                  if (!cs_trans)
                    cfdata->cur_cs = eina_stringshare_add(locale_parts->codeset);
@@ -1325,16 +1387,16 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
    cfdata->lang_dirty = 1;
 }
 
-static int 
-_lang_list_sort(const void *data1, const void *data2) 
+static int
+_lang_list_sort(const void *data1, const void *data2)
 {
    const E_Intl_Language_Node *ln1, *ln2;
    const char *trans1;
    const char *trans2;
-   
+
    if (!data1) return 1;
    if (!data2) return -1;
-   
+
    ln1 = data1;
    ln2 = data2;
 
@@ -1343,16 +1405,18 @@ _lang_list_sort(const void *data1, const void *data2)
 
    if (!ln2->lang_name) return -1;
    trans2 = ln2->lang_name;
-   
+
    return (strcmp(trans1, trans2));
 }
 
-static void 
-_lang_list_load(void *data) 
+static void
+_lang_list_load(void *data)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *l;
-   
+   Evas_Object *ic;
+   char buf[PATH_MAX];
+
    if (!data) return;
 
    cfdata = data;
@@ -1361,35 +1425,36 @@ _lang_list_load(void *data)
    evas_event_freeze(evas_object_evas_get(cfdata->gui.lang_list));
    edje_freeze();
    e_widget_ilist_freeze(cfdata->gui.lang_list);
-   
-   e_widget_ilist_append(cfdata->gui.lang_list, NULL, _("System Default"), NULL, NULL, "");
-   for (l = cfdata->lang_list; l; l = l->next) 
+
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   ic = e_util_icon_add(buf, cfdata->evas);
+   e_widget_ilist_append(cfdata->gui.lang_list, ic, _("System Default"), NULL, NULL, "");
+   for (l = cfdata->lang_list; l; l = l->next)
      {
        E_Intl_Language_Node *ln;
        const char *trans;
-       
+
        ln = l->data;
        if (!ln) continue;
        if (ln->lang_name)
          trans = ln->lang_name;
-       else 
+       else
          trans = ln->lang_code;
-       
+
        if (ln->lang_available)
          {
-            Evas_Object *ic;
-       
             ic = e_icon_add(cfdata->evas);
             e_util_icon_theme_set(ic, "dialog-ok-apply");
-            e_widget_ilist_append(cfdata->gui.lang_list, ic, trans, NULL, NULL, ln->lang_code);
          }
        else
-         e_widget_ilist_append(cfdata->gui.lang_list, NULL, trans, NULL, NULL, ln->lang_code);
+         ic = NULL;
+
+       e_widget_ilist_append(cfdata->gui.lang_list, ic, trans, NULL, NULL, ln->lang_code);
 
-       if (cfdata->cur_lang && !strcmp(cfdata->cur_lang, ln->lang_code)) 
+       if (cfdata->cur_lang && !strcmp(cfdata->cur_lang, ln->lang_code))
          {
             int count;
-            
+
             count = e_widget_ilist_count(cfdata->gui.lang_list);
             e_widget_ilist_selected_set(cfdata->gui.lang_list, count - 1);
          }
@@ -1399,16 +1464,16 @@ _lang_list_load(void *data)
    evas_event_thaw(evas_object_evas_get(cfdata->gui.lang_list));
 }
 
-static int 
-_region_list_sort(const void *data1, const void *data2) 
+static int
+_region_list_sort(const void *data1, const void *data2)
 {
    const E_Intl_Region_Node *rn1, *rn2;
    const char *trans1;
    const char *trans2;
-   
+
    if (!data1) return 1;
    if (!data2) return -1;
-   
+
    rn1 = data1;
    rn2 = data2;
 
@@ -1417,16 +1482,16 @@ _region_list_sort(const void *data1, const void *data2)
 
    if (!rn2->region_name) return -1;
    trans2 = rn2->region_name;
-   
+
    return (strcmp(trans1, trans2));
 }
 
-static void 
-_region_list_load(void *data) 
+static void
+_region_list_load(void *data)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *l;
-   
+
    if (!data) return;
 
    cfdata = data;
@@ -1435,25 +1500,25 @@ _region_list_load(void *data)
    evas_event_freeze(evas_object_evas_get(cfdata->gui.reg_list));
    edje_freeze();
    e_widget_ilist_freeze(cfdata->gui.reg_list);
-   
-   for (l = cfdata->region_list; l; l = l->next) 
+
+   for (l = cfdata->region_list; l; l = l->next)
      {
        E_Intl_Region_Node *rn;
        const char *trans;
-       
+
        rn = l->data;
        if (!rn) continue;
        if (rn->region_name)
          trans = rn->region_name;
-       else 
+       else
          trans = rn->region_code;
-       
+
        e_widget_ilist_append(cfdata->gui.reg_list, NULL, trans, NULL, NULL, rn->region_code);
-  
-       if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code)) 
+
+       if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code))
          {
             int count;
-            
+
             count = e_widget_ilist_count(cfdata->gui.reg_list);
             e_widget_ilist_selected_set(cfdata->gui.reg_list, count - 1);
          }
@@ -1463,16 +1528,16 @@ _region_list_load(void *data)
    evas_event_thaw(evas_object_evas_get(cfdata->gui.reg_list));
 }
 
-static int 
-_basic_lang_list_sort(const void *data1, const void *data2) 
+static int
+_basic_lang_list_sort(const void *data1, const void *data2)
 {
    const E_Intl_Pair *ln1, *ln2;
    const char *trans1;
    const char *trans2;
-   
+
    if (!data1) return 1;
    if (!data2) return -1;
-   
+
    ln1 = data1;
    ln2 = data2;
 
@@ -1481,7 +1546,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
 
    if (!ln2->locale_translation) return -1;
    trans2 = ln2->locale_translation;
-   
+
    return (strcmp(trans1, trans2));
 }
 
@@ -1489,15 +1554,15 @@ const char *
 _intl_charset_upper_get(const char *charset)
 {
    int i;
-   
+
    i = 0;
    while (charset_predefined_pairs[i].locale_key)
      {
        if (!strcmp(charset_predefined_pairs[i].locale_key, charset))
          {
             return charset_predefined_pairs[i].locale_translation;
-         }                      
-       i++;                          
+         }
+       i++;
      }
    return NULL;
 }
diff --git a/src/modules/conf_keybindings/.cvsignore b/src/modules/conf_keybindings/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index e3a4daa..c313f26 100644 (file)
@@ -245,10 +245,12 @@ _fill_bindings(E_Config_Dialog_Data *cfdata)
         char buff[32];
 
         i++;
-        if (!(lbl = _binding_label_get(bind))) continue;
         snprintf(buff, sizeof(buff), "%d", i);
+
+        lbl = _binding_label_get(bind);
+
         e_widget_ilist_append(cfdata->o_bindings, NULL, lbl,
-                              _cb_bindings_changed, cfdata, buff);
+                                _cb_bindings_changed, cfdata, buff);
      }
 
    e_widget_ilist_go(cfdata->o_bindings);
@@ -389,7 +391,7 @@ _binding_label_get(E_Config_Binding_Acpi *bind)
    if (bind->type == E_ACPI_TYPE_VAIO)
      return _("Vaio");
 
-   return NULL;
+   return _("Unknown");
 }
 
 static void
@@ -649,8 +651,6 @@ _cb_acpi_event(void          *data,
    bind->status = ev->status;
    bind->action = eina_stringshare_add("dim_screen");
    bind->params = NULL;
-   e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind);
-   e_config_save_queue();
 
    cfdata->bindings = eina_list_append(cfdata->bindings, bind);
    _fill_bindings(cfdata);
index 05756ff..9f7d228 100644 (file)
@@ -856,7 +856,7 @@ _update_key_binding_list(E_Config_Dialog_Data *cfdata,
         if (bi == bi_new) ret = bi_pos;
         if (ret < 0) bi_pos++;
 
-        if (modifiers != bi->modifiers)
+        if (modifiers != (int)bi->modifiers)
           {
              modifiers = bi->modifiers;
              b = _key_binding_header_get(modifiers);
@@ -1052,7 +1052,7 @@ _grab_key_down_cb(void          *data,
           {
              E_Config_Binding_Key *bi = NULL, *bi2 = NULL;
              Eina_List *l = NULL;
-             int mod = E_BINDING_MODIFIER_NONE;
+             unsigned int mod = E_BINDING_MODIFIER_NONE;
              int found = 0, n;
 
              if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
index ca1d426..ab05673 100644 (file)
@@ -1027,6 +1027,7 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
        action = &(bw->action);
        params = &(bw->params);
      } 
+   else return;
    
    if (action && *action) eina_stringshare_del(*action); 
    if (params && *params) eina_stringshare_del(*params); 
diff --git a/src/modules/conf_menus/.cvsignore b/src/modules/conf_menus/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_paths/.cvsignore b/src/modules/conf_paths/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 17fd653..a7fb333 100644 (file)
@@ -217,6 +217,7 @@ _del_cb(void *data, void *data2 __UNUSED__)
    E_Config_Dialog_Data *cfdata = data;
    Eina_List *l;
    E_Config_Env_Var *evr = NULL;
+/*
    int i, sel = -1;
    
    EINA_LIST_FOREACH(cfdata->env_vars, l, evr)
@@ -229,12 +230,15 @@ _del_cb(void *data, void *data2 __UNUSED__)
         evr = NULL;
         i++;
      }
+*/
+   evr = eina_list_data_get(cfdata->env_vars);
+   if (evr && strcmp(cfdata->var_str, evr->var)) evr = NULL;
    if (evr)
      {
         eina_stringshare_del(evr->var);
         if (evr->val) eina_stringshare_del(evr->val);
         E_FREE(evr);
-        cfdata->env_vars = eina_list_remove_list(cfdata->env_vars, l);
+//        cfdata->env_vars = eina_list_remove_list(cfdata->env_vars, l);
         e_widget_ilist_clear(cfdata->gui.list);
         e_widget_ilist_freeze(cfdata->gui.list);
         EINA_LIST_FOREACH(cfdata->env_vars, l, evr)
diff --git a/src/modules/conf_performance/.cvsignore b/src/modules/conf_performance/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_randr/Makefile.am b/src/modules/conf_randr/Makefile.am
new file mode 100644 (file)
index 0000000..213c5c0
--- /dev/null
@@ -0,0 +1,56 @@
+MAINTAINERCLEANFILES = Makefile.in module.desktop
+MODULE = conf_randr
+
+EDJE_CC = @edje_cc@
+EDJE_FLAGS = -v \
+           -id $(top_srcdir)/src/modules/$(MODULE)/images \
+           @EDJE_DEF@
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+           e-module-$(MODULE).edj \
+           module.desktop
+
+EXTRA_DIST = \
+           images/display-glass-shine.png \
+           images/display.png \
+           images/icon.png \
+           images/video-display.png \
+           e-module-$(MODULE).edc \
+           module.desktop.in
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_builddir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+                         e_int_config_randr_orientation.c \
+                         e_int_config_randr_resolutions.c \
+                         e_int_config_randr_arrangement.c \
+                         e_int_config_randr_policies.c \
+                         e_int_config_randr.c \
+                         e_int_config_randr.h
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
+       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
+       $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
+
+clean-local:
+       rm -f *.edj
+
+uninstall:
+       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_randr/e-module-conf_randr.edc b/src/modules/conf_randr/e-module-conf_randr.edc
new file mode 100755 (executable)
index 0000000..433fc73
--- /dev/null
@@ -0,0 +1,950 @@
+#define BORDERSIZE 1
+#define SUGGESTION_TIMEOUT 2.5
+
+images {
+   image: "icon.png" COMP;
+   image: "video-display.png" COMP;
+   image: "display.png" COMP;
+   image: "display-glass-shine.png" COMP;
+}
+
+data {
+   item: "disabled_output_width" "1024";
+   item: "disabled_output_height" "768";
+}
+
+collections {
+
+   // The icon used in the settings dialog
+   group {
+      name: "icon";
+      parts {
+         part {
+            name: "image";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon.png";
+            }
+         }
+      }
+   }
+
+   /**********************************************/
+   /*********Subdialog - Arrangement**************/
+   /**********************************************/
+
+   //The graphical representation of a single monitor, including its decorations
+   group {
+      name: "e/conf/randr/dialog/subdialog/arrangement/output";
+
+      styles {
+         style {
+            name: "display_name_text";
+            base: "font=Sans:style=Bold font_size=10 text_class=tb_plain align=center valign=center color=#fff style=soft_shadow shadow_color=#0000001f wrap=word";
+            tag:  "br" "\n";
+            tag:  "hilight" "+ font=Sans:style=Bold text_class=tb_light";
+         }
+      }
+
+
+      parts {
+
+         part {
+             name: "display";
+             type: IMAGE;
+             mouse_events: 0;
+
+             description {
+                state: "default" 0.0;
+                image.normal: "display.png";
+                rel1.relative: 0.0 0.0;
+                rel2.relative: 1.0 1.0;
+             }
+         }
+
+         part {
+            name: "e.swallow.content";
+            type: SWALLOW; // background of CRTC's zone
+
+            description {
+               state: "default" 0.0;
+               aspect_preference: BOTH;
+               color: 255 255 255 255;
+               rel1 {
+                  to: "display";
+                  relative: 0.047379 0.049303;
+               }
+               rel2 {
+                  to: "display";
+                  //relative: 0.97 0.657804;
+                  relative: 0.975 0.66;
+               }
+            }
+
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 128;
+            }
+         }
+
+         part {
+            name: "output_selected_frame_clip";
+            type: RECT;
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+
+         part {
+            name: "output_selected_frame_border_top";
+            type: RECT;
+            clip_to: "output_selected_frame_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 128 128 128 255;
+               min: 0 2;
+               fixed: 0 1;
+               align: 0.5 0.0;
+
+               rel1 {
+                  to: "output_selected_frame_clip";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "output_selected_frame_clip";
+                  relative: 1.0 0.0;
+                  offset: 0 BORDERSIZE;
+               }
+            }
+         }
+
+         part {
+            name: "output_selected_frame_border_right";
+            type: RECT;
+            clip_to: "output_selected_frame_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 128 128 128 255;
+               min: 1 0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+
+               rel1 {
+                  to_x: "output_selected_frame_clip";
+                  to_y: "output_selected_frame_border_top";
+                  relative: 1.0 1.0;
+                  offset: (-BORDERSIZE-1) 0;
+               }
+               rel2 {
+                  to_x: "output_selected_frame_clip";
+                  to_y: "output_selected_frame_border_bottom";
+                  relative: 1.0 0.0;
+               }
+            }
+         }
+
+         part {
+            name: "output_selected_frame_border_bottom";
+            type: RECT;
+            clip_to: "output_selected_frame_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 128 128 128 255;
+               min: 0 2;
+               fixed: 0 1;
+               align: 0.5 1.0;
+
+               rel1 {
+                  to: "output_selected_frame_clip";
+                  relative: 0.0 1.0;
+                  offset: 0 (-BORDERSIZE-1);
+               }
+               rel2 {
+                  to: "output_selected_frame_clip";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+
+         part {
+            name: "output_selected_frame_border_left";
+            type: RECT;
+            clip_to: "output_selected_frame_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 128 128 128 255;
+               min: 1 0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+
+               rel1 {
+                  to_x: "output_selected_frame_clip";
+                  to_y: "output_selected_frame_border_top";
+                  relative: 0.0 1.0;
+               }
+               rel2 {
+                  to_x: "output_selected_frame_clip";
+                  to_y: "output_selected_frame_border_bottom";
+                  relative: 0.0 0.0;
+                  offset: BORDERSIZE 0;
+               }
+            }
+         }
+
+         part {
+            name: "output_selected_frm_inside";
+            type: RECT;
+            clip_to: "output_selected_frame_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 120;
+
+               rel1 {
+                  to: "output_selected_frame_clip";
+                  offset: BORDERSIZE BORDERSIZE;
+               }
+               rel2 {
+                  to: "output_selected_frame_clip";
+                  offset: -BORDERSIZE -BORDERSIZE;
+               }
+            }
+         }
+
+         part {
+            name: "output_txt_bg";
+            type: RECT;
+                  //clip_to: "output_txt_clip";
+            mouse_events: 0;
+
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 128;
+               align: 0.5 0.5;
+
+               rel1 {
+                  to: "output_txt";
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  to: "output_txt";
+                  relative: 1.0 1.0;
+                  offset: 5 5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 255;
+            }
+         }
+
+         part {
+            name: "output_txt";
+            type: TEXTBLOCK;
+                  //clip_to: "output_txt_clip";
+            mouse_events: 0;
+
+            description {
+               align: 0.5 0.5;
+               state: "default" 0.0;
+               color: 0 0 0 255;
+                      // define part coordinates:
+                      //rel1.to: "output_txt_clip";
+                      //rel2.to: "output_txt_clip";
+               rel1.to: "e.swallow.content";
+               rel2.to: "e.swallow.content";
+
+               text {
+                  style: "display_name_text";
+                  text: "output name";
+                  min: 1.0 1.0;
+                  max: 1.0 1.0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+
+         part {
+            name: "selected_toggle_on";
+            type: RECT;
+            mouse_events: 1;
+
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 1;
+
+               rel1 {
+                  to: "e.swallow.content";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "e.swallow.content";
+                  relative: 1.0 1.0;
+               }
+            }
+
+            description {
+               state: "disable" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+
+         part {
+            name: "selected_toggle_off";
+            type: RECT;
+            mouse_events: 1;
+
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+
+               rel1 {
+                  to: "selected_toggle_on";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "selected_toggle_on";
+                  relative: 1.0 1.0;
+               }
+            }
+
+            description {
+               state: "disable" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+
+         part {
+             name: "display-glass-shine";
+             type: IMAGE;
+
+             description {
+                state: "default" 0.0;
+                image.normal: "display-glass-shine.png";
+             }
+         }
+
+         programs {
+            program {
+               name: "highlight";
+               signal: "mouse,down,1";
+               source: "selected_toggle_on";
+
+               action: STATE_SET "selected" 0.0;
+               transition: LINEAR 0.1;
+                           //target: "e.swallow.content";
+                           //target: "output_selected_clip";
+               target: "output_txt";
+               target: "output_txt_bg";
+               target: "output_selected_frame_clip";
+            }
+
+            program {
+               name: "normal";
+               signal: "mouse,clicked,1";
+               source: "selected_toggle_off";
+
+               action: STATE_SET "default" 0.0;
+               transition: LINEAR 0.1;
+                           //target: "e.swallow.content";
+                           //target: "output_selected_clip";
+               target: "output_txt";
+               target: "output_txt_bg";
+               target: "output_selected_frame_clip";
+            }
+
+            program {
+               name: "selected_toggle_off_on";
+               signal: "mouse,clicked,1";
+               source: "selected_toggle_on";
+               action: STATE_SET "disable" 1.0;
+               target: "selected_toggle_on";
+               target: "selected_toggle_off";
+            }
+
+            program {
+               name: "selected_toggle_on_off";
+               signal: "mouse,clicked,1";
+               source: "selected_toggle_off";
+               action: STATE_SET "default" 1.0;
+               target: "selected_toggle_on";
+               target: "selected_toggle_off";
+            }
+
+            program {
+               name: "emit_highlight";
+               signal: "select";
+               source: "e";
+               after: "highlight";
+            }
+
+            program {
+               name: "emit_normal";
+               signal: "deselect";
+               source: "e";
+               after: "normal";
+            }
+
+            program {
+               name: "disable";
+               signal: "disabled";
+               source: "e";
+               action: STATE_SET "disabled" 0.0;
+               target: "e.swallow.content";
+            }
+
+            program {
+               name: "enable";
+               signal: "enabled";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.swallow.content";
+            }
+
+            program {
+               name: "init";
+               after: "normal";
+            }
+         }
+      }
+   }
+
+   //This group describes the look of the suggestion entity used, when a monitor
+   //representation is dragged. Its size matches the size of the monitor
+   //dragged.
+   group{
+      name: "e/conf/randr/dialog/subdialog/arrangement/suggestion";
+      data {
+         item: "distance_min" "20";
+      }
+
+      /*
+      script {
+         public fade_out_timer_id = 0;
+
+         public suggestion_fade_out ()
+         {
+            cancel_timer(get_int(fade_out_timer_id));
+            run_program(PROGRAM:"hide");
+         }
+      }
+          */
+
+      parts {
+         part {
+            name: "shape_clip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "shape";
+            type: RECT;
+            mouse_events: 0;
+            clip_to: "shape_clip";
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 100;
+               rel1.to: "shape_clip";
+               rel2.to: "shape_clip";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show_transition";
+            signal: "show";
+            source: "e";
+            action: STATE_SET "visible" 0.0;
+            target: "shape_clip";
+            transition: LINEAR 0.2;
+         }
+         /*
+         program {
+            name: "set_timeout";
+            signal: "show";
+            source: "e";
+            script {
+               new i = timer(SUGGESTION_TIMEOUT, "suggestion_fade_out", 0);
+               set_int(fade_out_timer_id, i);
+            }
+         }
+         */
+         program {
+            name: "hide";
+            signal: "hide";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "shape_clip";
+            transition: LINEAR 0.2;
+         }
+      }
+   }
+
+   /**********************************************/
+   /************Subdialog - Policies**************/
+   /**********************************************/
+   group{
+      name: "e/conf/randr/dialog/subdialog/policies";
+      parts {
+         part {
+            name: "current_displays_setup/clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.25 0.25;
+               rel2.relative: 0.75 0.75;
+            }
+            description {
+               state: "above" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.25 0.5;
+               rel2.relative: 0.75 1.0;
+            }
+            description {
+               state: "right" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.0 0.25;
+               rel2.relative: 0.5 0.75;
+            }
+            description {
+               state: "below" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.25 0.0;
+               rel2.relative: 0.75 0.5;
+            }
+            description {
+               state: "left" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.5 0.25;
+               rel2.relative: 1.0 0.75;
+            }
+            description {
+               state: "clone" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "none" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "current_displays_setup.swallow.content";
+            type: SWALLOW;
+            clip_to: "current_displays_setup/clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "current_displays_setup/clipper";
+               rel2.to: "current_displays_setup/clipper";
+            }
+         }
+         part {
+            name: "new_display/clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.25 0.25;
+               rel2.relative: 0.75 0.75;
+            }
+            description {
+               state: "above" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.25 0.0;
+               rel2.relative: 0.75 0.5;
+            }
+            description {
+               state: "above_visible" 0.0;
+               inherit: "above" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "right" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.5 0.25;
+               rel2.relative: 1.0 0.75;
+            }
+            description {
+               state: "right_visible" 0.0;
+               inherit: "right" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "below" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.25 0.5;
+               rel2.relative: 0.75 1.0;
+            }
+            description {
+               state: "below_visible" 0.0;
+               inherit: "below" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "left" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.0 0.25;
+               rel2.relative: 0.5 0.75;
+            }
+            description {
+               state: "left_visible" 0.0;
+               inherit: "left" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "clone" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "clone_visible" 0.0;
+               inherit: "clone" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "none" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "none_visible" 0.0;
+               inherit: "none" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "new_display.swallow.content";
+            type: SWALLOW;
+            clip_to: "new_display/clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "new_display/clipper";
+               rel2.to: "new_display/clipper";
+            }
+         }
+      }
+      /*
+       * The signals emitted to the UI are encoded as their corresponding value
+       * in Ecore_X
+       *
+       * Policy                            = Signal emitted
+       * ECORE_X_RANDR_OUTPUT_POLICY_ABOVE = 1
+       * ECORE_X_RANDR_OUTPUT_POLICY_RIGHT = 2
+       * ECORE_X_RANDR_OUTPUT_POLICY_BELOW = 3
+       * ECORE_X_RANDR_OUTPUT_POLICY_LEFT  = 4
+       * ECORE_X_RANDR_OUTPUT_POLICY_CLONE = 5
+       * ECORE_X_RANDR_OUTPUT_POLICY_NONE  = 6
+       */
+      programs {
+         program {
+            name:   "new_display_hide";
+            signal: "conf,randr,dialog,policies,*";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "new_display/clipper";
+         }
+         program {
+            name:   "current_displays_setup_clipper_above";
+            signal: "conf,randr,dialog,policies,1";
+            source: "e";
+            action: STATE_SET "above" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            after: "new_display_above_visible_set";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "new_display_above_visible_set";
+            action: STATE_SET "above_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "current_displays_setup_clipper_right";
+            signal: "conf,randr,dialog,policies,2";
+            source: "e";
+            action: STATE_SET "right" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            after: "new_display_right_visible_set";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "new_display_right_visible_set";
+            action: STATE_SET "right_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "current_displays_setup_clipper_below";
+            signal: "conf,randr,dialog,policies,3";
+            source: "e";
+            action: STATE_SET "below" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            after: "new_display_below_visible_set";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "new_display_below_visible_set";
+            action: STATE_SET "below_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "current_displays_setup_clipper_left";
+            signal: "conf,randr,dialog,policies,4";
+            source: "e";
+            action: STATE_SET "left" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            after: "new_display_left_visible_set";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "new_display_left_visible_set";
+            action: STATE_SET "left_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "current_displays_setup_clipper_clone";
+            signal: "conf,randr,dialog,policies,5";
+            source: "e";
+            action: STATE_SET "clone" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            after: "new_display_clone_visible_set";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "new_display_clone_visible_set";
+            action: STATE_SET "clone_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "current_displays_setup_clipper_none";
+            signal: "conf,randr,dialog,policies,6";
+            source: "e";
+            action: STATE_SET "none" 0.0;
+            target: "current_displays_setup/clipper";
+            target: "new_display/clipper";
+            //after: "new_display_none_visible_set";
+            transition: LINEAR 0.5;
+         }
+         /*
+          * following is an analog program for none, but we don't want to show
+          * it anyway.
+         program {
+            name:   "new_display_none_visible_set";
+            action: STATE_SET "none_visible" 0.0;
+            target: "new_display/clipper";
+            transition: LINEAR 0.5;
+         }
+        */
+      }
+   }
+
+   // Text objects for rotation and reflection
+   group {
+      name: "e/conf/randr/dialog/subdialog/orientation";
+
+      parts {
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "display";
+            clip_to: "clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "video-display.png";
+            }
+         }
+         part {
+            name: "orientation_text";
+            clip_to: "clip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.8;
+               color: 0 0 0 255;
+               text {
+                  //Maybe use some default theme label text style later
+                  text: "Orientation";
+                  font: "Sans:style=Bold";
+                  /* Use the Bold style
+                   * of the Sans font from
+                   * fontconfig */
+                  size: 10;
+                  /* size in pixels - 10 */
+                  min: 0 1;
+                  /* the text will not determine minimum horizontal
+                   * size but WILL determine minimal vertical size
+                   * (thus 0 1 - horiz then vert flags) */
+                  /* align text to top-left of the region
+                   * given */
+                  text_class: "title_bar";
+                  /* text class - so font and size
+                   * can be changed by users */
+               }
+               map {
+                  on: 1;
+                  rotation {
+                     x: 0.0;
+                     y: 0.0;
+                     z: 0.0;
+                  }
+               }
+            }
+            description {
+               state: "rotate" 0.90;
+               inherit: "default" 0.0;
+               map.rotation.z: 270.0;
+            }
+            description {
+               state: "rotate" 0.180;
+               inherit: "default" 0.0;
+               map.rotation.z: 180.0;
+            }
+            description {
+               state: "rotate" 0.270;
+               inherit: "default" 0.0;
+               map.rotation.z: 90.0;
+            }
+            description {
+               state: "reflect_horizontal" 0.0;
+               inherit: "default" 0.0;
+               map.rotation.y: 180.0;
+            }
+            description {
+               state: "reflect_vertical" 0.0;
+               inherit: "default" 0.0;
+               map.rotation.x: 180.0;
+            }
+         }
+      }
+      programs {
+         program {
+            name:   "rot0";
+            signal: "conf,randr,dialog,orientation,current,1";
+            source: "e";
+            action: STATE_SET "default" 0.0;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "rot90";
+            signal: "conf,randr,dialog,orientation,current,2";
+            source: "e";
+            action: STATE_SET "rotate" 0.90;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "rot180";
+            signal: "conf,randr,dialog,orientation,current,4";
+            source: "e";
+            action: STATE_SET "rotate" 0.180;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "rot270";
+            signal: "conf,randr,dialog,orientation,current,8";
+            source: "e";
+            action: STATE_SET "rotate" 0.270;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "ref_x";
+            signal: "conf,randr,dialog,orientation,current,16";
+            source: "e";
+            action: STATE_SET "reflect_horizontal" 0.0;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name:   "ref_y";
+            signal: "conf,randr,dialog,orientation,current,32";
+            source: "e";
+            action: STATE_SET "reflect_vertical" 0.0;
+            target: "orientation_text";
+            transition: LINEAR 0.5;
+         }
+      }
+
+   }
+
+}
diff --git a/src/modules/conf_randr/e_int_config_randr.c b/src/modules/conf_randr/e_int_config_randr.c
new file mode 100644 (file)
index 0000000..ae4c11c
--- /dev/null
@@ -0,0 +1,430 @@
+#include "e.h"
+#include "e_randr.h"
+#include "e_int_config_randr.h"
+
+/*
+ * BUGS:
+ * - ethumb sometimes returns garbage objects leading to a segv
+ *
+ * TODO:
+ * - write 1.2 per monitor configuration
+ * - write Smart object, so crtcs representations can be properly freed (events,
+ *   etc.)
+ *
+ * IMPROVABLE:
+ *  See comments starting with 'IMPROVABLE'
+ */
+#ifndef  ECORE_X_RANDR_1_2
+#define ECORE_X_RANDR_1_2 ((1 << 16) | 2)
+#endif
+#ifndef  ECORE_X_RANDR_1_3
+#define ECORE_X_RANDR_1_3 ((1 << 16) | 3)
+#endif
+
+#ifdef  Ecore_X_Randr_None
+#undef  Ecore_X_Randr_None
+#define Ecore_X_Randr_None  0
+#else
+#define Ecore_X_Randr_None  0
+#endif
+#ifdef  Ecore_X_Randr_Unset
+#undef  Ecore_X_Randr_Unset
+#define Ecore_X_Randr_Unset -1
+#else
+#define Ecore_X_Randr_Unset -1
+#endif
+
+#define THEME_FILENAME      "/e-module-conf_randr.edj"
+#define TOOLBAR_ICONSIZE    16
+
+static void        *create_data(E_Config_Dialog *cfd);
+static void         free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int          basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int          basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Eina_Bool    _deferred_noxrandr_error(void *data);
+
+// Functions for the arrangement subdialog interaction
+extern Eina_Bool    dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *cfdata);
+extern Evas_Object *dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas);
+extern Eina_Bool    dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern Eina_Bool    dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata);
+
+// Functions for the policies subdialog interaction
+extern Eina_Bool    dialog_subdialog_policies_create_data(E_Config_Dialog_Data *cfdata);
+extern Evas_Object *dialog_subdialog_policies_basic_create_widgets(Evas *canvas);
+extern Eina_Bool    dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern Eina_Bool    dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata);
+
+// Functions for the resolutions subdialog interaction
+extern Eina_Bool    dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata);
+extern Evas_Object *dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas);
+extern Eina_Bool    dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern Eina_Bool    dialog_subdialog_resolutions_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_resolutions_update_list(Evas *canvas, Evas_Object *crtc);
+extern void         dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata);
+
+// Functions for the orientation subdialog interaction
+extern Eina_Bool    dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata);
+extern Evas_Object *dialog_subdialog_orientation_basic_create_widgets(Evas *canvas);
+extern Eina_Bool    dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern Eina_Bool    dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
+extern void         dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
+extern void         dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata);
+extern void         dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata);
+
+static void _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia);
+
+/* actual module specifics */
+E_Config_Dialog_Data *e_config_runtime_info = NULL;
+extern E_Module *conf_randr_module;
+char _theme_file_path[PATH_MAX];
+
+E_Config_Randr_Dialog_Output_Dialog_Data *
+_dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
+
+   if ((!crtc_info && !output_info) || !(dialog_data = E_NEW(E_Config_Randr_Dialog_Output_Dialog_Data, 1))) return NULL;
+   if (crtc_info)
+     {
+        //already enabled screen
+        dialog_data->crtc = crtc_info;
+     }
+   else if (output_info)
+     {
+        //disabled monitor
+        dialog_data->output = output_info;
+     }
+   return dialog_data;
+}
+
+static void *
+create_data(E_Config_Dialog *cfd)
+{
+   Eina_List *iter;
+   E_Randr_Output_Info *output_info;
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+
+   // Prove we got all things to get going
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2), NULL);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(!(e_config_runtime_info = E_NEW(E_Config_Dialog_Data, 1)), NULL);
+
+   e_config_runtime_info->cfd = cfd;
+
+   //Compose theme's file path and name
+   snprintf(_theme_file_path, sizeof(_theme_file_path), "%s%s", conf_randr_module->dir, THEME_FILENAME);
+
+   e_config_runtime_info->manager = e_manager_current_get();
+   EINA_LIST_FOREACH(e_randr_screen_info->rrvd_info.randr_info_12->outputs, iter, output_info)
+     {
+        if ((odd = _dialog_output_dialog_data_new(output_info->crtc, output_info)))
+          e_config_runtime_info->output_dialog_data_list = eina_list_append(e_config_runtime_info->output_dialog_data_list, odd);
+     }
+
+   fprintf(stderr, "CONF_RANDR: Added %d output data structs.\n", eina_list_count(e_config_runtime_info->output_dialog_data_list));
+   //FIXME: Properly (stack-like) free data when creation fails
+   EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_arrangement_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
+   EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_resolutions_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
+   EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_policies_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
+   EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_orientation_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
+
+   return e_config_runtime_info;
+
+_e_conf_randr_create_data_failed_free_data:
+   free(e_config_runtime_info);
+   return NULL;
+}
+
+static void
+free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   EINA_SAFETY_ON_TRUE_RETURN(!e_randr_screen_info);
+   dialog_subdialog_arrangement_free_data(cfd, cfdata);
+
+   evas_object_del(cfdata->gui.subdialogs.arrangement.dialog);
+   evas_object_del(cfdata->gui.subdialogs.policies.dialog);
+   evas_object_del(cfdata->gui.subdialogs.resolutions.dialog);
+   evas_object_del(cfdata->gui.subdialogs.orientation.dialog);
+
+   free(cfdata);
+}
+
+static Eina_Bool
+_e_conf_randr_confirmation_dialog_timer_cb(void *data)
+{
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cdd = (E_Config_Randr_Dialog_Confirmation_Dialog_Data *)data;
+   char buf[4096];
+
+   if (!cdd) return ECORE_CALLBACK_CANCEL;
+
+   --cdd->countdown;
+
+   if (cdd->countdown > 0)
+     {
+        snprintf(buf, sizeof(buf),
+                 _("Does this look OK? Click <hilight>Keep</hilight> if it does, or Restore if not.<ps>"
+                   "If you do not press a button, the previous settings will be<ps>"
+                   "restored in %d seconds."), cdd->countdown);
+     }
+   else
+     {
+        snprintf(buf, sizeof(buf),
+                 _("Does this look OK? Click <hilight>Keep</hilight> if it does, or Restore if not.<ps>"
+                   "If you do not press a button, the previous settings will be<ps>"
+                   "restored <highlight>IMMEDIATELY</highlight>."));
+     }
+
+   e_dialog_text_set(cdd->dialog, buf);
+
+   if (cdd->countdown == 0)
+      {
+         _e_conf_randr_confirmation_dialog_discard_cb(cdd, cdd->dialog);
+         return ECORE_CALLBACK_CANCEL;
+      }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static void
+_e_conf_randr_confirmation_dialog_delete_cb(E_Win *win)
+{
+   E_Dialog *dia;
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cd;
+   E_Config_Dialog *cfd;
+
+   dia = win->data;
+   cd = dia->data;
+   cd->cfdata->gui.confirmation_dialog = NULL;
+   cfd = cd->cfdata->cfd;
+   if (cd->timer) ecore_timer_del(cd->timer);
+   cd->timer = NULL;
+   free(cd);
+   e_object_del(E_OBJECT(dia));
+   e_object_unref(E_OBJECT(cfd));
+}
+
+static void
+_e_conf_randr_confirmation_dialog_keep_cb(void *data, E_Dialog *dia)
+{
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cdd = (E_Config_Randr_Dialog_Confirmation_Dialog_Data *)data;
+
+   if (!cdd) return;
+
+   dialog_subdialog_arrangement_keep_changes(cdd->cfdata);
+   dialog_subdialog_orientation_keep_changes(cdd->cfdata);
+   dialog_subdialog_policies_keep_changes(cdd->cfdata);
+   dialog_subdialog_resolutions_keep_changes(cdd->cfdata);
+   _e_conf_randr_confirmation_dialog_delete_cb(dia->win);
+}
+
+static void
+_e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia)
+{
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cdd = (E_Config_Randr_Dialog_Confirmation_Dialog_Data *)data;
+
+   if (!cdd) return;
+
+   dialog_subdialog_arrangement_discard_changes(cdd->cfdata);
+   dialog_subdialog_orientation_discard_changes(cdd->cfdata);
+   dialog_subdialog_policies_discard_changes(cdd->cfdata);
+   dialog_subdialog_resolutions_discard_changes(cdd->cfdata);
+   _e_conf_randr_confirmation_dialog_delete_cb(dia->win);
+}
+
+static void
+_e_conf_randr_confirmation_dialog_store_cb(void *data, E_Dialog *dia)
+{
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cdd = (E_Config_Randr_Dialog_Confirmation_Dialog_Data *)data;
+
+   if (!cdd) return;
+
+   _e_conf_randr_confirmation_dialog_keep_cb(data, dia);
+   e_randr_store_configuration(e_randr_screen_info);
+}
+
+static void
+_e_conf_randr_confirmation_dialog_new(E_Config_Dialog *cfd)
+{
+   E_Config_Randr_Dialog_Confirmation_Dialog_Data *cd = E_NEW(E_Config_Randr_Dialog_Confirmation_Dialog_Data, 1);
+
+   char buf[4096];
+
+   if (!cd) return;
+
+   cd->cfd = cfd;
+
+   if ((cd->dialog = e_dialog_new(cfd->con, "E", "e_randr_confirmation_dialog")))
+     {
+        e_dialog_title_set(cd->dialog, _("New settings confirmation"));
+        cd->cfdata = cfd->cfdata;
+        cd->timer = ecore_timer_add(1.0, _e_conf_randr_confirmation_dialog_timer_cb, cd);
+        cd->countdown = 15;
+        cd->dialog->data = cd;
+        e_dialog_icon_set(cd->dialog, "preferences-system-screen-resolution", 48);
+        e_win_delete_callback_set(cd->dialog->win, _e_conf_randr_confirmation_dialog_delete_cb);
+        snprintf(buf, sizeof(buf),
+                 _("Does this look OK? Click <hilight>Keep</hilight> if it does, or Restore if not.<ps>"
+                   "If you do not press a button, the previous settings will be<ps>"
+                   "restored in %d seconds."), cd->countdown);
+        e_dialog_text_set(cd->dialog, buf);
+        e_dialog_button_add(cd->dialog, _("Keep"), NULL, _e_conf_randr_confirmation_dialog_keep_cb, cd);
+        e_dialog_button_add(cd->dialog, _("Store Permanently"), NULL, _e_conf_randr_confirmation_dialog_store_cb, cd);
+        e_dialog_button_add(cd->dialog, _("Restore"), NULL, _e_conf_randr_confirmation_dialog_discard_cb, cd);
+        e_dialog_button_focus_num(cd->dialog, 1);
+        e_win_centered_set(cd->dialog->win, 1);
+        e_win_borderless_set(cd->dialog->win, 1);
+        e_win_layer_set(cd->dialog->win, 6);
+        e_win_sticky_set(cd->dialog->win, 1);
+        e_dialog_show(cd->dialog);
+        e_object_ref(E_OBJECT(cfd));
+     }
+}
+
+static Evas_Object *
+basic_create_widgets(E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *table = NULL, *wl = NULL;
+
+   EINA_SAFETY_ON_TRUE_RETURN_VAL (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2), NULL);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL((!canvas || !cfdata), NULL);
+
+   if (!(cfdata->gui.subdialogs.arrangement.dialog = dialog_subdialog_arrangement_basic_create_widgets(canvas))) goto _dialog_create_subdialog_arrangement_fail;
+   if (!(cfdata->gui.subdialogs.policies.dialog = dialog_subdialog_policies_basic_create_widgets(canvas))) goto _dialog_create_subdialog_policies_fail;
+   if (!(cfdata->gui.subdialogs.resolutions.dialog = dialog_subdialog_resolutions_basic_create_widgets(canvas))) goto _dialog_create_subdialog_resolutions_fail;
+   if (!(cfdata->gui.subdialogs.orientation.dialog = dialog_subdialog_orientation_basic_create_widgets(canvas))) goto _dialog_create_subdialog_orientation_fail;
+
+   EINA_SAFETY_ON_FALSE_GOTO((table = e_widget_table_add(canvas, EINA_FALSE)), _dialog_create_widgets_fail);
+   EINA_SAFETY_ON_FALSE_GOTO((wl = e_widget_list_add(canvas, EINA_FALSE, EINA_TRUE)), _dialog_create_widget_list_fail);
+
+   //e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h);
+   e_widget_table_object_append(table, cfdata->gui.subdialogs.arrangement.dialog, 1, 1, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   /*
+      e_widget_table_object_append(table, cfdata->gui.subdialogs.policies.dialog, 1, 2, 1, 1, 0, 0, 0, 0);
+      e_widget_table_object_append(table, cfdata->gui.subdialogs.orientation.dialog, 2, 2, 1, 1, 0, 0, 0, 0);
+      e_widget_table_object_append(table, cfdata->gui.subdialogs.resolutions.dialog, 3, 2, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    */
+   //e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align);
+   e_widget_list_object_append(wl, cfdata->gui.subdialogs.policies.dialog, 0, 0, 0.0);
+   e_widget_list_object_append(wl, cfdata->gui.subdialogs.orientation.dialog, 0, 0, 0.0);
+   e_widget_list_object_append(wl, cfdata->gui.subdialogs.resolutions.dialog, EVAS_HINT_FILL, EVAS_HINT_EXPAND, 1.0);
+   e_widget_table_object_append(table, wl, 1, 2, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   cfdata->gui.widget_list = wl;
+
+   cfdata->gui.dialog = table;
+
+   e_dialog_resizable_set(cfd->dia, EINA_TRUE);
+
+   return cfdata->gui.dialog;
+
+_dialog_create_widget_list_fail:
+   evas_object_del(table);
+_dialog_create_widgets_fail:
+   evas_object_del(cfdata->gui.subdialogs.orientation.dialog);
+_dialog_create_subdialog_orientation_fail:
+   evas_object_del(cfdata->gui.subdialogs.resolutions.dialog);
+_dialog_create_subdialog_resolutions_fail:
+   evas_object_del(cfdata->gui.subdialogs.policies.dialog);
+_dialog_create_subdialog_policies_fail:
+   evas_object_del(cfdata->gui.subdialogs.arrangement.dialog);
+_dialog_create_subdialog_arrangement_fail:
+   return NULL;
+}
+
+static int
+basic_apply_data
+  (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   Eina_Bool ret = EINA_TRUE;
+
+   fprintf(stderr, "CONF_RANDR: New configuration is beeing applied.\n");
+   //this is a special case, where the function is called, before the
+   //configuration data is created.
+   if (!cfdata) return EINA_FALSE;
+
+   //the order matters except for policies!
+   if (dialog_subdialog_policies_basic_check_changed(cfd, cfdata))
+     {
+        ret &= dialog_subdialog_policies_basic_apply_data(cfd, cfdata);
+        if (!ret) return EINA_FALSE;
+     }
+
+   if (dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata))
+     {
+        ret &= dialog_subdialog_resolutions_basic_apply_data(cfd, cfdata);
+        if (!ret) return EINA_FALSE;
+     }
+
+   if (dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata))
+     {
+        ret &= dialog_subdialog_arrangement_basic_apply_data(cfd, cfdata);
+        if (!ret) return EINA_FALSE;
+     }
+
+   if (dialog_subdialog_orientation_basic_check_changed(cfd, cfdata))
+     ret &= dialog_subdialog_orientation_basic_apply_data(cfd, cfdata);
+
+   _e_conf_randr_confirmation_dialog_new(cfd);
+
+   return ret;
+}
+
+E_Config_Dialog *
+e_int_config_randr(E_Container *con, const char *params __UNUSED__){
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2))
+     {
+        ecore_timer_add(0.5, _deferred_noxrandr_error, NULL);
+        fprintf(stderr, "CONF_RANDR: XRandR version >= 1.2 necessary to work.\n");
+        return NULL;
+     }
+
+   //Dialog already opened?
+   if (e_config_dialog_find("E", "screen/screen_setup")) return NULL;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = create_data;
+   v->free_cfdata = free_cfdata;
+   v->basic.apply_cfdata = basic_apply_data;
+   v->basic.create_widgets = basic_create_widgets;
+   v->basic.check_changed = basic_check_changed;
+   //v->override_auto_apply = 0;
+
+   cfd = e_config_dialog_new(con, _("Screen Setup"),
+                             "E", "screen/screen_setup",
+                             "preferences-system-screen-setup", 0, v, NULL);
+   return cfd;
+}
+
+static Eina_Bool
+_deferred_noxrandr_error(void *data __UNUSED__)
+{
+   e_util_dialog_show(_("Missing Features"),
+                      _("Your X Display Server is missing support for<ps>"
+                        "the <hilight>XRandR</hilight> (X Resize and Rotate) extension version 1.2 or above.<ps>"
+                        "You cannot change screen resolutions without<ps>"
+                        "the support of this extension. It could also be<ps>"
+                        "that at the time <hilight>ecore</hilight> was built, there<ps>"
+                        "was no XRandR support detected."));
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static int
+basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   if (!cfdata) return EINA_FALSE;
+   else
+     return dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata)
+            || dialog_subdialog_policies_basic_check_changed(cfd, cfdata)
+            || dialog_subdialog_orientation_basic_check_changed(cfd, cfdata)
+            || dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata);
+}
+
diff --git a/src/modules/conf_randr/e_int_config_randr.h b/src/modules/conf_randr/e_int_config_randr.h
new file mode 100644 (file)
index 0000000..06687a2
--- /dev/null
@@ -0,0 +1,74 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_RANDR_H
+#define E_INT_CONFIG_RANDR_H
+
+#include "e.h"
+
+typedef struct _E_Config_Randr_Dialog_Output_Dialog_Data  E_Config_Randr_Dialog_Output_Dialog_Data;
+typedef struct _E_Config_Randr_Dialog_Confirmation_Dialog_Data E_Config_Randr_Dialog_Confirmation_Dialog_Data;
+
+struct _E_Config_Dialog_Data
+{
+   E_Config_Dialog *cfd;
+
+   //list of E_Config_Randr_Dialog_Output_Dialog_Data
+   Eina_List *output_dialog_data_list;
+   E_Manager *manager;
+   struct {
+        Evas_Object *dialog, *widget_list, *selected_eo;
+        E_Config_Randr_Dialog_Output_Dialog_Data *selected_output_dd;
+        E_Config_Randr_Dialog_Confirmation_Dialog_Data *confirmation_dialog;
+        struct {
+             struct {
+                  Evas_Object *dialog, *swallowing_edje, *smart_parent, *suggestion, *clipper;
+                  Evas_Coord_Point previous_pos, relative_zero;
+                  Evas_Coord_Rectangle disabled_output_size;
+                  int suggestion_dist_min;
+             } arrangement;
+             struct {
+                  Evas_Object *dialog;
+                  //Evas_Object *swallowing_edje;
+                  Evas_Object *radio_above, *radio_right, *radio_below, *radio_left, *radio_clone, *radio_none;
+                  int radio_val;
+                  //Evas_Object *current_displays_setup, *current_displays_setup_background, *new_display, *new_display_background;
+             } policies;
+             struct {
+                  Evas_Object *dialog;
+             } resolutions;
+             struct {
+                  Evas_Object *dialog;
+                  //Evas_Object *swallowing_edje;
+                  Evas_Object *radio_normal, *radio_rot90, *radio_rot180, *radio_rot270, *radio_reflect_horizontal, *radio_reflect_vertical;
+                  int radio_val;
+             } orientation;
+        } subdialogs;
+   } gui;
+   Ecore_X_Randr_Screen_Size screen_size;
+
+};
+
+struct _E_Config_Randr_Dialog_Output_Dialog_Data
+{
+   E_Randr_Crtc_Info *crtc;
+   E_Randr_Output_Info *output;
+   Evas_Coord_Point previous_pos, new_pos;
+   Ecore_X_Randr_Mode_Info *previous_mode, *new_mode, *preferred_mode;
+   Ecore_X_Randr_Orientation previous_orientation, new_orientation;
+   Ecore_X_Randr_Output_Policy previous_policy, new_policy;
+   Evas_Object *bg;
+};
+
+struct _E_Config_Randr_Dialog_Confirmation_Dialog_Data
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_Data *cfdata;
+   E_Dialog *dialog;
+   Ecore_Timer *timer;
+   int countdown;
+};
+
+E_Config_Dialog *e_int_config_randr(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
diff --git a/src/modules/conf_randr/e_int_config_randr_arrangement.c b/src/modules/conf_randr/e_int_config_randr_arrangement.c
new file mode 100644 (file)
index 0000000..ee64efe
--- /dev/null
@@ -0,0 +1,824 @@
+#include "e_int_config_randr.h"
+#include "e_randr.h"
+#include "Ecore_X.h"
+
+#ifndef  ECORE_X_RANDR_1_2
+#define ECORE_X_RANDR_1_2   ((1 << 16) | 2)
+#endif
+#ifndef  ECORE_X_RANDR_1_3
+#define ECORE_X_RANDR_1_3   ((1 << 16) | 3)
+#endif
+
+#ifndef  Ecore_X_Randr_Unset
+#define Ecore_X_Randr_Unset -1
+#endif
+
+#define DOUBLECLICK_TIMEOUT 0.2
+#define CRTC_THUMB_SIZE_W   300
+#define CRTC_THUMB_SIZE_H   300
+
+Eina_Bool                dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *e_config_runtime_info);
+Evas_Object             *dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas);
+Eina_Bool                dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool                dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+void                     dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static inline Eina_List *_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj);
+static void              _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj);
+
+//static inline E_Config_Randr_Dialog_Output_Dialog_Data *_dialog_subdialog_arrangement_output_dialog_data_new        (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info);
+static inline void       _dialog_subdialog_arrangement_suggestion_add(Evas *evas);
+static inline void       _dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj);
+static void              _dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+static Evas_Object      *_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data);
+static void              _dialog_subdialog_arrangement_output_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void              _dialog_subdialog_arrangement_output_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void              _dialog_subdialog_arrangement_output_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+
+// Function for the resolutions subdialog interaction
+extern void              dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
+// Function for the orientation subdialog interaction
+extern void              dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
+extern void              dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
+// Functions for the orientation subdialog interaction
+extern void              dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
+
+static Evas_Smart_Class screen_setup_smart_class = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartScreenSetup");
+static Evas_Smart *screen_setup_smart = NULL;
+
+extern E_Config_Dialog_Data *e_config_runtime_info;
+extern char _theme_file_path[];
+
+static void
+_dialog_subdialog_arrangement_output_dialog_data_fill(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
+{
+   if (!odd) return;
+
+   if (odd->crtc)
+     {
+        //already enabled screen
+        odd->previous_pos.x = odd->crtc->geometry.x;
+        odd->previous_pos.y = odd->crtc->geometry.y;
+        odd->previous_mode = odd->crtc->current_mode;
+     }
+   else if (odd->output)
+     {
+        //disabled monitor
+        //try to get a mode from the preferred list, else use default list
+        if (!(odd->preferred_mode = (Ecore_X_Randr_Mode_Info *)eina_list_data_get(eina_list_last(odd->output->preferred_modes))))
+          {
+             if (odd->output->modes)
+               odd->preferred_mode = (Ecore_X_Randr_Mode_Info *)eina_list_data_get(eina_list_last(odd->output->modes));
+             else
+               odd->preferred_mode = NULL;
+          }
+
+        odd->previous_pos.x = Ecore_X_Randr_Unset;
+        odd->previous_pos.y = Ecore_X_Randr_Unset;
+     }
+
+   odd->new_pos.x = Ecore_X_Randr_Unset;
+   odd->new_pos.y = Ecore_X_Randr_Unset;
+}
+
+Eina_Bool
+dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
+{
+   Eina_List *iter;
+   E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
+   char *disabled_output_width, *disabled_output_height;
+   Evas_Object *display;
+
+   EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data)
+     {
+        _dialog_subdialog_arrangement_output_dialog_data_fill(dialog_data);
+     }
+
+   if(!(disabled_output_width = edje_file_data_get(_theme_file_path, "disabled_output_width")))
+     disabled_output_width = "1024";
+   if(!(disabled_output_height = edje_file_data_get(_theme_file_path, "disabled_output_height")))
+     disabled_output_height = "768";
+
+   data->gui.subdialogs.arrangement.disabled_output_size.w = atoi(disabled_output_width);
+   data->gui.subdialogs.arrangement.disabled_output_size.h = atoi(disabled_output_height);
+
+   return EINA_TRUE;
+}
+
+//IMPROVABLE: Clean up properly if instances can't be created
+Evas_Object *
+dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
+{
+   Evas_Object *subdialog, *crtc;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   Eina_List *iter;
+
+   if (!canvas || !e_config_runtime_info || !e_config_runtime_info->output_dialog_data_list) return NULL;
+
+   //initialize smart object
+   evas_object_smart_clipped_smart_set(&screen_setup_smart_class);
+   screen_setup_smart_class.resize = _dialog_subdialog_arrangement_smart_class_resize;
+   screen_setup_smart = evas_smart_class_new(&screen_setup_smart_class);
+
+   subdialog = evas_object_smart_add(canvas, screen_setup_smart);
+   e_config_runtime_info->gui.subdialogs.arrangement.clipper = evas_object_smart_clipped_clipper_get(subdialog);
+   fprintf(stderr, "CONF_RANDR: Arrangement subdialog added (%p).\n", subdialog);
+
+   //only use information we can restore.
+   EINA_LIST_FOREACH(e_config_runtime_info->output_dialog_data_list, iter, output_dialog_data)
+     {
+        if ((!output_dialog_data->crtc && !output_dialog_data->output))
+          continue;
+        crtc = _dialog_subdialog_arrangement_output_add(canvas, output_dialog_data);
+
+        if (!crtc) continue;
+        evas_object_show(crtc);
+
+        evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_DOWN, _dialog_subdialog_arrangement_output_mouse_down_cb, NULL);
+        evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_MOVE, _dialog_subdialog_arrangement_output_mouse_move_cb, NULL);
+        evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_arrangement_output_mouse_up_cb, NULL);
+
+        evas_object_smart_member_add(crtc, subdialog);
+        fprintf(stderr, "CONF_RANDR: CRTC representation (%p) added to arrangement subdialog (%p).\n", crtc, subdialog);
+     }
+
+   e_config_runtime_info->gui.subdialogs.arrangement.smart_parent = subdialog;
+
+   return subdialog;
+}
+
+static Evas_Object *
+_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
+{
+   E_Randr_Output_Info *output_info;
+   Evas_Object *output;
+   const char *output_name = NULL;
+
+   if (!canvas || !output_dialog_data || !e_config_runtime_info) return NULL;
+
+   output = edje_object_add(canvas);
+
+   //set instance data for output
+   evas_object_data_set(output, "output_info", output_dialog_data);
+
+   //set theme for monitor representation
+   EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(output, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _dialog_subdialog_arrangement_output_add_edje_set_fail);
+   //indicate monitor state
+   if (!output_dialog_data->crtc || (output_dialog_data->crtc && !output_dialog_data->previous_mode))
+     edje_object_signal_emit(output, "disabled", "e");
+   else
+     edje_object_signal_emit(output, "enabled", "e");
+   //for now use deskpreview widget as background of output, maybe change this to
+   //live image from comp module
+   output_dialog_data->bg = e_widget_deskpreview_add(canvas, 1, 1);
+   edje_object_part_swallow(output, "e.swallow.content", output_dialog_data->bg);
+
+   //Try to get the name of the monitor connected to the output's last output via edid
+   //else use the output's name
+   if (output_dialog_data->crtc)
+     output_info = (E_Randr_Output_Info *)eina_list_data_get(eina_list_last(output_dialog_data->crtc->outputs));
+   else
+     output_info = output_dialog_data->output;
+   if (output_info)
+     {
+        if (ecore_x_randr_edid_has_valid_header(output_info->edid, output_info->edid_length))
+          output_name = ecore_x_randr_edid_display_name_get(output_info->edid, output_info->edid_length);
+        else if (output_info->name)
+          output_name = output_info->name;
+     }
+   if (output_name)
+     edje_object_part_text_set(output, "output_txt", output_name);
+
+   //set output orientation
+   dialog_subdialog_orientation_update_edje(output);
+   return output;
+
+_dialog_subdialog_arrangement_output_add_edje_set_fail:
+   evas_object_del(output);
+   return NULL;
+}
+
+static void
+_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   Evas_Object *output;
+   Evas_Coord real_sum_w = 0, real_sum_h = 0;
+   Eina_Rectangle parent_geo, new_geo;
+   Evas_Coord_Point offset = {.x = 0, .y = 0};
+   Evas_Coord offset_x_max = 0;
+   float scaling_factor = 0.1;
+   Eina_List *lst, *itr;
+   const E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+
+   evas_object_geometry_get(obj, &parent_geo.x, &parent_geo.y, &parent_geo.w, &parent_geo.h);
+   fprintf(stderr, "CONF_RANDR: Arrangement dialog shall be resized to %d x %d\n", w, h);
+   fprintf(stderr, "CONF_RANDR: Arrangement dialog Smart object geo: %d x %d, %d x %d\n", parent_geo.x, parent_geo.y, parent_geo.w, parent_geo.h);
+   if ((w < 1) || (h < 1)) return;
+
+   lst = evas_object_smart_members_get(obj);
+   //Calc average aspect ratio from all available monitors
+   EINA_LIST_FOREACH(lst, itr, output)
+     {
+        if (output == e_config_runtime_info->gui.subdialogs.arrangement.clipper) continue;
+        output_dialog_data = evas_object_data_get(output, "output_info");
+        if (!output_dialog_data) continue;
+        if ((!output_dialog_data->previous_mode) && (!output_dialog_data->preferred_mode)) continue;
+        if (output_dialog_data->previous_mode)
+          {
+             real_sum_w += output_dialog_data->previous_mode->width;
+             real_sum_h += output_dialog_data->previous_mode->height;
+          }
+        else if (output_dialog_data->preferred_mode)
+          {
+             real_sum_w += output_dialog_data->preferred_mode->width;
+             real_sum_h += output_dialog_data->preferred_mode->height;
+          }
+        else
+          {
+             real_sum_w += e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.w;
+             real_sum_h += e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.h;
+          }
+     }
+
+   scaling_factor = (((float)parent_geo.w / (float)real_sum_w) < ((float)parent_geo.h / (float)real_sum_h)) ? ((float)parent_geo.w / (float)real_sum_w) : ((float)parent_geo.h / (float)real_sum_h);
+   scaling_factor *= e_scale;
+
+   EINA_LIST_FOREACH(lst, itr, output)
+     {
+        //Skip elements that are either the clipped smart object or falsely added
+        //to the list of outputs (which should not happen)
+        if (output == e_config_runtime_info->gui.subdialogs.arrangement.clipper) continue;
+        output_dialog_data = evas_object_data_get(output, "output_info");
+        if (!output_dialog_data) continue;
+        if (output_dialog_data->previous_mode)
+          {
+             new_geo.w = (int)((float)output_dialog_data->previous_mode->width * scaling_factor);
+             new_geo.h = (int)((float)output_dialog_data->previous_mode->height * scaling_factor);
+          }
+        else if (output_dialog_data->preferred_mode)
+          {
+             new_geo.w = (int)((float)output_dialog_data->preferred_mode->width * scaling_factor);
+             new_geo.h = (int)((float)output_dialog_data->preferred_mode->height * scaling_factor);
+          }
+        else
+          {
+             new_geo.w = (int)((float)e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.w * scaling_factor);
+             new_geo.h = (int)((float)e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.h * scaling_factor);
+             fprintf(stderr, "CONF_RANDR: Neither mode nor preferred mode are avavailable for %x. Using %dx%d.\n", (output_dialog_data->crtc ? output_dialog_data->crtc->xid : output_dialog_data->output->xid), e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.w, e_config_runtime_info->gui.subdialogs.arrangement.disabled_output_size.h);
+          }
+        if ((new_geo.w <= 0) || (new_geo.h <= 0))
+          {
+             //this is an effect, occuring during dialog closing.
+             //If we don't return here, e_thumb will segfault!
+             return;
+          }
+        if ((output_dialog_data->previous_pos.x == Ecore_X_Randr_Unset) || (output_dialog_data->previous_pos.y == Ecore_X_Randr_Unset))
+          {
+             //this is a non enabled monitor
+             new_geo.x = parent_geo.x + parent_geo.w - new_geo.w - offset.x;
+             new_geo.y = parent_geo.y + offset.y;
+             offset.y = new_geo.y + new_geo.h;
+             if (offset_x_max < new_geo.w)
+               {
+                  //adopt new max value for x
+                  offset_x_max = new_geo.w;
+               }
+             if ((offset.y + new_geo.h) > (parent_geo.y + parent_geo.h))
+               {
+                  //reset offset.y and adjust offset.x
+                  offset.y = 0;
+                  offset.x += offset_x_max;
+               }
+          }
+        else
+          {
+             new_geo.x = ((int)((float)output_dialog_data->previous_pos.x * scaling_factor)) + parent_geo.x;
+             new_geo.y = ((int)((float)output_dialog_data->previous_pos.y * scaling_factor)) + parent_geo.y;
+          }
+        //resize edje element
+        evas_object_resize(output, new_geo.w, new_geo.h);
+        //also resize bg
+        e_thumb_icon_size_set(output_dialog_data->bg, new_geo.w, new_geo.h); //need to clarify the usage of e_thumb. Usable without e_thumb_icon_file_set??!!
+        evas_object_move(output, new_geo.x, new_geo.y);
+        fprintf(stderr, "CONF_RANDR: output representation %p was resized to %d x %d\n", output, new_geo.w, new_geo.h);
+        fprintf(stderr, "CONF_RANDR: output representation %p was moved to %d x %d\n", output, new_geo.x, new_geo.y);
+     }
+}
+
+static void
+_dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Object *element = NULL;
+   Eina_List *iter;
+   Eina_Bool crtc_selected = EINA_FALSE;
+
+   EINA_LIST_FOREACH(evas_object_smart_members_get(evas_object_smart_parent_get(obj)), iter, element)
+     {
+        if (e_config_runtime_info->gui.subdialogs.arrangement.clipper == obj) continue;
+        if (element != obj)
+          edje_object_signal_emit(element, "deselect", "e");
+        else
+          {
+             edje_object_signal_emit(element, "select", "e");
+             //update data for other dialogs
+             e_config_runtime_info->gui.selected_eo = obj;
+
+             //update resolutions list
+             dialog_subdialog_resolutions_update_list(obj);
+
+             //update orientation radio buttons
+             dialog_subdialog_orientation_update_radio_buttons(obj);
+
+             //update policy radio buttons
+             dialog_subdialog_policies_update_radio_buttons(obj);
+
+             crtc_selected = EINA_TRUE;
+          }
+     }
+   if (!crtc_selected)
+     {
+        //update data for other dialogs
+        e_config_runtime_info->gui.selected_eo = NULL;
+
+        //update resolutions list
+        dialog_subdialog_resolutions_update_list(NULL);
+
+        //update orientation radio buttons
+        dialog_subdialog_orientation_update_radio_buttons(NULL);
+
+        //update policy radio buttons
+        dialog_subdialog_policies_update_radio_buttons(NULL);
+     }
+
+   evas_object_geometry_get(obj, &e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.x, &e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.y, NULL, NULL);
+}
+
+static void
+_dialog_subdialog_arrangement_output_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev = event_info;
+   Eina_Rectangle geo, parent;
+   Evas_Coord_Point delta, new;
+
+   if (ev->buttons != 1) return;
+   evas_object_geometry_get (obj, &geo.x, &geo.y, &geo.w, &geo.h);
+   evas_object_geometry_get (evas_object_smart_parent_get(obj), &parent.x, &parent.y, &parent.w, &parent.h);
+   delta.x = ev->cur.canvas.x - ev->prev.canvas.x;
+   delta.y = ev->cur.canvas.y - ev->prev.canvas.y;
+
+   new.x = geo.x + delta.x;
+   new.y = geo.y + delta.y;
+   //respect container borders
+   if (new.x < parent.x + 1)
+     new.x = parent.x + 1;
+   else if (new.x > parent.x + parent.w - geo.w)
+     new.x = parent.x + parent.w - geo.w;
+   if (new.y < parent.y + 1)
+     new.y = parent.y + 1;
+   else if (new.y > parent.y + parent.h - geo.h)
+     new.y = parent.y + parent.h - geo.h;
+   //only take action if position changed
+   if ((geo.x != new.x) || (geo.y != new.y))
+     {
+        evas_object_move(obj, new.x, new.y);
+        _dialog_subdialog_arrangement_make_suggestion(obj);
+     }
+}
+
+static void
+_dialog_subdialog_arrangement_output_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Coord_Point coords;
+
+   if (evas_object_visible_get(e_config_runtime_info->gui.subdialogs.arrangement.suggestion))
+     {
+        edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, "hide", "e");
+        evas_object_geometry_get(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, &coords.x, &coords.y, NULL, NULL);
+        evas_object_move(obj, coords.x, coords.y);
+     }
+   else
+     {
+        evas_object_move(obj, e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.x, e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.y);
+     }
+}
+
+void
+_dialog_subdialog_arrangement_suggestion_add(Evas *evas)
+{
+   const char *theme_data_item = NULL;
+
+   e_config_runtime_info->gui.subdialogs.arrangement.suggestion = edje_object_add(evas);
+   edje_object_file_set(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/suggestion");
+   if ((theme_data_item = edje_object_data_get(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, "distance_min")))
+     e_config_runtime_info->gui.subdialogs.arrangement.suggestion_dist_min = MIN(MAX(atoi(theme_data_item), 0), 100);
+   else
+     e_config_runtime_info->gui.subdialogs.arrangement.suggestion_dist_min = 20;
+}
+
+void
+_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
+{
+   Eina_List *li, *crtcs = evas_object_smart_members_get(evas_object_smart_parent_get(obj));
+   Evas_Object *crtc = NULL;
+   Eina_Rectangle p_geo, geo, crtc_geo, s_geo;
+   int dxa = 10000, dya = 10000, tmp, min_dist;
+
+   if (!obj) return;
+
+   if (!e_config_runtime_info->gui.subdialogs.arrangement.suggestion)
+     {
+        _dialog_subdialog_arrangement_suggestion_add(evas_object_evas_get(obj));
+        evas_object_show(e_config_runtime_info->gui.subdialogs.arrangement.suggestion);
+     }
+
+   min_dist = e_config_runtime_info->gui.subdialogs.arrangement.suggestion_dist_min;
+
+   evas_object_geometry_get(evas_object_smart_parent_get(obj), &p_geo.x, &p_geo.y, &p_geo.w, &p_geo.h);
+   evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h);
+
+   s_geo.x = geo.x;
+   s_geo.y = geo.y;
+   s_geo.w = geo.w;
+   s_geo.h = geo.h;
+
+   //compare possible positions
+   //aritifical (relative) 0x0 element
+   tmp = s_geo.x;
+   if ((tmp < dxa) && (tmp < min_dist))
+     {
+        s_geo.x = p_geo.x;
+        dxa = tmp;
+     }
+   tmp = s_geo.y;
+   if ((tmp < dya) && (tmp < min_dist))
+     {
+        s_geo.y = p_geo.y;
+        dya = tmp;
+     }
+   //iterate crtc list
+   EINA_LIST_FOREACH(crtcs, li, crtc)
+     {
+        if ((crtc == obj) || (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper)) continue;
+        evas_object_geometry_get(crtc, &crtc_geo.x, &crtc_geo.y, &crtc_geo.w, &crtc_geo.h);
+        //X-Axis
+        tmp = abs(s_geo.x - crtc_geo.x);
+        if ((tmp < dxa) && (tmp < min_dist))
+          {
+             s_geo.x = crtc_geo.x;
+             dxa = abs(s_geo.x - crtc_geo.x);
+          }
+
+        tmp = abs(s_geo.x - (crtc_geo.x + crtc_geo.w));
+        if ((tmp < dxa) && (tmp < min_dist))
+          {
+             s_geo.x = (crtc_geo.x + crtc_geo.w);
+             dxa = tmp;
+          }
+
+        tmp = abs((s_geo.x + s_geo.w) - (crtc_geo.x - 1));
+        if ((tmp < dxa) && (tmp < min_dist))
+          {
+             s_geo.x = (crtc_geo.x - s_geo.w);
+             dxa = tmp;
+          }
+
+        tmp = abs((s_geo.x + s_geo.w) - (crtc_geo.x + crtc_geo.w));
+        if ((tmp < dxa) && (tmp < min_dist))
+          {
+             s_geo.x = (crtc_geo.x + crtc_geo.w - s_geo.w);
+             dxa = tmp;
+          }
+
+        //Y-Axis
+        tmp = abs(s_geo.y - crtc_geo.y);
+        if ((tmp < dya) && (tmp < min_dist))
+          {
+             s_geo.y = crtc_geo.y;
+             dya = abs(s_geo.y - crtc_geo.y);
+          }
+
+        tmp = abs(s_geo.y - (crtc_geo.y + crtc_geo.h));
+        if ((tmp < dya) && (tmp < min_dist))
+          {
+             s_geo.y = (crtc_geo.y + crtc_geo.h);
+             dya = tmp;
+          }
+
+        tmp = abs((s_geo.y + s_geo.h) - (crtc_geo.y - 1));
+        if ((tmp < dya) && (tmp < min_dist))
+          {
+             s_geo.y = (crtc_geo.y - s_geo.h);
+             dya = tmp;
+          }
+
+        tmp = abs((s_geo.y + s_geo.h) - (crtc_geo.y + crtc_geo.h));
+        if ((tmp < dya) && (tmp < min_dist))
+          {
+             s_geo.y = (crtc_geo.y + crtc_geo.h - s_geo.h);
+             dya = tmp;
+          }
+     }
+
+   if ((s_geo.x != geo.x) && (s_geo.y != geo.y))
+     {
+        if (s_geo.x < p_geo.x) s_geo.x = p_geo.x;
+        if ((s_geo.x + s_geo.w) > (p_geo.x + p_geo.w)) s_geo.x = ((p_geo.x + p_geo.w) - s_geo.w);
+        if (s_geo.y < p_geo.y) s_geo.y = p_geo.y;
+        if ((s_geo.y + s_geo.h) > (p_geo.y + p_geo.h)) s_geo.y = ((p_geo.y + p_geo.h) - s_geo.h);
+
+        if (!evas_object_visible_get(e_config_runtime_info->gui.subdialogs.arrangement.suggestion))
+          {
+             evas_object_show(e_config_runtime_info->gui.subdialogs.arrangement.suggestion);
+             edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, "show", "e");
+          }
+
+        evas_object_resize(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, s_geo.w, s_geo.h);
+        evas_object_move(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, s_geo.x, s_geo.y);
+     }
+   else
+     {
+        edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.arrangement.suggestion, "hide", "e");
+        evas_object_hide(e_config_runtime_info->gui.subdialogs.arrangement.suggestion);
+     }
+}
+
+void
+dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
+
+   EINA_SAFETY_ON_NULL_RETURN(cfdata);
+
+   EINA_LIST_FREE(cfdata->output_dialog_data_list, dialog_data)
+     {
+        if (!dialog_data) continue;
+        if (dialog_data->bg)
+          {
+             evas_object_del(dialog_data->bg);
+             dialog_data->bg = NULL;
+          }
+        free(dialog_data);
+     }
+}
+
+static Eina_List *
+_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
+{
+   Evas_Object *smart_parent, *crtc;
+   Eina_List *crtcs, *iter, *neighbors = NULL;
+   Eina_Rectangle geo, neighbor_geo;
+   E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data, *neighbor_info;
+
+   smart_parent = evas_object_smart_parent_get(obj);
+   crtcs = evas_object_smart_members_get(smart_parent);
+
+   EINA_SAFETY_ON_FALSE_RETURN_VAL((dialog_data = evas_object_data_get(obj, "output_info")), NULL);
+   evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h);
+   EINA_LIST_FOREACH(crtcs, iter, crtc)
+     {
+        if ((crtc == obj)
+            || (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper)) continue;
+        evas_object_geometry_get(crtc, &neighbor_geo.x, &neighbor_geo.y, &neighbor_geo.w, &neighbor_geo.h);
+        if (!(neighbor_info = evas_object_data_get(crtc, "output_info"))) continue;
+        if (!neighbor_info->previous_mode) continue;
+
+        if (((geo.x + geo.w) == neighbor_geo.x)
+            || (geo.x == (neighbor_geo.x + neighbor_geo.w))
+            || (geo.x == neighbor_geo.x)
+            || ((geo.x + geo.w) == (neighbor_geo.x + neighbor_geo.w))
+            || ((geo.y + geo.h) == neighbor_geo.y)
+            || (geo.y == (neighbor_geo.y + neighbor_geo.h))
+            || (geo.y == neighbor_geo.y)
+            || ((geo.y + geo.h) == (neighbor_geo.y + neighbor_geo.h)))
+          {
+             neighbors = eina_list_append(neighbors, crtc);
+          }
+     }
+
+   return neighbors;
+}
+
+static void
+_dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
+{
+   Eina_List *neighbors, *iter;
+   Evas_Object *smart_parent, *crtc;
+   E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data, *neighbor_info;
+   Eina_Rectangle geo, neighbor_geo, smart_geo;
+
+   // Each object is seen as a tree. All its edges are compared to their
+   // neighbors and wandered recusively.
+   EINA_SAFETY_ON_NULL_RETURN(obj);
+
+   smart_parent = e_config_runtime_info->gui.subdialogs.arrangement.smart_parent;
+   evas_object_geometry_get(smart_parent, &smart_geo.x, &smart_geo.y, &smart_geo.w, &smart_geo.h);
+   //fprintf(stderr, "CONF_RANDR: Smart Parent is at %dx%d\n", smart_geo.x, smart_geo.y);
+   neighbors = _dialog_subdialog_arrangement_neighbors_get(obj);
+
+   EINA_SAFETY_ON_FALSE_RETURN((dialog_data = evas_object_data_get(obj, "output_info")));
+   evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h);
+
+   //fprintf(stderr, "CONF_RANDR: Traversed element (%p) is at %dx%d\n", obj, geo.x, geo.y);
+   if (geo.x == e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.x) dialog_data->new_pos.x = 0;
+   if (geo.y == e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.y) dialog_data->new_pos.y = 0;
+
+   if ((dialog_data->new_pos.x != 0) || (dialog_data->new_pos.y != 0))
+     {
+        // Find neighbor object we can calculate our own coordinates from
+        EINA_LIST_FOREACH(neighbors, iter, crtc)
+          {
+             evas_object_geometry_get(crtc, &neighbor_geo.x, &neighbor_geo.y, &neighbor_geo.w, &neighbor_geo.h);
+             if (!(neighbor_info = evas_object_data_get(crtc, "output_info"))) continue;
+
+             evas_object_geometry_get(crtc, &neighbor_geo.x, &neighbor_geo.y, &neighbor_geo.w, &neighbor_geo.h);
+
+             if ((dialog_data->new_pos.x == Ecore_X_Randr_Unset) && (neighbor_info->new_pos.x != Ecore_X_Randr_Unset))
+               {
+                  if ((geo.x + geo.w) == neighbor_geo.x)
+                    {
+                       dialog_data->new_pos.x = neighbor_info->new_pos.x - dialog_data->previous_mode->width;
+                    }
+
+                  if (geo.x == (neighbor_geo.x + neighbor_geo.w))
+                    {
+                       dialog_data->new_pos.x = neighbor_info->new_pos.x + neighbor_info->previous_mode->width;
+                    }
+
+                  if (geo.x == neighbor_geo.x)
+                    {
+                       dialog_data->new_pos.x = neighbor_info->new_pos.x;
+                    }
+
+                  if ((geo.x + geo.w) == (neighbor_geo.x + neighbor_geo.w))
+                    {
+                       dialog_data->new_pos.x = (neighbor_info->new_pos.x + neighbor_info->previous_mode->width) - dialog_data->previous_mode->width;
+                    }
+               }
+
+             if ((dialog_data->new_pos.y == Ecore_X_Randr_Unset) && (neighbor_info->new_pos.y != Ecore_X_Randr_Unset))
+               {
+                  if ((geo.y + geo.h) == neighbor_geo.y)
+                    {
+                       dialog_data->new_pos.y = neighbor_info->new_pos.y - dialog_data->previous_mode->height;
+                    }
+
+                  if (geo.y == (neighbor_geo.y + neighbor_geo.h))
+                    {
+                       dialog_data->new_pos.y = neighbor_info->new_pos.y + neighbor_info->previous_mode->height;
+                    }
+
+                  if (geo.y == neighbor_geo.y)
+                    {
+                       dialog_data->new_pos.y = neighbor_info->new_pos.y;
+                    }
+
+                  if ((geo.y + geo.h) == (neighbor_geo.y + neighbor_geo.h))
+                    {
+                       dialog_data->new_pos.y = (neighbor_info->new_pos.y + neighbor_info->previous_mode->height) - dialog_data->previous_mode->height;
+                    }
+               }
+             if ((dialog_data->new_pos.x != Ecore_X_Randr_Unset)
+                 && (dialog_data->new_pos.y != Ecore_X_Randr_Unset))
+               {
+                  //fprintf(stderr, "CONF_RANDR: Determined position for %p: %dx%d\n", obj, dialog_data->new_pos.x, dialog_data->new_pos.y);
+                  break;
+               }
+          }
+     }
+   if ((dialog_data->new_pos.x != Ecore_X_Randr_Unset) || (dialog_data->new_pos.y != Ecore_X_Randr_Unset))
+     {
+        //Only wander all neighbors recursively, if they can use the current
+        //element as reference for their position
+        EINA_LIST_FOREACH(neighbors, iter, crtc)
+          {
+             neighbor_info = evas_object_data_get(crtc, "output_info");
+             if ((neighbor_info->new_pos.x == Ecore_X_Randr_Unset)
+                 || (neighbor_info->new_pos.y == Ecore_X_Randr_Unset))
+               {
+                  //fprintf(stderr, "CONF_RANDR: Now going to travel %p.\n", crtc);
+                  _dialog_subdialog_arrangement_determine_positions_recursive(crtc);
+               }
+          }
+     }
+   eina_list_free(neighbors);
+}
+
+Eina_Bool
+dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   Eina_List *crtcs, *iter;
+   Evas_Object *smart_parent, *crtc, *top_left = NULL;
+   Eina_Rectangle geo, smart_geo;
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Evas_Coord_Point relz = { .x = 10000, .y = 10000};
+   Eina_Bool arrangement_failed = EINA_FALSE;
+
+   smart_parent = e_config_runtime_info->gui.subdialogs.arrangement.smart_parent;
+   evas_object_geometry_get(smart_parent, &smart_geo.x, &smart_geo.y, &smart_geo.w, &smart_geo.h);
+   crtcs = evas_object_smart_members_get(smart_parent);
+
+   //Create virtual borders around the displayed representations by finding
+   //relative x and y as virtual 0x0
+   EINA_LIST_FOREACH(crtcs, iter, crtc)
+     {
+        if (crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper) continue;
+        //Already reset values for upcoming calculation
+        if (!(odd = evas_object_data_get(crtc, "output_info"))) continue;
+        odd->new_pos.x = Ecore_X_Randr_Unset;
+        odd->new_pos.y = Ecore_X_Randr_Unset;
+        odd = NULL;
+
+        //See whether this element is closer to 0x0 than any before
+        evas_object_geometry_get(crtc, &geo.x, &geo.y, &geo.w, &geo.h);
+        if (geo.x < relz.x)
+          {
+             relz.x = geo.x;
+             top_left = crtc;
+          }
+        if (geo.y < relz.y)
+          {
+             relz.y = geo.y;
+             top_left = crtc;
+          }
+     }
+   e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.x = relz.x;
+   e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.y = relz.y;
+   if (top_left) _dialog_subdialog_arrangement_determine_positions_recursive(top_left);
+
+   EINA_LIST_FOREACH(crtcs, iter, crtc)
+     {
+        if ((crtc == e_config_runtime_info->gui.subdialogs.arrangement.clipper) || !(odd = evas_object_data_get(crtc, "output_info")) || !odd->crtc
+            || ((odd->new_pos.x == Ecore_X_Randr_Unset) || (odd->new_pos.y == Ecore_X_Randr_Unset))) continue;
+        if ((odd->previous_pos.x != odd->new_pos.x) || (odd->previous_pos.y != odd->new_pos.y))
+          {
+             fprintf(stderr, "CONF_RANDR: CRTC %x is moved to %dx%d\n", odd->crtc->xid, odd->new_pos.x, odd->new_pos.y);
+             if (!ecore_x_randr_crtc_pos_set(cfd->con->manager->root, odd->crtc->xid, odd->new_pos.x, odd->new_pos.y))
+               {
+                  arrangement_failed = EINA_TRUE;
+                  break;
+               }
+          }
+     }
+   if (arrangement_failed)
+     return EINA_FALSE;
+   else
+     {
+        ecore_x_randr_screen_reset(cfd->con->manager->root);
+        return EINA_TRUE;
+     }
+}
+
+Eina_Bool
+dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   Eina_List *iter;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, output_dialog_data)
+     {
+        if ((output_dialog_data->previous_pos.x != output_dialog_data->new_pos.x)
+            || (output_dialog_data->previous_pos.y != output_dialog_data->new_pos.y)
+            ) return EINA_TRUE;
+     }
+   return EINA_FALSE;
+}
+
+void
+dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd->crtc || ((odd->new_pos.x == Ecore_X_Randr_Unset) || (odd->new_pos.y == Ecore_X_Randr_Unset))) continue;
+        odd->previous_pos.x = odd->new_pos.x;
+        odd->previous_pos.y = odd->new_pos.y;
+        odd->new_pos.x = Ecore_X_Randr_Unset;
+        odd->new_pos.y = Ecore_X_Randr_Unset;
+     }
+}
+
+void
+dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd->crtc || ((odd->previous_pos.x == Ecore_X_Randr_Unset) || (odd->previous_pos.y == Ecore_X_Randr_Unset))) continue;
+        if (ecore_x_randr_crtc_pos_set(cfdata->manager->root, odd->crtc->xid, odd->previous_pos.x, odd->previous_pos.y))
+          {
+             odd->new_pos.x = odd->previous_pos.x;
+             odd->new_pos.y = odd->previous_pos.y;
+             odd->previous_pos.x = Ecore_X_Randr_Unset;
+             odd->previous_pos.y = Ecore_X_Randr_Unset;
+             ecore_x_randr_screen_reset(cfdata->manager->root);
+          }
+     }
+}
+
diff --git a/src/modules/conf_randr/e_int_config_randr_orientation.c b/src/modules/conf_randr/e_int_config_randr_orientation.c
new file mode 100644 (file)
index 0000000..eda1746
--- /dev/null
@@ -0,0 +1,342 @@
+#include "e_int_config_randr.h"
+#include "e_randr.h"
+
+#ifndef  Ecore_X_Randr_Unset
+#define Ecore_X_Randr_Unset          -1
+#endif
+
+#define RANDR_DIALOG_ORIENTATION_ALL (ECORE_X_RANDR_ORIENTATION_ROT_0 | ECORE_X_RANDR_ORIENTATION_ROT_90 | ECORE_X_RANDR_ORIENTATION_ROT_180 | ECORE_X_RANDR_ORIENTATION_ROT_270 | ECORE_X_RANDR_ORIENTATION_ROT_270 | ECORE_X_RANDR_ORIENTATION_FLIP_X | ECORE_X_RANDR_ORIENTATION_FLIP_Y)
+
+Eina_Bool    dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata);
+Evas_Object *dialog_subdialog_orientation_basic_create_widgets(Evas *canvas);
+Eina_Bool    dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool    dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool    dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+void         dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
+void         dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
+
+//static void _dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+extern E_Config_Dialog_Data *e_config_runtime_info;
+extern char _theme_file_path[];
+
+/*
+   static void
+   _dialog_subdialog_orientation_radio_add_callbacks(void)
+   {
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
+   }
+ */
+
+Eina_Bool
+dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   E_Randr_Crtc_Info *ci;
+   Eina_List *iter;
+
+   if (!cfdata || !cfdata->output_dialog_data_list) return EINA_FALSE;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        ci = odd->crtc;
+        if (!ci || !ci->current_mode) continue;
+        odd->new_orientation = Ecore_X_Randr_Unset;
+        odd->previous_orientation = ci->current_orientation;
+     }
+
+   return EINA_TRUE;
+}
+
+Evas_Object *
+dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
+{
+   Evas_Object *subdialog;
+   E_Radio_Group *rg;
+   //char signal[29];
+
+   if (!canvas || !e_config_runtime_info) return NULL;
+   if (e_config_runtime_info->gui.subdialogs.orientation.dialog) return e_config_runtime_info->gui.subdialogs.orientation.dialog;
+
+   if (!(subdialog = e_widget_framelist_add(canvas, _("Display Orientation"), EINA_FALSE))) return NULL;
+
+   // Add radio buttons
+   if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.orientation.radio_val))) goto _dialog_subdialog_orientation_radio_add_fail;
+
+   //IMPROVABLE: use enum to determine objects via 'switch'-statement
+   e_config_runtime_info->gui.subdialogs.orientation.radio_normal = e_widget_radio_add(canvas, _("Normal"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_normal);
+
+   e_config_runtime_info->gui.subdialogs.orientation.radio_rot90 = e_widget_radio_add(canvas, _("Rotated, 90°"), ECORE_X_RANDR_OUTPUT_POLICY_RIGHT, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_rot90);
+
+   e_config_runtime_info->gui.subdialogs.orientation.radio_rot180 = e_widget_radio_add(canvas, _("Rotated, 180°"), ECORE_X_RANDR_OUTPUT_POLICY_BELOW, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_rot180);
+
+   e_config_runtime_info->gui.subdialogs.orientation.radio_rot270 = e_widget_radio_add(canvas, _("Rotated, 270°"), ECORE_X_RANDR_OUTPUT_POLICY_LEFT, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_rot270);
+
+   e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal = e_widget_radio_add(canvas, _("Flipped, horizontally"), ECORE_X_RANDR_OUTPUT_POLICY_CLONE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal);
+
+   e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical = e_widget_radio_add(canvas, _("Flipped, vertically"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical);
+
+   //_dialog_subdialog_orientation_radio_add_callbacks();
+
+   /*
+      // Add orientation demonstration edje
+      if (!(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje = edje_object_add(canvas)))
+      goto _dialog_subdialog_orientation_edje_add_fail;
+      if (!edje_object_file_set(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/orientation"))
+      goto _dialog_subdialog_orientation_edje_set_fail;
+
+      e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
+    */
+
+   //disable widgets, if no CRTC is selected
+   dialog_subdialog_orientation_update_radio_buttons(e_config_runtime_info->gui.selected_eo);
+
+   //evas_object_show(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
+
+   return subdialog;
+
+   /*
+      _dialog_subdialog_orientation_edje_set_fail:
+      evas_object_del(ol);
+      evas_object_del(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
+      _dialog_subdialog_orientation_edje_add_fail:
+      fprintf(stderr, "CONF_RANDR: Couldn't set edj for orientation subdialog!\n");
+      evas_object_del(subdialog);
+      return NULL;
+    */
+_dialog_subdialog_orientation_radio_add_fail:
+   evas_object_del(subdialog);
+   fprintf(stderr, "CONF_RANDR: Could not add radio group!\n");
+   return NULL;
+}
+
+#if 0
+static void
+_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   char signal[40];
+   int orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
+
+   /*
+    * IMPROVABLE:
+    * "sadly" the evas callbacks are called before radio_val is set to its new
+    * value. If that is ever changed, remove the used code below and just use the
+    * 1-liner below.
+    * snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,%d", e_config_runtime_info->gui.subdialogs.orientation.radio_val);
+    */
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_normal) orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot90) orientation = ECORE_X_RANDR_ORIENTATION_ROT_90;
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot180) orientation = ECORE_X_RANDR_ORIENTATION_ROT_180;
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot270) orientation = ECORE_X_RANDR_ORIENTATION_ROT_270;
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal) orientation = ECORE_X_RANDR_ORIENTATION_FLIP_X;
+   if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical) orientation = ECORE_X_RANDR_ORIENTATION_FLIP_Y;
+
+   snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,%d", orientation);
+
+   edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje, signal, "e");
+
+   fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to orientation: %s\n", signal);
+}
+
+#endif
+
+void
+dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   Ecore_X_Randr_Orientation supported_oris, ori;
+
+   //disable widgets, if no crtc is selected
+   if (!crtc)
+     {
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EINA_TRUE);
+        return;
+     }
+
+   if (!(output_dialog_data = evas_object_data_get(crtc, "output_info"))) return;
+
+   if (output_dialog_data->crtc)
+     {
+        //enabled monitor
+        supported_oris = output_dialog_data->crtc->orientations;
+        ori = output_dialog_data->crtc->current_orientation;
+     }
+   else
+     {
+        //disabled monitor
+        //assume all orientations are supported
+        supported_oris = RANDR_DIALOG_ORIENTATION_ALL;
+        ori = ECORE_X_RANDR_ORIENTATION_ROT_0;
+     }
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_ROT_0)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EINA_TRUE);
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_ROT_90)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EINA_TRUE);
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_ROT_180)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EINA_TRUE);
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_ROT_270)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EINA_TRUE);
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_FLIP_X)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EINA_TRUE);
+
+   if (supported_oris & ECORE_X_RANDR_ORIENTATION_FLIP_Y)
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EINA_FALSE);
+   else
+     e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EINA_TRUE);
+
+   //toggle the switch of the currently used orientation
+   switch (ori)
+     {
+      case ECORE_X_RANDR_ORIENTATION_ROT_90:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_ORIENTATION_ROT_180:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_ORIENTATION_ROT_270:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_ORIENTATION_FLIP_X:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_ORIENTATION_FLIP_Y:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EINA_TRUE);
+        break;
+
+      default: //== ECORE_X_RANDR_ORIENTATION_ROT_0:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EINA_TRUE);
+     }
+}
+
+void
+dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   Ecore_X_Randr_Orientation supported_oris, ori;
+   char signal[40];
+
+   if (!e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(crtc, "output_info"))) return;
+
+   if (output_dialog_data->crtc)
+     {
+        //enabled monitor
+        supported_oris = output_dialog_data->crtc->orientations;
+        ori = output_dialog_data->crtc->current_orientation;
+     }
+   else
+     {
+        //disabled monitor
+        //assume all orientations are supported
+        supported_oris = RANDR_DIALOG_ORIENTATION_ALL;
+        ori = ECORE_X_RANDR_ORIENTATION_ROT_0;
+     }
+   //Send signal to the edje, to represent the supported and current set orientation
+   snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,supported,%d", supported_oris);
+   edje_object_signal_emit(crtc, signal, "e");
+   snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,current,%d", ori);
+   edje_object_signal_emit(crtc, signal, "e");
+}
+
+Eina_Bool
+dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   Ecore_X_Randr_Orientation orientation;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+
+   if (!e_config_runtime_info->gui.subdialogs.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info")) || !output_dialog_data->crtc) return EINA_FALSE;
+
+   orientation = e_config_runtime_info->gui.subdialogs.orientation.radio_val;
+
+   fprintf(stderr, "CONF_RANDR: Change orientation of crtc %x to %d.\n", output_dialog_data->crtc->xid, orientation);
+
+   if (ecore_x_randr_crtc_orientation_set(cfd->con->manager->root, output_dialog_data->crtc->xid, orientation))
+     {
+        ecore_x_randr_screen_reset(cfd->con->manager->root);
+        output_dialog_data->previous_orientation = output_dialog_data->new_orientation;
+        output_dialog_data->new_orientation = orientation;
+        return EINA_TRUE;
+     }
+   else
+     return EINA_FALSE;
+}
+
+Eina_Bool
+dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+
+   if (!e_config_runtime_info->gui.subdialogs.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE;
+
+   return (int)output_dialog_data->previous_orientation != (int)e_config_runtime_info->gui.subdialogs.orientation.radio_val;
+}
+
+void
+dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue;
+        odd->previous_orientation = odd->new_orientation;
+        odd->new_orientation = Ecore_X_Randr_Unset;
+     }
+}
+
+void
+dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd->crtc || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue;
+        if (ecore_x_randr_crtc_orientation_set(cfdata->manager->root, odd->crtc->xid, odd->previous_orientation))
+          {
+             odd->new_orientation = odd->previous_orientation;
+             odd->previous_orientation = Ecore_X_Randr_Unset;
+             ecore_x_randr_screen_reset(cfdata->manager->root);
+          }
+     }
+}
+
diff --git a/src/modules/conf_randr/e_int_config_randr_policies.c b/src/modules/conf_randr/e_int_config_randr_policies.c
new file mode 100644 (file)
index 0000000..6329b74
--- /dev/null
@@ -0,0 +1,307 @@
+#include "e_int_config_randr.h"
+#include "e_randr.h"
+
+#ifndef  ECORE_X_RANDR_1_2
+#define ECORE_X_RANDR_1_2   ((1 << 16) | 2)
+#endif
+#ifndef  ECORE_X_RANDR_1_3
+#define ECORE_X_RANDR_1_3   ((1 << 16) | 3)
+#endif
+
+#ifndef  Ecore_X_Randr_Unset
+#define Ecore_X_Randr_Unset -1
+#endif
+
+Evas_Object *dialog_subdialog_policies_basic_create_widgets(Evas *canvas);
+Eina_Bool    dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool    dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool    dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+void         dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
+
+static void  _dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+extern E_Config_Dialog_Data *e_config_runtime_info;
+extern char _theme_file_path[];
+
+/*
+   static void
+   _dialog_subdialog_policies_radio_add_callbacks(void)
+   {
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_none, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_left, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_below, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_above, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_right, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
+   }
+ */
+
+Eina_Bool
+dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_info)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!e_config_runtime_info || !e_config_runtime_info->output_dialog_data_list) return EINA_FALSE;
+
+   EINA_LIST_FOREACH(e_config_runtime_info->output_dialog_data_list, iter, odd)
+     {
+        E_Randr_Output_Info *oi;
+        if (odd->crtc)
+          oi = eina_list_data_get(eina_list_last(odd->crtc->outputs));
+        else if (odd->output)
+          oi = odd->output;
+        else continue;
+        odd->previous_policy = oi->policy;
+        odd->new_policy = Ecore_X_Randr_Unset;
+     }
+
+   return EINA_TRUE;
+}
+
+Evas_Object *
+dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
+{
+   Evas_Object *subdialog;
+   E_Radio_Group *rg;
+   //char signal[29];
+
+   if (!canvas || !e_config_runtime_info) return NULL;
+
+   if (e_config_runtime_info->gui.subdialogs.policies.dialog) return e_config_runtime_info->gui.subdialogs.policies.dialog;
+
+   if (!(subdialog = e_widget_framelist_add(canvas, _("Screen attachement policy"), EINA_FALSE))) return NULL;
+
+   // Add radio buttons
+   if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.policies.radio_val))) goto _dialog_subdialog_policies_radio_add_fail;
+
+   //IMPROVABLE: use enum to determine objects via 'switch'-statement
+   e_config_runtime_info->gui.subdialogs.policies.radio_above = e_widget_radio_add(canvas, _("Above"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_above);
+
+   e_config_runtime_info->gui.subdialogs.policies.radio_right = e_widget_radio_add(canvas, _("Right"), ECORE_X_RANDR_OUTPUT_POLICY_RIGHT, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_right);
+
+   e_config_runtime_info->gui.subdialogs.policies.radio_below = e_widget_radio_add(canvas, _("Below"), ECORE_X_RANDR_OUTPUT_POLICY_BELOW, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_below);
+
+   e_config_runtime_info->gui.subdialogs.policies.radio_left = e_widget_radio_add(canvas, _("Left"), ECORE_X_RANDR_OUTPUT_POLICY_LEFT, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_left);
+
+   e_config_runtime_info->gui.subdialogs.policies.radio_clone = e_widget_radio_add(canvas, _("Clone display content"), ECORE_X_RANDR_OUTPUT_POLICY_CLONE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_clone);
+
+   e_config_runtime_info->gui.subdialogs.policies.radio_none = e_widget_radio_add(canvas, _("No reaction"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
+   e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_none);
+
+   //_dialog_subdialog_policies_radio_add_callbacks();
+
+   /*
+      // Add policies demonstration edje
+      if (!(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje = edje_object_add(canvas)))
+      {
+        goto _dialog_subdialog_policies_edje_add_fail;
+
+      }
+      if (!edje_object_file_set(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/policies"))
+      {
+        goto _dialog_subdialog_policies_edje_set_fail;
+      }
+
+      e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
+    */
+
+   /*
+      evas_object_show(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje);
+
+      //emit signal to edje so a demonstration can be shown
+      snprintf(signal, sizeof(signal), "conf,randr,dialog,policies,%d", e_randr_screen_info->rrvd_info.randr_info_12->output_policy);
+      edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, signal, "e");
+      fprintf(stderr, "CONF_RANDR: Initial signal emitted to policy dialog: %s\n", signal);
+
+      //Use theme's background as screen representation
+      e_config_runtime_info->gui.subdialogs.policies.new_display = edje_object_add(canvas);
+      e_theme_edje_object_set(e_config_runtime_info->gui.subdialogs.policies.new_display, "base/theme/widgets", "e/widgets/frame");
+      e_config_runtime_info->gui.subdialogs.policies.new_display_background = edje_object_add(canvas);
+      e_theme_edje_object_set(e_config_runtime_info->gui.subdialogs.policies.new_display_background, "base/theme/background", "e/desktop/background");
+      edje_object_part_swallow(e_config_runtime_info->gui.subdialogs.policies.new_display, "e.swallow.content", e_config_runtime_info->gui.subdialogs.policies.new_display_background);
+      edje_object_part_text_set(e_config_runtime_info->gui.subdialogs.policies.new_display, "e.text.label", _("New display"));
+      edje_object_part_swallow(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, "new_display.swallow.content", e_config_runtime_info->gui.subdialogs.policies.new_display);
+      //add theme's frame
+      //for now use the theme's background for the new display as well
+      e_config_runtime_info->gui.subdialogs.policies.current_displays_setup = edje_object_add(canvas);
+      e_theme_edje_object_set(e_config_runtime_info->gui.subdialogs.policies.current_displays_setup, "base/theme/widgets", "e/widgets/frame");
+      e_config_runtime_info->gui.subdialogs.policies.current_displays_setup_background = edje_object_add(canvas);
+      e_theme_edje_object_set(e_config_runtime_info->gui.subdialogs.policies.current_displays_setup_background, "base/theme/background", "e/desktop/background");
+      edje_object_part_swallow(e_config_runtime_info->gui.subdialogs.policies.current_displays_setup, "e.swallow.content", e_config_runtime_info->gui.subdialogs.policies.current_displays_setup_background);
+      edje_object_part_text_set(e_config_runtime_info->gui.subdialogs.policies.current_displays_setup, "e.text.label", _("Used display"));
+      edje_object_part_swallow(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, "current_displays_setup.swallow.content", e_config_runtime_info->gui.subdialogs.policies.current_displays_setup);
+    */
+
+   evas_object_show(subdialog);
+
+   return subdialog;
+
+   /*
+      _dialog_subdialog_policies_edje_set_fail:
+      evas_object_del(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje);
+      _dialog_subdialog_policies_edje_add_fail:
+      fprintf(stderr, "CONF_RANDR: Couldn't set edj for policies subdialog!\n");
+      evas_object_del(subdialog);
+      return NULL;
+    */
+_dialog_subdialog_policies_radio_add_fail:
+   evas_object_del(subdialog);
+   return NULL;
+}
+
+static void
+_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   char signal[29];
+   int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
+
+   /*
+    * IMPROVABLE:
+    * "sadly" the evas callbacks are called before radio_val is set to its new
+    * value. If that is ever changed, remove the used code below and just use the
+    * 1-liner below.
+    * snprintf(signal, sizeof(signal), "conf,randr,dialog,policies,%d", e_config_runtime_info->gui.subdialogs.policies.radio_val);
+    */
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_above) policy = ECORE_X_RANDR_OUTPUT_POLICY_ABOVE;
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_right) policy = ECORE_X_RANDR_OUTPUT_POLICY_RIGHT;
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_below) policy = ECORE_X_RANDR_OUTPUT_POLICY_BELOW;
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_left) policy = ECORE_X_RANDR_OUTPUT_POLICY_LEFT;
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_clone) policy = ECORE_X_RANDR_OUTPUT_POLICY_CLONE;
+   if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_none) policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
+
+   snprintf(signal, sizeof(signal), "conf,randr,dialog,policies,%d", policy);
+
+   //edje_object_signal_emit(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, signal, "e");
+
+   fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to policy: %s\n", signal);
+}
+
+Eina_Bool
+dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   if (!e_randr_screen_info || !e_config_runtime_info->gui.selected_output_dd) return EINA_FALSE;
+
+   //policy update
+   e_config_runtime_info->gui.selected_output_dd->previous_policy = e_config_runtime_info->gui.selected_output_dd->new_policy;
+   e_config_runtime_info->gui.selected_output_dd->new_policy = e_config_runtime_info->gui.subdialogs.policies.radio_val;
+   fprintf(stderr, "CONF_RANDR: 'New display attached'-policy set to %d\n", e_config_runtime_info->gui.selected_output_dd->new_policy);
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE;
+
+   return (int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val;
+}
+
+void
+dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   E_Randr_Output_Info *output = NULL;
+   Ecore_X_Randr_Output_Policy policy;
+
+   //disable widgets, if no crtc is selected
+   if (!crtc || !(output_dialog_data = evas_object_data_get(crtc, "output_info")))
+     {
+        //Evas_Object *radio_above, *radio_right, *radio_below, *radio_left, *radio_clone, *radio_none;
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_above, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_right, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_below, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_left, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EINA_TRUE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_none, EINA_TRUE);
+        return;
+     }
+   else
+     {
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_above, EINA_FALSE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_right, EINA_FALSE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_below, EINA_FALSE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_left, EINA_FALSE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EINA_FALSE);
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.policies.radio_none, EINA_FALSE);
+     }
+
+   if (output_dialog_data->crtc && output_dialog_data->crtc->outputs)
+     {
+        output = (E_Randr_Output_Info *)eina_list_data_get(eina_list_last(output_dialog_data->crtc->outputs));
+     }
+   else if (output_dialog_data->output)
+     {
+        output = output_dialog_data->output;
+     }
+
+   if (!output) return;
+   policy = output->policy;
+   e_config_runtime_info->gui.selected_output_dd = output_dialog_data;
+   //toggle the switch of the currently used policies
+   switch (policy)
+     {
+      case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_right, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_OUTPUT_POLICY_BELOW:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_below, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_left, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EINA_TRUE);
+        break;
+
+      case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_none, EINA_TRUE);
+        break;
+
+      default: //== ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
+        e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_above, EINA_TRUE);
+     }
+}
+
+void
+dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue;
+        odd->previous_policy = odd->new_policy;
+        if (odd->output)
+          odd->output->policy = odd->new_policy;
+        odd->new_policy = Ecore_X_Randr_Unset;
+     }
+}
+
+void
+dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (!odd->crtc || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue;
+        odd->new_policy = odd->previous_policy;
+        odd->previous_policy = Ecore_X_Randr_Unset;
+     }
+}
+
diff --git a/src/modules/conf_randr/e_int_config_randr_resolutions.c b/src/modules/conf_randr/e_int_config_randr_resolutions.c
new file mode 100644 (file)
index 0000000..3b60459
--- /dev/null
@@ -0,0 +1,264 @@
+#include "e_int_config_randr.h"
+#include "e_randr.h"
+#include "e_widget_ilist.h"
+
+#ifdef  Ecore_X_Randr_Unset
+#undef  Ecore_X_Randr_Unset
+#define Ecore_X_Randr_Unset -1
+#else
+#define Ecore_X_Randr_Unset -1
+#endif
+
+#ifdef  Ecore_X_Randr_None
+#undef  Ecore_X_Randr_None
+#endif
+#define Ecore_X_Randr_None        0
+
+#define ICON_WIDTH                10
+#define ICON_HEIGHT               10
+#define RESOLUTION_TXT_MAX_LENGTH 50
+
+Evas_Object *dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas);
+Eina_Bool    dialog_subdialog_resolutions_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+Eina_Bool    dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+void         dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
+void         dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata);
+void         dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata);
+
+extern E_Config_Dialog_Data *e_config_runtime_info;
+
+Eina_Bool
+dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Ecore_X_Randr_Mode_Info *mi;
+   Eina_List *iter;
+
+   if (!cfdata || !cfdata->output_dialog_data_list) return EINA_FALSE;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (odd->previous_mode || odd->preferred_mode)
+          {
+             //this means, that mode info is already filled
+             //(by the display arrangement code)
+             break;
+          }
+        if (odd->crtc)
+          {
+             if (!(mi = odd->crtc->current_mode))
+               mi = (Ecore_X_Randr_Mode_Info *)eina_list_data_get(eina_list_last(odd->crtc->outputs_common_modes));
+             odd->previous_mode = mi;
+          }
+        else if (odd->output)
+          {
+             odd->preferred_mode = (Ecore_X_Randr_Mode_Info *)eina_list_data_get(eina_list_last(odd->output->preferred_modes));
+          }
+     }
+
+   return EINA_TRUE;
+}
+
+Evas_Object *
+dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
+{
+   Evas_Object *subdialog;
+
+   if (!canvas || !e_config_runtime_info || e_config_runtime_info->gui.subdialogs.resolutions.dialog || !(subdialog = e_widget_ilist_add(canvas, ICON_WIDTH * e_scale, ICON_HEIGHT * e_scale, NULL))) return NULL;
+
+   e_widget_ilist_multi_select_set(subdialog, EINA_FALSE);
+   e_widget_disabled_set(subdialog, EINA_TRUE);
+
+   evas_object_show(subdialog);
+
+   return subdialog;
+}
+
+Eina_Bool
+dialog_subdialog_resolutions_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   //Apply new mode
+   Ecore_X_Randr_Mode_Info *selected_mode;
+   Ecore_X_ID selected_mode_xid;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   Ecore_X_Randr_Output *output = NULL;
+   E_Randr_Crtc_Info *crtc_info = NULL, *crtc_iter;
+   Eina_List *iter;
+   int noutputs = Ecore_X_Randr_Unset;
+
+   if (!e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info")))
+     {
+        fprintf(stderr, "CONF_RADNR: no crtc was selected or no output info could be retrieved for the selected crtc element (%p).\n", e_config_runtime_info->gui.selected_eo);
+        return EINA_FALSE;
+     }
+
+   if (output_dialog_data->crtc)
+     {
+        //CRTC is already asssigned, easy one!
+        crtc_info = output_dialog_data->crtc;
+     }
+   else if (output_dialog_data->output)
+     {
+        //CRTC not assigned yet. Let's try to find a non occupied one.
+        fprintf(stderr, "CONF_RANDR: Trying to find a CRTC for output %x, %d crtcs are possible.\n", output_dialog_data->output->xid, eina_list_count(output_dialog_data->output->possible_crtcs));
+        output = &output_dialog_data->output->xid;
+        noutputs = 1;
+        EINA_LIST_FOREACH(output_dialog_data->output->possible_crtcs, iter, crtc_iter)
+          {
+             if (!crtc_iter->outputs)
+               {
+                  //CRTC is not occupied yet
+                  crtc_info = crtc_iter;
+                  break;
+               }
+          }
+     }
+   if (!crtc_info)
+     {
+        fprintf(stderr, "CONF_RANDR: Changing mode failed, no unoccupied CRTC found!\n");
+        return EINA_FALSE;
+     }
+   //get selected mode
+   if ((selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.subdialogs.resolutions.dialog)))
+     {
+        selected_mode_xid = selected_mode->xid;
+     }
+   else
+     {
+        selected_mode_xid = Ecore_X_Randr_None;
+     }
+
+   fprintf(stderr, "CONF_RANDR: Change mode of crtc %x to %x.\n", crtc_info->xid, selected_mode_xid);
+
+   if (ecore_x_randr_crtc_mode_set(cfd->con->manager->root, crtc_info->xid, output, noutputs, selected_mode_xid))
+     {
+        //remove unused space
+        ecore_x_randr_screen_reset(cfd->con->manager->root);
+        //update information
+        if (!output_dialog_data->crtc)
+          output_dialog_data->crtc = crtc_info;
+        output_dialog_data->new_mode = selected_mode;
+        return EINA_TRUE;
+     }
+
+   return EINA_FALSE;
+}
+
+Eina_Bool
+dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
+{
+   Ecore_X_Randr_Mode_Info *selected_mode;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+
+   if (!e_config_runtime_info->gui.selected_eo || !(selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.subdialogs.resolutions.dialog)) || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE;
+
+   return selected_mode != output_dialog_data->previous_mode;
+}
+
+void
+dialog_subdialog_resolutions_update_list(Evas_Object *crtc)
+{
+   Eina_List *iter, *modelist = NULL;
+   E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
+   Ecore_X_Randr_Mode_Info *mode_info, *current_mode;
+   char resolution_text[RESOLUTION_TXT_MAX_LENGTH];
+   float rate;
+   int str_ret, i = 0;
+
+   e_widget_ilist_freeze(e_config_runtime_info->gui.subdialogs.resolutions.dialog);
+   e_widget_ilist_clear(e_config_runtime_info->gui.subdialogs.resolutions.dialog);
+   if (!crtc)
+     {
+        e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.resolutions.dialog, EINA_TRUE);
+        return;
+     }
+   if (!(output_dialog_data = evas_object_data_get(crtc, "output_info")))
+     return;
+
+   //select correct mode list
+   if (output_dialog_data->crtc)
+     {
+        current_mode = output_dialog_data->crtc->current_mode;
+        modelist = output_dialog_data->crtc->outputs_common_modes;
+     }
+   else if (output_dialog_data->output)
+     {
+        current_mode = NULL;
+        if (output_dialog_data->output->modes)
+          modelist = output_dialog_data->output->modes;
+        else
+          modelist = output_dialog_data->output->modes;
+     }
+   EINA_LIST_FOREACH(modelist, iter, mode_info)
+     {
+        //calculate refresh rate
+        if (!mode_info) continue;
+        if (mode_info->hTotal && mode_info->vTotal)
+          rate = ((float)mode_info->dotClock /
+                  ((float)mode_info->hTotal * (float)mode_info->vTotal));
+        else
+          rate = 0.0;
+
+        str_ret = snprintf(resolution_text, RESOLUTION_TXT_MAX_LENGTH, "%dx%d@%.1fHz", mode_info->width, mode_info->height, rate);
+        if (str_ret < 0 || str_ret > (RESOLUTION_TXT_MAX_LENGTH - 1))
+          {
+             fprintf(stderr, "CONF_RANDR: Resolution text could not be created.");
+             continue;
+          }
+        e_widget_ilist_append(e_config_runtime_info->gui.subdialogs.resolutions.dialog, NULL, resolution_text, NULL, mode_info, NULL);
+
+        //select currently enabled mode
+        if (mode_info == current_mode)
+          e_widget_ilist_selected_set(e_config_runtime_info->gui.subdialogs.resolutions.dialog, i);
+        i++;
+     }
+
+   //append 'disabled' mode
+   e_widget_ilist_append(e_config_runtime_info->gui.subdialogs.resolutions.dialog, NULL, _("Disabled"), NULL, NULL, NULL);
+
+   //reenable widget
+   e_widget_disabled_set(e_config_runtime_info->gui.subdialogs.resolutions.dialog, EINA_FALSE);
+   e_widget_ilist_go(e_config_runtime_info->gui.subdialogs.resolutions.dialog);
+   e_widget_ilist_thaw(e_config_runtime_info->gui.subdialogs.resolutions.dialog);
+}
+
+void
+dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        if (odd && odd->new_mode && (odd->new_mode != odd->previous_mode))
+          {
+             odd->previous_mode = odd->new_mode;
+             odd->new_mode = NULL;
+          }
+     }
+}
+
+void
+dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata)
+{
+   E_Config_Randr_Dialog_Output_Dialog_Data *odd;
+   Eina_List *iter;
+
+   if (!cfdata) return;
+
+   EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
+     {
+        //for now, there is no way to redisable an output during discartion
+        if (!odd->crtc || !odd->previous_mode) continue;
+        //use currently used outputs (noutputs == Ecore_X_Randr_Unset)
+        if (ecore_x_randr_crtc_mode_set(cfdata->manager->root, odd->crtc->xid, NULL, Ecore_X_Randr_Unset, odd->previous_mode->xid))
+          {
+             odd->new_mode = odd->previous_mode;
+             odd->previous_mode = NULL;
+             ecore_x_randr_screen_reset(cfdata->manager->root);
+          }
+     }
+}
+
diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c
new file mode 100644 (file)
index 0000000..5fd08be
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * vim:ts=8:sw=3:sts=8:expandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/* actual module specifics */
+E_Module *conf_randr_module = NULL;
+
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+   "Settings - Screen Setup"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
+   e_configure_registry_item_add("screen/randr", 20, _("Screen Setup"), NULL, "preferences-system-screen-resolution", e_int_config_randr);
+   conf_randr_module = m;
+   e_module_delayed_set(m, 1);
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m __UNUSED__)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "screen/randr")))
+     e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/randr");
+   e_configure_registry_category_del("screen");
+   conf_randr_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m __UNUSED__)
+{
+   return 1;
+}
+
diff --git a/src/modules/conf_randr/e_mod_main.h b/src/modules/conf_randr/e_mod_main.h
new file mode 100644 (file)
index 0000000..8735ba7
--- /dev/null
@@ -0,0 +1,19 @@
+/*
+ * vim:ts=8:sw=3:sts=8:expandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_randr.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_randr.h"
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_randr/images/display-glass-shine.png b/src/modules/conf_randr/images/display-glass-shine.png
new file mode 100644 (file)
index 0000000..0f299a6
Binary files /dev/null and b/src/modules/conf_randr/images/display-glass-shine.png differ
diff --git a/src/modules/conf_randr/images/display.png b/src/modules/conf_randr/images/display.png
new file mode 100644 (file)
index 0000000..589385f
Binary files /dev/null and b/src/modules/conf_randr/images/display.png differ
diff --git a/src/modules/conf_randr/images/icon.png b/src/modules/conf_randr/images/icon.png
new file mode 100644 (file)
index 0000000..11aa540
Binary files /dev/null and b/src/modules/conf_randr/images/icon.png differ
diff --git a/src/modules/conf_randr/images/video-display.png b/src/modules/conf_randr/images/video-display.png
new file mode 100644 (file)
index 0000000..81b425f
Binary files /dev/null and b/src/modules/conf_randr/images/video-display.png differ
diff --git a/src/modules/conf_randr/module.desktop.in b/src/modules/conf_randr/module.desktop.in
new file mode 100644 (file)
index 0000000..e0b1c07
--- /dev/null
@@ -0,0 +1,32 @@
+[Desktop Entry]
+Type=Link
+Name=Settings - Screen Setup
+Name[cs]=Nastavení - rozlišení obrazovky
+Name[de]=Konfiguration - Bildschirm
+Name[eo]=Agordo - Ekrandistingivo
+Name[es]=Configuración - Resolución de pantalla
+Name[fr]=Configuration - Résolution de l'écran
+Name[hu]=Beállítások - Képernyő felbontása
+Name[it]=Configurazione - Risoluzione schermo
+Name[ja]=
+Name[pt]=
+Name[pt_BR]=
+Name[tr]=Ayarlar - Ekran Çözünürlüğü
+Name[zh_CN]=
+Name[zh_TW]=
+Icon=e-module-conf_randr
+Comment=Used to configure your screen's resolution.
+Comment[cs]=Použit k nastavení rozlišení obrazovky.
+Comment[de]=
+Comment[eo]=Agordi sian ekrandistingivon.
+Comment[es]=Usado para configurar su resolución de pantalla.
+Comment[fr]=Permet de configurer la résolution de l'écran.
+Comment[hu]=Segítségével beállíthatod a képernyőd felbontását.
+Comment[it]=Usato per configurare la risoluzione del vostro schermo.
+Comment[ja]=
+Comment[pt]=
+Comment[pt_BR]=
+Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır.
+Comment[zh_CN]=
+Comment[zh_TW]=
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_shelves/.cvsignore b/src/modules/conf_shelves/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_theme/.cvsignore b/src/modules/conf_theme/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 6d9b192..f2de490 100644 (file)
@@ -49,7 +49,8 @@ module_la_SOURCES      = e_mod_main.c \
                          e_int_config_wallpaper_import.c \
                          e_int_config_wallpaper_import.h \
                          e_int_config_wallpaper_web.c \
-                         e_int_config_wallpaper_web.h
+                         e_int_config_wallpaper_web.h \
+                         e_int_config_xsettings.c
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@ @EXCHANGE_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
index 4257745..88a914d 100644 (file)
@@ -190,7 +190,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    Eina_List *borders, *l;
    int n, sel = 0;
    char *tmp;
-   
+   const char *str;
+
    if (cfdata->border)
      tmp = strdup(cfdata->border->client.border.name);
    else
@@ -247,7 +248,10 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
                                 &(cfdata->remember_border));
        e_widget_list_object_append(o, ob, 1, 0, 0.0);
      }
-   
+
+   EINA_LIST_FREE(borders, str)
+     eina_stringshare_del(str);
+
    E_FREE(tmp);
    e_dialog_resizable_set(cfd->dia, 1);
    return o;
index 2b2ca60..152897f 100644 (file)
@@ -96,6 +96,7 @@ static const CFColor_Class_Description _color_classes_wm[] =
 };
 static const CFColor_Class_Description _color_classes_widgets[] =
 {
+  CCDESC_S("focus",                  N_("Focus")),
   CCDESC_T("button_text",            N_("Button Text")),
   CCDESC_T("button_text_disabled",   N_("Button Text Disabled")),
   CCDESC_T("check_text",             N_("Check Text")),
index f092f41..5b93c06 100644 (file)
@@ -55,6 +55,7 @@ struct _CFText_Class
 
 const E_Text_Class_Pair text_class_predefined_names[ ] = {
      {  NULL,            N_("Core")},
+     { "application",    N_("Applications")},
      { "title_bar",      N_("Title Bar")},
      { "menu_item",      N_("Menu Item")},
      { "menu_title",     N_("Menu Title")},
@@ -75,6 +76,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
      { "init_title",      N_("Splash Title")},
      { "init_text",       N_("Splash Text")},
      { "init_version",    N_("Splash Version")},
+     { "clock",           N_("Digital Clock")},
 
      {  NULL,            N_("Widgets")},
      { "entry",           N_("Entry")},
@@ -379,6 +381,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 
    e_font_apply();
    e_config_save_queue();
+   e_xsettings_config_update();
 
    /* Apply to advanced */
    EINA_LIST_FOREACH(cfdata->text_classes, next, tc)
@@ -524,6 +527,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
 
    /* Populate size list (Select current font) */
    _size_list_load(cfdata, cfdata->font_scale_list, init_size, 1);
+   _size_list_load(cfdata, cfdata->font_px_list, init_size, 0);
 }
 
 static int
@@ -581,6 +585,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
    e_config->font_hinting = cfdata->hinting;
    e_config_save_queue();
    e_canvas_rehint();
+   e_xsettings_config_update();
    return 1;
 }
 
index 9454d1d..214fdca 100644 (file)
@@ -15,11 +15,11 @@ struct _E_Config_Dialog_Data
    const char *themename;
    int overrides;
    int enable_icon_theme;
+   int match_e17_icon_theme;
    int populating;
    struct 
      {
         Evas_Object *list;
-        Evas_Object *checkbox;
         Evas_Object *preview[4]; /* same size as _icon_previews */
      } gui;
    Ecore_Idler *fill_icon_themes_delayed;
@@ -74,6 +74,7 @@ _create_data(E_Config_Dialog *cfd)
    cfdata->cfd = cfd;
    cfdata->themename = eina_stringshare_add(e_config->icon_theme);
    cfdata->overrides = e_config->icon_theme_overrides;
+   cfdata->match_e17_icon_theme = e_config->xsettings.match_e17_icon_theme;
    cfdata->enable_icon_theme = !!(e_config->icon_theme);   
    return cfdata;
 }
@@ -95,6 +96,9 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
    if (cfdata->overrides != e_config->icon_theme_overrides)
      return 1;
 
+   if (cfdata->match_e17_icon_theme != e_config->xsettings.match_e17_icon_theme)
+     return 1;
+
    if (cfdata->enable_icon_theme != !!(e_config->icon_theme))
      return 1;
 
@@ -121,6 +125,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_config->icon_theme = NULL;
    
    e_config->icon_theme_overrides = !!cfdata->overrides;
+   e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;
    e_config_save_queue();
 
    e_util_env_set("E_ICON_THEME", e_config->icon_theme);
@@ -273,9 +278,12 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_on_change_hook_set(checkbox, _icon_theme_changed, cfdata);
    e_widget_list_object_append(o, checkbox, 0, 0, 0.0);
 
+   checkbox = e_widget_check_add(evas, _("Use icon theme for applications"), 
+                                 &(cfdata->match_e17_icon_theme));
+   e_widget_list_object_append(o, checkbox, 0, 0, 0.0);
+
    checkbox = e_widget_check_add(evas, _("Icons override general theme"), 
                                  &(cfdata->overrides));
-   e_widget_on_change_hook_set(checkbox, _icon_theme_changed, cfdata);
    e_widget_list_object_append(o, checkbox, 0, 0, 0.0);
 
    e_dialog_resizable_set(cfd->dia, 1);
index e859f6c..731d925 100644 (file)
@@ -104,8 +104,8 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    ow = e_widget_label_add(evas, _("Base DPI to scale relative to"));
    cfdata->gui.basic.o_lbl = ow;
    e_widget_framelist_object_append(of, ow);
-   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f DPI"), 30, 1200, 1, 0, 
-                            NULL, &(cfdata->base_dpi), 150);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f DPI"), 30, 600, 1, 0, 
+                            NULL, &(cfdata->base_dpi), 100);
    cfdata->gui.basic.o_slider = ow;
    e_widget_framelist_object_append(of, ow);
    snprintf(buff, sizeof(buff), _("Currently %i DPI"), ecore_x_dpi_get());
@@ -179,15 +179,15 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c
    ow = e_widget_label_add(evas, buff);
    cfdata->gui.adv.dpi_lbl = ow;
    e_widget_list_object_append(o, ow, 1, 1, 0.5);
-   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f DPI"), 30, 1200, 1, 0, 
-                            NULL, &(cfdata->base_dpi), 150);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f DPI"), 30, 600, 1, 0, 
+                            NULL, &(cfdata->base_dpi), 100);
    cfdata->gui.adv.dpi_slider = ow;
    e_widget_list_object_append(o, ow, 1, 1, 0.5);
    ow = e_widget_radio_add(evas, _("Custom scaling factor"), 2, rg);
    e_widget_on_change_hook_set(ow, _adv_policy_changed, cfdata);
    e_widget_list_object_append(o, ow, 1, 1, 0.5);
-   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f times"), 0.25, 8.0, 0.05, 
-                            0, &(cfdata->factor), NULL, 150);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f x"), 0.25, 8.0, 0.05, 
+                            0, &(cfdata->factor), NULL, 100);
    cfdata->gui.adv.custom_slider = ow;
    e_widget_list_object_append(o, ow, 1, 1, 0.5);
    e_widget_toolbook_page_append(otb, NULL, _("Policy"), o, 
@@ -270,8 +270,4 @@ _adv_policy_changed(void *data, Evas_Object *obj __UNUSED__)
    e_widget_disabled_set(cfdata->gui.adv.dpi_lbl, (cfdata->use_mode != 1));
    e_widget_disabled_set(cfdata->gui.adv.dpi_slider, (cfdata->use_mode != 1));
    e_widget_disabled_set(cfdata->gui.adv.custom_slider, (cfdata->use_mode != 2));
-   e_widget_disabled_set(cfdata->gui.adv.min_lbl, (cfdata->use_mode == 0));
-   e_widget_disabled_set(cfdata->gui.adv.min_slider, (cfdata->use_mode == 0));
-   e_widget_disabled_set(cfdata->gui.adv.max_lbl, (cfdata->use_mode == 0));
-   e_widget_disabled_set(cfdata->gui.adv.max_slider, (cfdata->use_mode == 0));
 }
index 2933c81..4f49b1e 100644 (file)
@@ -36,7 +36,7 @@ struct _E_Config_Dialog_Data
    E_Dialog *dia_web;
 };
 
-static const char *parts_list[] = 
+static const char *parts_list[] =
 {
    "about:e/widgets/about/main",
      "borders:e/widgets/border/default/border",
@@ -84,9 +84,9 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    v->advanced.create_widgets = _advanced_create_widgets;
    v->override_auto_apply = 1;
    cfd = e_config_dialog_new(con,
-                            _("Theme Selector"),
-                            "E", "appearance/theme",
-                            "preferences-desktop-theme", 0, v, NULL);
+                             _("Theme Selector"),
+                             "E", "appearance/theme",
+                             "preferences-desktop-theme", 0, v, NULL);
    return cfd;
 }
 
@@ -127,7 +127,7 @@ e_int_config_theme_update(E_Config_Dialog *dia, char *file)
      e_widget_flist_path_set(cfdata->o_fm, path, "/");
 
    if (cfdata->o_preview)
-     e_widget_preview_edje_set(cfdata->o_preview, cfdata->theme, 
+     e_widget_preview_edje_set(cfdata->o_preview, cfdata->theme,
                                "e/desktop/background");
    if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
@@ -149,7 +149,7 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
    cfdata = data;
    if (!cfdata->o_fm) return;
    if (cfdata->o_up_button)
-     e_widget_disabled_set(cfdata->o_up_button, 
+     e_widget_disabled_set(cfdata->o_up_button,
                            !e_widget_flist_has_parent_get(cfdata->o_fm));
 }
 
@@ -210,7 +210,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
    p = e_widget_flist_real_path_get(cfdata->o_fm);
    if (p)
      {
-       if (strncmp(p, cfdata->theme, strlen(p))) return;
+        if (strncmp(p, cfdata->theme, strlen(p))) return;
      }
    if (!p) return;
 
@@ -219,11 +219,11 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
      p = cfdata->theme + len + 1;
    else
      {
-       len = e_prefix_data_concat_static(buf, "data/themes");
-       if (!strncmp(cfdata->theme, buf, len))
-         p = cfdata->theme + len + 1;
-       else
-         p = cfdata->theme;
+        len = e_prefix_data_concat_static(buf, "data/themes");
+        if (!strncmp(cfdata->theme, buf, len))
+          p = cfdata->theme + len + 1;
+        else
+          p = cfdata->theme;
      }
    e_widget_flist_select_set(cfdata->o_fm, p, 1);
    e_widget_flist_file_show(cfdata->o_fm, p);
@@ -262,8 +262,8 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf
    n = eina_list_next(all);
    if (!n)
      {
-       n = eina_list_prev(all);
-       if (!n) return;
+        n = eina_list_prev(all);
+        if (!n) return;
      }
 
    if (!(ic = n->data)) return;
@@ -314,27 +314,27 @@ _fill_data(E_Config_Dialog_Data *cfdata)
      cfdata->theme = eina_stringshare_add(c->file);
    else
      {
-       e_prefix_data_concat_static(path, "data/themes/default.edj");
-       cfdata->theme = eina_stringshare_add(path);
+        e_prefix_data_concat_static(path, "data/themes/default.edj");
+        cfdata->theme = eina_stringshare_add(path);
      }
    if (cfdata->theme[0] != '/')
      {
-       e_user_dir_snprintf(path, sizeof(path), "themes/%s", cfdata->theme);
-       if (ecore_file_exists(path))
-         {
-            eina_stringshare_del(cfdata->theme);
-            cfdata->theme = eina_stringshare_add(path);
-         }
-       else
-         {
-            e_prefix_data_snprintf(path, sizeof(path), "data/themes/%s",
-                                   cfdata->theme);
-            if (ecore_file_exists(path))
-              {
-                 eina_stringshare_del(cfdata->theme);
-                 cfdata->theme = eina_stringshare_add(path);
-              }
-         }
+        e_user_dir_snprintf(path, sizeof(path), "themes/%s", cfdata->theme);
+        if (ecore_file_exists(path))
+          {
+             eina_stringshare_del(cfdata->theme);
+             cfdata->theme = eina_stringshare_add(path);
+          }
+        else
+          {
+             e_prefix_data_snprintf(path, sizeof(path), "data/themes/%s",
+                                    cfdata->theme);
+             if (ecore_file_exists(path))
+               {
+                  eina_stringshare_del(cfdata->theme);
+                  cfdata->theme = eina_stringshare_add(path);
+               }
+          }
      }
 
    cfdata->theme_list = _get_theme_categories_list();
@@ -366,9 +366,9 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 
    EINA_LIST_FREE(cfdata->theme_list, t)
      {
-       eina_stringshare_del(t->file);
-       eina_stringshare_del(t->category);
-       free(t);
+        eina_stringshare_del(t->file);
+        eina_stringshare_del(t->category);
+        free(t);
      }
 
    E_FREE(cfdata);
@@ -401,7 +401,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0);
 
    o = e_widget_button_add(evas, _("Go up a Directory"), "go-up",
-                          _cb_button_up, cfdata, NULL);
+                           _cb_button_up, cfdata, NULL);
    cfdata->o_up_button = o;
    e_widget_table_object_append(ol, o, 0, 1, 1, 1, 0, 0, 0, 0);
 
@@ -413,13 +413,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    o = e_widget_flist_add(evas);
    cfdata->o_fm = o;
    evas_object_smart_callback_add(o, "dir_changed",
-                                 _cb_files_changed, cfdata);
+                                  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(o, "selection_change",
-                                 _cb_files_selection_change, cfdata);
+                                  _cb_files_selection_change, cfdata);
    evas_object_smart_callback_add(o, "changed",
-                                 _cb_files_files_changed, cfdata);
+                                  _cb_files_files_changed, cfdata);
    evas_object_smart_callback_add(o, "files_deleted",
-                                 _cb_files_files_deleted, cfdata);
+                                  _cb_files_files_deleted, cfdata);
    e_widget_flist_path_set(o, path, "/");
 
    e_widget_size_min_set(o, 160, 160);
@@ -430,11 +430,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    il = e_widget_list_add(evas, 0, 1);
    o = e_widget_button_add(evas, _(" Import..."), "preferences-desktop-theme",
-                          _cb_import, cfdata, NULL);
+                           _cb_import, cfdata, NULL);
    e_widget_list_object_append(il, o, 1, 0, 0.5);
 #ifdef HAVE_EXCHANGE
    o = e_widget_button_add(evas, _(" Online..."), "network-website",
-                          _cb_web, cfdata, NULL);
+                           _cb_web, cfdata, NULL);
    e_widget_list_object_append(il, o, 1, 0, 0.5);
 #endif
    e_widget_list_object_append(of, il, 1, 0, 0.0);
@@ -447,9 +447,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
       mh = (mw * z->h) / z->w;
       oa = e_widget_aspect_add(evas, mw, mh);
       o = e_widget_preview_add(evas, mw, mh);
+      evas_object_size_hint_min_set(o, mw, mh);
       cfdata->o_preview = o;
       if (cfdata->theme)
-       e_widget_preview_edje_set(o, cfdata->theme, "e/desktop/background");
+        e_widget_preview_edje_set(o, cfdata->theme, "e/desktop/background");
       e_widget_aspect_child_set(oa, o);
       e_widget_list_object_append(of, oa, 1, 1, 0);
       evas_object_show(o);
@@ -542,43 +543,43 @@ _get_theme_categories_list(void)
     */
    EINA_LIST_FOREACH(e_theme_category_list(), g, c)
      {
-       int res;
+        int res;
 
-       if (!c) continue;
+        if (!c) continue;
 
-       cats2 = eina_list_search_sorted_near_list(cats, _cb_sort, c, &res);
-       if (!res) continue;
-       if (res < 0)
-         cats = eina_list_prepend_relative_list(cats, eina_stringshare_ref(c), cats2);
-       else
-         cats = eina_list_append_relative_list(cats, eina_stringshare_ref(c), cats2);
+        cats2 = eina_list_search_sorted_near_list(cats, _cb_sort, c, &res);
+        if (!res) continue;
+        if (res < 0)
+          cats = eina_list_prepend_relative_list(cats, eina_stringshare_ref(c), cats2);
+        else
+          cats = eina_list_append_relative_list(cats, eina_stringshare_ref(c), cats2);
      }
 
    EINA_LIST_FREE(cats, category)
      {
-       E_Config_Theme *theme, *newtheme = NULL;
-
-       /* Not interested in adding "base" */
-       if (strcmp(category, "base"))
-         {
-            newtheme = (E_Config_Theme *)malloc(sizeof(E_Config_Theme));
-            if (!newtheme) break;
-            if (!strcmp(category, "base/theme"))
-              newtheme->category = eina_stringshare_add("base/theme/Base Theme");
-            else
-              newtheme->category = eina_stringshare_ref(category);
-            newtheme->file = NULL;
-
-            EINA_LIST_FOREACH(e_config->themes, themes, theme)
-              {
-                 if (!strcmp(category + 5, theme->category))
-                   {
-                      newtheme->file = eina_stringshare_add(theme->file);
-                   }
-              }
-            tcl = eina_list_append(tcl, newtheme);
-         }
-       eina_stringshare_del(category);
+        E_Config_Theme *theme, *newtheme = NULL;
+
+        /* Not interested in adding "base" */
+        if (strcmp(category, "base"))
+          {
+             newtheme = (E_Config_Theme *)malloc(sizeof(E_Config_Theme));
+             if (!newtheme) break;
+             if (!strcmp(category, "base/theme"))
+               newtheme->category = eina_stringshare_add("base/theme/Base Theme");
+             else
+               newtheme->category = eina_stringshare_ref(category);
+             newtheme->file = NULL;
+
+             EINA_LIST_FOREACH(e_config->themes, themes, theme)
+               {
+                  if (!strcmp(category + 5, theme->category))
+                    {
+                       newtheme->file = eina_stringshare_add(theme->file);
+                    }
+               }
+             tcl = eina_list_append(tcl, newtheme);
+          }
+        eina_stringshare_del(category);
      }
 
    return tcl;
@@ -619,19 +620,19 @@ _preview_set(void *data)
             e_widget_ilist_selected_label_get(cfdata->o_categories_ilist));
    if (theme)
      {
-       int ret = 0;
-       int i;
+        int ret = 0;
+        int i;
 
-       for (i = 0; parts_list[i]; i++)
-         if (strstr(parts_list[i], c_label)) break;
+        for (i = 0; parts_list[i]; i++)
+          if (strstr(parts_list[i], c_label)) break;
 
-       if (parts_list[i])
-         ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
-                                         parts_list[i] + strlen(c_label));
+        if (parts_list[i])
+          ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
+                                          parts_list[i] + strlen(c_label));
         if (!ret)
-         e_widget_preview_edje_set(cfdata->o_preview, theme,
-                                   "e/desktop/background");
-       eina_stringshare_del(theme);
+          e_widget_preview_edje_set(cfdata->o_preview, theme,
+                                    "e/desktop/background");
+        eina_stringshare_del(theme);
      }
 }
 
@@ -656,33 +657,33 @@ _cb_adv_categories_change(void *data, Evas_Object *obj __UNUSED__)
    ic = e_widget_ilist_nth_icon_get(cfdata->o_categories_ilist, n);
    if (!ic)
      {
-       _preview_set(data);
-       return;
+        _preview_set(data);
+        return;
      }
 
    snprintf(category, sizeof(category), "base/theme/%s", label);
    EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
      {
-       if (!strcmp(category, t->category) && (t->file))
-         {
-            file = t->file;
-            break;
-         }
+        if (!strcmp(category, t->category) && (t->file))
+          {
+             file = t->file;
+             break;
+          }
      }
    if (!file) return;
 
    cnt = e_widget_ilist_count(cfdata->o_files_ilist);
    for (n = 0; n < cnt; n++)
      {
-       const char *tmp;
-
-       tmp = _files_ilist_nth_label_to_file(cfdata, n);
-       eina_stringshare_del(tmp);
-       if (file == tmp) /* We don't need the value, just the address. */
-         {
-            e_widget_ilist_selected_set(cfdata->o_files_ilist, n);
-            break;
-         }
+        const char *tmp;
+
+        tmp = _files_ilist_nth_label_to_file(cfdata, n);
+        eina_stringshare_del(tmp);
+        if (file == tmp) /* We don't need the value, just the address. */
+          {
+             e_widget_ilist_selected_set(cfdata->o_files_ilist, n);
+             break;
+          }
      }
 }
 
@@ -708,8 +709,8 @@ _theme_file_used(Eina_List *tlist, const char *filename)
 
 static void
 _ilist_files_add(E_Config_Dialog_Data *cfdata,
-                const char *header, const char *dir,
-                int *count_cb)
+                 const char *header, const char *dir,
+                 int *count_cb)
 {
    Eina_Iterator *it;
    const char *file;
@@ -728,43 +729,43 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata,
 
    if (it)
      {
-       EINA_ITERATOR_FOREACH(it, file)
-         if (strstr(file, ".edj"))
-           {
-              themefiles = eina_list_append(themefiles, file);
-           }
-         else
-           {
-              eina_stringshare_del(file);
-           }
-
-       eina_iterator_free(it);
+        EINA_ITERATOR_FOREACH(it, file)
+          if (strstr(file, ".edj"))
+            {
+               themefiles = eina_list_append(themefiles, file);
+            }
+          else
+            {
+               eina_stringshare_del(file);
+            }
+
+        eina_iterator_free(it);
      }
 
    if (themefiles)
      {
-       char themename[PATH_MAX];
-
-       themefiles = eina_list_sort(themefiles, -1, _cb_sort);
-       count = eina_list_count(themefiles);
-
-       EINA_LIST_FREE(themefiles, theme)
-         {
-            Evas_Object *ic = NULL;
-
-            if (_theme_file_used(cfdata->theme_list, theme))
-              {
-                 ic = e_icon_add(evas);
-                 e_util_icon_theme_set(ic, "preferences-desktop-theme");
-              }
-            tmp = strdup(strrchr(theme, '/') + 1);
-            strncpy(themename, tmp, strlen(tmp) - 3);
-            themename[strlen(tmp) - 4] = '\0';
-            e_widget_ilist_append(o, ic, themename, NULL, NULL, NULL);
-            free(tmp);
-
-            eina_stringshare_del(theme);
-         }
+        char themename[PATH_MAX];
+
+        themefiles = eina_list_sort(themefiles, -1, _cb_sort);
+        count = eina_list_count(themefiles);
+
+        EINA_LIST_FREE(themefiles, theme)
+          {
+             Evas_Object *ic = NULL;
+
+             if (_theme_file_used(cfdata->theme_list, theme))
+               {
+                  ic = e_icon_add(evas);
+                  e_util_icon_theme_set(ic, "preferences-desktop-theme");
+               }
+             tmp = strdup(strrchr(theme, '/') + 1);
+             strncpy(themename, tmp, strlen(tmp) - 3);
+             themename[strlen(tmp) - 4] = '\0';
+             e_widget_ilist_append(o, ic, themename, NULL, NULL, NULL);
+             free(tmp);
+
+             eina_stringshare_del(theme);
+          }
      }
 
    if (count_cb)
@@ -818,14 +819,14 @@ _fill_categories_ilist(E_Config_Dialog_Data *cfdata)
 
    EINA_LIST_FOREACH(cfdata->theme_list, themes, theme)
      {
-       Evas_Object *ic = NULL;
-
-       if (theme->file)
-         {
-            ic = e_icon_add(evas);
-            e_util_icon_theme_set(ic, "dialog-ok-apply");
-         }
-       e_widget_ilist_append(o, ic, theme->category + 11, NULL, NULL, NULL);
+        Evas_Object *ic = NULL;
+
+        if (theme->file)
+          {
+             ic = e_icon_add(evas);
+             e_util_icon_theme_set(ic, "dialog-ok-apply");
+          }
+        e_widget_ilist_append(o, ic, theme->category + 11, NULL, NULL, NULL);
      }
 
    e_widget_ilist_go(o);
@@ -872,41 +873,41 @@ _cb_adv_btn_assign(void *data1, void *data2 __UNUSED__)
 
    EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
      {
-       const char *filename = NULL;
-
-       if (!strcmp(t->category, newtheme->category))
-         {
-            if ((t->file) && (strcmp(t->file, newtheme->file)))
-              {
-                 filename = t->file;
-                 t->file = NULL;
-
-                 if (!_theme_file_used(cfdata->theme_list, filename))
-                   {
-                      cnt = e_widget_ilist_count(of);
-                      for (n = 0; n < cnt; n++)
-                        {
-                           const char *tmp;
-
-                           tmp = _files_ilist_nth_label_to_file(cfdata, n);
-                           eina_stringshare_del(tmp);
-                           if (filename == tmp) /* We just need the pointer, not the value. */
-                             e_widget_ilist_nth_icon_set(of, n, NULL);
-                        }
-                   }
-              }
-            t->file = eina_stringshare_add(newtheme->file);
-            if (filename) eina_stringshare_del(filename);
-            break;
-         }
+        const char *filename = NULL;
+
+        if (!strcmp(t->category, newtheme->category))
+          {
+             if ((t->file) && (strcmp(t->file, newtheme->file)))
+               {
+                  filename = t->file;
+                  t->file = NULL;
+
+                  if (!_theme_file_used(cfdata->theme_list, filename))
+                    {
+                       cnt = e_widget_ilist_count(of);
+                       for (n = 0; n < cnt; n++)
+                         {
+                            const char *tmp;
+
+                            tmp = _files_ilist_nth_label_to_file(cfdata, n);
+                            eina_stringshare_del(tmp);
+                            if (filename == tmp) /* We just need the pointer, not the value. */
+                              e_widget_ilist_nth_icon_set(of, n, NULL);
+                         }
+                    }
+               }
+             t->file = eina_stringshare_add(newtheme->file);
+             if (filename) eina_stringshare_del(filename);
+             break;
+          }
      }
    if (!themes)
      cfdata->theme_list = eina_list_append(cfdata->theme_list, newtheme);
    else
      {
-       eina_stringshare_del(newtheme->category);
-       eina_stringshare_del(newtheme->file);
-       free(newtheme);
+        eina_stringshare_del(newtheme->category);
+        eina_stringshare_del(newtheme->file);
+        free(newtheme);
      }
 
    return;
@@ -937,30 +938,30 @@ _cb_adv_btn_clear(void *data1, void *data2 __UNUSED__)
 
    EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
      {
-       if (!strcmp(t->category, cat))
-         {
-            if (t->file)
-              {
-                 filename = t->file;
-                 t->file = NULL;
-              }
-            break;
-         }
+        if (!strcmp(t->category, cat))
+          {
+             if (t->file)
+               {
+                  filename = t->file;
+                  t->file = NULL;
+               }
+             break;
+          }
      }
 
    if ((filename) && (!_theme_file_used(cfdata->theme_list, filename)))
      {
-       cnt = e_widget_ilist_count(of);
-       for (n = 0; n < cnt; n++)
-         {
-            const char *tmp;
-
-            tmp = _files_ilist_nth_label_to_file(cfdata, n);
-            if (filename == tmp)
-              e_widget_ilist_nth_icon_set(of, n, NULL);
-            eina_stringshare_del(tmp);
-         }
-       eina_stringshare_del(filename);
+        cnt = e_widget_ilist_count(of);
+        for (n = 0; n < cnt; n++)
+          {
+             const char *tmp;
+
+             tmp = _files_ilist_nth_label_to_file(cfdata, n);
+             if (filename == tmp)
+               e_widget_ilist_nth_icon_set(of, n, NULL);
+             eina_stringshare_del(tmp);
+          }
+        eina_stringshare_del(filename);
      }
 
    return;
@@ -990,8 +991,8 @@ _cb_adv_btn_clearall(void *data1, void *data2 __UNUSED__)
 
    EINA_LIST_FOREACH(cfdata->theme_list, themes, t)
      {
-       eina_stringshare_del(t->file);
-       t->file = NULL;
+        eina_stringshare_del(t->file);
+        t->file = NULL;
      }
 
    return;
@@ -1025,14 +1026,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
    ol = e_widget_list_add(evas, 1, 1);
-   ob = e_widget_button_add(evas, _("Assign"), NULL, 
-                           _cb_adv_btn_assign, cfdata, NULL);
+   ob = e_widget_button_add(evas, _("Assign"), NULL,
+                            _cb_adv_btn_assign, cfdata, NULL);
    e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-   ob = e_widget_button_add(evas, _("Clear"), NULL, 
-                           _cb_adv_btn_clear, cfdata, NULL);
+   ob = e_widget_button_add(evas, _("Clear"), NULL,
+                            _cb_adv_btn_clear, cfdata, NULL);
    e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-   ob = e_widget_button_add(evas, _("Clear All"), NULL, 
-                           _cb_adv_btn_clearall, cfdata, NULL);
+   ob = e_widget_button_add(evas, _("Clear All"), NULL,
+                            _cb_adv_btn_clearall, cfdata, NULL);
    e_widget_list_object_append(ol, ob, 1, 0, 0.5);
    e_widget_table_object_append(ot, ol, 0, 1, 1, 1, 1, 0, 0, 0);
 
@@ -1054,7 +1055,9 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_ilist_selected_set(cfdata->o_files_ilist, 1);
    e_widget_ilist_selected_set(cfdata->o_categories_ilist, 0);
 
-   e_dialog_resizable_set(cfd->dia, 1);
+   /* FIXME this makes the preview disappear at the beginning and
+      when resizing (Issue is caused by e_widget_aspect i guess) */
+   // e_dialog_resizable_set(cfd->dia, 1);
    return ot;
 }
 
@@ -1067,25 +1070,25 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
 
    EINA_LIST_FOREACH(cfdata->theme_list, themes, theme)
      {
-       E_Config_Theme *ec_theme;
-       Eina_List *ec_themes;
-
-       if (!strcmp(theme->category, "base/theme/Base Theme"))
-         theme->category = eina_stringshare_add("base/theme");
-
-       EINA_LIST_FOREACH(e_config->themes, ec_themes, ec_theme)
-         {
-            if (!strcmp(theme->category + 5, ec_theme->category))
-              {
-                 if (theme->file)
-                   e_theme_config_set(theme->category + 5, theme->file);
-                 else
-                   e_theme_config_remove(theme->category + 5);
-                 break;
-              }
-         }
-       if ((!ec_themes) && (theme->file))
-         e_theme_config_set(theme->category + 5, theme->file);
+        E_Config_Theme *ec_theme;
+        Eina_List *ec_themes;
+
+        if (!strcmp(theme->category, "base/theme/Base Theme"))
+          theme->category = eina_stringshare_add("base/theme");
+
+        EINA_LIST_FOREACH(e_config->themes, ec_themes, ec_theme)
+          {
+             if (!strcmp(theme->category + 5, ec_theme->category))
+               {
+                  if (theme->file)
+                    e_theme_config_set(theme->category + 5, theme->file);
+                  else
+                    e_theme_config_remove(theme->category + 5);
+                  break;
+               }
+          }
+        if ((!ec_themes) && (theme->file))
+          e_theme_config_set(theme->category + 5, theme->file);
      }
 
    e_config_save_queue();
index e479dfe..214688f 100644 (file)
@@ -80,14 +80,25 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 static int 
 _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) 
 {
+   Eina_List *trans = NULL;
+   const char *str;
+
+   trans = e_theme_transition_list();
+
    if (e_config->transition_start)
      eina_stringshare_del(e_config->transition_start);
    e_config->transition_start = NULL;
    if (cfdata->transition_start) 
      {
-       if (e_theme_transition_find(cfdata->transition_start)) 
-         e_config->transition_start = 
-          eina_stringshare_add(cfdata->transition_start);
+        if (eina_list_search_sorted(trans, EINA_COMPARE_CB(strcmp), 
+                                    cfdata->transition_start)) 
+          {
+             e_config->transition_start = 
+               eina_stringshare_add(cfdata->transition_start);
+          }
+       /* if (e_theme_transition_find(cfdata->transition_start))  */
+       /*   e_config->transition_start =  */
+        /*   eina_stringshare_add(cfdata->transition_start); */
      }
 
    if (e_config->transition_desk)
@@ -95,8 +106,14 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    e_config->transition_desk = NULL;
    if (cfdata->transition_desk) 
      {
-       if (e_theme_transition_find(cfdata->transition_desk)) 
-         e_config->transition_desk = eina_stringshare_add(cfdata->transition_desk);
+        if (eina_list_search_sorted(trans, EINA_COMPARE_CB(strcmp), 
+                                    cfdata->transition_desk)) 
+          {
+             e_config->transition_desk = 
+               eina_stringshare_add(cfdata->transition_desk);
+          }
+       /* if (e_theme_transition_find(cfdata->transition_desk))  */
+       /*   e_config->transition_desk = eina_stringshare_add(cfdata->transition_desk); */
      }
 
    if (e_config->transition_change)
@@ -104,11 +121,21 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    e_config->transition_change = NULL;
    if (cfdata->transition_change) 
      {   
-       if (e_theme_transition_find(cfdata->transition_change)) 
-         e_config->transition_change = eina_stringshare_add(cfdata->transition_change);
+        if (eina_list_search_sorted(trans, EINA_COMPARE_CB(strcmp), 
+                                    cfdata->transition_change)) 
+          {
+             e_config->transition_change = 
+               eina_stringshare_add(cfdata->transition_change);
+          }
+       /* if (e_theme_transition_find(cfdata->transition_change))  */
+       /*   e_config->transition_change = eina_stringshare_add(cfdata->transition_change); */
      }
 
    e_config_save_queue();
+
+   EINA_LIST_FREE(trans, str)
+     eina_stringshare_del(str);
+
    return 1;
 }
 
@@ -151,12 +178,17 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    edje_freeze();
    e_widget_ilist_freeze(il);
    e_widget_ilist_append(il, NULL, _("None"), _trans_cb_changed, cfdata, NULL);
+
    for (l = e_theme_transition_list(); l; l = l->next) 
      {
-       t = l->data;
-       if (!t) continue;
-       e_widget_ilist_append(il, NULL, t, _trans_cb_changed, cfdata, NULL);
+       t = l->data;
+       if (!t) continue;
+       e_widget_ilist_append(il, NULL, t, _trans_cb_changed, cfdata, NULL);
      }
+
+   EINA_LIST_FREE(l, t) 
+     eina_stringshare_del(t);
+
    e_widget_ilist_go(il);
    e_widget_ilist_thaw(il);
    edje_thaw();
@@ -170,6 +202,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    e_dialog_resizable_set(cfd->dia, 1);
+
    return o;
 }
 
index c2ea25e..c99845b 100644 (file)
@@ -91,8 +91,8 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
      cw->specific_config = 1;
    else
      {
-       v->advanced.apply_cfdata   = _adv_apply;
-       v->advanced.create_widgets = _adv_create;
+        v->advanced.apply_cfdata   = _adv_apply;
+        v->advanced.create_widgets = _adv_create;
      }
 
    v->override_auto_apply = 1;
@@ -102,12 +102,36 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    cw->desk_x = desk_x;
    cw->desk_y = desk_y;
 
-   cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E", 
-                            "appearance/wallpaper",
-                            "preferences-desktop-wallpaper", 0, v, cw);
+   cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E",
+                             "appearance/wallpaper",
+                             "preferences-desktop-wallpaper", 0, v, cw);
    return cfd;
 }
 
+static void
+_bg_set(E_Config_Dialog_Data *cfdata)
+{
+   if (!cfdata->o_preview) return;
+   if (cfdata->bg)
+     {
+        if (eina_str_has_extension(cfdata->bg, ".edj"))
+           e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg,
+                                     "e/desktop/background");
+        else
+           e_widget_preview_file_set(cfdata->o_preview, cfdata->bg,
+                                     NULL);
+     }
+   else
+     {
+        const char *f;
+
+        f = e_theme_edje_file_get("base/theme/backgrounds",
+                                  "e/desktop/background");
+        e_widget_preview_edje_set(cfdata->o_preview, f,
+                                  "e/desktop/background");
+     }
+}
+
 void
 e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
 {
@@ -124,9 +148,7 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, cfdata->use_theme_bg);
    if (cfdata->o_fm) e_widget_flist_path_set(cfdata->o_fm, path, "/");
-   if (cfdata->o_preview)
-     e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, 
-                               "e/desktop/background");
+   _bg_set(cfdata);
    if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
@@ -166,8 +188,8 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
 
    if (!(cfdata = data)) return;
    if (!cfdata->o_fm) return;
-   if (cfdata->o_up_button) 
-     e_widget_disabled_set(cfdata->o_up_button, 
+   if (cfdata->o_up_button)
+     e_widget_disabled_set(cfdata->o_up_button,
                            !e_widget_flist_has_parent_get(cfdata->o_fm));
 }
 
@@ -195,8 +217,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_
    E_FREE(cfdata->bg);
 
    cfdata->bg = strdup(buf);
-   if (cfdata->o_preview)
-     e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background");
+   _bg_set(cfdata);
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, 0);
    cfdata->use_theme_bg = 0;
@@ -216,7 +237,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
    p = e_widget_flist_real_path_get(cfdata->o_fm);
    if (p)
      {
-       if (strncmp(p, cfdata->bg, strlen(p))) return;
+        if (strncmp(p, cfdata->bg, strlen(p))) return;
      }
    else return;
 
@@ -225,11 +246,11 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
      p = cfdata->bg + len + 1;
    else
      {
-       len = e_prefix_data_concat_static(buf, "data/backgrounds");
-       if (!strncmp(cfdata->bg, buf, len))
-         p = cfdata->bg + len + 1;
-       else
-         p = cfdata->bg;
+        len = e_prefix_data_concat_static(buf, "data/backgrounds");
+        if (!strncmp(cfdata->bg, buf, len))
+          p = cfdata->bg + len + 1;
+        else
+          p = cfdata->bg;
      }
 
    e_widget_flist_select_set(cfdata->o_fm, p, 1);
@@ -237,7 +258,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
 }
 
 static void
-_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 
+_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *sel, *all, *n;
@@ -252,10 +273,10 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf
    ici = sel->data;
    all = eina_list_data_find_list(all, ici);
    n = eina_list_next(all);
-   if (!n) 
+   if (!n)
      {
-       n = eina_list_prev(all);
-       if (!n) return;
+        n = eina_list_prev(all);
+        if (!n) return;
      }
 
    if (!(ic = n->data)) return;
@@ -277,24 +298,17 @@ _cb_theme_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event_info __
    cfdata = data;
    if (cfdata->use_theme_bg)
      {
-       f = e_theme_edje_file_get("base/theme/backgrounds", 
+        f = e_theme_edje_file_get("base/theme/backgrounds",
                                   "e/desktop/background");
-       E_FREE(cfdata->bg);
-       cfdata->bg = strdup(f);
-       if (cfdata->o_preview)
-         e_widget_preview_edje_set(cfdata->o_preview, f, 
-                                    "e/desktop/background");
+        E_FREE(cfdata->bg);
+        cfdata->bg = strdup(f);
+        _bg_set(cfdata);
      }
    else
      {
-       evas_object_smart_callback_call(cfdata->o_fm, "selection_change", 
+        evas_object_smart_callback_call(cfdata->o_fm, "selection_change",
                                         cfdata);
-       if (cfdata->bg)
-         {
-            if (cfdata->o_preview)
-              e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, 
-                                         "e/desktop/background");
-         }
+        _bg_set(cfdata);
      }
 }
 
@@ -318,9 +332,9 @@ _cb_import(void *data1, void *data2 __UNUSED__)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = data1;
-   if (cfdata->win_import) 
+   if (cfdata->win_import)
      e_win_raise(cfdata->win_import);
-   else 
+   else
      cfdata->win_import = e_int_config_wallpaper_fsel(cfdata->cfd);
 }
 
@@ -334,9 +348,9 @@ _cb_web(void *data1, void *data2 __UNUSED__)
    if (cfdata->dia_web)
       e_win_raise(cfdata->dia_web->win);
    else
-      cfdata->dia_web = e_int_config_wallpaper_web(cfdata->cfd);   
+      cfdata->dia_web = e_int_config_wallpaper_web(cfdata->cfd);
 }
-#endif   
+#endif
 
 static void
 _fill_data(E_Config_Dialog_Data *cfdata)
@@ -348,52 +362,52 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cw = cfdata->cfd->data;
    if (cw->specific_config)
      {
-       const char *bg;
+        const char *bg;
 
-       /* specific config passed in. set for that only */
-       bg = e_bg_file_get(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y);
-       if (bg) cfdata->bg = strdup(bg);
+        /* specific config passed in. set for that only */
+        bg = e_bg_file_get(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y);
+        if (bg) cfdata->bg = strdup(bg);
      }
    else
      {
-       /* get current desk. advanced mode allows selecting all, screen or desk */
-       E_Container *c;
-       E_Zone *z;
-       E_Desk *d;
-
-       c = e_container_current_get(e_manager_current_get());
-       z = e_zone_current_get(c);
-       d = e_desk_current_get(z);
-
-       cfbg = e_bg_config_get(c->num, z->id, d->x, d->y);
-       /* if we have a config for this bg, use it. */
-       if (cfbg)
-         {
-            if (cfbg->container >= 0 && cfbg->zone >= 0)
-              {
-                 if (cfbg->desk_x >= 0 && cfbg->desk_y >= 0)
-                   cfdata->all_this_desk_screen = E_CONFIG_WALLPAPER_DESK;
-                 else
-                   cfdata->all_this_desk_screen = E_CONFIG_WALLPAPER_SCREEN;
-              }
-            E_FREE(cfdata->bg);
-            cfdata->bg = strdup(cfbg->file);
-         }
+        /* get current desk. advanced mode allows selecting all, screen or desk */
+        E_Container *c;
+        E_Zone *z;
+        E_Desk *d;
+
+        c = e_container_current_get(e_manager_current_get());
+        z = e_zone_current_get(c);
+        d = e_desk_current_get(z);
+
+        cfbg = e_bg_config_get(c->num, z->id, d->x, d->y);
+        /* if we have a config for this bg, use it. */
+        if (cfbg)
+          {
+             if (cfbg->container >= 0 && cfbg->zone >= 0)
+               {
+                  if (cfbg->desk_x >= 0 && cfbg->desk_y >= 0)
+                    cfdata->all_this_desk_screen = E_CONFIG_WALLPAPER_DESK;
+                  else
+                    cfdata->all_this_desk_screen = E_CONFIG_WALLPAPER_SCREEN;
+               }
+             E_FREE(cfdata->bg);
+             cfdata->bg = strdup(cfbg->file);
+          }
      }
 
-   if ((!cfdata->bg) && (e_config->desktop_default_background)) 
+   if ((!cfdata->bg) && (e_config->desktop_default_background))
      cfdata->bg = strdup(e_config->desktop_default_background);
 
    if (cfdata->bg)
      {
-       const char *f;
-       size_t len;
+        const char *f;
+        size_t len;
 
-       f = e_theme_edje_file_get("base/theme/backgrounds", 
+        f = e_theme_edje_file_get("base/theme/backgrounds",
                                   "e/desktop/background");
-       if (!strcmp(cfdata->bg, f)) cfdata->use_theme_bg = 1;
-       len = e_prefix_data_concat_static(path, "data/backgrounds");
-       if (!strncmp(cfdata->bg, path, len)) cfdata->fmdir = 1;
+        if (!strcmp(cfdata->bg, f)) cfdata->use_theme_bg = 1;
+        len = e_prefix_data_concat_static(path, "data/backgrounds");
+        if (!strncmp(cfdata->bg, path, len)) cfdata->fmdir = 1;
      }
    else
      cfdata->use_theme_bg = 1;
@@ -414,12 +428,12 @@ _create_data(E_Config_Dialog *cfd)
 static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   if (cfdata->win_import) 
+   if (cfdata->win_import)
      e_int_config_wallpaper_fsel_del(cfdata->win_import);
 #ifdef HAVE_EXCHANGE
    if (cfdata->dia_web)
      e_int_config_wallpaper_web_del(cfdata->dia_web);
-#endif   
+#endif
    E_FREE(cfdata->bg);
    E_FREE(cfd->data);
    E_FREE(cfdata);
@@ -429,12 +443,11 @@ static Evas_Object *
 _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *rt, *ot;
-   Evas_Object *ow, *oa;
+   Evas_Object *ow;
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
    char path[PATH_MAX];
    int mw, mh, online;
-   const char *f;
 
    online = ecore_file_download_protocol_available("http://");
 
@@ -457,7 +470,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(ot, rt, 0, 0, 1, 1, 0, 0, 0, 0);
 
    ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up",
-                           _cb_button_up, cfdata, NULL);
+                            _cb_button_up, cfdata, NULL);
    cfdata->o_up_button = ow;
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 0, 0, 0, 0);
 
@@ -469,13 +482,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
    evas_object_smart_callback_add(ow, "dir_changed",
-                                 _cb_files_changed, cfdata);
+                                  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "selection_change",
-                                 _cb_files_selection_change, cfdata);
-   evas_object_smart_callback_add(ow, "changed", 
+                                  _cb_files_selection_change, cfdata);
+   evas_object_smart_callback_add(ow, "changed",
                                   _cb_files_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "files_deleted",
-                                 _cb_files_files_deleted, cfdata);
+                                  _cb_files_files_deleted, cfdata);
    e_widget_flist_path_set(ow, path, "/");
 
    e_widget_size_min_set(ow, 160, 160);
@@ -483,13 +496,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_list_object_append(o, ot, 1, 1, 0.0);
 
    ot = e_widget_table_add(evas, 0);
-   ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), 
+   ow = e_widget_check_add(evas, _("Use Theme Wallpaper"),
                            &cfdata->use_theme_bg);
    cfdata->o_theme_bg = ow;
    evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata);
    e_widget_table_object_append(ot, ow, 0, 0, 2 + online, 1, 1, 0, 0, 0);
    ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
-                           _cb_import, cfdata, NULL);
+                            _cb_import, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
 
 #ifdef HAVE_EXCHANGE
@@ -500,23 +513,16 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
         e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
      }
 #endif
-   
+
    mw = 320;
    mh = (320 * zone->h) / zone->w;
-   oa = e_widget_aspect_add(evas, mw, mh);
    ow = e_widget_preview_add(evas, mw, mh);
    cfdata->o_preview = ow;
-   if (cfdata->bg)
-     f = cfdata->bg;
-   else
-     f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
-   e_widget_preview_edje_set(ow, f, "e/desktop/background");
-   e_widget_aspect_child_set(oa, ow);
+   _bg_set(cfdata);
    evas_object_show(ow);
-   evas_object_show(oa);
-   e_widget_table_object_append(ot, oa, 0, 2, 2 + online, 1, 1, 1, 1, 1);
+   e_widget_table_object_append(ot, ow, 0, 2, 2 + online, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, ot, 1, 1, 0.5);
-   e_dialog_resizable_set(cfd->dia, 1);
+   e_dialog_resizable_set(cfd->dia, 0);
    return o;
 }
 
@@ -528,26 +534,26 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    cw = cfd->data;
    if (cw->specific_config)
      {
-       /* update a specific config */
-       e_bg_del(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y);
-       e_bg_add(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y, cfdata->bg);
+        /* update a specific config */
+        e_bg_del(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y);
+        e_bg_add(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y, cfdata->bg);
      }
    else
      {
-       /* set the default and nuke individual configs */
-       while (e_config->desktop_backgrounds)
-         {
-            E_Config_Desktop_Background *cfbg;
-
-            cfbg = e_config->desktop_backgrounds->data;
-            e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
-         }
-       if ((cfdata->use_theme_bg) || (!cfdata->bg))
-         e_bg_default_set(NULL);
-       else
-         e_bg_default_set(cfdata->bg);
-
-       cfdata->all_this_desk_screen = 0;
+        /* set the default and nuke individual configs */
+        while (e_config->desktop_backgrounds)
+          {
+             E_Config_Desktop_Background *cfbg;
+
+             cfbg = e_config->desktop_backgrounds->data;
+             e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+          }
+        if ((cfdata->use_theme_bg) || (!cfdata->bg))
+          e_bg_default_set(NULL);
+        else
+          e_bg_default_set(cfdata->bg);
+
+        cfdata->all_this_desk_screen = 0;
      }
 
    e_bg_update();
@@ -559,12 +565,11 @@ static Evas_Object *
 _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *rt, *ot;
-   Evas_Object *ow, *of, *oa;
+   Evas_Object *ow, *of;
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
    char path[PATH_MAX];
    int mw, mh, online;
-   const char *f;
 
    online = ecore_file_download_protocol_available("http://");
 
@@ -587,7 +592,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(ot, rt, 0, 0, 1, 1, 0, 0, 0, 0);
 
    ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up",
-                           _cb_button_up, cfdata, NULL);
+                            _cb_button_up, cfdata, NULL);
    cfdata->o_up_button = ow;
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 0, 0, 0, 0);
 
@@ -599,10 +604,10 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
    evas_object_smart_callback_add(ow, "dir_changed",
-                                 _cb_files_changed, cfdata);
+                                  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "selection_change",
-                                 _cb_files_selection_change, cfdata);
-   evas_object_smart_callback_add(ow, "changed", 
+                                  _cb_files_selection_change, cfdata);
+   evas_object_smart_callback_add(ow, "changed",
                                   _cb_files_files_changed, cfdata);
    e_widget_flist_path_set(ow, path, "/");
 
@@ -611,13 +616,13 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_list_object_append(o, ot, 1, 1, 0.0);
 
    ot = e_widget_table_add(evas, 0);
-   ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), 
+   ow = e_widget_check_add(evas, _("Use Theme Wallpaper"),
                            &cfdata->use_theme_bg);
    cfdata->o_theme_bg = ow;
    evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata);
    e_widget_table_object_append(ot, ow, 0, 0, 2 + online, 1, 1, 0, 0, 0);
    ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
-                           _cb_import, cfdata, NULL);
+                            _cb_import, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
 
 #ifdef HAVE_EXCHANGE
@@ -628,19 +633,14 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
         e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
      }
 #endif
-   
+
    mw = 320;
    mh = (320 * zone->h) / zone->w;
-   oa = e_widget_aspect_add(evas, mw, mh);
    ow = e_widget_preview_add(evas, mw, mh);
+   evas_object_size_hint_aspect_set(ow, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h); 
    cfdata->o_preview = ow;
-   if (cfdata->bg)
-     f = cfdata->bg;
-   else
-     f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
-   e_widget_preview_edje_set(ow, f, "e/desktop/background");
-   e_widget_aspect_child_set(oa, ow);
-   e_widget_table_object_append(ot, oa, 0, 2, 2 + online, 1, 1, 1, 1, 1);
+   _bg_set(cfdata);
+   e_widget_table_object_append(ot, ow, 0, 2, 2 + online, 1, 1, 1, 1, 1);
 
    rg = e_widget_radio_group_new(&(cfdata->all_this_desk_screen));
    of = e_widget_frametable_add(evas, _("Where to place the Wallpaper"), 0);
@@ -650,13 +650,14 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0);
    ow = e_widget_radio_add(evas, _("This Screen"), E_CONFIG_WALLPAPER_SCREEN, rg);
    if (!(e_util_container_zone_number_get(0, 1) ||
-        (e_util_container_zone_number_get(1, 0))))
+         (e_util_container_zone_number_get(1, 0))))
      e_widget_disabled_set(ow, 1);
    e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
-   e_widget_table_object_append(ot, of, 0, 3, 2 + online, 1, 1, 1, 1, 0);
+   e_widget_table_object_append(ot, of, 0, 3, 2 + online, 1, 1, 0, 1, 0);
 
-   e_widget_list_object_append(o, ot, 1, 1, 0.5);
-   e_dialog_resizable_set(cfd->dia, 1);
+   e_widget_list_object_append(o, ot, 1, 1, 0.0);
+   e_dialog_resizable_set(cfd->dia, 0);
+   
    return o;
 }
 
@@ -671,58 +672,58 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    if (!(d = e_desk_current_get(z))) return 0;
    if (cfdata->use_theme_bg)
      {
-       while (e_config->desktop_backgrounds)
-         {
-            E_Config_Desktop_Background *cfbg;
-
-            cfbg = e_config->desktop_backgrounds->data;
-            e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
-         }
-       e_bg_default_set(NULL);
+        while (e_config->desktop_backgrounds)
+          {
+             E_Config_Desktop_Background *cfbg;
+
+             cfbg = e_config->desktop_backgrounds->data;
+             e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+          }
+        e_bg_default_set(NULL);
      }
    else
      {
-       if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_ALL)
-         {
-            while (e_config->desktop_backgrounds)
-              {
-                 E_Config_Desktop_Background *cfbg;
-
-                 cfbg = e_config->desktop_backgrounds->data;
-                 e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
-              }
-            e_bg_default_set(cfdata->bg);
-         }
-       else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK)
-         {
-            e_bg_del(z->container->num, z->id, d->x, d->y);
-            e_bg_del(z->container->num, -1, d->x, d->y);
-            e_bg_del(-1, z->id, d->x, d->y);
-            e_bg_del(-1, -1, d->x, d->y);
-            e_bg_add(z->container->num, z->id, d->x, d->y, cfdata->bg);
-         }
-       else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN)
-         {
-            for (l = e_config->desktop_backgrounds; l; l = l->next)
-              {
-                 E_Config_Desktop_Background *cfbg;
-
-                 cfbg = l->data;
-                 if ((cfbg->container == (int)z->container->num) &&
-                     (cfbg->zone == z->id))
-                   fl = eina_list_append(fl, cfbg);
-              }
-            while (fl)
-              {
-                 E_Config_Desktop_Background *cfbg;
-
-                 cfbg = fl->data;
-                 e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, 
+        if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_ALL)
+          {
+             while (e_config->desktop_backgrounds)
+               {
+                  E_Config_Desktop_Background *cfbg;
+
+                  cfbg = e_config->desktop_backgrounds->data;
+                  e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+               }
+             e_bg_default_set(cfdata->bg);
+          }
+        else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK)
+          {
+             e_bg_del(z->container->num, z->num, d->x, d->y);
+             e_bg_del(z->container->num, -1, d->x, d->y);
+             e_bg_del(-1, z->num, d->x, d->y);
+             e_bg_del(-1, -1, d->x, d->y);
+             e_bg_add(z->container->num, z->num, d->x, d->y, cfdata->bg);
+          }
+        else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN)
+          {
+             for (l = e_config->desktop_backgrounds; l; l = l->next)
+               {
+                  E_Config_Desktop_Background *cfbg;
+
+                  cfbg = l->data;
+                  if ((cfbg->container == (int)z->container->num) &&
+                      (cfbg->zone == (int)z->num))
+                    fl = eina_list_append(fl, cfbg);
+               }
+             while (fl)
+               {
+                  E_Config_Desktop_Background *cfbg;
+
+                  cfbg = fl->data;
+                  e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x,
                            cfbg->desk_y);
-                 fl = eina_list_remove_list(fl, fl);
-              }
-            e_bg_add(z->container->num, z->id, -1, -1, cfdata->bg);
-         }
+                  fl = eina_list_remove_list(fl, fl);
+               }
+             e_bg_add(z->container->num, z->num, -1, -1, cfdata->bg);
+          }
      }
    e_bg_update();
    e_config_save_queue();
index 1fb543f..da2ed39 100644 (file)
@@ -6,6 +6,7 @@
 #define IMPORT_CENTER 2
 #define IMPORT_SCALE_ASPECT_IN 3
 #define IMPORT_SCALE_ASPECT_OUT 4
+#define IMPORT_PAN 5
 
 typedef struct _FSel FSel;
 
@@ -44,6 +45,7 @@ struct _Import
    Evas_Object *fill_center_obj;
    Evas_Object *fill_tile_obj;
    Evas_Object *fill_within_obj;
+   Evas_Object *fill_pan_obj;
    Evas_Object *fill_fill_obj;
    Evas_Object *external_obj;
    Evas_Object *quality_obj;
@@ -112,7 +114,7 @@ e_int_config_wallpaper_import(void *data, const char *path)
    import->fsel = data;
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
-   cfdata->method = IMPORT_STRETCH;
+   cfdata->method = IMPORT_SCALE_ASPECT_OUT;
    cfdata->external = 0;
    cfdata->quality = 90;
    cfdata->file = strdup(path);
@@ -190,8 +192,13 @@ e_int_config_wallpaper_import(void *data, const char *path)
    ord = e_widget_radio_icon_add(evas, _("Fill"),
                                 "enlightenment/wallpaper_scale_aspect_out",
                                 24, 24, IMPORT_SCALE_ASPECT_OUT, rg);
-   import->fill_fill_obj = ord;
+   import->fill_pan_obj = ord;
    e_widget_frametable_object_append(of, ord, 4, 0, 1, 1, 1, 0, 1, 0);
+   ord = e_widget_radio_icon_add(evas, _("Pan"),
+                                "enlightenment/wallpaper_pan",
+                                24, 24, IMPORT_PAN, rg);
+   import->fill_fill_obj = ord;
+   e_widget_frametable_object_append(of, ord, 5, 0, 1, 1, 1, 0, 1, 0);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 0);
 
    of = e_widget_frametable_add(evas, _("File Quality"), 0);
@@ -591,6 +598,67 @@ _import_edj_gen(Import *import)
                , fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
        setlocale(LC_NUMERIC, locale);
        break;
+      case IMPORT_PAN:
+       locale = e_intl_language_get();
+       setlocale(LC_NUMERIC, "C");
+       fprintf(f, 
+               "images { image: \"%s\" %s; }\n"
+               "collections {\n"
+               "group { name: \"e/desktop/background\";\n"
+               "data { item: \"style\" \"4\"; }\n"
+               "max: %i %i;\n"
+                "script {\n"
+                "public cur_anim; public cur_x; public cur_y; public prev_x;\n"
+                "public prev_y; public total_x; public total_y; \n"
+                "public pan_bg(val, Float:v) {\n"
+                "new Float:x, Float:y, Float:px, Float: py;\n"
+
+                "px = get_float(prev_x); py = get_float(prev_y);\n"
+                "if (get_int(total_x) > 1) {\n"
+                "x = float(get_int(cur_x)) / (get_int(total_x) - 1);\n"
+                "x = px - (px - x) * v;\n"
+                "} else { x = 0.0; v = 1.0; }\n"
+                "if (get_int(total_y) > 1) {\n"
+                "y = float(get_int(cur_y)) / (get_int(total_y) - 1);\n"
+                "y = py - (py - y) * v;\n"
+                "} else { y = 0.0; v = 1.0; }\n"
+
+                "set_state_val(PART:\"bg\", STATE_ALIGNMENT, x, y);\n"
+
+                "if (v >= 1.0) {\n"
+                "set_int(cur_anim, 0); set_float(prev_x, x);\n"
+                "set_float(prev_y, y); return 0;\n"
+                "}\n"
+                "return 1;\n"
+                "}\n"
+                "public message(Msg_Type:type, id, ...) {\n"
+                "if ((type == MSG_FLOAT_SET) && (id == 0)) {\n"
+                "new ani;\n"
+
+                "get_state_val(PART:\"bg\", STATE_ALIGNMENT, prev_x, prev_y);\n"
+                "set_int(cur_x, round(getfarg(3))); set_int(total_x, round(getfarg(4)));\n"
+                "set_int(cur_y, round(getfarg(5))); set_int(total_y, round(getfarg(6)));\n"
+
+                "ani = get_int(cur_anim); if (ani > 0) cancel_anim(ani);\n"
+                "ani = anim(getfarg(2), \"pan_bg\", 0); set_int(cur_anim, ani);\n"
+                "} } }\n"
+               "parts {\n"
+               "part { name: \"bg\"; mouse_events: 0;\n"
+               "description { state: \"default\" 0.0;\n"
+               "aspect: %1.9f %1.9f; aspect_preference: NONE;\n"
+               "image { normal: \"%s\";  scale_hint: STATIC; }\n"
+               "} } }\n"
+                "programs { program {\n"
+                " name: \"init\";\n"
+                " signal: \"load\";\n"
+                " source: \"\";\n"
+                " script { custom_state(PART:\"bg\", \"default\", 0.0);\n"
+                " set_state(PART:\"bg\", \"custom\", 0.0);\n"
+                " set_float(prev_x, 0.0); set_float(prev_y, 0.0);\n"
+                "} } } } }\n"
+               , fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
+       setlocale(LC_NUMERIC, locale);
+       break;
       default:
        /* won't happen */
        break;
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
new file mode 100644 (file)
index 0000000..f105cc4
--- /dev/null
@@ -0,0 +1,253 @@
+#include "e.h"
+
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+//static int _sort_widget_themes(const void *data1, const void *data2);
+//static Evas_Object *_icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size);
+
+struct _E_Config_Dialog_Data
+{
+  E_Config_Dialog *cfd;
+  Eina_List *widget_themes;
+  const char *widget_theme;
+  int enable_xsettings;
+  int match_e17_theme;
+  int match_e17_icon_theme;
+  struct
+  {
+    Evas_Object *list;
+  } gui;
+};
+
+E_Config_Dialog *
+e_int_config_xsettings(E_Container *con, const char *params __UNUSED__)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "appearance/xsettings")) return NULL;
+   v = E_NEW(E_Config_Dialog_View, 1);
+
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create;
+   v->basic.apply_cfdata = _basic_apply;
+   v->basic.check_changed = _basic_check_changed;
+
+   cfd = e_config_dialog_new(con, _("Application Theme Settings"),
+                             "E", "appearance/xsettings",
+                             "preferences-desktop-theme", 0, v, NULL);
+   return cfd;
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd)
+{
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   cfdata->cfd = cfd;
+   cfdata->widget_theme = eina_stringshare_add(e_config->xsettings.net_theme_name);
+   cfdata->match_e17_icon_theme = e_config->xsettings.match_e17_icon_theme;
+   cfdata->match_e17_theme = e_config->xsettings.match_e17_theme;
+   cfdata->enable_xsettings = e_config->xsettings.enabled;
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   eina_stringshare_del(cfdata->widget_theme);
+   E_FREE(cfdata);
+}
+
+static int
+_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   if (cfdata->match_e17_icon_theme != e_config->xsettings.match_e17_icon_theme)
+     return 1;
+
+   if (cfdata->match_e17_theme != e_config->xsettings.match_e17_theme)
+     return 1;
+
+   if (cfdata->enable_xsettings != !!(e_config->xsettings.enabled))
+     return 1;
+
+   if ((!cfdata->widget_theme) && (!e_config->xsettings.net_theme_name))
+     return 0;
+
+   if ((!cfdata->widget_theme) || (!e_config->xsettings.net_theme_name))
+     return 1;
+
+   return strcmp(cfdata->widget_theme, e_config->xsettings.net_theme_name) != 0;
+}
+
+static int
+_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   if (!_basic_check_changed(cfd, cfdata)) return 1;
+
+   e_widget_ilist_selected_label_get(cfdata->gui.list);
+
+   eina_stringshare_del(e_config->xsettings.net_icon_theme_name);
+   e_config->xsettings.net_theme_name = eina_stringshare_ref(cfdata->widget_theme);
+
+   e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;
+   e_config->xsettings.match_e17_theme = cfdata->match_e17_theme;
+   e_config->xsettings.enabled = cfdata->enable_xsettings;
+
+   e_config_save_queue();
+
+   e_xsettings_config_update();
+
+   return 1;
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const char *d1, *d2;
+
+   d1 = data1;
+   d2 = data2;
+   if (!d1) return 1;
+   if (!d2) return -1;
+
+   return strcmp(d1, d2);
+}
+
+static void
+_ilist_files_add(E_Config_Dialog_Data *cfdata, const char *dir)
+{
+   Eina_Iterator *it;
+   const char *file;
+
+   it = eina_file_ls(dir);
+   if (!it) return;
+
+   EINA_ITERATOR_FOREACH(it, file)
+     {
+        if (ecore_file_is_dir(file))
+          {
+             if (!eina_list_data_find(cfdata->widget_themes, file))
+               {
+
+                  cfdata->widget_themes = eina_list_append(cfdata->widget_themes, file);
+                  continue;
+               }
+          }
+
+        eina_stringshare_del(file);
+     }
+
+   eina_iterator_free(it);
+}
+
+static Eina_Bool
+_fill_files_ilist(void *data)
+{
+   Evas *evas;
+   Evas_Object *o;
+   char theme_dir[4096];
+   E_Config_Dialog_Data *cfdata = data;
+   Eina_List *xdg_dirs, *l;
+   const char *dir;
+
+   if (!(o = cfdata->gui.list))
+     return ECORE_CALLBACK_CANCEL;
+
+   e_user_homedir_concat_static(theme_dir, ".themes");
+   _ilist_files_add(cfdata, theme_dir);
+
+   xdg_dirs = efreet_data_dirs_get();
+   EINA_LIST_FOREACH(xdg_dirs, l, dir)
+     {
+        snprintf(theme_dir, sizeof(theme_dir), "%s/themes", dir);
+        _ilist_files_add(cfdata, theme_dir);
+     }
+
+   evas = evas_object_evas_get(o);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(o);
+   e_widget_ilist_clear(o);
+
+   if (cfdata->widget_themes)
+     {
+        const char *theme;
+        int cnt = 0;
+
+        cfdata->widget_themes = eina_list_sort(cfdata->widget_themes, -1, _cb_sort);
+
+        EINA_LIST_FREE(cfdata->widget_themes, theme)
+          {
+             char *tmp = strdup(strrchr(theme, '/') + 1);
+             const char *label;
+
+             if (tmp)
+               {
+                  /* label pointer will exist as long as ilist item
+                     so val remains valid */
+                  label = eina_stringshare_add(tmp);
+                  e_widget_ilist_append(o, NULL, label, NULL, NULL, label /* val */);
+                  eina_stringshare_del(label);
+                  free(tmp);
+                  if (cfdata->widget_theme && !strcmp(cfdata->widget_theme, tmp))
+                    e_widget_ilist_selected_set(cfdata->gui.list, cnt);
+
+                  cnt++;
+               }
+
+             eina_stringshare_del(theme);
+          }
+     }
+
+   e_widget_ilist_go(o);
+   e_widget_ilist_thaw(o);
+   edje_thaw();
+   evas_event_thaw(evas);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o, *ilist, *ow;
+
+   o = e_widget_list_add(evas, 0, 0);
+   ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->widget_theme));
+   cfdata->gui.list = ilist;
+   e_widget_size_min_set(cfdata->gui.list, 100, 100);
+
+   /* e_widget_on_change_hook_set(ilist, _icon_theme_changed, cfdata); */
+   e_widget_list_object_append(o, ilist, 1, 1, 0.5);
+
+   ow = e_widget_check_add(evas, _("Use icon theme for applications"),
+                                 &(cfdata->match_e17_icon_theme));
+   e_widget_list_object_append(o, ow, 0, 0, 0.0);
+
+   ow = e_widget_check_add(evas, _("Match E17 theme if possible"),
+                           &(cfdata->match_e17_theme));
+   e_widget_list_object_append(o, ow, 0, 0, 0.0);
+
+   /* ow = e_widget_check_add(evas, _("Set application theme"),
+    *                               &(cfdata->enable_app_theme));
+    * e_widget_list_object_append(o, ow, 0, 0, 0.0); */
+
+   // >> advanced
+   ow = e_widget_check_add(evas, _("Enable Settings Daemon"),
+                           &(cfdata->enable_xsettings));
+   /* e_widget_on_change_hook_set(ow, _settings_changed, cfdata); */
+   e_widget_list_object_append(o, ow, 0, 0, 0.0);
+
+
+   e_dialog_resizable_set(cfd->dia, 1);
+
+   _fill_files_ilist(cfdata);
+
+   return o;
+}
index 7f2b5ad..2f06c79 100644 (file)
@@ -35,6 +35,9 @@ e_modapi_init(E_Module *m)
    e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, 
                                  "preferences-desktop-theme", 
                                  e_int_config_theme);
+   e_configure_registry_item_add("appearance/xsettings", 20, _("Applications"), NULL, 
+                                 "preferences-desktop-theme", 
+                                 e_int_config_xsettings);
    e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
                                  "preferences-desktop-color",
                                  e_int_config_color_classes);
@@ -109,6 +112,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
       e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
       e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/xsettings")))
+     e_object_del(E_OBJECT(cfd));
    
    e_configure_registry_item_del("appearance/startup");
    e_configure_registry_item_del("appearance/scale");
@@ -120,6 +125,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    e_configure_registry_item_del("appearance/colors");
    e_configure_registry_item_del("appearance/theme");
    e_configure_registry_item_del("appearance/wallpaper");
+   e_configure_registry_item_del("appearance/xsettings");
    e_configure_registry_category_del("appearance");
    
    while ((cfd = e_config_dialog_get("E", "internal/borders_border")))
index 9022f3c..46f9fef 100644 (file)
@@ -39,4 +39,6 @@ EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
 
+E_Config_Dialog *e_int_config_xsettings(E_Container *con, const char *params __UNUSED__);
+
 #endif
old mode 100755 (executable)
new mode 100644 (file)
index 1cfc0f2..2fb77e5 100644 (file)
@@ -159,14 +159,11 @@ _e_smart_reconfigure_do(void *data)
    evas = evas_object_evas_get(obj);
    EINA_LIST_FOREACH(sd->items, l, it)
      {
-        xx = sd->x - sd->cx + x;
         if (x > (sd->w - ww))
           {
              x = 0;
              y += hh;
-             xx = sd->x - sd->cx + x;
           }
-        yy = sd->y - sd->cy + y;
         it->x = x;
         it->y = y;
         it->w = ww;
diff --git a/src/modules/conf_window_manipulation/.cvsignore b/src/modules/conf_window_manipulation/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 5eba9ae..5f6708b 100644 (file)
@@ -192,23 +192,52 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
 
    rg = e_widget_radio_group_new(&(cfdata->border_shade_transition));
+   
    ow = e_widget_radio_add(evas, _("Linear"), E_TRANSITION_LINEAR, rg);
    e_widget_disabled_set(ow, !cfdata->border_shade_animate);
    cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
-   ow = e_widget_radio_add(evas, _("Accelerate, then decelerate"), 
-                           E_TRANSITION_SINUSOIDAL, rg);
+   
+   ow = e_widget_radio_add(evas, _("Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL, rg);
    e_widget_disabled_set(ow, !cfdata->border_shade_animate);
    cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
    ow = e_widget_radio_add(evas, _("Accelerate"), E_TRANSITION_ACCELERATE, rg);
    e_widget_disabled_set(ow, !cfdata->border_shade_animate);
    cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
    ow = e_widget_radio_add(evas, _("Decelerate"), E_TRANSITION_DECELERATE, rg);
    e_widget_disabled_set(ow, !cfdata->border_shade_animate);
    cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
    e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_radio_add(evas, _("Pronounced Accelerate"), E_TRANSITION_ACCELERATE_LOTS, rg);
+   e_widget_disabled_set(ow, !cfdata->border_shade_animate);
+   cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_radio_add(evas, _("Pronounced Decelerate"), E_TRANSITION_DECELERATE_LOTS, rg);
+   e_widget_disabled_set(ow, !cfdata->border_shade_animate);
+   cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_radio_add(evas, _("Pronounced Acceleratem then decelerate"), E_TRANSITION_SINUSOIDAL_LOTS, rg);
+   e_widget_disabled_set(ow, !cfdata->border_shade_animate);
+   cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_radio_add(evas, _("Bounce"), E_TRANSITION_BOUNCE, rg);
+   e_widget_disabled_set(ow, !cfdata->border_shade_animate);
+   cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
+   ow = e_widget_radio_add(evas, _("Bounce more"), E_TRANSITION_BOUNCE_LOTS, rg);
+   e_widget_disabled_set(ow, !cfdata->border_shade_animate);
+   cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   
    e_widget_toolbook_page_append(otb, NULL, _("Shading"), ol, 
                                  0, 0, 1, 0, 0.5, 0.0);
 
index 03aae6c..7bd621e 100644 (file)
@@ -52,7 +52,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con, _("Window Geometry"),
                             "E", "windows/window_geometry",
-                            "preferences-window-manipulation", 0, v, NULL);
+                            "preferences-window-geometry", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_window_remembers/.cvsignore b/src/modules/conf_window_remembers/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/connman/.cvsignore b/src/modules/connman/.cvsignore
deleted file mode 100644 (file)
index 91e5195..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-e_mod_main.lo
-module.la
-*.lo
-*.la
-module.desktop
index 30d62b9..68bf9ed 100644 (file)
@@ -331,6 +331,19 @@ _connman_service_free(E_Connman_Service *service)
    E_FREE(service);
 }
 
+static const char *
+_connman_service_security_find(const E_Connman_Element *element)
+{
+   const char **security;
+   unsigned int count;
+
+   if (!e_connman_service_security_get(element, &count, &security))
+     return NULL;
+   if ((!security) || (count < 1))
+     return NULL;
+   return security[0];
+}
+
 static void
 _connman_service_changed(void                    *data,
                          const E_Connman_Element *element)
@@ -348,12 +361,13 @@ _connman_service_changed(void                    *data,
 
    GSTR(name, e_connman_service_name_get);
    GSTR(type, e_connman_service_type_get);
-   GSTR(mode, e_connman_service_mode_get);
    GSTR(state, e_connman_service_state_get);
    GSTR(error, e_connman_service_error_get);
-   GSTR(security, e_connman_service_security_get);
    GSTR(ipv4_method, e_connman_service_ipv4_configuration_method_get);
 
+   str = _connman_service_security_find(element);
+   eina_stringshare_replace(&service->security, str);
+
    if (service->ipv4_method && strcmp(service->ipv4_method, "dhcp") == 0)
      {
         GSTR(ipv4_address, e_connman_service_ipv4_address_get);
@@ -439,15 +453,16 @@ _connman_service_new(E_Connman_Module_Context *ctxt,
 
    GSTR(name, e_connman_service_name_get);
    GSTR(type, e_connman_service_type_get);
-   GSTR(mode, e_connman_service_mode_get);
    GSTR(state, e_connman_service_state_get);
    GSTR(error, e_connman_service_error_get);
-   GSTR(security, e_connman_service_security_get);
    GSTR(ipv4_method, e_connman_service_ipv4_method_get);
    GSTR(ipv4_address, e_connman_service_ipv4_address_get);
    GSTR(ipv4_netmask, e_connman_service_ipv4_netmask_get);
 #undef GSTR
 
+   str = _connman_service_security_find(element);
+   eina_stringshare_replace(&service->security, str);
+
    if ((service->state != e_str_failure) && (service->error))
      eina_stringshare_replace(&service->error, NULL);
 
@@ -554,8 +569,10 @@ _connman_service_disconnect_cb(void            *data,
 
    if (error && dbus_error_is_set(error))
      {
-        if (strcmp(error->name,
-                   "org.moblin.connman.Error.NotConnected") != 0)
+        if ((strcmp(error->name,
+                    "org.moblin.connman.Error.NotConnected") != 0) ||
+           (strcmp(error->name,
+                    "net.connman.Error.NotConnected") != 0))
           _connman_dbus_error_show(_("Disconnect from network service."),
                                    error);
         dbus_error_free(error);
@@ -587,14 +604,27 @@ _connman_service_connect_cb(void            *data,
 
    if (error && dbus_error_is_set(error))
      {
-        /* TODO: cellular might ask for SetupRequired to enter APN,
-         * username and password
-         */
-          if ((strcmp(error->name,
-                      "org.moblin.connman.Error.PassphraseRequired") == 0) ||
-              (strcmp(error->name,
-                      "org.moblin.connman.Error.Failed") == 0))
+        char *password_needed[] = {
+          "org.moblin.connman.Error.PassphraseRequired",
+          "org.moblin.connman.Error.Failed",
+          "net.connman.Error.PassphraseRequired",
+          "net.connman.Error.Failed",
+          NULL
+        };
+        char *dont_display_error[] = {
+          "org.moblin.connman.Error.AlreadyConnected",
+          "net.connman.Error.AlreadyConnected",
+          "net.connman.Error.OperationAborted",
+          NULL
+        };
+        int i;
+
+        for (i = 0; password_needed[i]; ++i)
+          if (strcmp(error->name, password_needed[i]) == 0)
             {
+               /* TODO: cellular might ask for SetupRequired to enter APN,
+                * username and password
+                */
                E_Connman_Service *service;
 
                service = _connman_ctxt_find_service_stringshare
@@ -608,15 +638,23 @@ _connman_service_connect_cb(void            *data,
                     _connman_service_ask_pass_and_connect(service);
                  }
                else
-     /* TODO: cellular might ask for user and pass */
+                 /* TODO: cellular might ask for user and pass */
                  _connman_dbus_error_show(_("Connect to network service."),
                                           error);
+               break;
             }
-          else if (strcmp(error->name,
-                          "org.moblin.connman.Error.AlreadyConnected") != 0)
-            _connman_dbus_error_show(_("Connect to network service."), error);
 
-          dbus_error_free(error);
+        if (password_needed[i] == NULL)
+          {
+             for (i = 0; dont_display_error[i]; ++i)
+               if (strcmp(error->name, dont_display_error[i]) == 0)
+                 break;
+
+             if (dont_display_error[i] == NULL)
+               _connman_dbus_error_show(_("Connect to network service."), error);
+          }
+
+        dbus_error_free(error);
      }
 
    _connman_default_service_changed_delayed(d->ctxt);
@@ -1625,7 +1663,7 @@ _gc_orient(E_Gadcon_Client       *gcc,
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_connman_Name);
index 0731471..c6c8013 100644 (file)
@@ -3,7 +3,8 @@
 
 #include "config.h"
 #include <e.h>
-#include <E_Connman.h>
+#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
+#include <connman0_7x/E_Connman.h>
 #include <eina_log.h>
 
 #define MOD_CONF_VERSION 2
diff --git a/src/modules/cpufreq/.cvsignore b/src/modules/cpufreq/.cvsignore
deleted file mode 100644 (file)
index b8fa828..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-freqset
-module.desktop
index 10a2b33..fd09b41 100644 (file)
@@ -10,7 +10,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
@@ -126,7 +126,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Cpufreq");
diff --git a/src/modules/dropshadow/.cvsignore b/src/modules/dropshadow/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index f355d06..cd977b4 100644 (file)
@@ -4,7 +4,9 @@ MODULE = everything
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-e-module-$(MODULE).edj module.desktop
+e-module-$(MODULE).edj \
+e-module-$(MODULE)-start.edj \
+module.desktop
 
 EXTRA_DIST = $(files_DATA) everything.pc.in module.desktop.in
 
diff --git a/src/modules/everything/e-module-everything-start.edj b/src/modules/everything/e-module-everything-start.edj
new file mode 100644 (file)
index 0000000..57abea3
Binary files /dev/null and b/src/modules/everything/e-module-everything-start.edj differ
index 724d928..a3daf71 100644 (file)
@@ -1,16 +1,14 @@
 #include "e_mod_main.h"
 
-static void _e_mod_action_cb(E_Object *obj, const char *params);
-static void _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev);
-static Eina_Bool  _e_mod_run_defer_cb(void *data);
-static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_mod_menu_add(void *data, E_Menu *m);
-static void _config_init(void);
-static void _config_free(void);
-static Eina_Bool  _cleanup_history(void *data);
-static void _evry_type_init(const char *type);
-
-static Evry_API *_api = NULL;
+static void      _e_mod_action_cb(E_Object *obj, const char *params);
+static void      _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev);
+static Eina_Bool _e_mod_run_defer_cb(void *data);
+static void      _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void      _e_mod_menu_add(void *data, E_Menu *m);
+static void      _config_init(void);
+static void      _config_free(void);
+static Eina_Bool _cleanup_history(void *data);
+static void      _evry_type_init(const char *type);
 static Eina_List *_evry_types = NULL;
 static E_Int_Menu_Augmentation *maug = NULL;
 static E_Action *act = NULL;
@@ -18,19 +16,20 @@ static Ecore_Timer *cleanup_timer;
 static const char *module_icon = NULL;
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *plugin_conf_edd = NULL;
+static E_Config_DD *gadget_conf_edd = NULL;
+static int _e_module_evry_log_dom = -1;
 
+Evry_API *evry = NULL;
 Evry_Config *evry_conf = NULL;
 int _evry_events[NUM_EVRY_EVENTS];
-int _e_module_evry_log_dom = -1;
-
+E_Module *_mod_evry = NULL;
 
 /* module setup */
 EAPI E_Module_Api e_modapi =
-  {
-    E_MODULE_API_VERSION,
-    "Everything"
-  };
-
+{
+   E_MODULE_API_VERSION,
+   "Everything"
+};
 
 EAPI void *
 e_modapi_init(E_Module *m)
@@ -40,39 +39,41 @@ e_modapi_init(E_Module *m)
    char buf[4096];
 
    _e_module_evry_log_dom = eina_log_domain_register
-     ("e_module_everything", EINA_LOG_DEFAULT_COLOR);
+       ("e_module_everything", EINA_LOG_DEFAULT_COLOR);
 
-   if(_e_module_evry_log_dom < 0)
+   if (_e_module_evry_log_dom < 0)
      {
-       EINA_LOG_ERR
-         ("impossible to create a log domain for everything module");
-       return NULL;
+        EINA_LOG_ERR
+          ("impossible to create a log domain for everything module");
+        return NULL;
      }
 
+   _mod_evry = m;
+
    /* add module supplied action */
    act = e_action_add("everything");
    if (act)
      {
-       act->func.go = _e_mod_action_cb;
-       act->func.go_edge = _e_mod_action_cb_edge;
-       e_action_predef_name_set
-         (_("Everything Launcher"),
-          _("Show Everything Launcher"),
-          "everything", "", NULL, 0);
+        act->func.go = _e_mod_action_cb;
+        act->func.go_edge = _e_mod_action_cb_edge;
+        e_action_predef_name_set
+          (_("Everything Launcher"),
+          _("Show Everything Launcher"),
+          "everything", "", NULL, 0);
      }
 
    maug = e_int_menus_menu_augmentation_add
-     ("main/1", _e_mod_menu_add, NULL, NULL, NULL);
+       ("main/1", _e_mod_menu_add, NULL, NULL, NULL);
 
    e_configure_registry_category_add
      ("launcher", 80, _("Launcher"), NULL, "modules-launcher");
 
    snprintf(buf, sizeof(buf), "%s/e-module-everything.edj", e_module_dir_get(m));
    module_icon = eina_stringshare_add(buf);
-   
+
    e_configure_registry_item_add
      ("launcher/run_everything", 40, _("Everything Configuration"),
-      NULL, module_icon, evry_config_dialog);
+     NULL, module_icon, evry_config_dialog);
    evry_init();
 
    _evry_type_init("NONE");
@@ -85,16 +86,16 @@ e_modapi_init(E_Module *m)
    _evry_type_init("TEXT");
 
    _config_init();
-   
-   _evry_events[EVRY_EVENT_ITEMS_UPDATE]     = ecore_event_type_new();
-   _evry_events[EVRY_EVENT_ITEM_SELECTED]    = ecore_event_type_new();
-   _evry_events[EVRY_EVENT_ITEM_CHANGED]     = ecore_event_type_new();
+
+   _evry_events[EVRY_EVENT_ITEMS_UPDATE] = ecore_event_type_new();
+   _evry_events[EVRY_EVENT_ITEM_SELECTED] = ecore_event_type_new();
+   _evry_events[EVRY_EVENT_ITEM_CHANGED] = ecore_event_type_new();
    _evry_events[EVRY_EVENT_ACTION_PERFORMED] = ecore_event_type_new();
-   _evry_events[EVRY_EVENT_PLUGIN_SELECTED]  = ecore_event_type_new();
-   
-   _api = E_NEW(Evry_API, 1);
-   _api->log_dom = _e_module_evry_log_dom;
-#define SET(func) (_api->func = &evry_##func);
+   _evry_events[EVRY_EVENT_PLUGIN_SELECTED] = ecore_event_type_new();
+
+   evry = E_NEW(Evry_API, 1);
+   evry->log_dom = _e_module_evry_log_dom;
+#define SET(func) (evry->func = &evry_##func);
    SET(api_version_check);
    SET(item_new);
    SET(item_free);
@@ -112,7 +113,6 @@ e_modapi_init(E_Module *m)
    SET(action_find);
    SET(api_version_check);
    SET(type_register);
-   SET(icon_mime_get);
    SET(icon_theme_get);
    SET(fuzzy_match);
    SET(util_exec_app);
@@ -122,7 +122,6 @@ e_modapi_init(E_Module *m)
    SET(util_plugin_items_add);
    SET(util_md5_sum);
    SET(util_icon_get);
-   SET(items_sort_func);
    SET(item_changed);
    SET(file_path_get);
    SET(file_url_get);
@@ -139,10 +138,10 @@ e_modapi_init(E_Module *m)
    evry_plug_windows_init(m);
    evry_plug_settings_init(m);
    evry_plug_calc_init(m);
-   e_datastore_set("evry_api", _api);
+   e_datastore_set("evry_api", evry);
 
-   EINA_LIST_FOREACH(e_datastore_get("evry_modules"), l, em)
-     em->active = em->init(_api);
+   EINA_LIST_FOREACH (e_datastore_get("evry_modules"), l, em)
+     em->active = em->init(evry);
 
    evry_plug_collection_init();
    evry_plug_clipboard_init();
@@ -168,32 +167,36 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    Eina_List *l;
    Evry_Module *em;
 
-   EINA_LIST_FOREACH(e_datastore_get("evry_modules"), l, em)
-     em->shutdown();
+   EINA_LIST_FOREACH (e_datastore_get("evry_modules"), l, em)
+     {
+        if (em->active)
+          em->shutdown();
 
-   e_datastore_del("evry_api");
-   E_FREE(_api);
+        em->active = EINA_FALSE;
+     }
 
-#ifndef USE_MODULE_EVERYTHING_AS_MODULES
    evry_plug_apps_shutdown();
    evry_plug_files_shutdown();
    evry_plug_settings_shutdown();
    evry_plug_windows_shutdown();
    evry_plug_calc_shutdown();
-#endif
-   evry_gadget_shutdown();
-   evry_shutdown();
-   evry_view_shutdown();
-   evry_view_help_shutdown();
    evry_plug_clipboard_shutdown();
    evry_plug_text_shutdown();
    evry_plug_collection_shutdown();
    evry_plug_actions_shutdown();
+   evry_view_shutdown();
+   evry_view_help_shutdown();
+   evry_gadget_shutdown();
+   evry_shutdown();
+
+   e_datastore_del("evry_api");
+   E_FREE(evry);
+   evry = NULL;
 
    _config_free();
    evry_history_free();
 
-   EINA_LIST_FREE(_evry_types, t)
+   EINA_LIST_FREE (_evry_types, t)
      eina_stringshare_del(t);
 
    e_configure_registry_item_del("launcher/run_everything");
@@ -204,33 +207,36 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 
    if (act)
      {
-       e_action_predef_name_del(_("Everything Launcher"),
-                                _("Show Everything Dialog"));
-       e_action_del("everything");
+        e_action_predef_name_del(_("Everything Launcher"),
+                                 _("Show Everything Dialog"));
+        e_action_del("everything");
      }
 
    if (maug)
      {
-       e_int_menus_menu_augmentation_del("main/1", maug);
-       maug = NULL;
+        e_int_menus_menu_augmentation_del("main/1", maug);
+        maug = NULL;
      }
 
    if (module_icon)
      eina_stringshare_del(module_icon);
-   
+
    /* Clean EET */
    E_CONFIG_DD_FREE(conf_edd);
    E_CONFIG_DD_FREE(plugin_conf_edd);
+   E_CONFIG_DD_FREE(gadget_conf_edd);
 
    if (cleanup_timer)
      ecore_timer_del(cleanup_timer);
 
 #ifdef CHECK_REFS
    Evry_Item *it;
-   EINA_LIST_FREE(_refd, it)
+   EINA_LIST_FREE (_refd, it)
      printf("%d %s\n", it->ref, it->label);
 #endif
 
+   _mod_evry = NULL;
+
    return 1;
 }
 
@@ -239,26 +245,23 @@ e_modapi_save(E_Module *m __UNUSED__)
 {
    e_config_domain_save("module.everything", conf_edd, evry_conf);
 
-#ifndef USE_MODULE_EVERYTHING_AS_MODULES
    evry_plug_apps_save();
    evry_plug_files_save();
    evry_plug_settings_save();
    evry_plug_windows_save();
    evry_plug_calc_save();
-#endif
-   
+
    return 1;
 }
 
 /***************************************************************************/
 
 Ecore_Event_Handler *
-evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
+evry_event_handler_add(int type, Eina_Bool (*func)(void *data, int type, void *event), const void *data)
 {
    return ecore_event_handler_add(_evry_events[type], func, data);
 }
 
-
 Evry_Type
 evry_type_register(const char *type)
 {
@@ -267,16 +270,16 @@ evry_type_register(const char *type)
    const char *i;
    Eina_List *l;
 
-   EINA_LIST_FOREACH(_evry_types, l, i)
+   EINA_LIST_FOREACH (_evry_types, l, i)
      {
-       if (i == t) break;
-       ret++;
+        if (i == t) break;
+        ret++;
      }
 
-   if(!l)
+   if (!l)
      {
-       _evry_types = eina_list_append(_evry_types, t);
-       return ret;
+        _evry_types = eina_list_append(_evry_types, t);
+        return ret;
      }
    eina_stringshare_del(t);
 
@@ -300,7 +303,8 @@ evry_type_get(Evry_Type type)
    return ret;
 }
 
-int evry_api_version_check(int version)
+int
+evry_api_version_check(int version)
 {
    if (EVRY_API_VERSION == version)
      return 1;
@@ -310,7 +314,6 @@ int evry_api_version_check(int version)
    return 0;
 }
 
-
 static int
 _evry_cb_view_sort(const void *data1, const void *data2)
 {
@@ -319,7 +322,6 @@ _evry_cb_view_sort(const void *data1, const void *data2)
    return v1->priority - v2->priority;
 }
 
-
 void
 evry_view_register(Evry_View *view, int priority)
 {
@@ -328,8 +330,8 @@ evry_view_register(Evry_View *view, int priority)
    evry_conf->views = eina_list_append(evry_conf->views, view);
 
    evry_conf->views = eina_list_sort(evry_conf->views,
-                                    eina_list_count(evry_conf->views),
-                                    _evry_cb_view_sort);
+                                     eina_list_count(evry_conf->views),
+                                     _evry_cb_view_sort);
 }
 
 void
@@ -376,6 +378,15 @@ _config_init()
    E_CONFIG_LIST(D, T, plugins, plugin_conf_edd);
 #undef T
 #undef D
+#define T Gadget_Config
+#define D gadget_conf_edd
+   gadget_conf_edd = E_CONFIG_DD_NEW("Gadget_Config", Gadget_Config);
+   E_CONFIG_VAL(D, T, id, STR);
+   E_CONFIG_VAL(D, T, plugin, STR);
+   E_CONFIG_VAL(D, T, hide_after_action, INT);
+   E_CONFIG_VAL(D, T, popup, INT);
+#undef T
+#undef D
 #define T Evry_Config
 #define D conf_edd
    conf_edd = E_CONFIG_DD_NEW("Config", Evry_Config);
@@ -398,117 +409,124 @@ _config_init()
    E_CONFIG_LIST(D, T, conf_subjects, plugin_conf_edd);
    E_CONFIG_LIST(D, T, conf_actions, plugin_conf_edd);
    E_CONFIG_LIST(D, T, conf_objects, plugin_conf_edd);
-   E_CONFIG_LIST(D, T, conf_views,   plugin_conf_edd);
-   E_CONFIG_LIST(D, T, collections,  plugin_conf_edd);
+   E_CONFIG_LIST(D, T, conf_views, plugin_conf_edd);
+   E_CONFIG_LIST(D, T, collections, plugin_conf_edd);
+   E_CONFIG_LIST(D, T, gadgets, gadget_conf_edd);
    E_CONFIG_VAL(D, T, first_run, UCHAR);
 #undef T
 #undef D
    evry_conf = e_config_domain_load("module.everything", conf_edd);
 
-   if (evry_conf && !e_util_module_config_check
-       (_("Everything Module"), evry_conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+   if (evry_conf && !e_util_module_config_check(_("Everything Module"),
+                                                evry_conf->version,
+                                                MOD_CONFIG_FILE_VERSION))
      _config_free();
 
    if (!evry_conf)
      {
-       evry_conf = E_NEW(Evry_Config, 1);
-       evry_conf->version = (MOD_CONFIG_FILE_EPOCH << 16);
+        evry_conf = E_NEW(Evry_Config, 1);
+        evry_conf->version = (MOD_CONFIG_FILE_EPOCH << 16);
      }
 
 #define IFMODCFG(v) if ((evry_conf->version & 0xffff) < v) {
 #define IFMODCFGEND }
 
-   /* setup defaults */
-   IFMODCFG(0x0001);
-   evry_conf->rel_x = 0.5;
-   evry_conf->rel_y = 0.43;
-   evry_conf->width = 455;
-   evry_conf->height = 430;
-   evry_conf->scroll_animate = 1;
-   evry_conf->scroll_speed = 10.0;
-   evry_conf->hide_input = 0;
-   evry_conf->hide_list = 0;
-   evry_conf->quick_nav = 1;
-   evry_conf->view_mode = VIEW_MODE_DETAIL;
-   evry_conf->view_zoom = 0;
-   evry_conf->cycle_mode = 0;
-   evry_conf->history_sort_mode = 0;
-   evry_conf->edge_width = 340;
-   evry_conf->edge_height = 385;
-   evry_conf->first_run = EINA_TRUE;
-
-   pcc = E_NEW(Plugin_Config, 1);
-   pcc->name = eina_stringshare_add("Start");
-   pcc->enabled = EINA_FALSE;
-   pcc->aggregate = EINA_FALSE;
-   pcc->top_level = EINA_TRUE;
-   pcc->view_mode = VIEW_MODE_THUMB;
-   evry_conf->collections = eina_list_append(evry_conf->collections, pcc);
-
-   pc = E_NEW(Plugin_Config, 1);
-   pc->name = eina_stringshare_add("Windows");
-   pc->enabled = EINA_TRUE;
-   pc->view_mode = VIEW_MODE_NONE;
-   pcc->plugins = eina_list_append(pcc->plugins, pc);
-
-   pc = E_NEW(Plugin_Config, 1);
-   pc->name = eina_stringshare_add("Settings");
-   pc->enabled = EINA_TRUE;
-   pc->view_mode = VIEW_MODE_NONE;
-   pcc->plugins = eina_list_append(pcc->plugins, pc);
-
-   pc = E_NEW(Plugin_Config, 1);
-   pc->name = eina_stringshare_add("Files");
-   pc->enabled = EINA_TRUE;
-   pc->view_mode = VIEW_MODE_NONE;
-   pcc->plugins = eina_list_append(pcc->plugins, pc);
-
-   pc = E_NEW(Plugin_Config, 1);
-   pc->name = eina_stringshare_add("Applications");
-   pc->enabled = EINA_TRUE;
-   pc->view_mode = VIEW_MODE_NONE;
-   pcc->plugins = eina_list_append(pcc->plugins, pc);
-   IFMODCFGEND;
-
-   IFMODCFG(0x0003);
-   evry_conf->width = 464;
-   evry_conf->height = 366;
-   IFMODCFGEND;
-   
-   evry_conf->version = MOD_CONFIG_FILE_VERSION;
+    /* setup defaults */
+    IFMODCFG(0x0001);
+    evry_conf->rel_x = 0.5;
+    evry_conf->rel_y = 0.43;
+    evry_conf->width = 455;
+    evry_conf->height = 430;
+    evry_conf->scroll_animate = 1;
+    evry_conf->scroll_speed = 10.0;
+    evry_conf->hide_input = 0;
+    evry_conf->hide_list = 0;
+    evry_conf->quick_nav = 1;
+    evry_conf->view_mode = VIEW_MODE_DETAIL;
+    evry_conf->view_zoom = 0;
+    evry_conf->cycle_mode = 0;
+    evry_conf->history_sort_mode = 0;
+    evry_conf->edge_width = 340;
+    evry_conf->edge_height = 385;
+    evry_conf->first_run = EINA_TRUE;
+
+    pcc = E_NEW(Plugin_Config, 1);
+    pcc->name = eina_stringshare_add("Start");
+    pcc->enabled = EINA_FALSE;
+    pcc->aggregate = EINA_FALSE;
+    pcc->top_level = EINA_TRUE;
+    pcc->view_mode = VIEW_MODE_THUMB;
+    evry_conf->collections = eina_list_append(evry_conf->collections, pcc);
+
+    pc = E_NEW(Plugin_Config, 1);
+    pc->name = eina_stringshare_add("Windows");
+    pc->enabled = EINA_TRUE;
+    pc->view_mode = VIEW_MODE_NONE;
+    pcc->plugins = eina_list_append(pcc->plugins, pc);
+
+    pc = E_NEW(Plugin_Config, 1);
+    pc->name = eina_stringshare_add("Settings");
+    pc->enabled = EINA_TRUE;
+    pc->view_mode = VIEW_MODE_NONE;
+    pcc->plugins = eina_list_append(pcc->plugins, pc);
+
+    pc = E_NEW(Plugin_Config, 1);
+    pc->name = eina_stringshare_add("Files");
+    pc->enabled = EINA_TRUE;
+    pc->view_mode = VIEW_MODE_NONE;
+    pcc->plugins = eina_list_append(pcc->plugins, pc);
+
+    pc = E_NEW(Plugin_Config, 1);
+    pc->name = eina_stringshare_add("Applications");
+    pc->enabled = EINA_TRUE;
+    pc->view_mode = VIEW_MODE_NONE;
+    pcc->plugins = eina_list_append(pcc->plugins, pc);
+    IFMODCFGEND;
+
+    IFMODCFG(0x0003);
+    evry_conf->width = 464;
+    evry_conf->height = 366;
+    IFMODCFGEND;
+
+    evry_conf->version = MOD_CONFIG_FILE_VERSION;
 }
 
 static void
 _config_free(void)
 {
    Plugin_Config *pc, *pc2;
-
-   EINA_LIST_FREE(evry_conf->collections, pc)
-     EINA_LIST_FREE(pc->plugins, pc2)
+   Gadget_Config *gc;
+
+   EINA_LIST_FREE (evry_conf->collections, pc)
+     EINA_LIST_FREE (pc->plugins, pc2)
+       {
+          IF_RELEASE(pc2->name);
+          IF_RELEASE(pc2->trigger);
+          E_FREE(pc2);
+       }
+   EINA_LIST_FREE (evry_conf->conf_subjects, pc)
      {
-       IF_RELEASE(pc2->name);
-       IF_RELEASE(pc2->trigger);
-       E_FREE(pc2);
+        IF_RELEASE(pc->name);
+        IF_RELEASE(pc->trigger);
+        E_FREE(pc);
      }
-
-   EINA_LIST_FREE(evry_conf->conf_subjects, pc)
+   EINA_LIST_FREE (evry_conf->conf_actions, pc)
      {
-       IF_RELEASE(pc->name);
-       IF_RELEASE(pc->trigger);
-       E_FREE(pc);
+        IF_RELEASE(pc->name);
+        IF_RELEASE(pc->trigger);
+        E_FREE(pc);
      }
-   EINA_LIST_FREE(evry_conf->conf_actions, pc)
+   EINA_LIST_FREE (evry_conf->conf_objects, pc)
      {
-       IF_RELEASE(pc->name);
-       IF_RELEASE(pc->trigger);
-       E_FREE(pc);
+        IF_RELEASE(pc->name);
+        IF_RELEASE(pc->trigger);
+        E_FREE(pc);
      }
-   EINA_LIST_FREE(evry_conf->conf_objects, pc)
+   EINA_LIST_FREE (evry_conf->gadgets, gc)
      {
-       IF_RELEASE(pc->name);
-       IF_RELEASE(pc->trigger);
-       E_FREE(pc);
+        IF_RELEASE(gc->id);
+        IF_RELEASE(gc->plugin);
+        E_FREE(gc);
      }
 
    E_FREE(evry_conf);
@@ -526,7 +544,7 @@ _e_mod_run_defer_cb(void *data)
    E_Zone *zone;
 
    zone = data;
-   if (zone) evry_show(zone, E_ZONE_EDGE_NONE, _params);
+   if (zone) evry_show(zone, E_ZONE_EDGE_NONE, _params, EINA_TRUE);
 
    _idler = NULL;
    return ECORE_CALLBACK_CANCEL;
@@ -539,14 +557,14 @@ _e_mod_action_cb(E_Object *obj, const char *params)
 
    if (obj)
      {
-       if (obj->type == E_MANAGER_TYPE)
-         zone = e_util_zone_current_get((E_Manager *)obj);
-       else if (obj->type == E_CONTAINER_TYPE)
-         zone = e_util_zone_current_get(((E_Container *)obj)->manager);
-       else if (obj->type == E_ZONE_TYPE)
-         zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
-       else
-         zone = e_util_zone_current_get(e_manager_current_get());
+        if (obj->type == E_MANAGER_TYPE)
+          zone = e_util_zone_current_get((E_Manager *)obj);
+        else if (obj->type == E_CONTAINER_TYPE)
+          zone = e_util_zone_current_get(((E_Container *)obj)->manager);
+        else if (obj->type == E_ZONE_TYPE)
+          zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
+        else
+          zone = e_util_zone_current_get(e_manager_current_get());
      }
    if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
 
@@ -558,7 +576,7 @@ _e_mod_action_cb(E_Object *obj, const char *params)
    /* if (zone) evry_show(zone, _params); */
 
    if (_idler) ecore_idle_enterer_del(_idler);
-  _idler = ecore_idle_enterer_add(_e_mod_run_defer_cb, zone);
+   _idler = ecore_idle_enterer_add(_e_mod_run_defer_cb, zone);
 }
 
 static void
@@ -570,7 +588,7 @@ _e_mod_action_cb_edge(E_Object *obj  __UNUSED__, const char *params, E_Event_Zon
 
    if (_idler) ecore_idle_enterer_del(_idler);
 
-   evry_show(ev->zone, ev->edge, _params);
+   evry_show(ev->zone, ev->edge, _params, EINA_TRUE);
 }
 
 /* menu item callback(s) */
@@ -592,3 +610,4 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
    e_util_menu_item_theme_icon_set(mi, "system-run");
    e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
 }
+
index 3224d4f..1f0b31e 100644 (file)
 #define SLIDE_LEFT   1
 #define SLIDE_RIGHT -1
 
-typedef struct _Evry_View      Evry_View;
 typedef struct _History                Evry_History;
 typedef struct _Config         Evry_Config;
 typedef struct _Evry_Selector  Evry_Selector;
 typedef struct _Tab_View       Tab_View;
 typedef struct _Evry_Window    Evry_Window;
+typedef struct _Gadget_Config   Gadget_Config;
 
 struct _Evry_Window
 {
@@ -45,6 +45,14 @@ struct _Evry_Window
   Eina_Bool grab;
 
   Evry_State *state_clearing;
+
+  struct
+  {
+      void (*hide) (Evry_Window *win, int finished);
+  } func;    
+
+  /* only to be used by creator of win */
+  void *data;
 };
 
 struct _Evry_Selector
@@ -120,26 +128,6 @@ struct _Evry_State
   Eina_Bool delete_me;
 };
 
-struct _Evry_View
-{
-  Evry_View  *id;
-  const char *name;
-  const char *trigger;
-  int active;
-  Evas_Object *o_list;
-  Evas_Object *o_bar;
-
-  Evry_View *(*create) (Evry_View *view, const Evry_State *s, const Evas_Object *swallow);
-  void (*destroy)      (Evry_View *view);
-  int  (*cb_key_down)  (Evry_View *view, const Ecore_Event_Key *ev);
-  int  (*update)       (Evry_View *view);
-  void (*clear)        (Evry_View *view);
-
-  int priority;
-
-  Evry_State *state;
-};
-
 struct _Tab_View
 {
   const Evry_State *state;
@@ -196,8 +184,9 @@ struct _Config
   /* use up/down keys for prev/next in thumb view */
   int cycle_mode;
 
+  Eina_List *gadgets;
+  
   unsigned char first_run;
-
   /* not saved data */
   Eina_List *actions;
   Eina_List *views;
@@ -205,6 +194,14 @@ struct _Config
   int min_w, min_h;
 };
 
+struct _Gadget_Config
+{
+  const char *id;
+  const char *plugin;
+  int hide_after_action;
+  int popup;
+};
+  
 struct _History
 {
   int version;
@@ -226,7 +223,7 @@ void  evry_plugin_update(Evry_Plugin *plugin, int state);
 void  evry_clear_input(Evry_Plugin *p);
 
 /* evry_util.c */
-Evas_Object *evry_icon_mime_get(const char *mime, Evas *e);
+/* Evas_Object *evry_icon_mime_get(const char *mime, Evas *e); */
 Evas_Object *evry_icon_theme_get(const char *icon, Evas *e);
 int   evry_fuzzy_match(const char *str, const char *match);
 Eina_List *evry_fuzzy_match_sort(Eina_List *items);
@@ -237,9 +234,9 @@ void  evry_util_file_detail_set(Evry_Item_File *file);
 int   evry_util_module_config_check(const char *module_name, int conf, int epoch, int version);
 Evas_Object *evry_util_icon_get(Evry_Item *it, Evas *e);
 int   evry_util_plugin_items_add(Evry_Plugin *p, Eina_List *items, const char *input, int match_detail, int set_usage);
-int   evry_items_sort_func(const void *data1, const void *data2);
 void  evry_item_changed(Evry_Item *it, int change_icon, int change_selected);
 char *evry_util_md5_sum(const char *str);
+void evry_util_items_sort(Eina_List **items, int flags);
 
 const char *evry_file_path_get(Evry_Item_File *file);
 const char *evry_file_url_get(Evry_Item_File *file);
@@ -263,8 +260,7 @@ Evry_Plugin *evry_plugin_new(Evry_Plugin *base, const char *name, const char *la
                             Evry_Type item_type,
                             Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
                             void (*cleanup) (Evry_Plugin *p),
-                            int  (*fetch)   (Evry_Plugin *p, const char *input),
-                            void (*free) (Evry_Plugin *p));
+                            int  (*fetch)   (Evry_Plugin *p, const char *input));
 
 void  evry_plugin_free(Evry_Plugin *p);
 
@@ -302,13 +298,13 @@ void  evry_plug_collection_shutdown(void);
 
 int   evry_init(void);
 int   evry_shutdown(void);
-Evry_Window *evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params);
+Evry_Window *evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup);
 void  evry_hide(Evry_Window *win, int clear);
 
-int   evry_plug_actions_init();
-void  evry_plug_actions_shutdown();
+int   evry_plug_actions_init(void);
+void  evry_plug_actions_shutdown(void);
 
-Evry_Plugin *evry_aggregator_new(Evry_Window *win, int type);
+Evry_Plugin *evry_aggregator_new(int type);
 
 void  evry_history_init(void);
 void  evry_history_free(void);
@@ -347,37 +343,11 @@ void evry_plug_calc_save(void);
 
 Ecore_Event_Handler *evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
 
+extern Evry_API *evry;
 extern Evry_History *evry_hist;
 extern Evry_Config  *evry_conf;
 extern int  _evry_events[NUM_EVRY_EVENTS];
-
-#define EVRY_ITEM_NEW(_base, _plugin, _label, _icon_get, _free)                \
-  (_base *) evry_item_new(EVRY_ITEM(E_NEW(_base, 1)), EVRY_PLUGIN(_plugin), \
-                         _label, _icon_get, _free)
-
-#define EVRY_ITEM_FREE(_item) evry_item_free((Evry_Item *)_item)
-#define EVRY_ITEM_REF(_item) evry_item_ref((Evry_Item *)_item)
-
-#define EVRY_PLUGIN_NEW(_base, _name, _icon, _item_type, _begin, _cleanup, _fetch, _free) \
-  evry_plugin_new(EVRY_PLUGIN(E_NEW(_base, 1)), _name, _(_name), _icon, _item_type, \
-                 _begin, _cleanup, _fetch, _free)
-
-#define EVRY_ACTION_NEW(_name, _in1, _in2, _icon, _action, _check)     \
-  evry_action_new(_name, _(_name), _in1, _in2, _icon, _action, _check)
-
-#define EVRY_PLUGIN_FREE(_p)                   \
-  if (_p) evry_plugin_free(EVRY_PLUGIN(_p))
-
-#define EVRY_PLUGIN_UPDATE(_p, _action)                        \
-  if (_p) evry_plugin_update(EVRY_PLUGIN(_p), _action)
-
-#define EVRY_PLUGIN_ITEMS_FREE(_p) {           \
-     Evry_Item *it;                            \
-     EINA_LIST_FREE(EVRY_PLUGIN(_p)->items, it) \
-       evry_item_free(it); }
-
-#define EVRY_PLUGIN_ITEMS_ADD(_plugin, _items, _input, _match_detail, _set_usage) \
-  evry_util_plugin_items_add(EVRY_PLUGIN(_plugin), _items, _input, _match_detail, _set_usage)
+extern E_Module *_mod_evry;
 
 /*** E Module ***/
 EAPI void *e_modapi_init     (E_Module *m);
@@ -387,27 +357,11 @@ EAPI E_Config_Dialog *evry_config_dialog(E_Container *con, const char *params);
 EAPI E_Config_Dialog *evry_collection_conf_dialog(E_Container *con, const char *params);
 EAPI extern E_Module_Api e_modapi;
 
-/*** Common Logging  ***/
-extern int _e_module_evry_log_dom;
-
-#ifndef EINA_LOG_DEFAULT_COLOR
-#define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN
-#endif
-
-#undef DBG
-#undef INF
-#undef WRN
-#undef ERR
-
-#define DBG(...) EINA_LOG_DOM_DBG(_e_module_evry_log_dom, __VA_ARGS__)
-#define INF(...) EINA_LOG_DOM_INFO(_e_module_evry_log_dom, __VA_ARGS__)
-#define WRN(...) EINA_LOG_DOM_WARN(_e_module_evry_log_dom, __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(_e_module_evry_log_dom, __VA_ARGS__)
-
-//#define CHECK_REFS 1
-//#define CHECK_TIME 1
-//#undef DBG
-//#define DBG(...) ERR(__VA_ARGS__)
+/* #define CHECK_REFS 1
+ * #define PRINT_REFS 1
+ * #define CHECK_TIME 1
+ * #undef DBG
+ * #define DBG(...) ERR(__VA_ARGS__) */
 
 #ifdef CHECK_REFS
 extern Eina_List *_refd;
index ddb4ced..16d190c 100644 (file)
@@ -7,8 +7,8 @@
 
 #define DRAG_OFF_WINDOW
 
-#define INPUTLEN 256
-#define MATCH_LAG 0.15
+#define INPUTLEN          256
+#define MATCH_LAG         0.15
 #define INITIAL_MATCH_LAG 0.3
 
 #if defined (CHECK_TIME) || defined (CHECK_REFS)
 #define DBG(...)
 #endif
 
-static void _evry_matches_update(Evry_Selector *sel, int async);
-static void _evry_plugin_action(Evry_Selector *sel, int finished);
-static void _evry_plugin_select(Evry_State *s, Evry_Plugin *p);
-static void _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p);
-static int  _evry_backspace(Evry_Selector *sel);
-static void _evry_update(Evry_Selector *sel, int fetch);
-static void _evry_update_text_label(Evry_State *s);
-static int  _evry_clear(Evry_Selector *sel);
-static Eina_Bool  _evry_cb_update_timer(void *data);
-
-static Evry_State *_evry_state_new(Evry_Selector *sel, Eina_List *plugins);
-static void _evry_state_pop(Evry_Selector *sel, int immediate);
-static void _evry_state_clear(Evry_Window *win);
+static void           _evry_matches_update(Evry_Selector *sel, int async);
+static void           _evry_plugin_action(Evry_Selector *sel, int finished);
+static void           _evry_plugin_select(Evry_State *s, Evry_Plugin *p);
+static void           _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p);
+static int            _evry_backspace(Evry_Selector *sel);
+static void           _evry_update(Evry_Selector *sel, int fetch);
+static void           _evry_update_text_label(Evry_State *s);
+static int            _evry_clear(Evry_Selector *sel);
+static Eina_Bool      _evry_cb_update_timer(void *data);
+
+static Evry_State    *_evry_state_new(Evry_Selector *sel, Eina_List *plugins);
+static void           _evry_state_pop(Evry_Selector *sel, int immediate);
+static void           _evry_state_clear(Evry_Window *win);
+static void           _evry_hide_func(Evry_Window *win, int finished);
 
 static Evry_Selector *_evry_selector_new(Evry_Window *win, int type);
-static void _evry_selector_free(Evry_Selector *sel);
-static void _evry_selector_activate(Evry_Selector *sel, int slide);
-static void _evry_selector_update(Evry_Selector *sel);
-static int  _evry_selector_plugins_get(Evry_Selector *sel, Evry_Item *it, const char *plugin_name);
-static void _evry_selector_update_actions(Evry_Selector *sel);
-static void _evry_selector_item_update(Evry_Selector *sel);
-static void _evry_selector_item_clear(Evry_Selector *sel);
-static void _evry_selector_label_set(Evry_Selector *sel, const char *part, const char *label);
-static void _evry_selector_signal_emit(Evry_Selector *sel, const char *msg);
-static int  _evry_selectors_shift(Evry_Window *win, int dir);
-static int  _evry_selectors_switch(Evry_Window *win, int dir);
-
-static Evry_Window *_evry_window_new(E_Zone *zone, E_Zone_Edge edge);
-static void _evry_window_free(Evry_Window *win);
-static void _evry_list_win_show(Evry_Window *win);
-static void _evry_list_win_hide(Evry_Window *win);
-static void _evry_list_win_update(Evry_State *s);
-
-static void _evry_view_clear(Evry_State *s);
-static int  _evry_view_update(Evry_Window *win, Evry_State *s);
-static int  _evry_view_key_press(Evry_State *s, Ecore_Event_Key *ev);
-static void _evry_view_show(Evry_Window *win, Evry_View *v, int slide);
-static void _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
-
-
-static void _evry_item_desel(Evry_State *s);
-static void _evry_item_sel(Evry_State *s, Evry_Item *it);
-
-static Eina_Bool  _evry_cb_key_down(void *data, int type, void *event);
-static Eina_Bool  _evry_cb_selection_notify(void *data, int type, void *event);
-static Eina_Bool  _evry_cb_mouse(void *data, int type, void *event);
+static void           _evry_selector_free(Evry_Selector *sel);
+static void           _evry_selector_activate(Evry_Selector *sel, int slide);
+static void           _evry_selector_update(Evry_Selector *sel);
+static int            _evry_selector_plugins_get(Evry_Selector *sel, Evry_Item *it, const char *plugin_name);
+static void           _evry_selector_update_actions(Evry_Selector *sel);
+static void           _evry_selector_item_update(Evry_Selector *sel);
+static void           _evry_selector_item_clear(Evry_Selector *sel);
+static void           _evry_selector_label_set(Evry_Selector *sel, const char *part, const char *label);
+static void           _evry_selector_signal_emit(Evry_Selector *sel, const char *msg);
+static int            _evry_selectors_shift(Evry_Window *win, int dir);
+static int            _evry_selectors_switch(Evry_Window *win, int dir);
+
+static Evry_Window   *_evry_window_new(E_Zone *zone, E_Zone_Edge edge);
+static void           _evry_window_free(Evry_Window *win);
+static void           _evry_list_win_show(Evry_Window *win);
+static void           _evry_list_win_hide(Evry_Window *win);
+static void           _evry_list_win_update(Evry_State *s);
+
+static int            _evry_view_create(Evry_State *s);
+static void           _evry_view_clear(Evry_State *s);
+static int            _evry_view_update(Evry_Window *win, Evry_State *s);
+static int            _evry_view_key_press(Evry_State *s, Ecore_Event_Key *ev);
+static void           _evry_view_show(Evry_Window *win, Evry_View *v, int slide);
+static void           _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
+
+static void           _evry_item_desel(Evry_State *s);
+static void           _evry_item_sel(Evry_State *s, Evry_Item *it);
+
+static Eina_Bool      _evry_cb_key_down(void *data, int type, void *event);
+static Eina_Bool      _evry_cb_selection_notify(void *data, int type, void *event);
+static Eina_Bool      _evry_cb_mouse(void *data, int type, void *event);
 
 static Eina_List *windows = NULL;
 
@@ -91,7 +92,7 @@ evry_init(void)
 int
 evry_shutdown(void)
 {
-   while(windows)
+   while (windows)
      evry_hide(windows->data, 0);
 
    return 1;
@@ -104,24 +105,24 @@ _evry_aggregator_fetch(Evry_State *s)
 
    if (!s)
      {
-       ERR("no state");
-       return 0;
+        ERR("no state");
+        return 0;
      }
 
    if (s->aggregator->fetch(s->aggregator, s->input))
      {
-       l = eina_list_data_find_list(s->cur_plugins, s->aggregator);
+        l = eina_list_data_find_list(s->cur_plugins, s->aggregator);
 
-       if (l && l->prev)
-         s->cur_plugins = eina_list_promote_list(s->cur_plugins, l);
-       else if (!l)
-         s->cur_plugins = eina_list_prepend(s->cur_plugins, s->aggregator);
-     }
-   else
-     {
-       s->cur_plugins = eina_list_remove(s->cur_plugins, s->aggregator);
+        if (!l)
+          s->cur_plugins = eina_list_prepend(s->cur_plugins, s->aggregator);
+        else
+          s->cur_plugins = eina_list_promote_list(s->cur_plugins, l);
+
+        return 1;
      }
 
+   s->cur_plugins = eina_list_remove(s->cur_plugins, s->aggregator);
+
    return 1;
 }
 
@@ -139,14 +140,14 @@ _evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 
    if (sel->state && sel->state->cur_item == it)
      {
-       _evry_selector_update(sel);
+        _evry_selector_update(sel);
      }
 
    return ECORE_CALLBACK_PASS_ON;
 }
 
 Evry_Window *
-evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params)
+evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup)
 {
    Evry_Window *win;
    Evry_Selector *sel;
@@ -155,31 +156,35 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params)
    _evry_time = ecore_time_get();
    DBG("_____evry_show______");
 #endif
-   
+
    E_OBJECT_CHECK_RETURN(zone, 0);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, 0);
 
    if (!(win = _evry_window_new(zone, edge)))
      return NULL;
 
-   e_win_layer_set(win->ewin, 255);
-   ecore_x_netwm_window_type_set(win->ewin->evas_win,
-                                ECORE_X_WINDOW_TYPE_UTILITY);
+   if (popup)
+     {
+        e_win_layer_set(win->ewin, 255);
+        ecore_x_netwm_window_type_set(win->ewin->evas_win,
+                                      ECORE_X_WINDOW_TYPE_UTILITY);
 
-   ecore_evas_name_class_set(win->ewin->ecore_evas, "E", "everything");
-   ecore_evas_show(win->ewin->ecore_evas);
+        ecore_evas_name_class_set(win->ewin->ecore_evas, "E", "everything");
 
-   if (e_grabinput_get(win->ewin->evas_win, 0, win->ewin->evas_win))
-     win->grab = 1;
-   else
-     ERR("could not acquire grab");
+        ecore_evas_show(win->ewin->ecore_evas);
+
+        if (e_grabinput_get(win->ewin->evas_win, 0, win->ewin->evas_win))
+          win->grab = 1;
+        else
+          ERR("could not acquire grab");
+     }
 
    evry_history_load();
 
    if (params)
      win->plugin_dedicated = EINA_TRUE;
 
-   win->sel_list = E_NEW(Evry_Selector*, 4);
+   win->sel_list = E_NEW(Evry_Selector *, 4);
    win->sel_list[3] = NULL;
    win->selectors = win->sel_list;
    _evry_selector_new(win, EVRY_PLUGIN_SUBJECT);
@@ -187,81 +192,87 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params)
    _evry_selector_new(win, EVRY_PLUGIN_OBJECT);
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_EVENT_KEY_DOWN,
-       _evry_cb_key_down, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_EVENT_KEY_DOWN,
+         _evry_cb_key_down, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_X_EVENT_SELECTION_NOTIFY,
-       _evry_cb_selection_notify, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_X_EVENT_SELECTION_NOTIFY,
+         _evry_cb_selection_notify, win));
 
    win->handlers = eina_list_append
-     (win->handlers, evry_event_handler_add
-      (EVRY_EVENT_ITEM_CHANGED,
-       _evry_cb_item_changed, win));
+       (win->handlers, evry_event_handler_add
+         (EVRY_EVENT_ITEM_CHANGED,
+         _evry_cb_item_changed, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_BUTTON_DOWN,
-       _evry_cb_mouse, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_EVENT_MOUSE_BUTTON_DOWN,
+         _evry_cb_mouse, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_BUTTON_UP,
-       _evry_cb_mouse, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_EVENT_MOUSE_BUTTON_UP,
+         _evry_cb_mouse, win));
 #if 0
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_MOVE,
-       _evry_cb_mouse, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_EVENT_MOUSE_MOVE,
+         _evry_cb_mouse, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_WHEEL,
-       _evry_cb_mouse, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_EVENT_MOUSE_WHEEL,
+         _evry_cb_mouse, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_X_EVENT_MOUSE_IN,
-       _evry_cb_mouse_in, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_X_EVENT_MOUSE_IN,
+         _evry_cb_mouse_in, win));
 
    win->handlers = eina_list_append
-     (win->handlers, ecore_event_handler_add
-      (ECORE_X_EVENT_MOUSE_OUT,
-       _evry_cb_mouse_out, win));
+       (win->handlers, ecore_event_handler_add
+         (ECORE_X_EVENT_MOUSE_OUT,
+         _evry_cb_mouse_out, win));
 #endif
    _evry_selector_plugins_get(SUBJ_SEL, NULL, params);
    _evry_selector_update(SUBJ_SEL);
 
    windows = eina_list_append(windows, win);
 
-   if (!evry_conf->hide_list || edge)
+   _evry_selector_activate(SUBJ_SEL, 0);
+
+   if ((!evry_conf->hide_list) || (edge))
      {
-       _evry_selector_activate(SUBJ_SEL, 0);
-       sel = CUR_SEL;
+        sel = CUR_SEL;
 
-       if (sel && sel->state && evry_conf->views)
-         {
-            if (evry_conf->first_run)
-              {
-                 evry_view_toggle(sel->state, "?");
-                 evry_conf->first_run = EINA_FALSE;
-              }
+        if (sel && sel->state && evry_conf->views)
+          {
+             /* if (evry_conf->first_run)
+              *   {
+              *      evry_view_toggle(sel->state, "?");
+              *      evry_conf->first_run = EINA_FALSE;
+              *   } */
 
-            edje_object_signal_emit(win->o_main, "list:e,state,list_show", "e");
-            edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e");
-            win->visible = EINA_TRUE;
-         }
-     }
-   else
-     {
-       _evry_selector_activate(SUBJ_SEL, 0);
+             edje_object_signal_emit(win->o_main, "list:e,state,list_show", "e");
+             edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e");
+             win->visible = EINA_TRUE;
+          }
      }
 
+   win->func.hide = &_evry_hide_func;
+
    return win;
 }
 
+static void
+_evry_hide_func(Evry_Window *win, int finished)
+{
+   if ((finished) && (win->grab))
+     evry_hide(win, 0);
+}
+
 void
 evry_hide(Evry_Window *win, int clear)
 {
@@ -273,50 +284,52 @@ evry_hide(Evry_Window *win, int clear)
    _evry_state_clear(win);
 
    if ((clear && CUR_SEL) &&
+       /* pop states */
        ((eina_list_count((SUBJ_SEL)->states) > 1) ||
-       (CUR_SEL != SUBJ_SEL) ||
-       (((CUR_SEL)->state) &&
-        ((CUR_SEL)->state->input[0]))))
-     {
-       int slide = 0;
-       Evry_Selector *sel;
-       Evry_State *s;
-
-       if (CUR_SEL != SUBJ_SEL)
-         {
-            if (CUR_SEL == ACTN_SEL)
-              _evry_selectors_switch(win, -1);
-            else if (CUR_SEL == OBJ_SEL)
-              _evry_selectors_switch(win, 1);
-         }
-
-       /* just to be sure */
-       CUR_SEL = SUBJ_SEL;
-
-       while ((CUR_SEL)->states->next)
-         {
-            slide = SLIDE_RIGHT;
-            _evry_state_pop(CUR_SEL, 1);
-         }
-
-       sel = CUR_SEL;
-       s = sel->state;
-       _evry_clear(sel);
-       _evry_clear(sel);
-
-       _evry_aggregator_fetch(s);
-       _evry_selector_update(sel);
-       _evry_update_text_label(s);
-       _evry_view_show(win, s->view, slide);
-       s->view->update(s->view);
-
-       return;
+        /* move to subject selector */
+        (CUR_SEL != SUBJ_SEL) ||
+        /* clear input */
+        (((CUR_SEL)->state) && ((CUR_SEL)->state->input[0]))))
+     {
+        int slide = 0;
+        Evry_Selector *sel;
+        Evry_State *s;
+
+        if (CUR_SEL != SUBJ_SEL)
+          {
+             if (CUR_SEL == ACTN_SEL)
+               _evry_selectors_switch(win, -1);
+             else if (CUR_SEL == OBJ_SEL)
+               _evry_selectors_switch(win, 1);
+          }
+
+        /* just to be sure */
+        CUR_SEL = SUBJ_SEL;
+
+        while ((CUR_SEL)->states->next)
+          {
+             slide = SLIDE_RIGHT;
+             _evry_state_pop(CUR_SEL, 1);
+          }
+
+        sel = CUR_SEL;
+        s = sel->state;
+        _evry_clear(sel);
+        _evry_clear(sel);
+
+        _evry_aggregator_fetch(s);
+        _evry_selector_update(sel);
+        _evry_update_text_label(s);
+        if (s->view)
+          {
+             _evry_view_show(win, s->view, slide);
+             s->view->update(s->view);
+          }
+        return;
      }
 
    if (_evry_selectors_shift(win, -1))
-     {
-       return;
-     }
+     return;
 
    win->visible = EINA_FALSE;
 
@@ -325,12 +338,12 @@ evry_hide(Evry_Window *win, int clear)
 
    E_FREE(win->sel_list);
 
-   EINA_LIST_FREE(win->handlers, ev)
+   EINA_LIST_FREE (win->handlers, ev)
      ecore_event_handler_del(ev);
 
    if (win->grab)
      e_grabinput_release(win->ewin->evas_win,
-                        win->ewin->evas_win);
+                         win->ewin->evas_win);
 
    windows = eina_list_remove(windows, win);
 
@@ -343,7 +356,7 @@ evry_hide(Evry_Window *win, int clear)
    int _cnt = eina_list_count(_refd);
    Eina_List *_l;
    printf("__________________________");
-   EINA_LIST_FOREACH(_refd, _l, _it)
+   EINA_LIST_FOREACH (_refd, _l, _it)
      printf("%d %s\n", _it->ref, _it->label);
    printf("sum: %d", _cnt);
 #endif
@@ -354,83 +367,78 @@ _evry_selectors_shift(Evry_Window *win, int dir)
 {
    if ((dir > 0) && (win->level == 0))
      {
-       void *new_sel;
-       Evry_Selector *sel;
-       Evry_State *s;
-       int i;
+        void *new_sel;
+        Evry_Selector *sel;
+        Evry_State *s;
+        int i;
 
-       for (i = 1; i < 3; i++)
-         _evry_selector_item_clear(win->selectors[i]);
+        for (i = 1; i < 3; i++)
+          _evry_selector_item_clear(win->selectors[i]);
 
-       if (!(new_sel = realloc(win->sel_list, sizeof(Evry_Selector*) * 6)))
-         return 0;
+        if (!(new_sel = realloc(win->sel_list, sizeof(Evry_Selector *) * 6)))
+          return 0;
 
-       win->sel_list = new_sel;
+        win->sel_list = new_sel;
 
-       edje_object_signal_emit(win->o_main,
-                               "e,state,object_selector_hide", "e");
+        edje_object_signal_emit(win->o_main,
+                                "e,state,object_selector_hide", "e");
 
-       win->sel_list[5] = NULL;
-       win->selectors = win->sel_list + 2;
-       _evry_selector_new(win, EVRY_PLUGIN_ACTION);
-       _evry_selector_new(win, EVRY_PLUGIN_OBJECT);
+        win->sel_list[5] = NULL;
+        win->selectors = win->sel_list + 2;
+        _evry_selector_new(win, EVRY_PLUGIN_ACTION);
+        _evry_selector_new(win, EVRY_PLUGIN_OBJECT);
 
-       CUR_SEL = SUBJ_SEL;
-       sel = CUR_SEL;
+        CUR_SEL = SUBJ_SEL;
+        sel = CUR_SEL;
 
-       _evry_selector_signal_emit(sel, "e,state,selected");
+        _evry_selector_signal_emit(sel, "e,state,selected");
 
-       _evry_selector_item_update(SUBJ_SEL);
-       _evry_selector_item_update(ACTN_SEL);
-       _evry_selector_item_update(OBJ_SEL);
+        _evry_selector_item_update(SUBJ_SEL);
+        _evry_selector_item_update(ACTN_SEL);
+        _evry_selector_item_update(OBJ_SEL);
 
-       /* was checked before. anyway */
-       if ((s = sel->state) && (s->cur_item))
-         _evry_selector_update_actions(sel);
+        /* was checked before. anyway */
+        if ((s = sel->state) && (s->cur_item))
+          _evry_selector_update_actions(sel);
 
-       win->level++;
+        win->level++;
 
-       return 1;
+        return 1;
      }
    else if ((dir < 0) && (win->level > 0))
      {
-       _evry_selector_item_clear(SUBJ_SEL);
-       _evry_selector_free(ACTN_SEL);
-       _evry_selector_free(OBJ_SEL);
+        _evry_selector_item_clear(SUBJ_SEL);
+        _evry_selector_free(ACTN_SEL);
+        _evry_selector_free(OBJ_SEL);
 
-       win->selectors = win->sel_list;
-       win->sel_list[3] = NULL;
-       CUR_SEL = NULL;
+        win->selectors = win->sel_list;
+        win->sel_list[3] = NULL;
+        CUR_SEL = NULL;
 
-       edje_object_signal_emit(win->o_main,
-                               "e,state,object_selector_show", "e");
-       _evry_selector_item_update(SUBJ_SEL);
-       _evry_selector_item_update(ACTN_SEL);
-       _evry_selector_item_update(OBJ_SEL);
-       _evry_selector_activate(OBJ_SEL, 0);
+        edje_object_signal_emit(win->o_main,
+                                "e,state,object_selector_show", "e");
+        _evry_selector_item_update(SUBJ_SEL);
+        _evry_selector_item_update(ACTN_SEL);
+        _evry_selector_item_update(OBJ_SEL);
+        _evry_selector_activate(OBJ_SEL, 0);
 
-       win->level = 0;
+        win->level = 0;
 
-       return 1;
+        return 1;
      }
 
    return 0;
 }
 
 Evry_Item *
-evry_item_new(Evry_Item *base, Evry_Plugin *p, const char *label,
-             Evas_Object *(*icon_get) (Evry_Item *it, Evas *e),
-             void (*cb_free) (Evry_Item *item))
+evry_item_new(Evry_Item *it, Evry_Plugin *p, const char *label,
+              Evas_Object *(*icon_get)(Evry_Item * it, Evas * e),
+              void (*cb_free)(Evry_Item *item))
 {
-   Evry_Item *it;
-   if (base)
-     {
-       it = base;
-     }
-   else
+   if (!it)
      {
-       it = E_NEW(Evry_Item, 1);
-       if (!it) return NULL;
+        it = E_NEW(Evry_Item, 1);
+        if (!it) return NULL;
      }
 
    if (p && EVRY_ITEM(p)->subtype)
@@ -462,7 +470,7 @@ evry_item_free(Evry_Item *it)
    it->ref--;
 
 #ifdef PRINT_REFS
-    printf("%d, %d\t unref: %s\n", it->ref, _item_cnt - 1, it->label);
+   printf("%d, %d\t unref: %s\n", it->ref, _item_cnt, it->label);
 #endif
 
    if (it->ref > 0) return;
@@ -491,7 +499,6 @@ evry_item_ref(Evry_Item *it)
 #ifdef PRINT_REFS
    printf("%d, %d\t ref : %s\n", it->ref, _item_cnt, it->label);
 #endif
-
 }
 
 static int
@@ -502,8 +509,8 @@ _evry_selector_update_actions_do(Evry_Selector *sel)
 
    if (sel->action_timer)
      {
-       ecore_timer_del(sel->action_timer);
-       sel->action_timer = NULL;
+        ecore_timer_del(sel->action_timer);
+        sel->action_timer = NULL;
      }
 
    if ((s = (SUBJ_SEL)->state))
@@ -525,8 +532,8 @@ _evry_timer_cb_actions_get(void *data)
 
    if ((CUR_SEL == sel) && (s = sel->state))
      {
-       if (_evry_view_update(win, s))
-         _evry_view_show(win, s->view, 0);
+        if (_evry_view_update(win, s))
+          _evry_view_show(win, s->view, 0);
      }
 
    return ECORE_CALLBACK_CANCEL;
@@ -538,7 +545,8 @@ _evry_selector_update_actions(Evry_Selector *sel)
    if (sel->action_timer)
      ecore_timer_del(sel->action_timer);
 
-   sel->action_timer = ecore_timer_add(0.1, _evry_timer_cb_actions_get, sel);
+   _evry_selector_item_clear(sel);
+   sel->action_timer = ecore_timer_add(0.2, _evry_timer_cb_actions_get, sel);
 }
 
 void
@@ -561,9 +569,16 @@ evry_item_select(const Evry_State *state, Evry_Item *it)
 
    if (s == sel->state)
      {
-       _evry_selector_update(sel);
-       if (CUR_SEL ==  SUBJ_SEL)
-         _evry_selector_update_actions(ACTN_SEL);
+        _evry_selector_update(sel);
+
+        if (CUR_SEL == SUBJ_SEL)
+          _evry_selector_update_actions(ACTN_SEL);
+
+        if (CUR_SEL == ACTN_SEL)
+          {
+             while (OBJ_SEL->state)
+               _evry_state_pop(OBJ_SEL, 1);
+          }
      }
 }
 
@@ -577,13 +592,13 @@ evry_item_mark(const Evry_State *state, Evry_Item *it, Eina_Bool mark)
 
    if (mark && !it->marked)
      {
-       it->marked = EINA_TRUE;
-       s->sel_items = eina_list_append(s->sel_items, it);
+        it->marked = EINA_TRUE;
+        s->sel_items = eina_list_append(s->sel_items, it);
      }
    else if (it->marked)
      {
-       it->marked = EINA_FALSE;
-       s->sel_items = eina_list_remove(s->sel_items, it);
+        it->marked = EINA_FALSE;
+        s->sel_items = eina_list_remove(s->sel_items, it);
      }
 }
 
@@ -603,73 +618,76 @@ evry_plugin_update(Evry_Plugin *p, int action)
    if (!(win = sel->win))
      return;
 
-   // if (s->request != p->request)
-   //   return;
+   if (sel->state->request != p->request)
+     return;
 
    DBG("update %d %d %s", s->request, p->request, p->name);
 
    if (action == EVRY_UPDATE_ADD)
      {
-       /* clear marked items */
-       if (s->sel_items)
-         {
-            eina_list_free(s->sel_items);
-            s->sel_items = NULL;
-         }
-
-       if ((!p->items) && (!s->trigger_active))
-         {
-            /* remove plugin */
-            if (!(eina_list_data_find(s->cur_plugins, p)))
-              return;
-
-            s->cur_plugins = eina_list_remove(s->cur_plugins, p);
-
-            if (p == s->plugin)
-              _evry_plugin_select(s, NULL);
-         }
-       else
-         {
-            /* add plugin to current plugins*/
-            _evry_plugin_list_insert(s, p);
-         }
-
-       _evry_aggregator_fetch(s);
-
-       /* select first plugin */
-       if ((!s->plugin) || (s->plugin_auto_selected) ||
-           !(eina_list_data_find(s->cur_plugins, s->plugin)))
-         {
-            _evry_plugin_select(s, NULL);
-         }
-
-       if ((s->plugin && sel->state == s) &&
-           /* plugin is current */
-           ((s->plugin == p) ||
-            /* plugin items are shown in aggregator */
-            ((s->plugin == s->aggregator) && p->config->aggregate)))
-         {
-            _evry_selector_update(sel);
-
-            if (_evry_view_update(win, s))
-              /* XXX when there is a case where view disappears
-                 check this one! is swallow always visible ? */
-              _evry_view_show(win, s->view, 0);
-         }
-
-       /* switch back to subject selector when no current items */
-       if ((sel == SUBJ_SEL) &&
-           (!(s->plugin) || !(s->plugin->items)) &&
-           (CUR_SEL == ACTN_SEL))
-         {
-            _evry_selectors_switch(win, -1);
-            _evry_clear(SUBJ_SEL);
-         }
+        /* clear marked items */
+        if (s->sel_items)
+          {
+             eina_list_free(s->sel_items);
+             s->sel_items = NULL;
+          }
+
+        if ((!p->items) && (!s->trigger_active))
+          {
+             /* remove plugin */
+             if (!(eina_list_data_find(s->cur_plugins, p)))
+               return;
+
+             s->cur_plugins = eina_list_remove(s->cur_plugins, p);
+
+             if (p == s->plugin)
+               _evry_plugin_select(s, NULL);
+          }
+        else
+          {
+             /* add plugin to current plugins*/
+             _evry_plugin_list_insert(s, p);
+          }
+
+        if (sel->state == s)
+          {
+             _evry_aggregator_fetch(s);
+
+             /* select first plugin */
+             if ((!s->plugin) || (s->plugin_auto_selected) ||
+                 !(eina_list_data_find(s->cur_plugins, s->plugin)))
+               {
+                  _evry_plugin_select(s, NULL);
+               }
+
+             if ((s->plugin && (sel->state == s)) &&
+                 /* plugin is current */
+                 ((s->plugin == p) ||
+                  /* plugin items are shown in aggregator */
+                  ((s->plugin == s->aggregator) && p->config->aggregate)))
+               {
+                  _evry_selector_update(sel);
+
+                  if (_evry_view_update(win, s))
+                    /* XXX when there is a case where view disappears
+                       check this one! is swallow always visible ? */
+                    _evry_view_show(win, s->view, 0);
+               }
+
+             /* switch back to subject selector when no current items */
+             if ((sel == SUBJ_SEL) &&
+                 (!(s->plugin) || !(s->plugin->items)) &&
+                 (CUR_SEL == ACTN_SEL))
+               {
+                  _evry_selectors_switch(win, -1);
+                  _evry_clear(SUBJ_SEL);
+               }
+          }
      }
    else if (action == EVRY_UPDATE_REFRESH)
      {
-       _evry_view_clear(s);
-       _evry_view_update(win, s);
+        _evry_view_clear(s);
+        _evry_view_update(win, s);
      }
 }
 
@@ -752,40 +770,40 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
    o = edje_object_add(win->evas);
    win->o_main = o;
    e_theme_edje_object_set(o, "base/theme/modules/everything",
-                          "e/modules/everything/main");
+                           "e/modules/everything/main");
 
    if ((shape_option = edje_object_data_get(o, "shaped")) &&
        (!strcmp(shape_option, "1")))
      {
-       win->shaped = EINA_TRUE;
+        win->shaped = EINA_TRUE;
 
-       if (e_config->use_composite)
-         {
-            ecore_evas_alpha_set(win->ewin->ecore_evas, 1);
-            win->ewin->evas_win = ecore_evas_software_x11_window_get(win->ewin->ecore_evas);
-            edje_object_signal_emit(o, "e,state,composited", "e");
-            edje_object_signal_emit(o, "list:e,state,composited", "e");
-            edje_object_message_signal_process(o);
-            edje_object_calc_force(o);
+        if (e_config->use_composite)
+          {
+             ecore_evas_alpha_set(win->ewin->ecore_evas, 1);
+             win->ewin->evas_win = ecore_evas_software_x11_window_get(win->ewin->ecore_evas);
+             edje_object_signal_emit(o, "e,state,composited", "e");
+             edje_object_signal_emit(o, "list:e,state,composited", "e");
+             edje_object_message_signal_process(o);
+             edje_object_calc_force(o);
 
-            tmp = edje_object_data_get(o, "shadow_offset");
-            offset_s = tmp ? atoi(tmp) : 0;
-         }
-       else
-         ecore_evas_shaped_set(win->ewin->ecore_evas, 1);
+             tmp = edje_object_data_get(o, "shadow_offset");
+             offset_s = tmp ? atoi(tmp) : 0;
+          }
+        else
+          ecore_evas_shaped_set(win->ewin->ecore_evas, 1);
      }
 
    edje_object_size_min_calc(o, &mw, &mh);
 
    if (edge == E_ZONE_EDGE_NONE)
      {
-       w = evry_conf->width;
-       h = evry_conf->height;
+        w = evry_conf->width;
+        h = evry_conf->height;
      }
    else
      {
-       w = evry_conf->edge_width;
-       h = evry_conf->edge_height;
+        w = evry_conf->edge_width;
+        h = evry_conf->edge_height;
      }
    e_win_size_min_set(win->ewin, mw, mh);
 
@@ -797,48 +815,51 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
 
    if (edge == E_ZONE_EDGE_NONE)
      {
-       mw += offset_s*2;
-       mh += offset_s*2;
+        mw += offset_s * 2;
+        mh += offset_s * 2;
 
-       x = (zone->x + (zone->w * evry_conf->rel_x)) - (mw / 2);
-       y = (zone->y + (zone->h * evry_conf->rel_y)) - (mh / 2);
+        x = (zone->x + (zone->w * evry_conf->rel_x)) - (mw / 2);
+        y = (zone->y + (zone->h * evry_conf->rel_y)) - (mh / 2);
      }
    else
      {
-       int to_side = 0;
-
-       switch (edge)
-         {
-          case E_ZONE_EDGE_TOP_LEFT:
-             x = to_side - offset_s;
-             y = to_side - offset_s;
-             break;
-          case E_ZONE_EDGE_TOP_RIGHT:
-             x = zone->w - (mw + offset_s + to_side);
-             y = to_side - offset_s;
-             break;
-          case E_ZONE_EDGE_BOTTOM_RIGHT:
-             x = zone->w - (mw + offset_s + to_side);
-             y = zone->h - (mh + offset_s + to_side);
-             break;
-          case E_ZONE_EDGE_BOTTOM_LEFT:
-             x = to_side - offset_s;
-             y = zone->h - (mh + offset_s + to_side);
-             break;
-
-          default:
-             mw += offset_s*2;
-             mh += offset_s*2;
-             x = (zone->w * evry_conf->rel_x) - (mw / 2);
-             y = (zone->h * evry_conf->rel_y) - (mh / 2);
-             break;
-         }
-
-       x += zone->x;
-       y += zone->y;
-
-       mw += offset_s*2;
-       mh += offset_s*2;
+        int to_side = 0;
+
+        switch (edge)
+          {
+           case E_ZONE_EDGE_TOP_LEFT:
+             x = to_side - offset_s;
+             y = to_side - offset_s;
+             break;
+
+           case E_ZONE_EDGE_TOP_RIGHT:
+             x = zone->w - (mw + offset_s + to_side);
+             y = to_side - offset_s;
+             break;
+
+           case E_ZONE_EDGE_BOTTOM_RIGHT:
+             x = zone->w - (mw + offset_s + to_side);
+             y = zone->h - (mh + offset_s + to_side);
+             break;
+
+           case E_ZONE_EDGE_BOTTOM_LEFT:
+             x = to_side - offset_s;
+             y = zone->h - (mh + offset_s + to_side);
+             break;
+
+           default:
+             mw += offset_s * 2;
+             mh += offset_s * 2;
+             x = (zone->w * evry_conf->rel_x) - (mw / 2);
+             y = (zone->h * evry_conf->rel_y) - (mh / 2);
+             break;
+          }
+
+        x += zone->x;
+        y += zone->y;
+
+        mw += offset_s * 2;
+        mh += offset_s * 2;
      }
 
    e_win_move_resize(win->ewin, x, y, mw, mh);
@@ -852,7 +873,7 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
 
    evas_event_feed_mouse_in(win->evas, ecore_x_current_time_get(), NULL);
    evas_event_feed_mouse_move(win->evas, -1000000, -1000000,
-                             ecore_x_current_time_get(), NULL);
+                              ecore_x_current_time_get(), NULL);
 
    e_win_delete_callback_set(win->ewin, _evry_cb_win_delete);
    e_win_resize_callback_set(win->ewin, _evry_cb_win_resize);
@@ -867,6 +888,7 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped)
 {
    E_FREE(drag->data);
 }
+
 #endif
 
 static Eina_Bool
@@ -889,78 +911,78 @@ _evry_cb_mouse(void *data, int type, void *event)
 #if 0
    if (type == ECORE_EVENT_MOUSE_MOVE)
      {
-       Ecore_Event_Mouse_Move *ev = event;
-       Evry_State *s;
-
-       if ((win->mouse_button == 3) &&
-           (s = (CUR_SEL)->state) && (s->cur_item) &&
-           (CHECK_TYPE(s->cur_item, EVRY_TYPE_FILE)) &&
-           (!E_INSIDE(ev->x, ev->y,
-                      win->zone->x,
-                      win->zone->y,
-                      w->w, w->h)))
-         {
-            const char *drag_types[] = { "text/uri-list" };
-            E_Drag *d;
-            Evas_Object *o;
-            const char *uri;
-            int s_len, sel_length = 0;
-            char *tmp, *sel = NULL;
-
-            GET_FILE(file, s->cur_item);
-
-            if (!(uri = evry_file_url_get(file)))
-              return ECORE_CALLBACK_PASS_ON;
-
-            s_len = strlen(uri);
-            if (!(tmp = realloc(sel, sel_length + s_len + 2 + 1)))
-              return ECORE_CALLBACK_PASS_ON;
-            sel = tmp;
-            memcpy(sel + sel_length, uri, s_len);
-            memcpy(sel + sel_length + s_len, "\r\n", 2);
-            sel_length += s_len + 2;
-
-            d = e_drag_new(e_container_current_get(e_manager_current_get()),
-                           ev->x, ev->y,
-                           drag_types, 1, sel, sel_length, NULL,
-                           _evry_cb_drag_finished);
-            e_drag_resize(d, 128, 128);
-            o = evry_util_icon_get(s->cur_item, e_drag_evas_get(d));
-            e_drag_object_set(d, o);
-            e_drag_xdnd_start(d, ev->x, ev->y);
-
-            evry_hide(win, 0);
-            return ECORE_CALLBACK_PASS_ON;
-         }
+        Ecore_Event_Mouse_Move *ev = event;
+        Evry_State *s;
+
+        if ((win->mouse_button == 3) &&
+            (s = (CUR_SEL)->state) && (s->cur_item) &&
+            (CHECK_TYPE(s->cur_item, EVRY_TYPE_FILE)) &&
+            (!E_INSIDE(ev->x, ev->y,
+                       win->zone->x,
+                       win->zone->y,
+                       w->w, w->h)))
+          {
+             const char *drag_types[] = { "text/uri-list" };
+             E_Drag *d;
+             Evas_Object *o;
+             const char *uri;
+             int s_len, sel_length = 0;
+             char *tmp, *sel = NULL;
+
+             GET_FILE(file, s->cur_item);
+
+             if (!(uri = evry_file_url_get(file)))
+               return ECORE_CALLBACK_PASS_ON;
+
+             s_len = strlen(uri);
+             if (!(tmp = realloc(sel, sel_length + s_len + 2 + 1)))
+               return ECORE_CALLBACK_PASS_ON;
+             sel = tmp;
+             memcpy(sel + sel_length, uri, s_len);
+             memcpy(sel + sel_length + s_len, "\r\n", 2);
+             sel_length += s_len + 2;
+
+             d = e_drag_new(e_container_current_get(e_manager_current_get()),
+                            ev->x, ev->y,
+                            drag_types, 1, sel, sel_length, NULL,
+                            _evry_cb_drag_finished);
+             e_drag_resize(d, 128, 128);
+             o = evry_util_icon_get(s->cur_item, e_drag_evas_get(d));
+             e_drag_object_set(d, o);
+             e_drag_xdnd_start(d, ev->x, ev->y);
+
+             evry_hide(win, 0);
+             return ECORE_CALLBACK_PASS_ON;
+          }
      }
    else if (type == ECORE_EVENT_MOUSE_WHEEL)
      {
-       Ecore_Event_Mouse_Wheel *ev = event;
+        Ecore_Event_Mouse_Wheel *ev = event;
      }
    else
 #endif
    if (type == ECORE_EVENT_MOUSE_BUTTON_DOWN)
      {
-       win->mouse_out = 0;
+        win->mouse_out = 0;
 
-       if (!E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
-         {
-            win->mouse_out = 1;
-            return ECORE_CALLBACK_PASS_ON;
-         }
+        if (!E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
+          {
+             win->mouse_out = 1;
+             return ECORE_CALLBACK_PASS_ON;
+          }
 
-       win->mouse_button = ev->buttons;
+        win->mouse_button = ev->buttons;
      }
    else if (type == ECORE_EVENT_MOUSE_BUTTON_UP)
      {
-       win->mouse_button = 0;
+        win->mouse_button = 0;
 
-       if (win->mouse_out &&
-           !E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
-         {
-            evry_hide(win, 0);
-            return ECORE_CALLBACK_PASS_ON;
-         }
+        if (win->mouse_out &&
+            !E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
+          {
+             evry_hide(win, 0);
+             return ECORE_CALLBACK_PASS_ON;
+          }
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -988,8 +1010,8 @@ _evry_selector_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
 
    if (ev->button == 1)
      {
-       if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-         evry_plugin_action(sel->win, 1);
+        if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
+          evry_plugin_action(sel->win, 1);
      }
 }
 
@@ -1002,13 +1024,13 @@ _evry_selector_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
 
    if (ev->z > 0)
      {
-       /* FIXME dont loose selector 2 state until state 0 changed: */
-       if (CUR_SEL != OBJ_SEL)
-         _evry_selectors_switch(sel->win, 1);
+        /* FIXME dont loose selector 2 state until state 0 changed: */
+        if (CUR_SEL != OBJ_SEL)
+          _evry_selectors_switch(sel->win, 1);
      }
    else if (ev->z < 0)
      {
-       _evry_selectors_switch(sel->win, -1);
+        _evry_selectors_switch(sel->win, -1);
      }
 }
 
@@ -1024,30 +1046,29 @@ _evry_selector_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
 
    if (ev->button == 3)
      {
-       evry_plugin_action(win, 0);
+        evry_plugin_action(win, 0);
      }
    else if (ev->button == 1)
      {
-       if (sel == SUBJ_SEL)
-         {
-            if (CUR_SEL == ACTN_SEL)
-              _evry_selectors_switch(win, -1);
-            else
-              _evry_selectors_switch(win, 1);
-         }
-
-       else if (sel == ACTN_SEL)
-         {
-            if (CUR_SEL == SUBJ_SEL)
-              _evry_selectors_switch(win, 1);
-            else
-              _evry_selectors_switch(win, -1);
-         }
-       else if (sel == OBJ_SEL)
-         {
-            if (CUR_SEL == ACTN_SEL)
-              _evry_selectors_switch(win, 1);
-         }
+        if (sel == SUBJ_SEL)
+          {
+             if (CUR_SEL == ACTN_SEL)
+               _evry_selectors_switch(win, -1);
+             else
+               _evry_selectors_switch(win, 1);
+          }
+        else if (sel == ACTN_SEL)
+          {
+             if (CUR_SEL == SUBJ_SEL)
+               _evry_selectors_switch(win, 1);
+             else
+               _evry_selectors_switch(win, -1);
+          }
+        else if (sel == OBJ_SEL)
+          {
+             if (CUR_SEL == ACTN_SEL)
+               _evry_selectors_switch(win, 1);
+          }
      }
 }
 
@@ -1059,40 +1080,39 @@ _evry_selector_new(Evry_Window *win, int type)
    Evry_Selector *sel = E_NEW(Evry_Selector, 1);
    Evas_Object *o = NULL;
 
-   sel->aggregator = evry_aggregator_new(win, type);
+   sel->aggregator = evry_aggregator_new(type);
 
    if (type == EVRY_PLUGIN_SUBJECT)
      {
-       pcs = evry_conf->conf_subjects;
-       sel->edje_part = "subject_selector";
+        pcs = evry_conf->conf_subjects;
+        sel->edje_part = "subject_selector";
      }
    else if (type == EVRY_PLUGIN_ACTION)
      {
-       pcs = evry_conf->conf_actions;
-       sel->edje_part = "action_selector";
+        pcs = evry_conf->conf_actions;
+        sel->edje_part = "action_selector";
      }
    else if (type == EVRY_PLUGIN_OBJECT)
      {
-       pcs = evry_conf->conf_objects;
-       sel->edje_part = "object_selector";
+        pcs = evry_conf->conf_objects;
+        sel->edje_part = "object_selector";
      }
 
    if ((o = edje_object_part_swallow_get(win->o_main, sel->edje_part)))
      {
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
-                                      _evry_selector_cb_down, sel);
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
-                                      _evry_selector_cb_up, sel);
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
-                                      _evry_selector_cb_wheel, sel);
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+                                       _evry_selector_cb_down, sel);
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
+                                       _evry_selector_cb_up, sel);
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
+                                       _evry_selector_cb_wheel, sel);
      }
 
-   EINA_LIST_FOREACH(pcs, l, pc)
+   EINA_LIST_FOREACH (pcs, l, pc)
      {
-       if (!pc->enabled && !win->plugin_dedicated) continue;
-       if (!pc->plugin) continue;
-       if (pc->plugin == sel->aggregator) continue;
-       sel->plugins = eina_list_append(sel->plugins, pc->plugin);
+        if (!pc->plugin) continue;
+        if (pc->plugin == sel->aggregator) continue;
+        sel->plugins = eina_list_append(sel->plugins, pc->plugin);
      }
 
    win->selectors[type] = sel;
@@ -1153,20 +1173,20 @@ _evry_selector_activate(Evry_Selector *sel, int slide)
 
    if (CUR_SEL)
      {
-       Evry_Selector *cur = CUR_SEL;
-       _evry_selector_signal_emit(cur, "e,state,unselected");
+        Evry_Selector *cur = CUR_SEL;
+        _evry_selector_signal_emit(cur, "e,state,unselected");
 
-       if (cur->state && cur->state->view)
-         _evry_view_hide(win, cur->state->view, slide);
+        if (cur->state && cur->state->view)
+          _evry_view_hide(win, cur->state->view, slide);
 
-       if (!slide && evry_conf->hide_list)
-         _evry_list_win_hide(win);
+        if (!slide && evry_conf->hide_list)
+          _evry_list_win_hide(win);
      }
 
    if (!sel)
      {
-       ERR("selector == NULL");
-       return;
+        ERR("selector == NULL");
+        return;
      }
 
    CUR_SEL = sel;
@@ -1179,24 +1199,17 @@ _evry_selector_activate(Evry_Selector *sel, int slide)
 
    if ((s = sel->state))
      {
-       _evry_update_text_label(s);
-
-       if (s->cur_item)
-         _evry_selector_label_set(sel, "e.text.plugin",
-                                  EVRY_ITEM(s->cur_item->plugin)->label);
+        _evry_update_text_label(s);
 
-       if (!s->view)
-         {
-            Evry_View *view = evry_conf->views->data;
-            s->view = view->create(view, s, win->o_main);
-            s->view->state = s;
-         }
+        if (s->cur_item)
+          _evry_selector_label_set(sel, "e.text.plugin",
+                                   EVRY_ITEM(s->cur_item->plugin)->label);
 
-       if (s->view)
-         {
-            _evry_view_show(win, s->view, slide);
-            s->view->update(s->view);
-         }
+        if (_evry_view_create(s))
+          {
+             _evry_view_show(win, s->view, slide);
+             s->view->update(s->view);
+          }
      }
 }
 
@@ -1210,8 +1223,8 @@ _evry_selector_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_in
 
    if (sel->o_icon)
      {
-       evas_object_del(sel->o_icon);
-       sel->o_icon = NULL;
+        evas_object_del(sel->o_icon);
+        sel->o_icon = NULL;
      }
 
    e_icon_size_get(sel->o_thumb, &w, &h);
@@ -1239,7 +1252,8 @@ _evry_selector_thumb(Evry_Selector *sel, const Evry_Item *it)
      evas_object_del(sel->o_thumb);
    sel->o_thumb = NULL;
 
-   if (it->type != EVRY_TYPE_FILE) return 0;
+   if (it->type != EVRY_TYPE_FILE)
+     return 0;
 
    GET_FILE(file, it);
 
@@ -1252,21 +1266,21 @@ _evry_selector_thumb(Evry_Selector *sel, const Evry_Item *it)
    if ((!strncmp(file->mime, "image/", 6)) ||
        ((suffix = strrchr(file->path, '.')) && (!strncmp(suffix, ".edj", 4))))
      {
-       sel->o_thumb = e_thumb_icon_add(win->evas);
-       e_thumb_icon_size_set(sel->o_thumb, 128, 128);
-       evas_object_smart_callback_add(sel->o_thumb, "e_thumb_gen",
-                                      _evry_selector_thumb_gen, sel);
-       if (suffix)
-         {
-            e_thumb_icon_file_set(sel->o_thumb, file->path, "e/desktop/background");
-            e_thumb_icon_size_set(sel->o_thumb, 128, 80);
-         }     
-       else
-         e_thumb_icon_file_set(sel->o_thumb, file->path, NULL);
+        sel->o_thumb = e_thumb_icon_add(win->evas);
+        e_thumb_icon_size_set(sel->o_thumb, 128, 128);
+        evas_object_smart_callback_add(sel->o_thumb, "e_thumb_gen",
+                                       _evry_selector_thumb_gen, sel);
+        if (suffix)
+          {
+             e_thumb_icon_file_set(sel->o_thumb, file->path, "e/desktop/background");
+             e_thumb_icon_size_set(sel->o_thumb, 128, 80);
+          }
+        else
+          e_thumb_icon_file_set(sel->o_thumb, file->path, NULL);
 
-       e_thumb_icon_begin(sel->o_thumb);
-       sel->do_thumb = EINA_TRUE;
-       return 1;
+        e_thumb_icon_begin(sel->o_thumb);
+        sel->do_thumb = EINA_TRUE;
+        return 1;
      }
 
    return 0;
@@ -1277,17 +1291,17 @@ _evry_selector_item_clear(Evry_Selector *sel)
 {
    if (sel->o_icon)
      {
-       evas_object_del(sel->o_icon);
-       sel->o_icon = NULL;
+        evas_object_del(sel->o_icon);
+        sel->o_icon = NULL;
      }
 
    if (sel->o_thumb)
      {
-       if (sel->do_thumb)
-         e_thumb_icon_end(sel->o_thumb);
+        if (sel->do_thumb)
+          e_thumb_icon_end(sel->o_thumb);
 
-       evas_object_del(sel->o_thumb);
-       sel->o_thumb = NULL;
+        evas_object_del(sel->o_thumb);
+        sel->o_thumb = NULL;
      }
 }
 
@@ -1303,45 +1317,45 @@ _evry_selector_item_update(Evry_Selector *sel)
 
    if ((!s) || !(s->cur_item))
      {
-       /* no items for this state - clear selector */
-       _evry_selector_label_set(sel, "e.text.label","");
+        /* no items for this state - clear selector */
+        _evry_selector_label_set(sel, "e.text.label", "");
 
-       if (sel == CUR_SEL && s && s->plugin)
-         _evry_selector_label_set(sel, "e.text.plugin",
-                                  EVRY_ITEM(s->plugin)->label);
-       else
-         _evry_selector_label_set(sel, "e.text.plugin", "");
+        if (sel == CUR_SEL && s && s->plugin)
+          _evry_selector_label_set(sel, "e.text.plugin",
+                                   EVRY_ITEM(s->plugin)->label);
+        else
+          _evry_selector_label_set(sel, "e.text.plugin", "");
 
-       if (!s) return;
+        if (!s) return;
      }
 
    if ((it = s->cur_item))
      {
-       _evry_selector_label_set(sel, "e.text.label", it->label);
-       _evry_selector_label_set(sel, "e.text.plugin",
-                                EVRY_ITEM(it->plugin)->label);
+        _evry_selector_label_set(sel, "e.text.label", it->label);
+        _evry_selector_label_set(sel, "e.text.plugin",
+                                 EVRY_ITEM(it->plugin)->label);
 
-       if (!_evry_selector_thumb(sel, it))
-         {
-            o = evry_util_icon_get(it, win->evas);
+        if (!_evry_selector_thumb(sel, it))
+          {
+             o = evry_util_icon_get(it, win->evas);
 
-            if ((!o) && it->plugin)
-              o = evry_util_icon_get(EVRY_ITEM(it->plugin), win->evas);
-         }
+             if ((!o) && it->plugin)
+               o = evry_util_icon_get(EVRY_ITEM(it->plugin), win->evas);
+          }
      }
 
    if ((!o) && (s->plugin && (EVRY_ITEM(s->plugin)->icon)))
      {
-       o = evry_icon_theme_get(EVRY_ITEM(s->plugin)->icon, win->evas);
+        o = evry_icon_theme_get(EVRY_ITEM(s->plugin)->icon, win->evas);
      }
 
    if (o)
      {
-       char buf[64];
-       snprintf(buf, sizeof(buf), "%s:e.swallow.icons", sel->edje_part);
-       edje_object_part_swallow(win->o_main, buf, o);
-       evas_object_show(o);
-       sel->o_icon = o;
+        char buf[64];
+        snprintf(buf, sizeof(buf), "%s:e.swallow.icons", sel->edje_part);
+        edje_object_part_swallow(win->o_main, buf, o);
+        evas_object_show(o);
+        sel->o_icon = o;
      }
 }
 
@@ -1357,28 +1371,28 @@ _evry_selector_update(Evry_Selector *sel)
 
    if (!s)
      {
-       _evry_selector_item_update(sel);
-       return;
+        _evry_selector_item_update(sel);
+        return;
      }
 
    if ((it = s->cur_item))
      {
-       if (!s->plugin || !eina_list_data_find_list(s->plugin->items, it))
-         {
-            _evry_item_desel(s);
-            item_changed = EINA_TRUE;
-         }
+        if (!s->plugin || !eina_list_data_find_list(s->plugin->items, it))
+          {
+             _evry_item_desel(s);
+             item_changed = EINA_TRUE;
+          }
      }
 
    /* get first item */
    if (s->plugin && ((!s->cur_item) || s->item_auto_selected))
      {
-       it = eina_list_data_get(s->plugin->items);
-       s->item_auto_selected = EINA_TRUE;
-       if (!s->cur_plugins || (it != s->cur_item))
-         item_changed = EINA_TRUE;
+        it = eina_list_data_get(s->plugin->items);
+        s->item_auto_selected = EINA_TRUE;
+        if (!s->cur_plugins || (it != s->cur_item))
+          item_changed = EINA_TRUE;
 
-       _evry_item_sel(s, it);
+        _evry_item_sel(s, it);
      }
 
    _evry_selector_item_update(sel);
@@ -1416,16 +1430,19 @@ _evry_selector_plugins_get(Evry_Selector *sel, Evry_Item *it, const char *plugin
    if (it && CHECK_TYPE(it, EVRY_TYPE_ACTION))
      act = (Evry_Action *)it;
 
-   EINA_LIST_FOREACH(sel->plugins, l, p)
+   EINA_LIST_FOREACH (sel->plugins, l, p)
      {
-       if (plugin_name && strcmp(plugin_name, p->name))
-         continue;
+        if (!p->config->enabled && !win->plugin_dedicated)
+          continue;
+
+        if (plugin_name && strcmp(plugin_name, p->name))
+          continue;
 
-       if (act && (!CHECK_SUBTYPE(p, act->it2.type)))
-         continue;
+        if (act && (!CHECK_SUBTYPE(p, act->it2.type)))
+          continue;
 
-       if (p->begin && (pp = p->begin(p, it)))
-         plugins = eina_list_append(plugins, pp);
+        if (p->begin && (pp = p->begin(p, it)))
+          plugins = eina_list_append(plugins, pp);
      }
 
    _evry_state_new(sel, plugins);
@@ -1458,7 +1475,7 @@ _evry_state_new(Evry_Selector *sel, Eina_List *plugins)
    s->plugins = eina_list_append(s->plugins, p);
    s->aggregator = p;
 
-   EINA_LIST_FOREACH(s->plugins, l, p)
+   EINA_LIST_FOREACH (s->plugins, l, p)
      p->state = s;
 
    return s;
@@ -1474,54 +1491,57 @@ _evry_state_pop(Evry_Selector *sel, int immediate)
 
    _evry_item_desel(s);
 
-   if (s->selector->update_timer)
+   if (sel->update_timer)
      {
-       ecore_timer_del(s->selector->update_timer);
-       s->selector->update_timer = NULL;
+        ecore_timer_del(sel->update_timer);
+        sel->update_timer = NULL;
      }
 
-   if (s->selector->action_timer)
+   if (sel->action_timer)
      {
-       ecore_timer_del(s->selector->action_timer);
-       s->selector->action_timer = NULL;
+        ecore_timer_del(sel->action_timer);
+        sel->action_timer = NULL;
      }
-     
+
    if (s->view)
      {
-       if (immediate)
-         {
-            s->view->destroy(s->view);
-         }
-       else
-         {
-            _evry_view_hide(win, s->view, SLIDE_RIGHT);
-            /* XXX delay free state? is it possible that
-               view can receive events here? */
-            s->delete_me = EINA_TRUE;
-         }
+        if (immediate)
+          {
+             s->view->destroy(s->view);
+          }
+        else
+          {
+             _evry_view_hide(win, s->view, SLIDE_RIGHT);
+             /* XXX delay free state? is it possible that
+                view can receive events here? */
+             s->delete_me = EINA_TRUE;
+          }
      }
 
    if (s->sel_items)
      eina_list_free(s->sel_items);
 
+   if (s->cur_plugins)
+     eina_list_free(s->cur_plugins);
+
    sel->states = eina_list_remove_list(sel->states, sel->states);
    prev = eina_list_data_get(sel->states);
 
-   EINA_LIST_FREE(s->plugins, p)
+   EINA_LIST_FREE (s->plugins, p)
      {
-       /* skip non top-level plugins */
-       if (prev && eina_list_data_find(prev->plugins, p))
-         {
-            p->state = prev;
-            continue;
-         }
-       EVRY_ITEM_FREE(p);
+        /* skip non top-level plugins */
+        if (prev && eina_list_data_find(prev->plugins, p))
+          {
+             p->state = prev;
+             continue;
+          }
+        EVRY_ITEM_FREE(p);
      }
 
    if (!s->delete_me)
      {
-       E_FREE(s->inp);
-       E_FREE(s);
+        E_FREE(s->inp);
+        E_FREE(s);
      }
 
    sel->state = prev;
@@ -1540,17 +1560,17 @@ evry_state_push(Evry_Selector *sel, Eina_List *plugins)
 
    if (!(new_state = _evry_state_new(sel, plugins)))
      {
-       DBG("no new state");
-       return 0;
+        DBG("no new state");
+        return 0;
      }
 
-   EINA_LIST_FOREACH(plugins, l, p)
+   EINA_LIST_FOREACH (plugins, l, p)
      p->state = new_state;
 
    if (s && s->view)
      {
-       _evry_view_hide(win, s->view, SLIDE_LEFT);
-       view = s->view;
+        _evry_view_hide(win, s->view, SLIDE_LEFT);
+        view = s->view;
      }
 
    _evry_matches_update(sel, 1);
@@ -1560,13 +1580,13 @@ evry_state_push(Evry_Selector *sel, Eina_List *plugins)
 
    if (view && win->visible)
      {
-       s->view = view->create(view, s, win->o_main);
-       if (s->view)
-         {
-            s->view->state = s;
-            _evry_view_show(win, s->view, SLIDE_LEFT);
-            s->view->update(s->view);
-         }
+        s->view = view->create(view, s, win->o_main);
+        if (s->view)
+          {
+             s->view->state = s;
+             _evry_view_show(win, s->view, SLIDE_LEFT);
+             s->view->update(s->view);
+          }
      }
 
    _evry_update_text_label(sel->state);
@@ -1587,14 +1607,14 @@ evry_browse_item(Evry_Item *it)
 
    if (!(it) || !(it->plugin) || !(it->browseable))
      {
-       DBG("no item");
-       return 0;
+        DBG("no item");
+        return 0;
      }
 
    if (!(s = it->plugin->state))
      {
-       DBG("no state");
-       return 0;
+        DBG("no state");
+        return 0;
      }
 
    sel = s->selector;
@@ -1603,92 +1623,95 @@ evry_browse_item(Evry_Item *it)
    /* aggregator */
    if (CHECK_TYPE(it, EVRY_TYPE_PLUGIN))
      {
-       browse_aggregator = 1;
-       plugins = eina_list_append(plugins, it);
+        browse_aggregator = 1;
+        plugins = eina_list_append(plugins, it);
      }
    else
      {
-       if ((it->plugin->browse) &&
-           (pp = it->plugin->browse(it->plugin, it)))
-         {
-            plugins = eina_list_append(plugins, pp);
-            pref = pp;
-         }
+        if ((it->plugin->browse) && (pp = it->plugin->browse(it->plugin, it)))
+          {
+             plugins = eina_list_append(plugins, pp);
+             pref = pp;
+          }
 
-       EINA_LIST_FOREACH(sel->plugins, l, p)
-         {
-            if (!p->browse)
-              continue;
+        /* items of type NONE can only be browsed by their own plugin */
+        if (!CHECK_TYPE(it, EVRY_TYPE_NONE))
+          {
+             EINA_LIST_FOREACH (sel->plugins, l, p)
+               {
+                  if (!p->browse)
+                    continue;
 
-            if ((pref) && (!strcmp(p->name, pref->name)))
-              continue;
+                  if ((pref) && (!strcmp(p->name, pref->name)))
+                    continue;
 
-            if ((pp = p->browse(p, it)))
-              plugins = eina_list_append(plugins, pp);
-         }
+                  if ((pp = p->browse(p, it)))
+                    plugins = eina_list_append(plugins, pp);
+               }
+          }
      }
 
    if (!(plugins))
      {
-       DBG("no plugins");
-       return 0;
+        DBG("no plugins");
+        return 0;
      }
 
    if (!(new_state = _evry_state_new(sel, plugins)))
      {
-       DBG("no new state");
-       return 0;
+        DBG("no new state");
+        return 0;
      }
 
    if (s->view)
      {
-       _evry_view_hide(win, s->view, SLIDE_LEFT);
-       view = s->view;
+        _evry_view_hide(win, s->view, SLIDE_LEFT);
+        view = s->view;
      }
 
    if (browse_aggregator)
      {
-       it->hi = NULL;
-
-       if (!EVRY_PLUGIN(it)->items)
-         {
-            evry_history_item_add(it, NULL, s->input);
-            s = new_state;
-            EVRY_PLUGIN(it)->state = s;
-            _evry_matches_update(sel, 1);
-         }
-       else
-         {
-            evry_history_item_add(it, NULL, NULL);
-            strncpy(new_state->input, s->input, INPUTLEN);
-            s = new_state;
-            EVRY_PLUGIN(it)->state = s;
-            s->cur_plugins = eina_list_append(s->cur_plugins, it);
-         }
-
-       _evry_plugin_select(s, EVRY_PLUGIN(it));
+        it->hi = NULL;
+
+        if (!EVRY_PLUGIN(it)->items)
+          {
+             evry_history_item_add(it, NULL, s->input);
+             s = new_state;
+             EVRY_PLUGIN(it)->state = s;
+             _evry_matches_update(sel, 1);
+          }
+        else
+          {
+             evry_history_item_add(it, NULL, NULL);
+             strncpy(new_state->input, s->input, INPUTLEN);
+             s = new_state;
+             EVRY_PLUGIN(it)->state = s;
+             s->cur_plugins = eina_list_append(s->cur_plugins, it);
+          }
+
+        _evry_plugin_select(s, EVRY_PLUGIN(it));
      }
    else
      {
-       if (it->plugin->history)
-         evry_history_item_add(it, NULL, s->input);
+        if (it->plugin->history)
+          evry_history_item_add(it, NULL, s->input);
 
-       _evry_matches_update(sel, 1);
-       s = new_state;
-       _evry_plugin_select(s, pref);
+        _evry_matches_update(sel, 1);
+        s = new_state;
+        _evry_plugin_select(s, pref);
      }
 
    _evry_selector_update(sel);
 
    if (view && win->visible)
      {
-       s->view = view->create(view, s, win->o_main);
-       if (s->view)
-         {
-            s->view->state = s;
-            _evry_view_show(win, s->view, SLIDE_LEFT);
-            s->view->update(s->view);
-         }
+        s->view = view->create(view, s, win->o_main);
+        if (s->view)
+          {
+             s->view->state = s;
+             s->view->update(s->view);
+             _evry_view_show(win, s->view, SLIDE_LEFT);
+          }
      }
 
    _evry_update_text_label(sel->state);
@@ -1699,27 +1722,29 @@ evry_browse_item(Evry_Item *it)
 int
 evry_browse_back(Evry_Selector *sel)
 {
-   Evry_Window *win = sel->win;
+   Evry_Window *win;
 
-   if (!sel) sel = CUR_SEL;
+   if (!sel) return 0;
 
-   Evry_State *s = sel->state;
-
-   DBG("%p", sel);
+   if ((!sel) || !(win = sel->win))
+     return 0;
 
-   if (!s || !sel->states->next)
+   if ((!sel->state) || (!sel->states->next))
      return 0;
 
    _evry_state_pop(sel, 0);
 
-   s = sel->state;
-   /* _evry_aggregator_fetch(s); */
    _evry_selector_update(sel);
+   _evry_update_text_label(sel->state);
+
    if (sel == SUBJ_SEL)
      _evry_selector_update_actions(ACTN_SEL);
-   _evry_update_text_label(s);
-   _evry_view_show(win, s->view, SLIDE_RIGHT);
-   s->view->update(s->view);
+
+   if (sel->state->view)
+     {
+        _evry_view_show(win, sel->state->view, SLIDE_RIGHT);
+        sel->state->view->update(sel->state->view);
+     }
 
    return 1;
 }
@@ -1731,55 +1756,55 @@ evry_selectors_switch(Evry_Window *win, int dir, int slide)
 
    if ((CUR_SEL)->update_timer)
      {
-       if ((CUR_SEL == SUBJ_SEL) || (CUR_SEL == ACTN_SEL))
-         {
-            _evry_matches_update(CUR_SEL, 0);
-            _evry_selector_update(CUR_SEL);
-         }
+        if ((CUR_SEL == SUBJ_SEL) || (CUR_SEL == ACTN_SEL))
+          {
+             _evry_matches_update(CUR_SEL, 0);
+             _evry_selector_update(CUR_SEL);
+          }
      }
 
    if (CUR_SEL != SUBJ_SEL && dir == 0)
      {
-       edje_object_signal_emit(win->o_main, "e,state,object_selector_hide", "e");
-       _evry_selector_activate(SUBJ_SEL, (slide * SLIDE_RIGHT));
-       return 1;
+        edje_object_signal_emit(win->o_main, "e,state,object_selector_hide", "e");
+        _evry_selector_activate(SUBJ_SEL, (slide * SLIDE_RIGHT));
+        return 1;
      }
    if (CUR_SEL == SUBJ_SEL && dir > 0)
      {
-       if (s->cur_item)
-         {
-            _evry_selector_activate(ACTN_SEL, slide * SLIDE_LEFT);
-            return 1;
-         }
+        if (s->cur_item)
+          {
+             _evry_selector_activate(ACTN_SEL, slide * SLIDE_LEFT);
+             return 1;
+          }
      }
    else if (CUR_SEL == ACTN_SEL && dir > 0)
      {
-       Evry_Item *it;
+        Evry_Item *it;
 
-       if (!s || !(it = s->cur_item) || !(CHECK_TYPE(it, EVRY_TYPE_ACTION)))
-         return 0;
+        if (!s || !(it = s->cur_item) || !(CHECK_TYPE(it, EVRY_TYPE_ACTION)))
+          return 0;
 
-       GET_ACTION(act,it);
-       if (!act->it2.type)
-         return 0;
+        GET_ACTION(act, it);
+        if (!act->it2.type)
+          return 0;
 
-       _evry_selector_plugins_get(OBJ_SEL, it, NULL);
-       _evry_selector_update(OBJ_SEL);
-       edje_object_signal_emit(win->o_main, "e,state,object_selector_show", "e");
+        _evry_selector_plugins_get(OBJ_SEL, it, NULL);
+        _evry_selector_update(OBJ_SEL);
+        edje_object_signal_emit(win->o_main, "e,state,object_selector_show", "e");
 
-       _evry_selector_activate(OBJ_SEL, (slide * SLIDE_LEFT));
-       return 1;
+        _evry_selector_activate(OBJ_SEL, (slide * SLIDE_LEFT));
+        return 1;
      }
    else if (CUR_SEL == ACTN_SEL && dir < 0)
      {
-       _evry_selector_activate(SUBJ_SEL, (slide * SLIDE_RIGHT));
-       edje_object_signal_emit(win->o_main, "e,state,object_selector_hide", "e");
-       return 1;
+        _evry_selector_activate(SUBJ_SEL, (slide * SLIDE_RIGHT));
+        edje_object_signal_emit(win->o_main, "e,state,object_selector_hide", "e");
+        return 1;
      }
    else if (CUR_SEL == OBJ_SEL && dir < 0)
      {
-       _evry_selector_activate(ACTN_SEL, (slide * SLIDE_RIGHT));
-       return 1;
+        _evry_selector_activate(ACTN_SEL, (slide * SLIDE_RIGHT));
+        return 1;
      }
    return 0;
 }
@@ -1811,10 +1836,10 @@ _evry_input_complete(Evry_State *s)
 
    if (input && action == EVRY_COMPLETE_INPUT)
      {
-       strncpy(s->input, input, INPUTLEN - 1);
-       _evry_update_text_label(s);
-       _evry_cb_update_timer(CUR_SEL);
-       evry_item_select(s, it);
+        strncpy(s->input, input, INPUTLEN - 1);
+        _evry_update_text_label(s);
+        _evry_cb_update_timer(CUR_SEL);
+        evry_item_select(s, it);
      }
 
    evry_item_free(it);
@@ -1826,7 +1851,6 @@ _evry_input_complete(Evry_State *s)
 static int
 _evry_cheat_history(Evry_State *s, int promote, int delete)
 {
-
    History_Entry *he;
    History_Item *hi;
    History_Types *ht;
@@ -1841,33 +1865,33 @@ _evry_cheat_history(Evry_State *s, int promote, int delete)
    if (!(he = eina_hash_find(ht->types, (it->id ? it->id : it->label))))
      return 1;
 
-   EINA_LIST_FOREACH_SAFE(he->items, l, ll, hi)
-     {
-       if (hi->plugin != it->plugin->name)
-         continue;
-
-       if (delete)
-         {
-            if (hi->input)
-              eina_stringshare_del(hi->input);
-            if (hi->plugin)
-              eina_stringshare_del(hi->plugin);
-            if (hi->context)
-              eina_stringshare_del(hi->context);
-            E_FREE(hi);
-
-            he->items = eina_list_remove_list(he->items, l);
-         }
-       else if (promote)
-         {
-            hi->count += 5;
-            hi->last_used = ecore_time_unix_get();
-         }
-       else /* demote */
-         {
-            hi->count -= 5;
-            if (hi->count < 0) hi->count = 1;
-         }
+   EINA_LIST_FOREACH_SAFE (he->items, l, ll, hi)
+     {
+        if (hi->plugin != it->plugin->name)
+          continue;
+
+        if (delete)
+          {
+             if (hi->input)
+               eina_stringshare_del(hi->input);
+             if (hi->plugin)
+               eina_stringshare_del(hi->plugin);
+             if (hi->context)
+               eina_stringshare_del(hi->context);
+             E_FREE(hi);
+
+             he->items = eina_list_remove_list(he->items, l);
+          }
+        else if (promote)
+          {
+             hi->count += 5;
+             hi->last_used = ecore_time_unix_get();
+          }
+        else /* demote */
+          {
+             hi->count -= 5;
+             if (hi->count < 0) hi->count = 1;
+          }
      }
    if (s->plugin == s->aggregator)
      _evry_aggregator_fetch(s);
@@ -1878,7 +1902,7 @@ _evry_cheat_history(Evry_State *s, int promote, int delete)
 }
 
 static Eina_Bool
-_evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
+_evry_cb_key_down(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
    Evry_State *s;
@@ -1891,88 +1915,88 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    if (!strcmp(ev->key, "Escape"))
      {
-       evry_hide(win, 0);
-       return ECORE_CALLBACK_PASS_ON;
+        evry_hide(win, 0);
+        return ECORE_CALLBACK_PASS_ON;
      }
 #ifdef DRAG_OFF_WINDOW
    else if (win->grab && !strcmp(ev->key, "F1"))
      {
-       E_Win *ewin = win->ewin;
+        E_Win *ewin = win->ewin;
 
-       e_grabinput_release(ewin->evas_win, ewin->evas_win);
-       if (!win->shaped)
-         e_win_borderless_set(ewin, 0);
-       ecore_evas_lower(ewin->ecore_evas);
-       ewin->border = e_border_new(ewin->container, ewin->evas_win, 1, 1);
-       // dont need this - special stuff - here it is needed
-       ewin->border->ignore_first_unmap = 1;
-       ewin->border->internal = 1;
-       ewin->border->internal_ecore_evas = ewin->ecore_evas;
-       ewin->border->internal_no_remember = 1;
-       e_border_show(ewin->border);
+        e_grabinput_release(ewin->evas_win, ewin->evas_win);
+        if (!win->shaped)
+          e_win_borderless_set(ewin, 0);
+        ecore_evas_lower(ewin->ecore_evas);
+        ewin->border = e_border_new(ewin->container, ewin->evas_win, 1, 1);
+        // dont need this - special stuff - here it is needed
+        ewin->border->ignore_first_unmap = 1;
+        ewin->border->internal = 1;
+        ewin->border->internal_ecore_evas = ewin->ecore_evas;
+        ewin->border->internal_no_remember = 1;
+        e_border_show(ewin->border);
 
-       win->grab = 0;
-       return ECORE_CALLBACK_PASS_ON;
+        win->grab = 0;
+        return ECORE_CALLBACK_PASS_ON;
      }
 #endif
    else if (ev->modifiers)
      {
-       Eina_List *l;
-       E_Config_Binding_Key *bind;
-       E_Binding_Modifier mod;
-
-       for (l = e_config->key_bindings; l; l = l->next)
-         {
-            bind = l->data;
-
-            if (bind->action && strcmp(bind->action, "everything")) continue;
-
-            mod = 0;
-
-            if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
-              mod |= E_BINDING_MODIFIER_SHIFT;
-            if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
-              mod |= E_BINDING_MODIFIER_CTRL;
-            if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
-              mod |= E_BINDING_MODIFIER_ALT;
-            if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
-              mod |= E_BINDING_MODIFIER_WIN;
-
-            if (!(bind->key && (!strcmp(bind->key, ev->keyname)) &&
-                  (((unsigned int)bind->modifiers == mod) || (bind->any_mod))))
-              continue;
-
-            if (win->level > 0)
-              return ECORE_CALLBACK_PASS_ON;
-
-            if (!(bind->params) &&
-                (CUR_SEL == OBJ_SEL) &&
-                ((CUR_SEL)->state && (CUR_SEL)->state->cur_item))
-              {
-                 _evry_selectors_shift(win, 1);
-                 return ECORE_CALLBACK_PASS_ON;
-              }
-
-            evry_hide(win, 1);
-
-            if (win && CUR_SEL && bind->params)
-              {
-                 Eina_List *ll;
-                 Evry_Plugin *p;
-
-                 EINA_LIST_FOREACH((SUBJ_SEL)->plugins, ll, p)
-                   if (!strcmp(bind->params, p->name)) break;
-
-                 if (p)
-                   {
-                      _evry_plugin_select((CUR_SEL)->state, p);
-                      _evry_selector_update(CUR_SEL);
-                      _evry_view_update(win, (CUR_SEL)->state);
-                   }
-              }
-
-            return ECORE_CALLBACK_PASS_ON;
-         }
+        Eina_List *l;
+        E_Config_Binding_Key *bind;
+        E_Binding_Modifier mod;
+
+        for (l = e_config->key_bindings; l; l = l->next)
+          {
+             bind = l->data;
+
+             if (bind->action && strcmp(bind->action, "everything")) continue;
+
+             mod = 0;
+
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+               mod |= E_BINDING_MODIFIER_SHIFT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
+               mod |= E_BINDING_MODIFIER_CTRL;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
+               mod |= E_BINDING_MODIFIER_ALT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
+               mod |= E_BINDING_MODIFIER_WIN;
+
+             if (!(bind->key && (!strcmp(bind->key, ev->keyname)) &&
+                   (((unsigned int)bind->modifiers == mod) || (bind->any_mod))))
+               continue;
+
+             if (win->level > 0)
+               return ECORE_CALLBACK_PASS_ON;
+
+             if (!(bind->params) && (CUR_SEL == OBJ_SEL) &&
+                 ((CUR_SEL)->state && (CUR_SEL)->state->cur_item))
+               {
+                  _evry_selectors_shift(win, 1);
+                  return ECORE_CALLBACK_PASS_ON;
+               }
+
+             evry_hide(win, 1);
+
+#if 0 /* FIXME this causes segv when triggering a plugin keybinding twice */
+             if (win && CUR_SEL && bind->params)
+               {
+                  Eina_List *ll;
+                  Evry_Plugin *p;
+
+                  EINA_LIST_FOREACH ((SUBJ_SEL)->plugins, ll, p)
+                    if (!strcmp(bind->params, p->name)) break;
+
+                  if (p)
+                    {
+                       _evry_plugin_select((CUR_SEL)->state, p);
+                       _evry_selector_update(CUR_SEL);
+                       _evry_view_update(win, (CUR_SEL)->state);
+                    }
+               }
+#endif
+             return ECORE_CALLBACK_PASS_ON;
+          }
      }
 
    old = ev->key;
@@ -1980,64 +2004,64 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    if (!strcmp(ev->key, "KP_Enter"))
      {
-       ev->key = "Return";
+        ev->key = "Return";
      }
    else if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
      {
-       if (!strcmp(ev->key, "Tab"))
-         {
-            ev->key = "Down";
-         }
-       else if (!strcmp(ev->key, "ISO_Left_Tab") || (!strcmp(ev->key, "Tab") &&
-                 (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
-         {
-            ev->key = "Up";
-            ev->modifiers = 0;
-         }
-       else if (!strcmp(ev->key, "q"))
-         {
-            evry_hide(win, 0);
-            return 1;
-         }
-       else if (!strcmp(ev->key, "w"))
-         {
-            ev->key = "Return";
-            ev->modifiers = 0;
-         }
-       else if (evry_conf->quick_nav == 1)
-         {
-            if (!strcmp(ev->key, "k") || (!strcmp(ev->key, "K")))
-              ev->key = "Up";
-            else if (!strcmp(ev->key, "j") || (!strcmp(ev->key, "J")))
-              ev->key = "Down";
-            else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
-              ev->key = "Next";
-            else if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
-              ev->key = "Prior";
-            else if (!strcmp(ev->key, "l") || (!strcmp(ev->key, "L")))
-              ev->key = "Right";
-            else if (!strcmp(ev->key, "h") || (!strcmp(ev->key, "H")))
-              ev->key = "Left";
-            else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
-              ev->key = "Tab";
-            else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
-              ev->key = "Return";
-         }
-       else if (evry_conf->quick_nav == 3)
-         {
-            if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
-              ev->key = "Up";
-            else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
-              ev->key = "Down";
-            else if (!strcmp(ev->key, "f") || (!strcmp(ev->key, "F")))
-              ev->key = "Right";
-            else if (!strcmp(ev->key, "b") || (!strcmp(ev->key, "B")))
-              ev->key = "Left";
-            else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
-              ev->key = "Tab";
-            else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
-              ev->key = "Return";
-         }
+        if (!strcmp(ev->key, "Tab"))
+          {
+             ev->key = "Down";
+          }
+        else if (!strcmp(ev->key, "ISO_Left_Tab") || (!strcmp(ev->key, "Tab") &&
+                                                      (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
+          {
+             ev->key = "Up";
+             ev->modifiers = 0;
+          }
+        else if (!strcmp(ev->key, "q"))
+          {
+             evry_hide(win, 0);
+             return 1;
+          }
+        else if (!strcmp(ev->key, "w"))
+          {
+             ev->key = "Return";
+             ev->modifiers = 0;
+          }
+        else if (evry_conf->quick_nav == 1)
+          {
+             if (!strcmp(ev->key, "k") || (!strcmp(ev->key, "K")))
+               ev->key = "Up";
+             else if (!strcmp(ev->key, "j") || (!strcmp(ev->key, "J")))
+               ev->key = "Down";
+             else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
+               ev->key = "Next";
+             else if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
+               ev->key = "Prior";
+             else if (!strcmp(ev->key, "l") || (!strcmp(ev->key, "L")))
+               ev->key = "Right";
+             else if (!strcmp(ev->key, "h") || (!strcmp(ev->key, "H")))
+               ev->key = "Left";
+             else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
+               ev->key = "Tab";
+             else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
+               ev->key = "Return";
+          }
+        else if (evry_conf->quick_nav == 3)
+          {
+             if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
+               ev->key = "Up";
+             else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
+               ev->key = "Down";
+             else if (!strcmp(ev->key, "f") || (!strcmp(ev->key, "F")))
+               ev->key = "Right";
+             else if (!strcmp(ev->key, "b") || (!strcmp(ev->key, "B")))
+               ev->key = "Left";
+             else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
+               ev->key = "Tab";
+             else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
+               ev->key = "Return";
+          }
      }
 
    if (!win || !(sel = CUR_SEL))
@@ -2045,11 +2069,11 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    if (!strcmp(ev->key, "Tab") &&
        !((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
-        (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
+         (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
      {
-       if (!_evry_selectors_switch(win, 1))
-         _evry_selectors_switch(win, 0);
-       goto end;
+        if (!_evry_selectors_switch(win, 1))
+          _evry_selectors_switch(win, 0);
+        goto end;
      }
 
    if (!(s = sel->state))
@@ -2057,108 +2081,108 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    if (!win->visible && (!strcmp(ev->key, "Down")))
      {
-       _evry_list_win_show(win);
-       goto end;
+        _evry_list_win_show(win);
+        goto end;
      }
    else if ((!strcmp(ev->key, "ISO_Left_Tab") ||
-            (((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
-              (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)) &&
-             (!strcmp(ev->key, "Tab")))))
+             (((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
+               (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)) &&
+              (!strcmp(ev->key, "Tab")))))
      {
-       _evry_input_complete(s);
-       goto end;
+        _evry_input_complete(s);
+        goto end;
      }
    else if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
-           (!strcmp(ev->key, "Delete") || !strcmp(ev->key, "Insert")))
+            (!strcmp(ev->key, "Delete") || !strcmp(ev->key, "Insert")))
      {
-       int delete = (!strcmp(ev->key, "Delete") &&
-                     (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT));
-       int promote = (!strcmp(ev->key, "Insert"));
+        int delete = (!strcmp(ev->key, "Delete") &&
+                      (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT));
+        int promote = (!strcmp(ev->key, "Insert"));
 
-       _evry_cheat_history(s, promote, delete);
-       goto end;
+        _evry_cheat_history(s, promote, delete);
+        goto end;
      }
    else if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
      {
-       if (!strcmp(ev->key, "u"))
-         {
-            if (!_evry_clear(sel))
-              evry_browse_back(sel);
-            goto end;
-         }
-       else if (!strcmp(ev->key, "1"))
-         evry_view_toggle(s, NULL);
-       else if (!strcmp(ev->key, "Return"))
-         _evry_plugin_action(sel, 0);
-       else if (!strcmp(ev->key, "v"))
-         {
-            win->request_selection = EINA_TRUE;
-            ecore_x_selection_primary_request
-              (win->ewin->evas_win, ECORE_X_SELECTION_TARGET_UTF8_STRING);
-         }
-       else
-         {
-            _evry_view_key_press(s, ev);
-         }
-       goto end;
+        if (!strcmp(ev->key, "u"))
+          {
+             if (!_evry_clear(sel))
+               evry_browse_back(sel);
+             goto end;
+          }
+        else if (!strcmp(ev->key, "1"))
+          evry_view_toggle(s, NULL);
+        else if (!strcmp(ev->key, "Return"))
+          _evry_plugin_action(sel, 0);
+        else if (!strcmp(ev->key, "v"))
+          {
+             win->request_selection = EINA_TRUE;
+             ecore_x_selection_primary_request
+               (win->ewin->evas_win, ECORE_X_SELECTION_TARGET_UTF8_STRING);
+          }
+        else
+          {
+             _evry_view_key_press(s, ev);
+          }
+        goto end;
      }
    if ((s->plugin && s->plugin->cb_key_down) &&
        (s->plugin->cb_key_down(s->plugin, ev)))
      {
-       /* let plugin intercept keypress */
-       goto end;
+        /* let plugin intercept keypress */
+        goto end;
      }
    else if (_evry_view_key_press(s, ev))
      {
-       /* let view intercept keypress */
-       goto end;
+        /* let view intercept keypress */
+        goto end;
      }
    else if (!strcmp(ev->key, "Right"))
      {
-       if (!evry_browse_item(sel->state->cur_item))
-         evry_selectors_switch(win, 1, EINA_TRUE);
+        if (!evry_browse_item(sel->state->cur_item))
+          evry_selectors_switch(win, 1, EINA_TRUE);
      }
    else if (!strcmp(ev->key, "Left"))
      {
-       if (!evry_browse_back(sel))
-         evry_selectors_switch(win, -1, EINA_TRUE);
+        if (!evry_browse_back(sel))
+          evry_selectors_switch(win, -1, EINA_TRUE);
      }
    else if (!strcmp(ev->key, "Return"))
      {
-       if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
-         {
-            _evry_plugin_action(sel, 0);
-         }
-       else if (s->cur_item && s->cur_item->browseable)
-         {
-            evry_browse_item(sel->state->cur_item);
-         }
-       else
-         {
-            _evry_plugin_action(sel, 1);
-         }
+        if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+          {
+             _evry_plugin_action(sel, 0);
+          }
+        else if (s->cur_item && s->cur_item->browseable)
+          {
+             evry_browse_item(sel->state->cur_item);
+          }
+        else
+          {
+             _evry_plugin_action(sel, 1);
+          }
      }
    else if (!strcmp(ev->key, "BackSpace"))
      {
-       if (!_evry_backspace(sel))
-         evry_browse_back(sel);
+        if (!_evry_backspace(sel))
+          evry_browse_back(sel);
      }
    else if ((ev->compose && !(ev->modifiers & ECORE_EVENT_MODIFIER_ALT)))
      {
-       unsigned int len = strlen(s->inp);
+        unsigned int len = strlen(s->inp);
 
-       if (len == 0 && (evry_view_toggle(s, ev->compose)))
-         goto end;
+        if (len == 0 && (evry_view_toggle(s, ev->compose)))
+          goto end;
 
-       if (len < (INPUTLEN - strlen(ev->compose)))
-         {
-            strcat(s->inp, ev->compose);
+        if (len < (INPUTLEN - strlen(ev->compose)))
+          {
+             strcat(s->inp, ev->compose);
 
-            _evry_update(sel, 1);
-         }
+             _evry_update(sel, 1);
+          }
      }
 
- end:
+end:
    ev->key = old;
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -2175,22 +2199,22 @@ _evry_backspace(Evry_Selector *sel)
    pos = evas_string_char_prev_get(s->inp, len, &val);
    if ((pos < len) && (pos >= 0))
      {
-       val = *(s->inp + pos);
+        val = *(s->inp + pos);
 
-       s->inp[pos] = 0;
+        s->inp[pos] = 0;
 
-       if (s->trigger_active && s->inp[0] != 0)
-         s->input = s->inp + 1;
-       else
-         s->input = s->inp;
+        if (s->trigger_active && s->inp[0] != 0)
+          s->input = s->inp + 1;
+        else
+          s->input = s->inp;
 
-       if (pos == 0)
-         s->trigger_active = EINA_FALSE;
+        if (pos == 0)
+          s->trigger_active = EINA_FALSE;
 
-       if ((pos == 0) || !isspace(val))
-         _evry_update(sel, 1);
+        if ((pos == 0) || !isspace(val))
+          _evry_update(sel, 1);
 
-       return 1;
+        return 1;
      }
 
    return 0;
@@ -2203,10 +2227,10 @@ _evry_update_text_label(Evry_State *s)
 
    if (!win->visible && evry_conf->hide_input)
      {
-       if (strlen(s->inp) > 0)
-         edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e");
-       else
-         edje_object_signal_emit(win->o_main, "list:e,state,entry_hide", "e");
+        if (strlen(s->inp) > 0)
+          edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e");
+        else
+          edje_object_signal_emit(win->o_main, "list:e,state,entry_hide", "e");
      }
 
    edje_object_part_text_set(win->o_main, "list:e.text.label", s->inp);
@@ -2222,13 +2246,13 @@ _evry_update(Evry_Selector *sel, int fetch)
 
    if (fetch)
      {
-       if (sel->update_timer)
-         ecore_timer_del(sel->update_timer);
+        if (sel->update_timer)
+          ecore_timer_del(sel->update_timer);
 
-       sel->update_timer =
-         ecore_timer_add(MATCH_LAG, _evry_cb_update_timer, sel);
+        sel->update_timer =
+          ecore_timer_add(MATCH_LAG, _evry_cb_update_timer, sel);
 
-       edje_object_signal_emit(win->o_main, "list:e,signal,update", "e");
+        edje_object_signal_emit(win->o_main, "list:e,signal,update", "e");
      }
 }
 
@@ -2256,14 +2280,14 @@ _evry_clear(Evry_Selector *sel)
 
    if (s->trigger_active && s->inp[1] != 0)
      {
-       s->inp[1] = 0;
-       s->input = s->inp + 1;
+        s->inp[1] = 0;
+        s->input = s->inp + 1;
      }
    else
      {
-       s->inp[0] = 0;
-       s->input = s->inp;
-       s->trigger_active = EINA_FALSE;
+        s->inp[0] = 0;
+        s->input = s->inp;
+        s->trigger_active = EINA_FALSE;
      }
 
    _evry_update(sel, 1);
@@ -2293,22 +2317,23 @@ static int
 _evry_action_do(Evry_Action *act)
 {
    Evry_Event_Action_Performed *ev;
+   int ret;
 
-   if (act->action(act))
+   if ((ret = act->action(act)))
      {
-       ev = E_NEW(Evry_Event_Action_Performed, 1);
-       ev->action = eina_stringshare_ref(act->name);
-       ev->it1 = act->it1.item;
-       ev->it2 = act->it2.item;
+        ev = E_NEW(Evry_Event_Action_Performed, 1);
+        ev->action = eina_stringshare_ref(act->name);
+        ev->it1 = act->it1.item;
+        ev->it2 = act->it2.item;
 
-       if (ev->it1)
-         EVRY_ITEM_REF(ev->it1);
-       if (ev->it2)
-         EVRY_ITEM_REF(ev->it2);
+        if (ev->it1)
+          EVRY_ITEM_REF(ev->it1);
+        if (ev->it2)
+          EVRY_ITEM_REF(ev->it2);
 
-       ecore_event_add(_evry_events[EVRY_EVENT_ACTION_PERFORMED], ev,
-                       _evry_cb_free_action_performed, NULL);
-       return 1;
+        ecore_event_add(_evry_events[EVRY_EVENT_ACTION_PERFORMED], ev,
+                        _evry_cb_free_action_performed, NULL);
+        return ret;
      }
    return 0;
 }
@@ -2326,11 +2351,12 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
    Evry_Item *it, *it_subj, *it_act, *it_obj = NULL;
    Evry_Window *win = sel->win;
    Eina_List *l;
+   int ret = 0;
 
    if ((SUBJ_SEL)->update_timer)
      {
-       _evry_matches_update(SUBJ_SEL, 0);
-       _evry_selector_update(SUBJ_SEL);
+        _evry_matches_update(SUBJ_SEL, 0);
+        _evry_selector_update(SUBJ_SEL);
      }
 
    /* do delayed fetch actions now */
@@ -2343,16 +2369,15 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
    if (!(it_subj = s_subj->cur_item))
      return;
 
-   if (CUR_SEL == SUBJ_SEL &&
-       (ACTN_SEL)->update_timer)
+   if ((CUR_SEL == SUBJ_SEL) && (ACTN_SEL)->update_timer)
      {
-       /* _evry_selector_actions_get(it_subj); */
-       _evry_selector_plugins_get(ACTN_SEL, it_subj, NULL);
+        /* _evry_selector_actions_get(it_subj); */
+        _evry_selector_plugins_get(ACTN_SEL, it_subj, NULL);
 
-       if (!(ACTN_SEL)->state)
-         return;
+        if (!(ACTN_SEL)->state)
+          return;
 
-       _evry_selector_update(ACTN_SEL);
+        _evry_selector_update(ACTN_SEL);
      }
 
    if (!(s_act = (ACTN_SEL)->state))
@@ -2364,69 +2389,73 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
    if (CHECK_TYPE(it_act, EVRY_TYPE_ACTION) ||
        CHECK_SUBTYPE(it_act, EVRY_TYPE_ACTION))
      {
-       GET_ACTION(act, it_act);
-
-       if (!act->action)
-         return;
-
-       /* get object item for action, when required */
-       if (act->it2.type)
-         {
-            /* check if object is provided */
-            if ((s_obj = (OBJ_SEL)->state))
-              {
-                 it_obj = s_obj->cur_item;
-              }
-
-            if (!it_obj)
-              {
-                 if (ACTN_SEL == CUR_SEL)
-                   _evry_selectors_switch(win, 1);
-                 return;
-              }
-
-            act->it2.item = it_obj;
-         }
-
-       if (s_obj && s_obj->sel_items  && !(act->it2.accept_list))
-         {
-            if (!(act->it1.item && CHECK_TYPE(act->it1.item, EVRY_TYPE_PLUGIN)))
-              act->it1.item = it_subj;
-
-            EINA_LIST_FOREACH(s_obj->sel_items, l, it)
-              {
-                 if (it->type != act->it2.type)
-                   continue;
-                 act->it2.item = it;
-
-                 _evry_action_do(act);
-              }
-         }
-       else if (s_subj->sel_items && !(act->it1.accept_list))
-         {
-            EINA_LIST_FOREACH(s_subj->sel_items, l, it)
-              {
-                 if (it->type != act->it1.type)
-                   continue;
-                 act->it1.item = it;
-
-                 _evry_action_do(act);
-              }
-         }
-       else
-         {
-            if (!(act->it1.item && CHECK_TYPE(act->it1.item, EVRY_TYPE_PLUGIN)))
-              {
-                 act->it1.item = it_subj;
-                 act->it1.items = s_subj->sel_items;
-              }
-
-            if (s_obj)
-              act->it2.items = s_obj->sel_items;
-
-            if (!_evry_action_do(act))
-              return;
-         }
+        GET_ACTION(act, it_act);
+
+        if (!act->action)
+          return;
+
+        /* get object item for action, when required */
+        if (act->it2.type)
+          {
+             /* check if object is provided */
+             if ((s_obj = (OBJ_SEL)->state) && (!s_obj->delete_me))
+               {
+                  it_obj = s_obj->cur_item;
+               }
+
+             if (!it_obj)
+               {
+                  if (SUBJ_SEL == CUR_SEL)
+                    _evry_selectors_switch(win, 1);
+                  if (ACTN_SEL == CUR_SEL)
+                    _evry_selectors_switch(win, 1);
+                  return;
+               }
+
+             act->it2.item = it_obj;
+          }
+
+        if (s_obj && s_obj->sel_items && !(act->it2.accept_list))
+          {
+             if (!(act->it1.item && CHECK_TYPE(act->it1.item, EVRY_TYPE_PLUGIN)))
+               act->it1.item = it_subj;
+
+             EINA_LIST_FOREACH (s_obj->sel_items, l, it)
+               {
+                  if (it->type != act->it2.type)
+                    continue;
+                  act->it2.item = it;
+
+                  _evry_action_do(act);
+               }
+          }
+        else if (s_subj->sel_items && !(act->it1.accept_list))
+          {
+             EINA_LIST_FOREACH (s_subj->sel_items, l, it)
+               {
+                  if (it->type != act->it1.type)
+                    continue;
+                  act->it1.item = it;
+
+                  _evry_action_do(act);
+               }
+          }
+        else
+          {
+             if (!(act->it1.item && CHECK_TYPE(act->it1.item, EVRY_TYPE_PLUGIN)))
+               {
+                  act->it1.item = it_subj;
+                  act->it1.items = s_subj->sel_items;
+               }
+
+             if (s_obj)
+               act->it2.items = s_obj->sel_items;
+
+             ret = _evry_action_do(act);
+
+             if (ret == EVRY_ACTION_OTHER)
+               return;
+          }
      }
    else return;
 
@@ -2439,8 +2468,34 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
    if (s_obj && it_obj && it_obj->plugin->history)
      evry_history_item_add(it_obj, it_act->context, s_obj->input);
 
-   if (finished && win->grab)
-     evry_hide(win, 0);
+   if (ret == EVRY_ACTION_CONTINUE)
+     return;
+
+   if (ret == EVRY_ACTION_CLEAR)
+     {
+        _evry_clear(CUR_SEL);
+     }
+   else
+     {
+        win->func.hide(win, finished);
+     }
+}
+
+static void
+_evry_view_list_swallow_set(Evas_Object *obj, const char *part, Evas_Object *swallow)
+{
+   Evas_Object *o;
+
+   o = edje_object_part_swallow_get(obj, part);
+   if (o != swallow)
+     {
+        evas_object_hide(o);
+        edje_object_part_unswallow(obj, o);
+
+        edje_object_part_unswallow(obj, swallow);
+        edje_object_part_swallow(obj, part, swallow);
+        evas_object_show(swallow);
+     }
 }
 
 static void
@@ -2450,8 +2505,8 @@ _evry_view_show(Evry_Window *win, Evry_View *v, int slide)
 
    if (v->o_bar)
      {
-       edje_object_part_swallow(win->o_main, "list:e.swallow.bar", v->o_bar);
-       evas_object_show(v->o_bar);
+        edje_object_part_swallow(win->o_main, "list:e.swallow.bar", v->o_bar);
+        evas_object_show(v->o_bar);
      }
 
    if (!v->o_list)
@@ -2459,27 +2514,24 @@ _evry_view_show(Evry_Window *win, Evry_View *v, int slide)
 
    if (slide == SLIDE_LEFT)
      {
-       edje_object_part_swallow(win->o_main, "list:e.swallow.list2", v->o_list);
-       evas_object_show(v->o_list);
+        _evry_view_list_swallow_set(win->o_main, "list:e.swallow.list2", v->o_list);
 
-       edje_object_signal_emit(win->o_main, "list:e,action,slide,left", "e");
-       edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
+        edje_object_signal_emit(win->o_main, "list:e,action,slide,left", "e");
+        edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
      }
    else if (slide == SLIDE_RIGHT)
      {
-       edje_object_part_swallow(win->o_main, "list:e.swallow.list", v->o_list);
-       evas_object_show(v->o_list);
+        _evry_view_list_swallow_set(win->o_main, "list:e.swallow.list", v->o_list);
 
-       edje_object_signal_emit(win->o_main, "list:e,action,slide,right", "e");
-       edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
+        edje_object_signal_emit(win->o_main, "list:e,action,slide,right", "e");
+        edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
      }
    else
      {
-       edje_object_part_swallow(win->o_main, "list:e.swallow.list", v->o_list);
-       evas_object_show(v->o_list);
+        _evry_view_list_swallow_set(win->o_main, "list:e.swallow.list", v->o_list);
 
-       edje_object_signal_emit(win->o_main, "list:e,action,slide,default", "e");
-       edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
+        edje_object_signal_emit(win->o_main, "list:e,action,slide,default", "e");
+        edje_object_signal_emit(v->o_list, "e,action,show,list", "e");
      }
 }
 
@@ -2508,21 +2560,20 @@ _evry_state_clear(Evry_Window *win)
 
    if (s->delete_me)
      {
-       if (s->view)
-         s->view->destroy(s->view);
-       s->clear_timer = NULL;
-       E_FREE(s->inp);
-       E_FREE(s);
+        if (s->view) s->view->destroy(s->view);
+        s->clear_timer = NULL;
+        E_FREE(s->inp);
+        E_FREE(s);
      }
    else if ((v = s->view))
      {
-       v->clear(v);
+        v->clear(v);
 
-       if (v->o_list)
-         {
-            edje_object_part_unswallow(win->o_main, v->o_list);
-            evas_object_hide(v->o_list);
-         }
+        if (v->o_list)
+          {
+             evas_object_hide(v->o_list);
+             edje_object_part_unswallow(win->o_main, v->o_list);
+          }
      }
 
    /* replay mouse down to allow direct sliding back */
@@ -2533,76 +2584,98 @@ _evry_state_clear(Evry_Window *win)
 static void
 _evry_view_hide(Evry_Window *win, Evry_View *v, int slide)
 {
+   if (v->state->delete_me)
+     {
+        _evry_state_clear(win);
+        return;
+     }
+
    _evry_state_clear(win);
 
    if (!v) return;
 
    if (slide && v->o_list)
      {
-       evas_object_hide(v->o_list);
-       edje_object_part_unswallow(win->o_main, v->o_list);
+        win->state_clearing = v->state;
 
-       if (slide == SLIDE_RIGHT)
-         {
-            edje_object_part_swallow(win->o_main, "list:e.swallow.list2",
-                                     v->o_list);
+        if (slide == SLIDE_RIGHT)
+          {
+             _evry_view_list_swallow_set(win->o_main, "list:e.swallow.list2", v->o_list);
+          }
+        else /* if (slide == SLIDE_LEFT) */
+          {
+             _evry_view_list_swallow_set(win->o_main, "list:e.swallow.list", v->o_list);
+          }
 
-            win->state_clearing = v->state;
-         }
-       else /* if (slide == SLIDE_LEFT) */
-         {
-            edje_object_part_swallow(win->o_main, "list:e.swallow.list",
-                                     v->o_list);
-            win->state_clearing = v->state;
-         }
+        edje_object_signal_emit(v->o_list, "e,action,hide,list", "e");
 
-       evas_object_show(v->o_list);
-       edje_object_signal_emit(v->o_list, "e,action,hide,list", "e");
-       /* FIXME get signal from theme when anim finished */
-       v->state->clear_timer = ecore_timer_add(0.5, _clear_timer, win);
+        /* FIXME get signal from theme when anim finished */
+        v->state->clear_timer = ecore_timer_add(1.5, _clear_timer, win);
 
-       if (v->o_bar)
-         {
-            edje_object_part_unswallow(win->o_main, v->o_bar);
-            evas_object_hide(v->o_bar);
-         }
+        if (v->o_bar)
+          {
+             evas_object_hide(v->o_bar);
+             edje_object_part_unswallow(win->o_main, v->o_bar);
+          }
 
-       return;
+        return;
      }
 
    v->clear(v);
 
    if (v->o_list)
      {
-       edje_object_part_unswallow(win->o_main, v->o_list);
-       evas_object_hide(v->o_list);
+        evas_object_hide(v->o_list);
+        edje_object_part_unswallow(win->o_main, v->o_list);
      }
 
    if (v->o_bar)
      {
-       edje_object_part_unswallow(win->o_main, v->o_bar);
-       evas_object_hide(v->o_bar);
+        evas_object_hide(v->o_bar);
+        edje_object_part_unswallow(win->o_main, v->o_bar);
      }
 }
 
 static int
-_evry_view_update(Evry_Window *win, Evry_State *s)
+_evry_view_create(Evry_State *s)
 {
-   if (!win->visible) return 0;
+   Evry_View *view;
 
-   if (!s->view)
-     {
-       Evry_View *view = evry_conf->views->data;
-       if (!(s->view = view->create(view, s, win->o_main)))
-         return 0;
+   if (s->view)
+     return 1;
+
+   if (s->plugin && s->plugin->view)
+     view = s->plugin->view;
+   else
+     view = eina_list_data_get(evry_conf->views);
+
+   s->view = view->create(view, s, s->selector->win->o_main);
 
-       s->view->state = s;
-       s->view->update(s->view);
-       return 1;
+   if (s->view)
+     {
+        s->view->state = s;
+        return 1;
      }
 
+   return 0;
+}
+
+static int
+_evry_view_update(Evry_Window *win, Evry_State *s)
+{
+   if (!win->visible) return 0;
+   /* TODO check this again !!!!*/
    if (s->view)
-     s->view->update(s->view);
+     {
+        s->view->update(s->view);
+        return 0;
+     }
+
+   if (_evry_view_create(s))
+     {
+        s->view->update(s->view);
+        return 1;
+     }
 
    return 0;
 }
@@ -2633,51 +2706,51 @@ evry_view_toggle(Evry_State *s, const char *trigger)
 
    if (trigger)
      {
-       EINA_LIST_FOREACH(evry_conf->views, ll, view)
-         {
-            if (view->trigger && !strncmp(trigger, view->trigger, 1) &&
-                (!s->view || (view->id != s->view->id)) &&
-                (v = view->create(view, s, win->o_main)))
-              {
-                 triggered = EINA_TRUE;
-                 goto found;
-              }
-         }
+        EINA_LIST_FOREACH (evry_conf->views, ll, view)
+          {
+             if (view->trigger && !strncmp(trigger, view->trigger, 1) &&
+                 (!s->view || (view->id != s->view->id)) &&
+                 (v = view->create(view, s, win->o_main)))
+               {
+                  triggered = EINA_TRUE;
+                  goto found;
+               }
+          }
      }
    else
      {
-       if (s->view)
-         l = eina_list_data_find_list(evry_conf->views, s->view->id);
-       else
-         {
-            view = evry_conf->views->data;
-            v = view->create(view, s, win->o_main);
-            goto found;
-         }
-
-       if (l && l->next)
-         l = l->next;
-       else
-         l = evry_conf->views;
-
-       EINA_LIST_FOREACH(l, ll, view)
-         {
-            if ((!view->trigger) &&
-                ((!s->view || (view->id != s->view->id)) &&
-                 (v = view->create(view, s, win->o_main))))
-              goto found;
-         }
-     }
-
- found:
+        if (s->view)
+          l = eina_list_data_find_list(evry_conf->views, s->view->id);
+        else
+          {
+             view = evry_conf->views->data;
+             v = view->create(view, s, win->o_main);
+             goto found;
+          }
+
+        if (l && l->next)
+          l = l->next;
+        else
+          l = evry_conf->views;
+
+        EINA_LIST_FOREACH (l, ll, view)
+          {
+             if ((!view->trigger) &&
+                 ((!s->view || (view->id != s->view->id)) &&
+                  (v = view->create(view, s, win->o_main))))
+               goto found;
+          }
+     }
+
+found:
    if (!v) return 0;
 
    _evry_list_win_show(win);
 
    if (s->view)
      {
-       _evry_view_hide(win, s->view, 0);
-       s->view->destroy(s->view);
+        _evry_view_hide(win, s->view, 0);
+        s->view->destroy(s->view);
      }
 
    s->view = v;
@@ -2697,7 +2770,7 @@ _evry_matches_update(Evry_Selector *sel, int async)
    Evry_Item *it;
    Evry_Window *win = sel->win;
    const char *input = NULL;
-   int len_inp = 0;
+   size_t len_inp = 0;
 
    s->changed = 1;
    s->request++;
@@ -2705,131 +2778,131 @@ _evry_matches_update(Evry_Selector *sel, int async)
 #ifdef CHECK_TIME
    DBG("matches update %f", ecore_time_get() - _evry_time);
 #endif
-   
+
    if (sel->update_timer)
      {
-       ecore_timer_del(sel->update_timer);
-       sel->update_timer = NULL;
+        ecore_timer_del(sel->update_timer);
+        sel->update_timer = NULL;
      }
 
    if (s->sel_items)
      {
-       eina_list_free(s->sel_items);
-       s->sel_items = NULL;
+        eina_list_free(s->sel_items);
+        s->sel_items = NULL;
      }
 
    if (s->inp[0])
      {
-       len_inp = strlen(s->inp);
-       input = s->inp;
+        len_inp = strlen(s->inp);
+        input = s->inp;
      }
 
    /* use current plugins */
    if (s->trigger_active)
      {
-       s->plugin_auto_selected = EINA_FALSE;
+        s->plugin_auto_selected = EINA_FALSE;
 
-       EINA_LIST_FOREACH(s->cur_plugins, l, p)
-         {
-            p->request = s->request;
-            p->fetch(p, s->input);
-         }
-       goto found;
+        EINA_LIST_FOREACH (s->cur_plugins, l, p)
+          {
+             p->request = s->request;
+             p->fetch(p, s->input);
+          }
+        goto found;
      }
 
-   EINA_LIST_FREE(s->cur_plugins, p);
+   EINA_LIST_FREE (s->cur_plugins, p) ;
 
    /* check if input matches plugin trigger */
    if (input)
      {
-       int len_trigger = 0;
-
-       EINA_LIST_FOREACH(s->plugins, l, p)
-         {
-            if (!p->config->trigger) continue;
-            int len = strlen(p->config->trigger);
-
-            if (len_trigger && len != len_trigger)
-              continue;
-
-            if ((len_inp >= len) &&
-                (!strncmp(s->inp, p->config->trigger, len)))
-              {
-                 len_trigger = len;
-                 s->cur_plugins = eina_list_append(s->cur_plugins, p);
-                 p->request = s->request;
-                 if(len_inp == len)
-                   p->fetch(p, NULL);
-                 else
-                   p->fetch(p, s->input + len);
-              }
-         }
-       if (s->cur_plugins)
-         {
-            s->trigger_active = EINA_TRUE;
-            /* replace trigger with indicator */
-            if (len_trigger > 1)
-              {
-                 s->inp[0] = ':';
-
-                 if (s->inp + len_trigger)
-                   strcpy(s->inp + 1, s->inp + len_trigger);
-                 else
-                   s->inp[1] = 0;
-              }
-            s->input = s->inp + 1;
-            _evry_update_text_label(s);
-
-            goto found;
-         }
+        int len_trigger = 0;
+
+        EINA_LIST_FOREACH (s->plugins, l, p)
+          {
+             if (!p->config->trigger) continue;
+             int len = strlen(p->config->trigger);
+
+             if (len_trigger && len != len_trigger)
+               continue;
+
+             if ((len_inp >= len) &&
+                 (!strncmp(s->inp, p->config->trigger, len)))
+               {
+                  len_trigger = len;
+                  s->cur_plugins = eina_list_append(s->cur_plugins, p);
+                  p->request = s->request;
+                  if (len_inp == len)
+                    p->fetch(p, NULL);
+                  else
+                    p->fetch(p, s->input + len);
+               }
+          }
+        if (s->cur_plugins)
+          {
+             s->trigger_active = EINA_TRUE;
+             /* replace trigger with indicator */
+             if (len_trigger > 1)
+               {
+                  s->inp[0] = ':';
+
+                  if (s->inp + len_trigger)
+                    strcpy(s->inp + 1, s->inp + len_trigger);
+                  else
+                    s->inp[1] = 0;
+               }
+             s->input = s->inp + 1;
+             _evry_update_text_label(s);
+
+             goto found;
+          }
      }
 
    /* query all other plugins for this state */
-   EINA_LIST_FOREACH(s->plugins, l, p)
-     {
-       p->request = s->request;
-
-       if (p == s->aggregator)
-         goto next;
-
-       /* dont wait for async plugin. use their current items */
-       if (!async && p->async_fetch && p->items)
-         {
-            s->cur_plugins = eina_list_append(s->cur_plugins, p);
-            goto next;
-         }
-
-       if (!((sel->states->next) ||
-             ((CUR_SEL == SUBJ_SEL) &&
-              (win->plugin_dedicated))))
-         {
-            /* skip plugins in toplevel which trigger-only */
-            if ((sel == SUBJ_SEL) &&
-                (p->config->top_level) &&
-                (p->config->trigger_only))
-              goto next;
-
-            /* skip non-toplevel plugins when input < min_query */
-            if ((!p->config->top_level) &&
-                (p->config->min_query > len_inp))
-              goto next;
-         }
-
-       if (p->fetch(p, input))
-         {
+   EINA_LIST_FOREACH (s->plugins, l, p)
+     {
+        p->request = s->request;
+
+        if (p == s->aggregator)
+          goto next;
+
+        /* dont wait for async plugin. use their current items */
+        if (!async && p->async_fetch && p->items)
+          {
+             s->cur_plugins = eina_list_append(s->cur_plugins, p);
+             goto next;
+          }
+
+        if (!((sel->states->next) ||
+              ((CUR_SEL == SUBJ_SEL) &&
+               (win->plugin_dedicated))))
+          {
+             /* skip plugins in toplevel which trigger-only */
+             if ((sel == SUBJ_SEL) &&
+                 (p->config->top_level) &&
+                 (p->config->trigger_only))
+               goto next;
+
+             /* skip non-toplevel plugins when input < min_query */
+             if ((!p->config->top_level) &&
+                 (p->config->min_query > len_inp))
+               goto next;
+          }
+
+        if (p->fetch(p, input))
+          {
 #ifdef CHECK_TIME
-            DBG("fetch %s %f", p->name, ecore_time_get() - _evry_time);
+             DBG("fetch %s %f", p->name, ecore_time_get() - _evry_time);
 #endif
-            s->cur_plugins = eina_list_append(s->cur_plugins, p);
-            continue;
-         }
+             s->cur_plugins = eina_list_append(s->cur_plugins, p);
+             continue;
+          }
 
-     next:
-       if (s->plugin == p)
-         s->plugin = NULL;
+next:
+        if (s->plugin == p)
+          s->plugin = NULL;
      }
 
- found:
+found:
    _evry_aggregator_fetch(s);
 
    if (s->plugin_auto_selected)
@@ -2840,7 +2913,7 @@ _evry_matches_update(Evry_Selector *sel, int async)
    if (!s->plugin)
      return;
 
-   EINA_LIST_FOREACH(s->plugin->items, l, it)
+   EINA_LIST_FOREACH (s->plugin->items, l, it)
      if (it->marked)
        s->sel_items = eina_list_append(s->sel_items, it);
 }
@@ -2852,8 +2925,8 @@ _evry_item_desel(Evry_State *s)
 
    if (it)
      {
-       it->selected = EINA_FALSE;
-       evry_item_free(it);
+        it->selected = EINA_FALSE;
+        evry_item_free(it);
      }
 
    s->cur_item = NULL;
@@ -2879,15 +2952,27 @@ _evry_plugin_select(Evry_State *s, Evry_Plugin *p)
 
    if (p)
      {
-       s->plugin_auto_selected = EINA_FALSE;
+        s->plugin_auto_selected = EINA_FALSE;
      }
    else
      {
-       p = eina_list_data_get(s->cur_plugins);
-       s->plugin_auto_selected = EINA_TRUE;
+        p = eina_list_data_get(s->cur_plugins);
+        s->plugin_auto_selected = EINA_TRUE;
      }
 
    s->plugin = p;
+
+   if ((s->view && s->plugin && s->plugin->view) &&
+       (s->view->name != s->plugin->view->name))
+     {
+        s->view->destroy(s->view);
+        s->view = NULL;
+        if (_evry_view_create(s))
+          {
+             _evry_view_show(s->selector->win, s->view, 0);
+             s->view->update(s->view);
+          }
+     }
 }
 
 static void
@@ -2908,8 +2993,8 @@ evry_plugin_select(Evry_Plugin *p)
 
    if (!p->state)
      {
-       ERR("no state!");
-       return;
+        ERR("no state!");
+        return;
      }
 
    _evry_plugin_select(p->state, p);
@@ -2919,7 +3004,7 @@ evry_plugin_select(Evry_Plugin *p)
    ev->item = EVRY_ITEM(p);
    EVRY_ITEM_REF(p);
    ecore_event_add(_evry_events[EVRY_EVENT_PLUGIN_SELECTED], ev,
-                  _evry_cb_free_plugin_selected, NULL);
+                   _evry_cb_free_plugin_selected, NULL);
 }
 
 static void
@@ -2928,13 +3013,13 @@ _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
    Eina_List *l;
    Evry_Plugin *p2;
 
-   EINA_LIST_FOREACH(s->cur_plugins, l, p2)
+   EINA_LIST_FOREACH (s->cur_plugins, l, p2)
      {
-       if (p == p2)
-         return;
+        if (p == p2)
+          return;
 
-       if (p->config->priority < p2->config->priority)
-         break;
+        if (p->config->priority < p2->config->priority)
+          break;
      }
 
    if (l)
@@ -2959,16 +3044,35 @@ _evry_cb_selection_notify(void *data, int type __UNUSED__, void *event)
    if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
        (ev->selection == ECORE_X_SELECTION_PRIMARY))
      {
-       if (strcmp(ev->target, ECORE_X_SELECTION_TARGET_UTF8_STRING) == 0)
-         {
-            Ecore_X_Selection_Data_Text *text_data;
+        if (strcmp(ev->target, ECORE_X_SELECTION_TARGET_UTF8_STRING) == 0)
+          {
+             Ecore_X_Selection_Data_Text *text_data;
 
-            text_data = ev->data;
+             text_data = ev->data;
 
-            strncat(s->input, text_data->text, (INPUTLEN - strlen(s->input)) - 1);
-            _evry_update(CUR_SEL, 1);
-         }
+             strncat(s->input, text_data->text, (INPUTLEN - strlen(s->input)) - 1);
+             _evry_update(CUR_SEL, 1);
+          }
      }
 
    return ECORE_CALLBACK_PASS_ON;
 }
+
+void
+evry_item_app_free(Evry_Item_App *app)
+{
+   efreet_desktop_free(app->desktop);
+   eina_stringshare_del(app->file);
+
+   free(app);
+}
+
+void
+evry_item_file_free(Evry_Item_File *file)
+{
+   eina_stringshare_del(file->url);
+   eina_stringshare_del(file->path);
+   eina_stringshare_del(file->mime);
+
+   free(file);
+}
index 600b19b..d641d60 100644 (file)
@@ -3,11 +3,12 @@
 
 #include "evry_types.h"
 
-#define EVRY_API_VERSION     26
+#define EVRY_API_VERSION     30
 
 #define EVRY_ACTION_OTHER    0
 #define EVRY_ACTION_FINISHED 1
 #define EVRY_ACTION_CONTINUE 2
+#define EVRY_ACTION_CLEAR    3
 
 #define EVRY_UPDATE_ADD             0
 #define EVRY_UPDATE_CLEAR    1
@@ -49,7 +50,7 @@ typedef struct _Evry_Module Evry_Module;
 typedef struct _Evry_Event_Item_Changed     Evry_Event_Item_Changed;
 typedef struct _Evry_Event_Item_Selected    Evry_Event_Item_Selected;
 typedef struct _Evry_Event_Action_Performed Evry_Event_Action_Performed;
-
+typedef void (*Evry_Item_Free_Cb) (Evry_Item *it);
 
 struct _Evry_Module
 {
@@ -65,11 +66,11 @@ struct _Evry_API
 
   Evry_Item *(*item_new)(Evry_Item *base, Evry_Plugin *p, const char *label,
                        Evas_Object *(*icon_get) (Evry_Item *it, Evas *e),
-                       void (*cb_free) (Evry_Item *item));
+                       Evry_Item_Free_Cb item_free);
 
   void (*item_free)(Evry_Item *it);
   void (*item_ref)(Evry_Item *it);
-  /* send EVRY_EVENT_ITEM_CHANGED event */
+  /* sends EVRY_EVENT_ITEM_CHANGED event */
   void  (*item_changed)(Evry_Item *it, int change_icon, int change_selected);
 
   Evry_Plugin *(*plugin_new)(Evry_Plugin *base, const char *name,
@@ -77,8 +78,7 @@ struct _Evry_API
                                  Evry_Type item_type,
                                  Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
                                  void (*cleanup) (Evry_Plugin *p),
-                                 int  (*fetch)   (Evry_Plugin *p, const char *input),
-                                 void (*free) (Evry_Plugin *p));
+                                 int  (*fetch)   (Evry_Plugin *p, const char *input));
 
   void (*plugin_free)(Evry_Plugin *p);
   /* when a new plugin config was created return val is 1. in this
@@ -101,8 +101,8 @@ struct _Evry_API
   Evry_Type (*type_register)(const char *type);
 
   /* evry_util.c */
-  Evas_Object *(*icon_mime_get)(const char *mime, Evas *e);
   Evas_Object *(*icon_theme_get)(const char *icon, Evas *e);
+
   int   (*fuzzy_match)(const char *str, const char *match);
   int   (*util_exec_app)(const Evry_Item *it_app, const Evry_Item *it_file);
   char *(*util_url_escape)(const char *string, int inlength);
@@ -111,7 +111,6 @@ struct _Evry_API
   int   (*util_plugin_items_add)(Evry_Plugin *p, Eina_List *items, const char *input, int match_detail, int set_usage);
   char *(*util_md5_sum)(const char *str);
   Evas_Object *(*util_icon_get)(Evry_Item *it, Evas *e);
-  int   (*items_sort_func)(const void *data1, const void *data2);
 
   const char *(*file_path_get)(Evry_Item_File *file);
   const char *(*file_url_get)(Evry_Item_File *file);
@@ -162,15 +161,15 @@ struct _Evry_Event_Action_Performed
 #define GET_ITEM(_it, _any) Evry_Item *_it = (Evry_Item *) _any
 
 /*** Evry_Item macros ***/
-#ifndef EVRY_H
+
+/* */
 #define EVRY_ITEM_NEW(_base, _plugin, _label, _icon_get, _free) \
   (_base *) evry->item_new(EVRY_ITEM(E_NEW(_base, 1)),         \
                           EVRY_PLUGIN(_plugin),                \
-                          _label, _icon_get, _free)
+                          _label, _icon_get, (Evry_Item_Free_Cb)_free)
 
 #define EVRY_ITEM_FREE(_item) evry->item_free((Evry_Item *)_item)
 #define EVRY_ITEM_REF(_item) evry->item_ref((Evry_Item *)_item)
-#endif
 
 #define EVRY_ITEM_DATA_INT_SET(_item, _data) \
   ((Evry_Item *)_item)->data = (void*)(long) _data
@@ -179,88 +178,97 @@ struct _Evry_Event_Action_Performed
   ((Evry_Item *)_item)->data
 
 #define EVRY_ITEM_DETAIL_SET(_it, _detail)                     \
-  if (EVRY_ITEM(_it)->detail)                                  \
-    eina_stringshare_del(EVRY_ITEM(_it)->detail);              \
-  EVRY_ITEM(_it)->detail = eina_stringshare_add(_detail);
+  eina_stringshare_replace(&(EVRY_ITEM(_it)->detail), _detail);
 
 #define EVRY_ITEM_LABEL_SET(_it, _label)                       \
-  if (EVRY_ITEM(_it)->label)                                   \
-    eina_stringshare_del(EVRY_ITEM(_it)->label);               \
-  EVRY_ITEM(_it)->label = eina_stringshare_add(_label);
+  eina_stringshare_replace(&(EVRY_ITEM(_it)->label), _label);
 
 #define EVRY_ITEM_CONTEXT_SET(_it, _context)                   \
-  if (EVRY_ITEM(_it)->context)                                 \
-    eina_stringshare_del(EVRY_ITEM(_it)->context);             \
-  EVRY_ITEM(_it)->context = eina_stringshare_add(_context);
+  eina_stringshare_replace(&(EVRY_ITEM(_it)->context), _context);
 
 #define EVRY_ITEM_ICON_SET(_it, _icon)                         \
-  if (EVRY_ITEM(_it)->icon)                                    \
-    eina_stringshare_del(EVRY_ITEM(_it)->icon);                        \
-  EVRY_ITEM(_it)->icon = eina_stringshare_add(_icon);
+  eina_stringshare_replace(&(EVRY_ITEM(_it)->icon), _icon);
 
 #define CHECK_TYPE(_item, _type) \
-  (((Evry_Item *)_item)->type && ((Evry_Item *)_item)->type == _type)
+  (((Evry_Item *)_item)->type == _type)
 
 #define CHECK_SUBTYPE(_item, _type) \
-  (((Evry_Item *)_item)->subtype && ((Evry_Item *)_item)->subtype == _type)
+  (((Evry_Item *)_item)->subtype == _type)
 
 #define IS_BROWSEABLE(_item) ((Evry_Item *)_item)->browseable
 
 /*** Evry_Plugin macros ***/
-#ifndef EVRY_H
-#define EVRY_PLUGIN_NEW(_base, _name, _icon, _item_type, _begin, _finish, _fetch, _free) \
-  evry->plugin_new(EVRY_PLUGIN(E_NEW(_base, 1)), _name, _(_name), _icon, _item_type,     \
-                  _begin, _finish, _fetch, _free)
 
+/* creates a Evry_Plugin to be registered with evry */
+#define EVRY_PLUGIN_BASE(_name, _icon, _item_type, _begin, _finish, _fetch) \
+  evry->plugin_new(EVRY_PLUGIN(E_NEW(Evry_Plugin, 1)), _name, _(_name), _icon, _item_type, \
+                  _begin, _finish, _fetch)
+
+/* creates the plugin instance '_p' for the Evry_Plugin '_plugin' */
+#define EVRY_PLUGIN_INSTANCE(_p, _plugin) {                            \
+     _p                           = E_NEW(Plugin, 1);                          \
+     _p->base              = *_plugin;                                 \
+     _p->base.items        = NULL;                                     \
+     _p->base.base.ref     = 1;                                                \
+     _p->base.base.plugin  = (Evry_Plugin*)_p;                         \
+     _p->base.base.free    = (Evry_Item_Free_Cb)_p->base.finish;       \
+     _p->base.base.label   = eina_stringshare_ref(_plugin->base.label);        \
+     _p->base.base.detail  = eina_stringshare_ref(_plugin->base.detail); \
+     _p->base.base.icon    = eina_stringshare_ref(_plugin->base.icon); \
+     _p->base.base.context = eina_stringshare_ref(_plugin->base.context); \
+     _p->base.base.id      = eina_stringshare_ref(_plugin->base.id);   \
+}
+
+/* free the plugin instance '_p' */
 #define EVRY_PLUGIN_FREE(_p) if (_p) evry->plugin_free(EVRY_PLUGIN(_p))
 
+/* call free on all items provided by plugin instance '_p' */
 #define EVRY_PLUGIN_ITEMS_FREE(_p) {                           \
      Evry_Item *it;                                            \
      EINA_LIST_FREE(EVRY_PLUGIN(_p)->items, it)                        \
        evry->item_free(it); }
 
+/* append '_item' to list of items provided by plugin instance '_p' */
+#define EVRY_PLUGIN_ITEM_APPEND(_p, _item)                              \
+  EVRY_PLUGIN(_p)->items = eina_list_append(EVRY_PLUGIN(_p)->items, EVRY_ITEM(_item))
+
+/* */
 #define EVRY_PLUGIN_ITEMS_ADD(_plugin, _items, _input, _match_detail, _set_usage) \
   evry->util_plugin_items_add(EVRY_PLUGIN(_plugin), _items, _input, _match_detail, _set_usage)
 
-#define EVRY_PLUGIN_UPDATE(_p, _action)        \
+/* call EVRY_PLUGIN_UPDATE when the list of items provided by plugin '_p' has
+ * changed. e.g. for files plugin when files were created or deleted
+ * while evry is active.
+ * '_action' can be EVRY_UPDATE_ADD (new items were added),
+ * EVRY_UPDATE_CLEAR (plugin does not provide any items) or
+ * EVRY_UPDATE_REFRESH (items have changed) */
+#define EVRY_PLUGIN_UPDATE(_p, _action)                 \
   if (_p) evry->plugin_update(EVRY_PLUGIN(_p), _action)
-#endif
+
 #define EVRY_PLUGIN_ITEMS_SORT(_p, _sortcb)                    \
   EVRY_PLUGIN(_p)->items = eina_list_sort                      \
     (EVRY_PLUGIN(_p)->items, eina_list_count(EVRY_PLUGIN(_p)->items), _sortcb)
 
-#define EVRY_PLUGIN_ITEM_APPEND(_p, _item) \
-  EVRY_PLUGIN(_p)->items = eina_list_append(EVRY_PLUGIN(_p)->items, EVRY_ITEM(_item))
-
-typedef void (*Evry_Item_Free_Cb) (Evry_Item *it);
 
-#define EVRY_PLUGIN_INSTANCE(_p, _plugin) {                               \
-     _p = E_NEW(Plugin, 1);                                               \
-     _p->base              = *_plugin;                                    \
-     _p->base.items        = NULL;                                        \
-     _p->base.base.ref     = 1;                                           \
-     _p->base.base.free    = (Evry_Item_Free_Cb)_p->base.finish;          \
-     _p->base.base.label   = eina_stringshare_add(_plugin->base.label);   \
-     _p->base.base.detail  = eina_stringshare_add(_plugin->base.detail);  \
-     _p->base.base.icon    = eina_stringshare_add(_plugin->base.icon);    \
-     _p->base.base.context = eina_stringshare_add(_plugin->base.context); \
-     _p->base.base.id      = eina_stringshare_add(_plugin->base.id);      \
-     _p->base.base.plugin  = (Evry_Plugin*)_p; }                          \
+#define EVRY_PLUGIN_MIN_QUERY(_p, _input)                              \
+  if (!(EVRY_PLUGIN(_p)->config->min_query) ||                         \
+      (_input && (strlen(_input) >= EVRY_PLUGIN(_p)->config->min_query)))
 
 #define EVRY_PLUGIN_ITEMS_CLEAR(_p) {                          \
      Evry_Item *it;                                            \
      EINA_LIST_FREE(EVRY_PLUGIN(_p)->items, it)                        \
        if (it) it->fuzzy_match = 0; }
 
+#define EVRY_PLUGIN_HAS_ITEMS(_p) !!(EVRY_PLUGIN(_p)->items)
+
 /*** Evry_Action macros ***/
-#ifndef EVRY_H
 #define EVRY_ACTION_NEW(_name, _in1, _in2, _icon, _action, _check) \
-  evry->action_new(_name, _(_name), _in1, _in2, _icon, _action, _check)
+  evry->action_new(N_(_name), _(_name), _in1, _in2, _icon, _action, _check)
 
 #define EVRY_ACTION_FREE(_act) if (_act) evry->action_free(EVRY_ACTN(_act))
-#endif
 
-#define EVRY_MODULE_NEW(_module, _evry_api, _init, _shutdown)  \
+/* register */
+#define EVRY_MODULE_NEW(_module, _evry, _init, _shutdown)      \
   {                                                            \
      _module = E_NEW(Evry_Module, 1);                          \
      _module->init     = &_init;                               \
@@ -268,13 +276,14 @@ typedef void (*Evry_Item_Free_Cb) (Evry_Item *it);
      Eina_List *l = e_datastore_get("evry_modules");           \
      l = eina_list_append(l, _module);                         \
      e_datastore_set("evry_modules", l);                       \
-     if ((_evry_api = e_datastore_get("evry_api")))            \
-       evry_module->active = _init(_evry_api);                 \
+     if ((_evry = e_datastore_get("evry_api")))                        \
+       _module->active = _init(_evry);                         \
   }
 
 #define EVRY_MODULE_FREE(_module)                      \
   {                                                    \
-     _module->shutdown();                              \
+     if (_module->active) _module->shutdown();         \
+     _module->active = EINA_FALSE;                     \
      Eina_List *l = e_datastore_get("evry_modules");   \
      l = eina_list_remove(l, _module);                 \
      if (l) e_datastore_set("evry_modules", l);                \
@@ -294,7 +303,6 @@ typedef void (*Evry_Item_Free_Cb) (Evry_Item *it);
   } while (0)
 
 
-#ifndef EVRY_H
 
 #ifndef EINA_LOG_DEFAULT_COLOR
 #define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN
@@ -311,4 +319,3 @@ typedef void (*Evry_Item_Free_Cb) (Evry_Item *it);
 #define ERR(...) EINA_LOG_DOM_ERR(evry->log_dom , __VA_ARGS__)
 
 #endif
-#endif
index a9f69cb..f0861b0 100644 (file)
@@ -1,65 +1,64 @@
 #include "e_mod_main.h"
 
-static void        *_create_data             (E_Config_Dialog *cfd);
-static void         _free_data               (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int          _basic_apply_data        (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets    (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void        *_create_data(E_Config_Dialog *cfd);
+static void         _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int          _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 typedef struct _Plugin_Page Plugin_Page;
 
 struct _Plugin_Page
 {
-  Evas_Object *list;
-  Evas_Object *o_trigger;
-  Evas_Object *o_trigger_only;
-  E_Radio_Group *view_rg;
-  Evas_Object *o_view_default;
-  Evas_Object *o_view_list;
-  Evas_Object *o_view_detail;
-  Evas_Object *o_view_thumb;
-  Evas_Object *o_enabled;
-  Evas_Object *o_aggregate;
-  Evas_Object *o_top_level;
-  Evas_Object *o_cfg_btn;
-  Evas_Object *o_min_query;
-
-  Eina_List *configs;
-
-  char *trigger;
-  int trigger_only;
-  int view_mode;
-  int aggregate;
-  int top_level;
-  int enabled;
-  int min_query;
-  Plugin_Config *cur;
-
-  Eina_Bool collection;
+   Evas_Object   *list;
+   Evas_Object   *o_trigger;
+   Evas_Object   *o_trigger_only;
+   E_Radio_Group *view_rg;
+   Evas_Object   *o_view_default;
+   Evas_Object   *o_view_list;
+   Evas_Object   *o_view_detail;
+   Evas_Object   *o_view_thumb;
+   Evas_Object   *o_enabled;
+   Evas_Object   *o_aggregate;
+   Evas_Object   *o_top_level;
+   Evas_Object   *o_cfg_btn;
+   Evas_Object   *o_min_query;
+
+   Eina_List     *configs;
+
+   char          *trigger;
+   int            trigger_only;
+   int            view_mode;
+   int            aggregate;
+   int            top_level;
+   int            enabled;
+   int            min_query;
+   Plugin_Config *cur;
+
+   Eina_Bool      collection;
 };
 
 struct _E_Config_Dialog_Data
 {
-  int hide_input;
-  int hide_list;
+   int         hide_input;
+   int         hide_list;
 
-  int quick_nav;
+   int         quick_nav;
 
-  int width, height;
-  int edge_width, edge_height;
-  double rel_x, rel_y;
-  int scroll_animate;
-  double scroll_speed;
+   int         width, height;
+   int         edge_width, edge_height;
+   double      rel_x, rel_y;
+   int         scroll_animate;
+   double      scroll_speed;
 
-  int view_mode;
-  int view_zoom;
-  int cycle_mode;
+   int         view_mode;
+   int         view_zoom;
+   int         cycle_mode;
 
-  int history_sort_mode;
+   int         history_sort_mode;
 
-  Plugin_Page page[3];
+   Plugin_Page page[3];
 };
 
-
 EAPI E_Config_Dialog *
 evry_config_dialog(E_Container *con, const char *params __UNUSED__)
 {
@@ -76,9 +75,9 @@ evry_config_dialog(E_Container *con, const char *params __UNUSED__)
    v->advanced.apply_cfdata = NULL;
    v->advanced.create_widgets = NULL;
    cfd = e_config_dialog_new(con,
-                            _("Everything Settings"),
-                            "E", "extensions/run_everything",
-                            "system-run", 0, v, NULL);
+                             _("Everything Settings"),
+                             "E", "extensions/run_everything",
+                             "system-run", 0, v, NULL);
    return cfd;
 }
 
@@ -153,37 +152,35 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 #undef C
 
    if (evry_conf->conf_subjects) eina_list_free(evry_conf->conf_subjects);
-   if (evry_conf->conf_actions)  eina_list_free(evry_conf->conf_actions);
-   if (evry_conf->conf_objects)  eina_list_free(evry_conf->conf_objects);
+   if (evry_conf->conf_actions) eina_list_free(evry_conf->conf_actions);
+   if (evry_conf->conf_objects) eina_list_free(evry_conf->conf_objects);
 
    evry_conf->conf_subjects = eina_list_clone(cfdata->page[0].configs);
-   evry_conf->conf_actions  = eina_list_clone(cfdata->page[1].configs);
-   evry_conf->conf_objects  = eina_list_clone(cfdata->page[2].configs);
+   evry_conf->conf_actions = eina_list_clone(cfdata->page[1].configs);
+   evry_conf->conf_objects = eina_list_clone(cfdata->page[2].configs);
 
    for (i = 0; i < 3; i++)
      {
-       pc = cfdata->page[i].cur;
-
-       if (pc)
-         {
-            if (pc->trigger)
-              eina_stringshare_del(pc->trigger);
-
-            if (cfdata->page[i].trigger[0])
-              pc->trigger = eina_stringshare_add(cfdata->page[i].trigger);
-            else
-              pc->trigger = NULL;
-
-            pc->trigger_only = cfdata->page[i].trigger_only;
-            pc->view_mode    = cfdata->page[i].view_mode;
-            pc->enabled      = cfdata->page[i].enabled;
-            pc->aggregate    = cfdata->page[i].aggregate;
-            pc->top_level    = cfdata->page[i].top_level;
-            pc->min_query    = cfdata->page[i].min_query;
-         }
+        pc = cfdata->page[i].cur;
+
+        if (pc)
+          {
+             if (cfdata->page[i].trigger[0])
+               eina_stringshare_replace(&pc->trigger, cfdata->page[i].trigger);
+             else
+               eina_stringshare_replace(&pc->trigger, NULL);
+
+             pc->trigger_only = cfdata->page[i].trigger_only;
+             pc->view_mode = cfdata->page[i].view_mode;
+             pc->enabled = cfdata->page[i].enabled;
+             pc->aggregate = cfdata->page[i].aggregate;
+             pc->top_level = cfdata->page[i].top_level;
+             pc->min_query = cfdata->page[i].min_query;
+          }
      }
 
    e_config_save_queue();
+
    return 1;
 }
 
@@ -194,7 +191,6 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__)
    Evas_Coord w;
    Eina_List *l;
    Plugin_Config *pc;
-   Evas_Object *end;
 
    /* freeze evas, edje, and list widget */
    evas = evas_object_evas_get(obj);
@@ -203,27 +199,30 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__)
    e_widget_ilist_freeze(obj);
    e_widget_ilist_clear(obj);
 
-   EINA_LIST_FOREACH(plugins, l, pc)
+   EINA_LIST_FOREACH (plugins, l, pc)
      {
-       if (!(end = edje_object_add(evas))) break;
-
-       if (e_theme_edje_object_set(end, "base/theme/widgets",
-                                   "e/widgets/ilist/toggle_end"))
-         {
-            char *sig = pc->plugin ? "e,state,checked" : "e,state,unchecked";
-            edje_object_signal_emit(end, sig, "e");
-         }
-       else
-         {
-            evas_object_del(end);
-            end = NULL;
-         }
-       e_widget_ilist_append_full(obj, NULL, end, pc->name, NULL, pc, NULL);
+        /* if (!(end = edje_object_add(evas))) break; */
+
+        if (!pc->plugin && strcmp(pc->name, "All"))
+          continue;
+
+        /* if (e_theme_edje_object_set(end, "base/theme/widgets",
+         *          "e/widgets/ilist/toggle_end"))
+         *   {
+         *      char *sig = pc->plugin ? "e,state,checked" : "e,state,unchecked";
+         *      edje_object_signal_emit(end, sig, "e");
+         *   }
+         * else
+         *   {
+         *      evas_object_del(end);
+         *      end = NULL;
+         *   } */
+        e_widget_ilist_append(obj, NULL, pc->name, NULL, pc, NULL);
      }
 
    e_widget_ilist_go(obj);
    e_widget_size_min_get(obj, &w, NULL);
-   e_widget_size_min_set(obj, w > 180 ? w : 180, 260);
+   e_widget_size_min_set(obj, w > 180 ? w : 180, 140);
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas);
@@ -237,24 +236,27 @@ _plugin_move(Plugin_Page *page, int dir)
 
    sel = e_widget_ilist_selected_get(page->list);
 
-   if ((page->collection) || (sel >= 1 && dir > 0) || (sel >= 2 && dir < 0))
+   if ((page->collection) ||
+       /* keep 'All' alway at top */
+       ((sel >= 1 && dir > 0) || (sel >= 2 && dir < 0)))
      {
-       Plugin_Config *pc;
-       int prio = 0;
+        Plugin_Config *pc, *pc2;
+        int prio = 0;
 
-       l1 = eina_list_nth_list(page->configs, sel);
-       l2 = eina_list_nth_list(page->configs, sel + dir);
+        pc = e_widget_ilist_nth_data_get(page->list, sel);
+        pc2 = e_widget_ilist_nth_data_get(page->list, sel + dir);
+        l1 = eina_list_data_find_list(page->configs, pc);
+        l2 = eina_list_data_find_list(page->configs, pc2);
+        if (!l1 || !l2) return;
 
-       if (!l1 || !l2) return;
-       pc = l1->data;
-       l1->data = l2->data;
-       l2->data = pc;
+        l1->data = pc2;
+        l2->data = pc;
 
-       _fill_list(page->configs, page->list, 0);
-       e_widget_ilist_selected_set(page->list, sel + dir);
+        _fill_list(page->configs, page->list, 0);
+        e_widget_ilist_selected_set(page->list, sel + dir);
 
-       EINA_LIST_FOREACH(page->configs, l1, pc)
-         pc->priority = prio++;
+        EINA_LIST_FOREACH (page->configs, l1, pc)
+          pc->priority = prio++;
      }
 }
 
@@ -271,70 +273,70 @@ _plugin_move_down_cb(void *data, void *data2 __UNUSED__)
 }
 
 static void
-_list_select_cb (void *data, Evas_Object *obj)
+_list_select_cb(void *data, Evas_Object *obj)
 {
    int sel = e_widget_ilist_selected_get(obj);
    Plugin_Config *pc = NULL;
    Plugin_Page *page = data;
 
-   if (sel >= 0 && (pc = eina_list_nth(page->configs, sel)))
+   if (sel >= 0 && (pc = e_widget_ilist_nth_data_get(page->list, sel)))
      {
-       e_widget_entry_text_set(page->o_trigger, pc->trigger);
-       e_widget_disabled_set(page->o_trigger, 0);
-
-       e_widget_check_checked_set(page->o_trigger_only, pc->trigger_only);
-       e_widget_disabled_set(page->o_trigger_only, 0);
-
-       e_widget_disabled_set(page->o_view_default, 0);
-       e_widget_disabled_set(page->o_view_detail, 0);
-       e_widget_disabled_set(page->o_view_list, 0);
-       e_widget_disabled_set(page->o_view_thumb, 0);
-
-       if (pc->view_mode == -1)
-         e_widget_radio_toggle_set(page->o_view_default, 1);
-       else if (pc->view_mode == 0)
-         e_widget_radio_toggle_set(page->o_view_list, 1);
-       else if (pc->view_mode == 1)
-         e_widget_radio_toggle_set(page->o_view_detail, 1);
-       else if (pc->view_mode == 2)
-         e_widget_radio_toggle_set(page->o_view_thumb, 1);
-
-       e_widget_check_checked_set(page->o_enabled, pc->enabled);
-       e_widget_disabled_set(page->o_enabled, 0);
-       e_widget_check_checked_set(page->o_aggregate, pc->aggregate);
-       e_widget_disabled_set(page->o_aggregate, 0);
-       e_widget_check_checked_set(page->o_top_level, pc->top_level);
-       e_widget_disabled_set(page->o_top_level, 0);
-       e_widget_slider_value_int_set(page->o_min_query, pc->min_query);
-       e_widget_disabled_set(page->o_min_query, 0);
-
-       if (pc->plugin && pc->plugin->config_path)
-         {
-            e_widget_disabled_set(page->o_cfg_btn, 0);
-         }
-       else
-         {
-            e_widget_disabled_set(page->o_cfg_btn, 1);
-         }
-
-       page->cur = pc;
+        e_widget_entry_text_set(page->o_trigger, pc->trigger);
+        e_widget_disabled_set(page->o_trigger, 0);
+
+        e_widget_check_checked_set(page->o_trigger_only, pc->trigger_only);
+        e_widget_disabled_set(page->o_trigger_only, 0);
+
+        e_widget_disabled_set(page->o_view_default, 0);
+        e_widget_disabled_set(page->o_view_detail, 0);
+        e_widget_disabled_set(page->o_view_list, 0);
+        e_widget_disabled_set(page->o_view_thumb, 0);
+
+        if (pc->view_mode == -1)
+          e_widget_radio_toggle_set(page->o_view_default, 1);
+        else if (pc->view_mode == 0)
+          e_widget_radio_toggle_set(page->o_view_list, 1);
+        else if (pc->view_mode == 1)
+          e_widget_radio_toggle_set(page->o_view_detail, 1);
+        else if (pc->view_mode == 2)
+          e_widget_radio_toggle_set(page->o_view_thumb, 1);
+
+        e_widget_check_checked_set(page->o_enabled, pc->enabled);
+        e_widget_disabled_set(page->o_enabled, 0);
+        e_widget_check_checked_set(page->o_aggregate, pc->aggregate);
+        e_widget_disabled_set(page->o_aggregate, 0);
+        e_widget_check_checked_set(page->o_top_level, pc->top_level);
+        e_widget_disabled_set(page->o_top_level, 0);
+        e_widget_slider_value_int_set(page->o_min_query, pc->min_query);
+        e_widget_disabled_set(page->o_min_query, 0);
+
+        if (pc->plugin && pc->plugin->config_path)
+          {
+             e_widget_disabled_set(page->o_cfg_btn, 0);
+          }
+        else
+          {
+             e_widget_disabled_set(page->o_cfg_btn, 1);
+          }
+
+        page->cur = pc;
      }
    else
      {
-       e_widget_entry_text_set(page->o_trigger, "");
-       e_widget_disabled_set(page->o_trigger, 1);
-       e_widget_disabled_set(page->o_trigger_only, 1);
-       e_widget_disabled_set(page->o_view_default, 1);
-       e_widget_disabled_set(page->o_view_detail, 1);
-       e_widget_disabled_set(page->o_view_list, 1);
-       e_widget_disabled_set(page->o_view_thumb, 1);
-       e_widget_disabled_set(page->o_enabled, 1);
-       e_widget_disabled_set(page->o_aggregate, 1);
-       e_widget_disabled_set(page->o_top_level, 1);
-       e_widget_disabled_set(page->o_cfg_btn, 1);
-       e_widget_disabled_set(page->o_min_query, 1);
-
-       page->cur = NULL;
+        e_widget_entry_text_set(page->o_trigger, "");
+        e_widget_disabled_set(page->o_trigger, 1);
+        e_widget_disabled_set(page->o_trigger_only, 1);
+        e_widget_disabled_set(page->o_view_default, 1);
+        e_widget_disabled_set(page->o_view_detail, 1);
+        e_widget_disabled_set(page->o_view_list, 1);
+        e_widget_disabled_set(page->o_view_thumb, 1);
+        e_widget_disabled_set(page->o_enabled, 1);
+        e_widget_disabled_set(page->o_aggregate, 1);
+        e_widget_disabled_set(page->o_top_level, 1);
+        e_widget_disabled_set(page->o_cfg_btn, 1);
+        e_widget_disabled_set(page->o_min_query, 1);
+
+        page->cur = NULL;
      }
 }
 
@@ -348,8 +350,8 @@ _plugin_config_cb(void *data, void *data2 __UNUSED__)
    printf(" %s\n", p->name);
 
    e_configure_registry_call(p->config_path,
-                            e_container_current_get(e_manager_current_get()),
-                            p->name);
+                             e_container_current_get(e_manager_current_get()),
+                             p->name);
 }
 
 static Evas_Object *
@@ -358,46 +360,42 @@ _create_plugin_page(E_Config_Dialog_Data *cfdata __UNUSED__, Evas *e, Plugin_Pag
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
 
-   of = e_widget_framelist_add(e, _("Available Plugins"), 0);
+   ob = e_widget_table_add(e, 0);
+   of = e_widget_frametable_add(e, _("Available Plugins"), 0);
    page->list = e_widget_ilist_add(e, 24, 24, NULL);
    e_widget_on_change_hook_set(page->list, _list_select_cb, page);
    _fill_list(page->configs, page->list, 0);
-   e_widget_framelist_object_append(of, page->list);
+   e_widget_frametable_object_append(of, page->list, 0, 0, 1, 1, 1, 1, 1, 1);
 
    o = e_widget_button_add(e, _("Move Up"), NULL,
-                          _plugin_move_up_cb,
-                          page, NULL);
-   e_widget_framelist_object_append(of, o);
-
+                           _plugin_move_up_cb, page, NULL);
+   e_widget_frametable_object_append(of, o, 0, 1, 1, 1, 1, 0, 1, 0);
    o = e_widget_button_add(e, _("Move Down"), NULL,
-                          _plugin_move_down_cb,
-                          page, NULL);
-   e_widget_framelist_object_append(of, o);
-   ob = e_widget_table_add(e, 0);
+                           _plugin_move_down_cb, page, NULL);
+   e_widget_frametable_object_append(of, o, 0, 2, 1, 1, 1, 0, 1, 0);
    e_widget_table_object_append(ob, of, 0, 0, 1, 3, 1, 1, 1, 0);
 
    of = e_widget_framelist_add(e, _("General"), 0);
    o = e_widget_button_add(e, _("Configure"), NULL,
-                          _plugin_config_cb,
-                          page, NULL);
+                           _plugin_config_cb, page, NULL);
    e_widget_disabled_set(o, 1);
    page->o_cfg_btn = o;
    e_widget_framelist_object_append(of, o);
 
    o = e_widget_check_add(e, _("Enabled"),
-                         &(page->enabled));
+                          &(page->enabled));
    e_widget_disabled_set(o, 1);
    page->o_enabled = o;
    e_widget_framelist_object_append(of, o);
 
    o = e_widget_check_add(e, _("Show in \"All\""),
-                         &(page->aggregate));
+                          &(page->aggregate));
    e_widget_disabled_set(o, 1);
    page->o_aggregate = o;
    e_widget_framelist_object_append(of, o);
 
    o = e_widget_check_add(e, _("Show in top-level"),
-                         &(page->top_level));
+                          &(page->top_level));
    e_widget_disabled_set(o, 1);
    page->o_top_level = o;
    e_widget_framelist_object_append(of, o);
@@ -405,45 +403,42 @@ _create_plugin_page(E_Config_Dialog_Data *cfdata __UNUSED__, Evas *e, Plugin_Pag
    o = e_widget_label_add(e, _("Minimum characters for search"));
    e_widget_framelist_object_append(of, o);
    o = e_widget_slider_add(e, 1, 0, _("%1.0f"), 0, 5, 1.0, 0, NULL,
-                          &(page->min_query), 10);
+                           &(page->min_query), 10);
    page->o_min_query = o;
    e_widget_framelist_object_append(of, o);
 
    e_widget_table_object_append(ob, of, 1, 0, 1, 1, 1, 1, 1, 0);
 
    of = e_widget_framelist_add(e, _("Plugin Trigger"), 0);
-   o = e_widget_label_add(e, _("Default is plugin name"));
-   e_widget_framelist_object_append(of, o);
-
    o = e_widget_entry_add(e, &(page->trigger), NULL, NULL, NULL);
    e_widget_disabled_set(o, 1);
    page->o_trigger = o;
    e_widget_framelist_object_append(of, o);
    o = e_widget_check_add(e, _("Search only when triggered"),
-                         &(page->trigger_only));
+                          &(page->trigger_only));
    e_widget_disabled_set(o, 1);
    page->o_trigger_only = o;
    e_widget_framelist_object_append(of, o);
    e_widget_table_object_append(ob, of, 1, 1, 1, 1, 1, 1, 1, 0);
 
-   of = e_widget_framelist_add(e, _("Plugin View"), 0);
+   of = e_widget_frametable_add(e, _("Plugin View"), 0);
    rg = e_widget_radio_group_new(&page->view_mode);
    o = e_widget_radio_add(e, _("Default"), -1, rg);
    e_widget_disabled_set(o, 1);
    page->o_view_default = o;
-   e_widget_framelist_object_append(of, o);
+   e_widget_frametable_object_append(of, o, 0, 0, 1, 1, 1, 1, 0, 0);
    o = e_widget_radio_add(e, _("List"), 0, rg);
-   e_widget_framelist_object_append(of, o);
+   e_widget_frametable_object_append(of, o, 0, 1, 1, 1, 1, 1, 0, 0);
    e_widget_disabled_set(o, 1);
    page->o_view_list = o;
    o = e_widget_radio_add(e, _("Detailed"), 1, rg);
    e_widget_disabled_set(o, 1);
    page->o_view_detail = o;
-   e_widget_framelist_object_append(of, o);
+   e_widget_frametable_object_append(of, o, 1, 1, 1, 1, 1, 1, 0, 0);
    o = e_widget_radio_add(e, _("Icons"), 2, rg);
    e_widget_disabled_set(o, 1);
    page->o_view_thumb = o;
-   e_widget_framelist_object_append(of, o);
+   e_widget_frametable_object_append(of, o, 1, 0, 1, 1, 1, 1, 0, 0);
    e_widget_table_object_append(ob, of, 1, 2, 1, 1, 1, 1, 1, 0);
 
    return ob;
@@ -460,34 +455,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
    o = e_widget_table_add(e, 0);
 
    /// GENERAL SETTNGS ///
-   of = e_widget_framelist_add(e, _("General"), 0);
-
-   /* FIXME no theme supports this currently, need to add info to themes
-      data section to know whether this option should be enabled */
-   cfdata->hide_input = 0;
-   ob = e_widget_check_add(e, _("Hide input when inactive"),
-                          &(cfdata->hide_input));
-   e_widget_disabled_set(ob, 1); 
-   e_widget_framelist_object_append(of, ob);
-   cfdata->hide_list = 0;
-   ob = e_widget_check_add(e, _("Hide list"),
-                          &(cfdata->hide_list));
-   e_widget_disabled_set(ob, 1); 
-   e_widget_framelist_object_append(of, ob);
-
-   ob = e_widget_label_add(e, _("Quick Navigation"));
-   e_widget_framelist_object_append(of, ob);
-
-   rg = e_widget_radio_group_new(&cfdata->quick_nav);
-   ob = e_widget_radio_add(e, _("Off"), 0, rg);
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(e, _("Emacs style (ALT + n,p,f,b,m,i)"), 3, rg);
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(e, _("Vi style (ALT + h,j,k,l,n,p,m,i)"), 1, rg);
-   e_widget_framelist_object_append(of, ob);
-
-   e_widget_table_object_append(o, of, 0, 0, 1, 1, 0, 0, 0, 0);
-
    of = e_widget_framelist_add(e, _("Default View"), 0);
    rg = e_widget_radio_group_new(&cfdata->view_mode);
    ob = e_widget_radio_add(e, _("List"), 0, rg);
@@ -498,19 +465,46 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
    e_widget_framelist_object_append(of, ob);
 
    ob = e_widget_check_add(e, _("Animate scrolling"),
-                          &(cfdata->scroll_animate));
+                           &(cfdata->scroll_animate));
    e_widget_framelist_object_append(of, ob);
    /* ob = e_widget_slider_add(e, 1, 0, _("%1.1f"),
-    *                      5, 20, 0.1, 0, &(cfdata->scroll_speed), NULL, 10);
+    *           5, 20, 0.1, 0, &(cfdata->scroll_speed), NULL, 10);
     * e_widget_framelist_object_append(of, ob); */
 
    ob = e_widget_check_add(e, _("Up/Down select next item in icon view"),
-                          &(cfdata->cycle_mode));
+                           &(cfdata->cycle_mode));
    e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(o, of, 1, 0, 1, 1, 0, 1, 0, 0);
+   e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 0, 1, 0);
+
+#if 0
+   /* FIXME no theme supports this currently, need to add info to themes
+      data section to know whether this option should be enabled */
+   cfdata->hide_input = 0;
+   ob = e_widget_check_add(e, _("Hide input when inactive"),
+                           &(cfdata->hide_input));
+   e_widget_disabled_set(ob, 1);
+   e_widget_framelist_object_append(of, ob);
+   cfdata->hide_list = 0;
+   ob = e_widget_check_add(e, _("Hide list"),
+                           &(cfdata->hide_list));
+   e_widget_disabled_set(ob, 1);
+   e_widget_framelist_object_append(of, ob);
+#endif
+   of = e_widget_framelist_add(e, _("Quick Navigation"), 0);
+   rg = e_widget_radio_group_new(&cfdata->quick_nav);
+   ob = e_widget_radio_add(e, _("Off"), 0, rg);
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_radio_add(e, _("Emacs style (ALT + n,p,f,b,m,i)"), 3, rg);
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_radio_add(e, _("Vi style (ALT + h,j,k,l,n,p,m,i)"), 1, rg);
+   e_widget_framelist_object_append(of, ob);
+   e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
 
    of = e_widget_framelist_add(e, _("Sorting"), 0);
    rg = e_widget_radio_group_new(&cfdata->history_sort_mode);
+   ob = e_widget_radio_add(e, _("No Sorting"), 3, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 3));
+   e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(e, _("By usage"), 0, rg);
    e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 0));
    e_widget_framelist_object_append(of, ob);
@@ -520,30 +514,28 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
    ob = e_widget_radio_add(e, _("Last used"), 2, rg);
    e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 2));
    e_widget_framelist_object_append(of, ob);
-
-   e_widget_table_object_append(o, of, 0, 1, 2, 1, 1, 0, 0, 0);
-
+   e_widget_table_object_append(o, of, 0, 2, 1, 1, 1, 0, 1, 0);
 
    e_widget_toolbook_page_append(otb, NULL, _("General Settings"),
-                                o, 1, 0, 1, 0, 0.5, 0.0);
+                                 o, 1, 0, 1, 0, 0.5, 0.0);
 
    /// PLUGINS ///
    otb2 = e_widget_toolbook_add(e, 48 * e_scale, 48 * e_scale);
 
    ob = _create_plugin_page(cfdata, e, &cfdata->page[0]);
    e_widget_toolbook_page_append(otb2, NULL, _("Subject Plugins"),
-                                ob, 1, 0, 1, 0, 0.5, 0.0);
+                                 ob, 1, 0, 1, 0, 0.5, 0.0);
 
    ob = _create_plugin_page(cfdata, e, &cfdata->page[1]);
    e_widget_toolbook_page_append(otb2, NULL, _("Action Plugins"),
-                                 ob, 1, 0, 1, 0, 0.5, 0.0);
+                                 ob, 1, 0, 1, 0, 0.5, 0.0);
 
    ob = _create_plugin_page(cfdata, e, &cfdata->page[2]);
    e_widget_toolbook_page_append(otb2, NULL, _("Object Plugins"),
-                                ob, 1, 0, 1, 0, 0.5, 0.0);
+                                 ob, 1, 0, 1, 0, 0.5, 0.0);
 
    e_widget_toolbook_page_append(otb, NULL, _("Plugins"),
-                                otb2, 1, 0, 1, 0, 0.5, 0.0);
+                                 otb2, 1, 0, 1, 0, 0.5, 0.0);
 
    e_widget_toolbook_page_show(otb2, 0);
 
@@ -553,15 +545,15 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
    ob = e_widget_label_add(e, _("Popup Width"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.0f"),
-                           evry_conf->min_w, 800, 1, 0, NULL,
-                           &(cfdata->width), 200);
+                            evry_conf->min_w, 800, 1, 0, NULL,
+                            &(cfdata->width), 200);
    e_widget_framelist_object_append(of, ob);
 
    ob = e_widget_label_add(e, _("Popup Height"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.0f"),
-                           evry_conf->min_h, 800, 1, 0, NULL,
-                           &(cfdata->height), 200);
+                            evry_conf->min_h, 800, 1, 0, NULL,
+                            &(cfdata->height), 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
@@ -569,53 +561,51 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
    ob = e_widget_label_add(e, _("Vertical"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.2f"),
-                           0.0, 1.0, 0.01, 0,
-                           &(cfdata->rel_y), NULL, 200);
+                            0.0, 1.0, 0.01, 0,
+                            &(cfdata->rel_y), NULL, 200);
    e_widget_framelist_object_append(of, ob);
 
    ob = e_widget_label_add(e, _("Horizontal"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.2f"),
-                           0.0, 1.0, 0.01, 0,
-                           &(cfdata->rel_x), NULL, 200);
+                            0.0, 1.0, 0.01, 0,
+                            &(cfdata->rel_x), NULL, 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
+#if 1
    of = e_widget_framelist_add(e, _("Edge Popup Size"), 0);
    ob = e_widget_label_add(e, _("Popup Width"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.0f"),
-                           evry_conf->min_w, 800, 1, 0, NULL,
-                           &(cfdata->edge_width), 200);
+                            evry_conf->min_w, 800, 1, 0, NULL,
+                            &(cfdata->edge_width), 200);
    e_widget_framelist_object_append(of, ob);
 
    ob = e_widget_label_add(e, _("Popup Height"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(e, 1, 0, _("%1.0f"),
-                           evry_conf->min_h, 800, 1, 0, NULL,
-                           &(cfdata->edge_height), 200);
+                            evry_conf->min_h, 800, 1, 0, NULL,
+                            &(cfdata->edge_height), 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+#endif
 
    e_widget_toolbook_page_append(otb, NULL, _("Geometry"),
-                                o, 1, 0, 1, 0, 0.5, 0.0);
-
+                                 o, 1, 0, 1, 0, 0.5, 0.0);
 
    e_widget_toolbook_page_show(otb, 0);
-
-   e_dialog_resizable_set(cfd->dia, 1);
+   e_dialog_resizable_set(cfd->dia, 0);
    return otb;
 }
 
-
 /***************************************************************************/
 
-static void *_cat_create_data(E_Config_Dialog *cfd);
-static void _cat_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void        *_cat_create_data(E_Config_Dialog *cfd);
+static void         _cat_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_cat_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
-                                             E_Config_Dialog_Data *cfdata);
-static int _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+                                              E_Config_Dialog_Data *cfdata);
+static int          _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 EAPI E_Config_Dialog *
 evry_collection_conf_dialog(E_Container *con, const char *params)
@@ -642,7 +632,7 @@ evry_collection_conf_dialog(E_Container *con, const char *params)
    snprintf(title, sizeof(title), "%s: %s", _("Everything Collection"), p->name);
 
    cfd = e_config_dialog_new(con, title, p->config_path, p->config_path,
-                            EVRY_ITEM(p)->icon, 0, v, p);
+                             EVRY_ITEM(p)->icon, 0, v, p);
 
    /* FIXME free dialogs on shutdown
       _conf->cfd = cfd; */
@@ -660,30 +650,30 @@ _cat_create_data(E_Config_Dialog *cfd)
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->page[0].collection = EINA_TRUE;
 
-   EINA_LIST_FOREACH(evry_conf->conf_subjects, l, pc)
+   EINA_LIST_FOREACH (evry_conf->conf_subjects, l, pc)
      {
-       if (pc->name == p->name)
-         continue;
-
-       if (!strcmp(pc->name, "All") ||
-           !strcmp(pc->name, "Actions") ||
-           !strcmp(pc->name, "Text") ||
-           !strcmp(pc->name, "Calculator") ||
-           !strcmp(pc->name, "Spell Checker") ||
-           !strcmp(pc->name, "Plugins"))
-         continue;
-
-       EINA_LIST_FOREACH(p->config->plugins, ll, pc2)
-         if (pc->name == pc2->name)
-           break;
-
-       if (pc2)
-         continue;
-
-       pc2 = E_NEW(Plugin_Config, 1);
-       pc2->name = eina_stringshare_ref(pc->name);
-       pc2->view_mode = VIEW_MODE_NONE;
-       p->config->plugins = eina_list_append(p->config->plugins, pc2);
+        if (pc->name == p->name)
+          continue;
+
+        if (!strcmp(pc->name, "All") ||
+            !strcmp(pc->name, "Actions") ||
+            !strcmp(pc->name, "Text") ||
+            !strcmp(pc->name, "Calculator") ||
+            !strcmp(pc->name, "Spell Checker") ||
+            !strcmp(pc->name, "Plugins"))
+          continue;
+
+        EINA_LIST_FOREACH (p->config->plugins, ll, pc2)
+          if (pc->name == pc2->name)
+            break;
+
+        if (pc2)
+          continue;
+
+        pc2 = E_NEW(Plugin_Config, 1);
+        pc2->name = eina_stringshare_ref(pc->name);
+        pc2->view_mode = VIEW_MODE_NONE;
+        p->config->plugins = eina_list_append(p->config->plugins, pc2);
      }
 
    cfdata->page[0].configs = eina_list_clone(p->config->plugins);
@@ -716,20 +706,20 @@ _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
    if (pc)
      {
-       if (pc->trigger)
-         eina_stringshare_del(pc->trigger);
-
-       if (cfdata->page[i].trigger[0])
-         pc->trigger = eina_stringshare_add(cfdata->page[i].trigger);
-       else
-         pc->trigger = NULL;
-
-       pc->trigger_only = cfdata->page[i].trigger_only;
-       pc->view_mode    = cfdata->page[i].view_mode;
-       pc->enabled      = cfdata->page[i].enabled;
-       pc->aggregate    = cfdata->page[i].aggregate;
-       pc->top_level    = cfdata->page[i].top_level;
-       pc->min_query    = cfdata->page[i].min_query;
+        if (pc->trigger)
+          eina_stringshare_del(pc->trigger);
+
+        if (cfdata->page[i].trigger[0])
+          pc->trigger = eina_stringshare_add(cfdata->page[i].trigger);
+        else
+          pc->trigger = NULL;
+
+        pc->trigger_only = cfdata->page[i].trigger_only;
+        pc->view_mode = cfdata->page[i].view_mode;
+        pc->enabled = cfdata->page[i].enabled;
+        pc->aggregate = cfdata->page[i].aggregate;
+        pc->top_level = cfdata->page[i].top_level;
+        pc->min_query = cfdata->page[i].min_query;
      }
 
    e_config_save_queue();
@@ -745,9 +735,10 @@ _cat_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dia
 
    ob = _create_plugin_page(cfdata, e, &cfdata->page[0]);
    e_widget_toolbook_page_append(otb, NULL, _("Plugins"),
-                                ob, 1, 0, 1, 0, 0.5, 0.0);
+                                 ob, 1, 0, 1, 0, 0.5, 0.0);
 
    e_widget_toolbook_page_show(otb, 0);
 
    return otb;
 }
+
index 5e7ec5d..d642e03 100644 (file)
@@ -5,36 +5,71 @@ typedef struct _Instance Instance;
 
 struct _Instance
 {
-  E_Gadcon_Client *gcc;
-  Evas_Object     *o_button;
+   EINA_INLIST;
 
-  E_Object_Delfn *del_fn;
-  Evry_Window *win;
+   E_Gadcon_Client *gcc;
+   Evas_Object     *o_button;
+
+   E_Object_Delfn  *del_fn;
+   Evry_Window     *win;
+   Gadget_Config   *cfg;
+   E_Config_Dialog *cfd;
+   E_Menu          *menu;
+
+   int              mouse_down;
+
+   Ecore_Animator  *hide_animator;
+   double           hide_start;
+   int              hide_x, hide_y;
+
+   Eina_List       *handlers;
+
+   Eina_Bool        hidden;
+   Eina_Bool        illume_mode;
 };
 
-static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+/* static void _button_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); */
+static void             _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static Eina_Bool        _cb_focus_out(void *data, int type __UNUSED__, void *event);
 
 /* gadcon requirements */
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
-static void _gc_shutdown(E_Gadcon_Client *gcc);
-static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static void             _gc_shutdown(E_Gadcon_Client *gcc);
+static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char      *_gc_label(E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static Gadget_Config   *_conf_item_get(const char *id);
+
+static void             _conf_dialog(Instance *inst);
+static Eina_Inlist *instances = NULL;
 
 static const E_Gadcon_Client_Class _gadcon_class =
 {
    GADCON_CLIENT_CLASS_VERSION,
-     "evry-starter",
-     {
-       _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
-       e_gadcon_site_is_not_toolbar
-     },
+   "evry-starter",
+   {
+      _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
+      e_gadcon_site_is_not_toolbar
+   },
    E_GADCON_CLIENT_STYLE_PLAIN
 };
 
-static E_Menu *_menu = NULL;
+static Eina_Bool
+_illume_running(void)
+{
+   /* hack to find out out if illume is running, dont grab if
+      this is the case... */
 
+   Eina_List *l;
+   E_Module *m;
+
+   EINA_LIST_FOREACH (e_module_list(), l, m)
+     if (!strcmp(m->name, "illume2") && m->enabled)
+       return EINA_TRUE;
+
+   return EINA_FALSE;
+}
 
 static E_Gadcon_Client *
 _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
@@ -42,11 +77,25 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Object *o;
    E_Gadcon_Client *gcc;
    Instance *inst;
+   Evry_Plugin *p;
 
    inst = E_NEW(Instance, 1);
+   inst->cfg = _conf_item_get(id);
 
    o = edje_object_add(gc->evas);
-   e_theme_edje_object_set(o, "base/theme/modules/start", "e/modules/start/main");
+   e_theme_edje_object_set(o, "base/theme/modules/everything", "e/modules/everything/gadget");
+
+   if (((inst->cfg->plugin) && (strcmp(inst->cfg->plugin, "Start") != 0)) &&
+       (p = evry_plugin_find(inst->cfg->plugin)))
+     {
+        Evas_Object *oo = evry_util_icon_get(EVRY_ITEM(p), gc->evas);
+        if (oo)
+          {
+             edje_object_part_swallow(o, "e.swallow.icon", oo);
+             edje_object_signal_emit(o, "e,state,icon,plugin", "e");
+          }
+     }
+
    edje_object_signal_emit(o, "e,state,unfocused", "e");
 
    gcc = e_gadcon_client_new(gc, name, id, style, o);
@@ -55,8 +104,23 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    inst->gcc = gcc;
    inst->o_button = o;
 
+   /* evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
+    *           _button_cb_mouse_up, inst); */
+
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
-                                 _button_cb_mouse_down, inst);
+                                  _button_cb_mouse_down, inst);
+
+   if (_illume_running())
+     {
+        inst->illume_mode = EINA_TRUE;
+
+        inst->handlers = eina_list_append(inst->handlers,
+                                          ecore_event_handler_add(E_EVENT_BORDER_FOCUS_OUT,
+                                                                  _cb_focus_out, inst));
+     }
+
+   instances = eina_inlist_append(instances, EINA_INLIST_GET(inst));
+
    return gcc;
 }
 
@@ -64,10 +128,20 @@ static void
 _gc_shutdown(E_Gadcon_Client *gcc)
 {
    Instance *inst;
+   Ecore_Event_Handler *h;
 
    inst = gcc->data;
+
+   instances = eina_inlist_remove(instances, EINA_INLIST_GET(inst));
+
+   EINA_LIST_FREE (inst->handlers, h)
+     ecore_event_handler_del(h);
+
    if (inst->del_fn && inst->win)
-     e_object_delfn_del(E_OBJECT(inst->win->ewin), inst->del_fn);
+     {
+        e_object_delfn_del(E_OBJECT(inst->win->ewin), inst->del_fn);
+        evry_hide(inst->win, 0);
+     }
 
    evas_object_del(inst->o_button);
    free(inst);
@@ -90,7 +164,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Everything Starter");
@@ -99,48 +173,275 @@ _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 static Evas_Object *
 _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
 {
-   /* Evas_Object *o; */
-   /* char buf[4096];
-    *
-    * o = edje_object_add(evas);
-    * snprintf(buf, sizeof(buf), "%s/e-module-start.edj",
-    *      e_module_dir_get(start_module));
-    * edje_object_file_set(o, buf, "icon"); */
-   return NULL;
+   Evas_Object *o;
+   char buf[PATH_MAX];
+
+   o = edje_object_add(evas);
+   snprintf(buf, sizeof(buf), "%s/e-module-everything-start.edj",
+            e_module_dir_get(_mod_evry));
+   edje_object_file_set(o, buf, "icon");
+   return o;
+}
+
+static Gadget_Config *
+_conf_item_get(const char *id)
+{
+   Gadget_Config *ci;
+
+   GADCON_CLIENT_CONFIG_GET(Gadget_Config, evry_conf->gadgets, _gadcon_class, id);
+
+   ci = E_NEW(Gadget_Config, 1);
+   ci->id = eina_stringshare_add(id);
+
+   evry_conf->gadgets = eina_list_append(evry_conf->gadgets, ci);
+
+   e_config_save_queue();
+
+   return ci;
 }
 
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   return _gadcon_class.name;
+   Gadget_Config *gc = _conf_item_get(NULL);
+   return gc->id;
 }
 
 /***************************************************************************/
 
-
-static void _del_func(void *data, void *obj __UNUSED__)
+static void
+_del_func(void *data, void *obj __UNUSED__)
 {
    Instance *inst = data;
 
    e_gadcon_locked_set(inst->gcc->gadcon, 0);
    e_object_delfn_del(E_OBJECT(inst->win->ewin), inst->del_fn);
+
+   if (inst->hide_animator) ecore_animator_del(inst->hide_animator);
    inst->del_fn = NULL;
    inst->win = NULL;
    edje_object_signal_emit(inst->o_button, "e,state,unfocused", "e");
 }
 
 static void
-_cb_menu_post(void *data __UNUSED__, E_Menu *m __UNUSED__)
+_cb_menu_post(void *data, E_Menu *m __UNUSED__)
 {
-   if (!_menu) return;
-   e_object_del(E_OBJECT(_menu));
-   _menu = NULL;
+   Instance *inst = data;
+
+   if (!inst->menu) return;
+   /* e_object_del(E_OBJECT(inst->menu)); */
+   inst->menu = NULL;
+}
+
+static void
+_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+{
+   _conf_dialog(data);
+}
+
+static Eina_Bool
+_hide_animator(void *data)
+{
+   Instance *inst = data;
+   E_Win *ewin = inst->win->ewin;
+   double val;
+   int finished = 0;
+
+   if (!inst->hide_start)
+     inst->hide_start = ecore_loop_time_get();
+
+   val = (ecore_loop_time_get() - inst->hide_start) / 0.4;
+   if (val > 0.99) finished = 1;
+
+   val = ecore_animator_pos_map(val, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
+
+   e_border_fx_offset(ewin->border,
+                      (val * (inst->hide_x * ewin->w)),
+                      (val * (inst->hide_y * ewin->h)));
+
+   if (finished)
+     {
+        /* go bac to subject selector */
+        evry_selectors_switch(inst->win, -1, 0);
+        evry_selectors_switch(inst->win, -1, 0);
+
+        inst->hide_animator = NULL;
+        e_border_iconify(ewin->border);
+        e_border_fx_offset(ewin->border, 0, 0);
+        return EINA_FALSE;
+     }
+
+   return EINA_TRUE;
+}
+
+static void
+_evry_hide_func(Evry_Window *win, int finished __UNUSED__)
+{
+   Instance *inst = win->data;
+
+   inst->hide_start = 0;
+   inst->hide_animator = ecore_animator_add(_hide_animator, inst);
+   inst->hidden = EINA_TRUE;
+}
+
+static Eina_Bool
+_cb_focus_out(void *data, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Focus_Out *ev;
+   Instance *inst;
+
+   ev = event;
+
+   EINA_INLIST_FOREACH (instances, inst)
+     if (inst == data) break;
+
+   if ((!inst) || (!inst->win))
+     return ECORE_CALLBACK_PASS_ON;
+
+   if (inst->hide_animator)
+     return ECORE_CALLBACK_PASS_ON;
+
+   if (inst->win->ewin->border != ev->border)
+     return ECORE_CALLBACK_PASS_ON;
+
+   _evry_hide_func(inst->win, 0);
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_gadget_popup_show(Instance *inst)
+{
+   Evas_Coord x, y, w, h;
+   int cx, cy, pw, ph;
+   E_Win *ewin = inst->win->ewin;
+
+   pw = ewin->w;
+   ph = ewin->h;
+
+   evas_object_geometry_get(inst->o_button, &x, &y, &w, &h);
+   e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL);
+   x += cx;
+   y += cy;
+
+   switch (inst->gcc->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+        e_win_move(ewin, x, y + h);
+        inst->hide_y = -1;
+        break;
+
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_BR:
+      case E_GADCON_ORIENT_CORNER_BL:
+        e_win_move(ewin, x, y - ph);
+        inst->hide_y = 1;
+        break;
+
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_CORNER_LT:
+      case E_GADCON_ORIENT_CORNER_LB:
+        e_win_move(ewin, x + w, y);
+        inst->hide_x = -1;
+        break;
+
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_RT:
+      case E_GADCON_ORIENT_CORNER_RB:
+        e_win_move(ewin, x - pw, y);
+        inst->hide_x = 1;
+        break;
+
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+      default:
+        break;
+     }
+
+   if (ewin->x + pw > inst->win->zone->w)
+     e_win_move(ewin, inst->win->zone->w - pw, ewin->y);
+
+   if (ewin->y + ph > inst->win->zone->h)
+     e_win_move(ewin, ewin->x, inst->win->zone->h - ph);
 }
 
 static void
-_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+_gadget_window_show(Instance *inst)
 {
-   evry_collection_conf_dialog(e_container_current_get(e_manager_current_get()), "Start");
+   int zx, zy, zw, zh;
+   int gx, gy, gw, gh;
+   int cx, cy;
+   int pw, ph;
+
+   E_Win *ewin = inst->win->ewin;
+
+   inst->win->func.hide = &_evry_hide_func;
+
+   e_zone_useful_geometry_get(inst->win->zone, &zx, &zy, &zw, &zh);
+
+   evas_object_geometry_get(inst->o_button, &gx, &gy, &gw, &gh);
+   e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL);
+   gx += cx;
+   gy += cy;
+
+   switch (inst->gcc->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+        pw = zw / 2;
+        ph = zh / 2;
+        inst->hide_y = -1;
+        e_win_move(ewin, zx, gy + gh);
+        break;
+
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_BR:
+      case E_GADCON_ORIENT_CORNER_BL:
+        pw = zw / 2;
+        ph = zh / 2;
+        inst->hide_y = 1;
+        e_win_move(ewin, zx, gy - ph);
+        break;
+
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_CORNER_LT:
+      case E_GADCON_ORIENT_CORNER_LB:
+        pw = zw / 2.5;
+        ph = zh;
+        inst->hide_x = -1;
+        e_win_move(ewin, gx + gw, zy);
+        break;
+
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_RT:
+      case E_GADCON_ORIENT_CORNER_RB:
+        pw = zw / 2.5;
+        ph = zh;
+        inst->hide_x = 1;
+        e_win_move(ewin, gx - pw, zy);
+        break;
+
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+      default:
+        pw = ph = 1;
+        break;
+     }
+
+   e_win_resize(ewin, pw, ph);
+   e_win_show(ewin);
+
+   e_border_focus_set(ewin->border, 1, 1);
+   ewin->border->client.netwm.state.skip_pager = 1;
+   ewin->border->client.netwm.state.skip_taskbar = 1;
+   ewin->border->sticky = 1;
+
+   inst->hidden = EINA_FALSE;
 }
 
 static void
@@ -150,102 +451,98 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
    Evas_Event_Mouse_Down *ev;
 
    inst = data;
+   /* if (!inst->mouse_down)
+    *   return; */
+
+   inst->mouse_down = 0;
+
    ev = event_info;
    if (ev->button == 1)
      {
-       Evas_Coord x, y, w, h;
-       int cx, cy, pw, ph;
-       Evry_Window *win;
-
-
-       win = evry_show(e_util_zone_current_get(e_manager_current_get()), 0, "Start");
-       if (!win) return;
-
-       evas_object_geometry_get(inst->o_button, &x, &y, &w, &h);
-       e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon,
-                                         &cx, &cy, NULL, NULL);
-       x += cx;
-       y += cy;
-       /* evas_object_resize(win->o_main,
-        *                 evry_conf->edge_width,
-        *                 evry_conf->edge_height);
-        * 
-        * e_popup_resize(win->popup,
-        *             evry_conf->edge_width,
-        *             evry_conf->edge_height); */
-
-       pw = win->ewin->w;
-       ph = win->ewin->h;
-
-       switch (inst->gcc->gadcon->orient)
-         {
-
-          case E_GADCON_ORIENT_TOP:
-          case E_GADCON_ORIENT_CORNER_TL:
-          case E_GADCON_ORIENT_CORNER_TR:
-             e_win_move(win->ewin, x, y + h);
-             break;
-          case E_GADCON_ORIENT_BOTTOM:
-          case E_GADCON_ORIENT_CORNER_BR:
-          case E_GADCON_ORIENT_CORNER_BL:
-             e_win_move(win->ewin, x, y - ph);
-             break;
-          case E_GADCON_ORIENT_LEFT:
-          case E_GADCON_ORIENT_CORNER_LT:
-          case E_GADCON_ORIENT_CORNER_LB:
-             e_win_move(win->ewin, x + w, y);
-             break;
-          case E_GADCON_ORIENT_RIGHT:
-          case E_GADCON_ORIENT_CORNER_RT:
-          case E_GADCON_ORIENT_CORNER_RB:
-             e_win_move(win->ewin, x - pw, y);
-             break;
-          case E_GADCON_ORIENT_FLOAT:
-          case E_GADCON_ORIENT_HORIZ:
-          case E_GADCON_ORIENT_VERT:
-          default:
-             break;
-         }
-
-       inst->win = win;
-
-       if (win->ewin->x + pw > win->zone->w)
-         e_win_move(win->ewin, win->zone->w - pw, win->ewin->y);
-
-       if (win->ewin->y + ph > win->zone->h)
-         e_win_move(win->ewin, win->ewin->x, win->zone->h - ph);
-
-       e_gadcon_locked_set(inst->gcc->gadcon, 1);
-
-       inst->del_fn = e_object_delfn_add(E_OBJECT(win->ewin), _del_func, inst);
-
-       edje_object_signal_emit(inst->o_button, "e,state,focused", "e");
+        Evry_Window *win;
+        E_Border *bd;
+
+        if (inst->win)
+          {
+             win = inst->win;
+             bd = win->ewin->border;
+
+             if (inst->hide_animator)
+               {
+                  ecore_animator_del(inst->hide_animator);
+                  inst->hide_animator = NULL;
+               }
+
+             if (inst->hidden || !bd->focused)
+               {
+                  e_border_fx_offset(bd, 0, 0);
+                  e_border_uniconify(bd);
+                  e_border_raise(bd);
+                  e_border_focus_set(bd, 1, 1);
+                  inst->hidden = EINA_FALSE;
+                  return;
+               }
+             else
+               {
+                  evry_hide(win, 1);
+                  return;
+               }
+          }
+
+        win = evry_show(e_util_zone_current_get(e_manager_current_get()),
+                        0, inst->cfg->plugin, !inst->illume_mode);
+        if (!win) return;
+
+        inst->win = win;
+        win->data = inst;
+
+        ecore_evas_name_class_set(win->ewin->ecore_evas, "E", "everything-window");
+
+        if (inst->illume_mode)
+          _gadget_window_show(inst);
+        else
+          _gadget_popup_show(inst);
+
+        e_gadcon_locked_set(inst->gcc->gadcon, 1);
+
+        inst->del_fn = e_object_delfn_add(E_OBJECT(win->ewin), _del_func, inst);
+
+        edje_object_signal_emit(inst->o_button, "e,state,focused", "e");
      }
-   else if ((ev->button == 3) && (!_menu))
+   else if ((ev->button == 3) && (!inst->menu))
      {
-       E_Menu *m;
-       E_Menu_Item *mi;
-       int cx, cy;
+        E_Menu *m;
+        E_Menu_Item *mi;
+        int cx, cy;
 
-       m = e_menu_new();       
-       mi = e_menu_item_new(m);
-       e_menu_item_label_set(mi, _("Settings"));
-       e_util_menu_item_theme_icon_set(mi, "configure");
-       e_menu_item_callback_set(mi, _cb_menu_configure, NULL);
+        m = e_menu_new();
+        mi = e_menu_item_new(m);
+        e_menu_item_label_set(mi, _("Settings"));
+        e_util_menu_item_theme_icon_set(mi, "configure");
+        e_menu_item_callback_set(mi, _cb_menu_configure, inst);
 
-       m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
-       e_menu_post_deactivate_callback_set(m, _cb_menu_post, inst);
-       _menu = m;
+        m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
+        e_menu_post_deactivate_callback_set(m, _cb_menu_post, inst);
+        inst->menu = m;
 
-       e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, 
+        e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy,
                                           NULL, NULL);
-       e_menu_activate_mouse(m,
-                             e_util_zone_current_get(e_manager_current_get()),
-                             cx + ev->output.x, cy + ev->output.y, 1, 1,
-                             E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+        e_menu_activate_mouse(m,
+                              e_util_zone_current_get(e_manager_current_get()),
+                              cx + ev->output.x, cy + ev->output.y, 1, 1,
+                              E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
      }
 }
 
+/* static void
+ * _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+ * {
+ *    Instance *inst;
+ *    Evas_Event_Mouse_Down *ev;
+ *
+ *    inst = data;
+ *    inst->mouse_down = 1;
+ * } */
 
 int
 evry_gadget_init(void)
@@ -259,3 +556,202 @@ evry_gadget_shutdown(void)
 {
    e_gadcon_provider_unregister(&_gadcon_class);
 }
+
+/***************************************************************************/
+
+struct _E_Config_Dialog_Data
+{
+   const char  *plugin;
+   int          hide_after_action;
+   int          popup;
+   Evas_Object *list;
+};
+
+static void        *_create_data(E_Config_Dialog *cfd);
+static void         _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int          _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+
+static void
+_conf_dialog(Instance *inst)
+{
+   E_Config_Dialog_View *v = NULL;
+   E_Container *con;
+
+   if (inst->cfd)
+     return;
+
+   /* if (e_config_dialog_find("everything-gadgets", "launcher/everything-gadgets"))
+    *   return; */
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   if (!v) return;
+
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create;
+   v->basic.apply_cfdata = _basic_apply;
+
+   con = e_container_current_get(e_manager_current_get());
+   inst->cfd = e_config_dialog_new(con, _("Everything Gadgets"), "everything-gadgets",
+                                   "launcher/everything-gadgets", NULL, 0, v, inst);
+
+   e_dialog_resizable_set(inst->cfd->dia, 0);
+   /* _conf->cfd = cfd; */
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd)
+{
+   E_Config_Dialog_Data *cfdata = NULL;
+   Instance *inst = cfd->data;
+   Gadget_Config *gc = inst->cfg;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
+#define CP(_name) cfdata->_name = (gc->_name ? strdup(gc->_name) : NULL);
+#define C(_name)  cfdata->_name = gc->_name;
+   /* CP(plugin); */
+   C(hide_after_action);
+   C(popup);
+#undef CP
+#undef C
+
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   Instance *inst = cfd->data;
+
+   inst->cfd = NULL;
+   /* if (cfdata->plugin) free(cfdata->plugin); */
+   E_FREE(cfdata);
+}
+
+static void
+_cb_button_settings(void *data __UNUSED__, void *data2 __UNUSED__)
+{
+   /* evry_collection_conf_dialog(e_container_current_get(e_manager_current_get()), "Start"); */
+}
+
+static void
+_fill_list(Eina_List *plugins, Evas_Object *obj, E_Config_Dialog_Data *cfdata)
+{
+   Evas *evas;
+   Evas_Coord w;
+   Eina_List *l;
+   Plugin_Config *pc;
+   int sel = 0, cnt = 1;
+
+   evas = evas_object_evas_get(obj);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(obj);
+   e_widget_ilist_clear(obj);
+
+   e_widget_ilist_append(obj, NULL, _("All"), NULL, NULL, NULL);
+
+   EINA_LIST_FOREACH (plugins, l, pc)
+     {
+        if (!pc->plugin) continue;
+        e_widget_ilist_append(obj, NULL, pc->plugin->base.label, NULL, NULL, pc->name);
+        if (cfdata->plugin && !strcmp(pc->name, cfdata->plugin))
+          sel = cnt;
+
+        cnt++;
+     }
+
+   e_widget_ilist_selected_set(obj, sel);
+
+   e_widget_ilist_go(obj);
+   e_widget_size_min_get(obj, &w, NULL);
+   e_widget_size_min_set(obj, w > 180 ? w : 180, 140);
+   e_widget_ilist_thaw(obj);
+   edje_thaw();
+   evas_event_thaw(evas);
+}
+
+#if 0
+static void
+_list_select_cb(void *data __UNUSED__, Evas_Object *obj)
+{
+   int sel = e_widget_ilist_selected_get(obj);
+
+   e_widget_ilist_nth_data_get(obj, sel);
+}
+
+#endif
+
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o = NULL, *of = NULL, *ow = NULL;
+   Instance *inst = cfd->data;
+
+   o = e_widget_list_add(e, 0, 0);
+
+   of = e_widget_framelist_add(e, _("Plugin"), 0);
+   /* ow = e_widget_entry_add(e, &(cfdata->plugin), NULL, NULL, NULL);
+    * e_widget_framelist_object_append(of, ow); */
+
+   ow = e_widget_ilist_add(e, 24, 24, &cfdata->plugin);
+   /* e_widget_on_change_hook_set(ow, _list_select_cb, cfdata); */
+   _fill_list(evry_conf->conf_subjects, ow, cfdata);
+   e_widget_framelist_object_append(of, ow);
+   cfdata->list = ow;
+
+   ow = e_widget_button_add(e, _("Settings"), NULL, _cb_button_settings, inst, NULL);
+   e_widget_framelist_object_append(of, ow);
+
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   return o;
+}
+
+static int
+_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   Instance *inst = cfd->data;
+   Gadget_Config *gc = inst->cfg;
+   Evry_Plugin *p;
+   Evas_Object *oo;
+   const char *plugin;
+
+#define CP(_name)                     \
+  if (gc->_name)                      \
+    eina_stringshare_del(gc->_name);  \
+  gc->_name = eina_stringshare_add(cfdata->_name);
+#define C(_name) gc->_name = cfdata->_name;
+   eina_stringshare_del(gc->plugin); \
+   plugin = e_widget_ilist_selected_label_get(cfdata->list);
+   if (plugin && plugin[0])
+     gc->plugin = eina_stringshare_add(cfdata->plugin);
+   else
+     gc->plugin = NULL;
+   C(hide_after_action);
+   C(popup);
+#undef CP
+#undef C
+
+   e_config_save_queue();
+
+   oo = edje_object_part_swallow_get(inst->o_button, "e.swallow.icon");
+   if (oo) evas_object_del(oo);
+
+   edje_object_signal_emit(inst->o_button, "e,state,icon,default", "e");
+
+   if ((p = evry_plugin_find(inst->cfg->plugin)))
+     {
+        oo = evry_util_icon_get(EVRY_ITEM(p), evas_object_evas_get(inst->o_button));
+        if (oo)
+          {
+             edje_object_part_swallow(inst->o_button, "e.swallow.icon", oo);
+             edje_object_signal_emit(inst->o_button, "e,state,icon,plugin", "e");
+          }
+     }
+
+   return 1;
+}
+
index e4494a2..9ae4052 100644 (file)
@@ -1,8 +1,11 @@
 #include "e_mod_main.h"
 
-#define HISTORY_VERSION 2
+#define HISTORY_VERSION   2
 
-#define SEVEN_DAYS 604800.0
+#define SEVEN_DAYS        604800.0
+
+/* old history entries will be removed when threshold is reached */
+#define CLEANUP_THRESHOLD 500
 
 #define TIME_FACTOR(_now) (1.0 - (evry_hist->begin / _now)) / 1000000000000000.0
 
@@ -10,10 +13,10 @@ typedef struct _Cleanup_Data Cleanup_Data;
 
 struct _Cleanup_Data
 {
-  double time;
-  Eina_List *keys;
-  Eina_Bool normalize;
-  const char *plugin;
+   double      time;
+   Eina_List  *keys;
+   Eina_Bool   normalize;
+   const char *plugin;
 };
 
 static E_Config_DD *hist_entry_edd = NULL;
@@ -31,14 +34,14 @@ evry_history_init(void)
    hist_item_edd = E_CONFIG_DD_NEW("History_Item", History_Item);
 #define T History_Item
 #define D hist_item_edd
-   E_CONFIG_VAL(D, T, plugin,    STR);
-   E_CONFIG_VAL(D, T, context,   STR);
-   E_CONFIG_VAL(D, T, input,     STR);
+   E_CONFIG_VAL(D, T, plugin, STR);
+   E_CONFIG_VAL(D, T, context, STR);
+   E_CONFIG_VAL(D, T, input, STR);
    E_CONFIG_VAL(D, T, last_used, DOUBLE);
-   E_CONFIG_VAL(D, T, usage,     DOUBLE);
-   E_CONFIG_VAL(D, T, count,     INT);
+   E_CONFIG_VAL(D, T, usage, DOUBLE);
+   E_CONFIG_VAL(D, T, count, INT);
    E_CONFIG_VAL(D, T, transient, INT);
-   E_CONFIG_VAL(D, T, data,      STR);
+   E_CONFIG_VAL(D, T, data, STR);
 #undef T
 #undef D
    hist_entry_edd = E_CONFIG_DD_NEW("History_Entry", History_Entry);
@@ -56,9 +59,9 @@ evry_history_init(void)
    hist_edd = E_CONFIG_DD_NEW("History", Evry_History);
 #define T Evry_History
 #define D hist_edd
-   E_CONFIG_VAL(D, T,  version,  INT);
-   E_CONFIG_VAL(D, T,  begin,    DOUBLE);
-   E_CONFIG_HASH(D, T, subjects,  hist_types_edd);
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, begin, DOUBLE);
+   E_CONFIG_HASH(D, T, subjects, hist_types_edd);
 #undef T
 #undef D
 }
@@ -69,17 +72,17 @@ _hist_entry_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__
    History_Entry *he = data;
    History_Item *hi;
 
-   EINA_LIST_FREE(he->items, hi)
+   EINA_LIST_FREE (he->items, hi)
      {
-       if (hi->input)
-         eina_stringshare_del(hi->input);
-       if (hi->plugin)
-         eina_stringshare_del(hi->plugin);
-       if (hi->context)
-         eina_stringshare_del(hi->context);
-       if (hi->data)
-         eina_stringshare_del(hi->data);
-       E_FREE(hi);
+        if (hi->input)
+          eina_stringshare_del(hi->input);
+        if (hi->plugin)
+          eina_stringshare_del(hi->plugin);
+        if (hi->context)
+          eina_stringshare_del(hi->context);
+        if (hi->data)
+          eina_stringshare_del(hi->data);
+        E_FREE(hi);
      }
 
    E_FREE(he);
@@ -94,8 +97,8 @@ _hist_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void
 
    if (ht->types)
      {
-       eina_hash_foreach(ht->types, _hist_entry_free_cb, NULL);
-       eina_hash_free(ht->types);
+        eina_hash_foreach(ht->types, _hist_entry_free_cb, NULL);
+        eina_hash_free(ht->types);
      }
 
    E_FREE(ht);
@@ -111,35 +114,35 @@ _hist_entry_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *
    History_Item *hi;
    Eina_List *l, *ll;
 
-   EINA_LIST_FOREACH_SAFE(he->items, l, ll, hi)
+   EINA_LIST_FOREACH_SAFE (he->items, l, ll, hi)
      {
-       if (hi->last_used < d->time - SEVEN_DAYS)
-         {
-            hi->count--;
-            hi->last_used = d->time - SEVEN_DAYS/2.0;
-         }
-
-       /* item is transient or too old */
-       if ((hi->count < 1) || hi->transient)
-         {
-            if (hi->input)
-              eina_stringshare_del(hi->input);
-            if (hi->plugin)
-              eina_stringshare_del(hi->plugin);
-            if (hi->context)
-              eina_stringshare_del(hi->context);
-            if (hi->data)
-              eina_stringshare_del(hi->data);
-            E_FREE(hi);
-
-            he->items = eina_list_remove_list(he->items, l);
-         }
+        if (hi->last_used < d->time - SEVEN_DAYS)
+          {
+             hi->count--;
+             hi->last_used = d->time - SEVEN_DAYS / 2.0;
+          }
+
+        /* item is transient or too old */
+        if ((hi->count < 1) || hi->transient)
+          {
+             if (hi->input)
+               eina_stringshare_del(hi->input);
+             if (hi->plugin)
+               eina_stringshare_del(hi->plugin);
+             if (hi->context)
+               eina_stringshare_del(hi->context);
+             if (hi->data)
+               eina_stringshare_del(hi->data);
+             E_FREE(hi);
+
+             he->items = eina_list_remove_list(he->items, l);
+          }
      }
 
    if (!he->items)
      {
-       E_FREE(he);
-       d->keys = eina_list_append(d->keys, key);
+        E_FREE(he);
+        d->keys = eina_list_append(d->keys, key);
      }
 
    return EINA_TRUE;
@@ -153,34 +156,33 @@ _hist_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data,
 
    if (ht->types)
      {
-       eina_hash_foreach(ht->types, _hist_entry_cleanup_cb, fdata);
+        eina_hash_foreach(ht->types, _hist_entry_cleanup_cb, fdata);
 
-       EINA_LIST_FREE(d->keys, key)
-         eina_hash_del_by_key(ht->types, key);
+        EINA_LIST_FREE (d->keys, key)
+          eina_hash_del_by_key(ht->types, key);
      }
 
    return EINA_TRUE;
 }
+
 void
 evry_history_free(void)
 {
-   Cleanup_Data *d;
-
    evry_hist = e_config_domain_load("module.everything.cache", hist_edd);
-   if (evry_hist)
-     {
-       d = E_NEW(Cleanup_Data, 1);
-       d->time = ecore_time_unix_get();
 
-       if (evry_hist->subjects)
-         {
-            eina_hash_foreach(evry_hist->subjects, _hist_cleanup_cb, d);
-         }
+   if ((evry_hist) && (evry_hist->subjects) &&
+       (eina_hash_population(evry_hist->subjects) > CLEANUP_THRESHOLD))
+     {
+        Cleanup_Data *d;
 
-       E_FREE(d);
-       evry_history_unload();
+        d = E_NEW(Cleanup_Data, 1);
+        d->time = ecore_time_unix_get();
+        eina_hash_foreach(evry_hist->subjects, _hist_cleanup_cb, d);
+        E_FREE(d);
      }
 
+   evry_history_unload();
+
    E_CONFIG_DD_FREE(hist_item_edd);
    E_CONFIG_DD_FREE(hist_entry_edd);
    E_CONFIG_DD_FREE(hist_types_edd);
@@ -196,24 +198,23 @@ evry_history_load(void)
 
    if (evry_hist && evry_hist->version != HISTORY_VERSION)
      {
-       eina_hash_foreach(evry_hist->subjects, _hist_free_cb, NULL);
-       eina_hash_free(evry_hist->subjects);
+        eina_hash_foreach(evry_hist->subjects, _hist_free_cb, NULL);
+        eina_hash_free(evry_hist->subjects);
 
-       E_FREE(evry_hist);
-       evry_hist = NULL;
+        E_FREE(evry_hist);
+        evry_hist = NULL;
      }
 
    if (!evry_hist)
      {
-       evry_hist = E_NEW(Evry_History, 1);
-       evry_hist->version = HISTORY_VERSION;
-       evry_hist->begin = ecore_time_unix_get() - SEVEN_DAYS;
+        evry_hist = E_NEW(Evry_History, 1);
+        evry_hist->version = HISTORY_VERSION;
+        evry_hist->begin = ecore_time_unix_get() - SEVEN_DAYS;
      }
    if (!evry_hist->subjects)
      evry_hist->subjects = eina_hash_string_superfast_new(NULL);
 }
 
-
 void
 evry_history_unload(void)
 {
@@ -233,10 +234,10 @@ evry_history_types_get(Evry_Type _type)
 {
    History_Types *ht;
    const char *type = evry_type_get(_type);
-   
+
    if (!evry_hist)
      return NULL;
-   
+
    if (!type)
      return NULL;
 
@@ -244,8 +245,8 @@ evry_history_types_get(Evry_Type _type)
 
    if (!ht)
      {
-       ht = E_NEW(History_Types, 1);
-       eina_hash_add(evry_hist->subjects, type, ht);
+        ht = E_NEW(History_Types, 1);
+        eina_hash_add(evry_hist->subjects, type, ht);
      }
 
    if (!ht->types)
@@ -259,7 +260,7 @@ evry_history_item_add(Evry_Item *it, const char *ctxt, const char *input)
 {
    History_Entry *he;
    History_Types *ht;
-   History_Item  *hi = NULL;
+   History_Item *hi = NULL;
    Eina_List *l;
    int rem_ctxt = 1;
    const char *id;
@@ -271,80 +272,80 @@ evry_history_item_add(Evry_Item *it, const char *ctxt, const char *input)
      return NULL;
 
    if ((!it->plugin->history) && (!CHECK_TYPE(it, EVRY_TYPE_PLUGIN)))
-       return NULL;
+     return NULL;
 
    if (it->type == EVRY_TYPE_ACTION)
      {
-       GET_ACTION(act, it);
-       if (!act->remember_context)
-         rem_ctxt = 0;
+        GET_ACTION(act, it);
+        if (!act->remember_context)
+          rem_ctxt = 0;
      }
 
    if (it->hi)
      {
-       /* keep hi when context didn't change */
-       if ((!rem_ctxt) || (!it->hi->context && !ctxt) ||
-           (it->hi->context && ctxt && !strcmp(it->hi->context, ctxt)))
-         hi = it->hi;
+        /* keep hi when context didn't change */
+        if ((!rem_ctxt) || (!it->hi->context && !ctxt) ||
+            (it->hi->context && ctxt && !strcmp(it->hi->context, ctxt)))
+          hi = it->hi;
      }
 
    if (!hi)
      {
-       id = (it->id ? it->id : it->label);
-       ht = evry_history_types_get(it->type);
-       if (!ht)
-         return NULL;
-       
-       he = eina_hash_find(ht->types, id);
-
-       if (!he)
-         {
-            he = E_NEW(History_Entry, 1);
-            eina_hash_add(ht->types, id, he);
-         }
-       else
-         {
-            EINA_LIST_FOREACH(he->items, l, hi)
-              if ((hi->plugin == it->plugin->name) &&
-                  (!rem_ctxt || (ctxt == hi->context)))
-                break;
-         }
+        id = (it->id ? it->id : it->label);
+        ht = evry_history_types_get(it->type);
+        if (!ht)
+          return NULL;
+
+        he = eina_hash_find(ht->types, id);
+
+        if (!he)
+          {
+             he = E_NEW(History_Entry, 1);
+             eina_hash_add(ht->types, id, he);
+          }
+        else
+          {
+             EINA_LIST_FOREACH (he->items, l, hi)
+               if ((hi->plugin == it->plugin->name) &&
+                   (!rem_ctxt || (ctxt == hi->context)))
+                 break;
+          }
      }
 
    if (!hi)
      {
-       hi = E_NEW(History_Item, 1);
-       hi->plugin = eina_stringshare_ref(it->plugin->name);
-       he->items = eina_list_append(he->items, hi);
+        hi = E_NEW(History_Item, 1);
+        hi->plugin = eina_stringshare_ref(it->plugin->name);
+        he->items = eina_list_append(he->items, hi);
      }
 
    if (hi)
      {
-       it->hi = hi;
-
-       hi->last_used = ecore_time_unix_get();
-       hi->usage /= 4.0;
-       hi->usage += TIME_FACTOR(hi->last_used);
-       hi->transient = it->plugin->transient;
-       hi->count += 1;
-
-       if (ctxt && !hi->context && rem_ctxt)
-         {
-            hi->context = eina_stringshare_ref(ctxt);
-         }
-
-       if (input && hi->input)
-         {
-            if (strncmp(hi->input, input, strlen(input)))
-              {
-                 eina_stringshare_del(hi->input);
-                 hi->input = eina_stringshare_add(input);
-              }
-         }
-       else if (input)
-         {
-            hi->input = eina_stringshare_add(input);
-         }
+        it->hi = hi;
+
+        hi->last_used = ecore_time_unix_get();
+        hi->usage /= 4.0;
+        hi->usage += TIME_FACTOR(hi->last_used);
+        hi->transient = it->plugin->transient;
+        hi->count += 1;
+
+        if (ctxt && !hi->context && rem_ctxt)
+          {
+             hi->context = eina_stringshare_ref(ctxt);
+          }
+
+        if (input && hi->input)
+          {
+             if (strncmp(hi->input, input, strlen(input)))
+               {
+                  eina_stringshare_del(hi->input);
+                  hi->input = eina_stringshare_add(input);
+               }
+          }
+        else if (input)
+          {
+             hi->input = eina_stringshare_add(input);
+          }
      }
 
    /* reset usage */
@@ -361,97 +362,104 @@ evry_history_item_usage_set(Evry_Item *it, const char *input, const char *ctxt)
    History_Item *hi = NULL;
    Eina_List *l;
    int rem_ctxt = 1;
-   it->usage = 0.0;
+
+   if (evry_conf->history_sort_mode == 3)
+     {
+        it->usage = -1;
+        return 1;
+     }
+   else
+     it->usage = 0.0;
 
    if ((!it->plugin->history) && (!CHECK_TYPE(it, EVRY_TYPE_PLUGIN)))
      return 0;
 
    if (it->hi)
      {
-       /* keep hi when context didn't change */
-       if ((!rem_ctxt) || (!it->hi->context && !ctxt) ||
-           (it->hi->context && ctxt && !strcmp(it->hi->context, ctxt)))
-         hi = it->hi;
+        /* keep hi when context didn't change */
+        if ((!rem_ctxt) || (!it->hi->context && !ctxt) ||
+            (it->hi->context && ctxt && !strcmp(it->hi->context, ctxt)))
+          hi = it->hi;
      }
 
    if (!hi)
      {
-       ht = evry_history_types_get(it->type);
-
-       if (!ht)
-         return 0;
-       
-       if (!(he = eina_hash_find(ht->types, (it->id ? it->id : it->label))))
-         return 0;
-
-       if (it->type == EVRY_TYPE_ACTION)
-         {
-            GET_ACTION(act, it);
-            if (!act->remember_context)
-              rem_ctxt = 0;
-         }
-
-       EINA_LIST_FOREACH(he->items, l, hi)
-         {
-            if (hi->plugin != it->plugin->name)
-              continue;
-
-            if (rem_ctxt && ctxt && (hi->context != ctxt))
-              {
-                it->hi = hi;
-                 continue;
-              }
-
-            it->hi = hi;
-            break;
-         }
+        ht = evry_history_types_get(it->type);
+
+        if (!ht)
+          return 0;
+
+        if (!(he = eina_hash_find(ht->types, (it->id ? it->id : it->label))))
+          return 0;
+
+        if (it->type == EVRY_TYPE_ACTION)
+          {
+             GET_ACTION(act, it);
+             if (!act->remember_context)
+               rem_ctxt = 0;
+          }
+
+        EINA_LIST_FOREACH (he->items, l, hi)
+          {
+             if (hi->plugin != it->plugin->name)
+               continue;
+
+             if (rem_ctxt && ctxt && (hi->context != ctxt))
+               {
+                  it->hi = hi;
+                  continue;
+               }
+
+             it->hi = hi;
+             break;
+          }
      }
 
    if (!hi) return 0;
 
    if (evry_conf->history_sort_mode == 0)
      {
-       if (!input || !hi->input)
-         {
-            it->usage += hi->usage * hi->count;
-         }
-       else
-         {
-            /* higher priority for exact matches */
-            if (!strncmp(input, hi->input, strlen(input)))
-              {
-                 it->usage += hi->usage * hi->count;
-              }
-            if (!strncmp(input, hi->input, strlen(hi->input)))
-              {
-                 it->usage += hi->usage * hi->count;
-              }
-         }
-
-       if (ctxt && hi->context && (hi->context == ctxt))
-         {
-            it->usage += hi->usage * hi->count * 10.0;
-         }
+        if (!input || !hi->input)
+          {
+             it->usage += hi->usage * hi->count;
+          }
+        else
+          {
+             /* higher priority for exact matches */
+             if (!strncmp(input, hi->input, strlen(input)))
+               {
+                  it->usage += hi->usage * hi->count;
+               }
+             if (!strncmp(input, hi->input, strlen(hi->input)))
+               {
+                  it->usage += hi->usage * hi->count;
+               }
+          }
+
+        if (ctxt && hi->context && (hi->context == ctxt))
+          {
+             it->usage += hi->usage * hi->count * 10.0;
+          }
      }
    else if (evry_conf->history_sort_mode == 1)
      {
-       it->usage = hi->count * (hi->last_used / 10000000000.0);
+        it->usage = hi->count * (hi->last_used / 10000000000.0);
 
-       if (ctxt && hi->context && (hi->context == ctxt))
-         {
-            it->usage += hi->usage * hi->count * 10.0;
-         }
+        if (ctxt && hi->context && (hi->context == ctxt))
+          {
+             it->usage += hi->usage * hi->count * 10.0;
+          }
      }
    else if (evry_conf->history_sort_mode == 2)
      {
-       if (hi->last_used > it->usage)
-         it->usage = hi->last_used;
+        if (hi->last_used > it->usage)
+          it->usage = hi->last_used;
      }
    if (it->fuzzy_match > 0)
-     it->usage /= (double) it->fuzzy_match;
+     it->usage /= (double)it->fuzzy_match;
    else
      it->usage /= 100.0;
-   
+
    if (it->usage > 0.0)
      return 1;
 
@@ -459,3 +467,4 @@ evry_history_item_usage_set(Evry_Item *it, const char *input, const char *ctxt)
 
    return 0;
 }
+
index 8899fa6..3e6a2f9 100644 (file)
@@ -7,10 +7,10 @@ typedef struct _Plugin Plugin;
 
 struct _Plugin
 {
-  Evry_Plugin base;
-  Eina_List *actions;
-  Eina_Bool parent;
-  Evry_Action *action;
+   Evry_Plugin  base;
+   Eina_List   *actions;
+   Eina_Bool    parent;
+   Evry_Action *action;
 };
 
 static Evry_Plugin *_plug = NULL;
@@ -21,7 +21,9 @@ _finish(Evry_Plugin *plugin)
    GET_PLUGIN(p, plugin);
    Evry_Action *act;
 
-   EINA_LIST_FREE(p->actions, act);
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   EINA_LIST_FREE (p->actions, act) ;
    E_FREE(p);
 }
 
@@ -55,34 +57,34 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it)
 
    if (!(CHECK_TYPE(it, EVRY_TYPE_PLUGIN)))
      {
-       EINA_LIST_FOREACH(evry_conf->actions, l, act)
-         {
-            if (!((!act->it1.type) ||
-                  (CHECK_TYPE(it, act->it1.type)) ||
-                  (CHECK_SUBTYPE(it, act->it1.type))))
-              continue;
-
-            if (act->check_item && !(act->check_item(act, it)))
-              continue;
-
-            act->base.plugin = EVRY_PLUGIN(p);
-            act->it1.item = it;
-            EVRY_ITEM(act)->hi = NULL;
-
-            p->actions = eina_list_append(p->actions, act);
-         }
+        EINA_LIST_FOREACH (evry_conf->actions, l, act)
+          {
+             if (!((!act->it1.type) ||
+                   (CHECK_TYPE(it, act->it1.type)) ||
+                   (CHECK_SUBTYPE(it, act->it1.type))))
+               continue;
+
+             if (act->check_item && !(act->check_item(act, it)))
+               continue;
+
+             act->base.plugin = EVRY_PLUGIN(p);
+             act->it1.item = it;
+             EVRY_ITEM(act)->hi = NULL;
+
+             p->actions = eina_list_append(p->actions, act);
+          }
      }
 
    if (it->plugin)
      {
-       EINA_LIST_FOREACH(it->plugin->actions, l, act)
-         {
-            act->base.plugin = EVRY_PLUGIN(p);
-
-            act->it1.item = EVRY_ITEM(it->plugin);
-            EVRY_ITEM(act)->hi = NULL;
-            p->actions = eina_list_append(p->actions, act);
-         }
+        EINA_LIST_FOREACH (it->plugin->actions, l, act)
+          {
+             act->base.plugin = EVRY_PLUGIN(p);
+
+             act->it1.item = EVRY_ITEM(it->plugin);
+             EVRY_ITEM(act)->hi = NULL;
+             p->actions = eina_list_append(p->actions, act);
+          }
      }
 
    return EVRY_PLUGIN(p);
@@ -98,40 +100,39 @@ _cb_sort(const void *data1, const void *data2)
 
    if (act1->remember_context || act2->remember_context)
      {
-       if (act1->remember_context && !act2->remember_context)
-         return -1;
-       if (!act1->remember_context && act2->remember_context)
-         return 1;
+        if (act1->remember_context && !act2->remember_context)
+          return -1;
+        if (!act1->remember_context && act2->remember_context)
+          return 1;
      }
 
    /* sort type match before subtype match */
    if (act1->it1.item && act2->it1.item)
      {
-       if ((act1->it1.type == act1->it1.item->type) &&
-           (act2->it1.type != act2->it1.item->type))
-         return -1;
+        if ((act1->it1.type == act1->it1.item->type) &&
+            (act2->it1.type != act2->it1.item->type))
+          return -1;
 
-       if ((act1->it1.type != act1->it1.item->type) &&
-           (act2->it1.type == act2->it1.item->type))
-         return 1;
+        if ((act1->it1.type != act1->it1.item->type) &&
+            (act2->it1.type == act2->it1.item->type))
+          return 1;
      }
 
    if (it1->fuzzy_match || it2->fuzzy_match)
+     if (it1->fuzzy_match || it2->fuzzy_match)
+       {
+          if (it1->fuzzy_match && !it2->fuzzy_match)
+            return -1;
 
-   if (it1->fuzzy_match || it2->fuzzy_match)
-     {
-       if (it1->fuzzy_match && !it2->fuzzy_match)
-         return -1;
+          if (!it1->fuzzy_match && it2->fuzzy_match)
+            return 1;
 
-       if (!it1->fuzzy_match && it2->fuzzy_match)
-         return 1;
-
-       if (it1->fuzzy_match - it2->fuzzy_match)
-         return (it1->fuzzy_match - it2->fuzzy_match);
-     }
+          if (it1->fuzzy_match - it2->fuzzy_match)
+            return it1->fuzzy_match - it2->fuzzy_match;
+       }
 
    if (it1->priority - it2->priority)
-     return (it1->priority - it2->priority);
+     return it1->priority - it2->priority;
 
    return 0;
 }
@@ -146,15 +147,15 @@ _fetch(Evry_Plugin *plugin, const char *input)
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   EINA_LIST_FOREACH(p->actions, l, it)
+   EINA_LIST_FOREACH (p->actions, l, it)
      {
-       match = evry_fuzzy_match(it->label, input);
+        match = evry_fuzzy_match(it->label, input);
 
-       if (!input || match)
-         {
-            it->fuzzy_match = match;
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-         }
+        if (!input || match)
+          {
+             it->fuzzy_match = match;
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+          }
      }
 
    if (!plugin->items) return 0;
@@ -169,9 +170,8 @@ _fetch(Evry_Plugin *plugin, const char *input)
 int
 evry_plug_actions_init()
 {
-   _plug = EVRY_PLUGIN_NEW(Plugin, N_("Actions"), NULL,
-                          EVRY_TYPE_ACTION,
-                          _begin, _finish, _fetch, NULL);
+   _plug = EVRY_PLUGIN_BASE("Actions", NULL, EVRY_TYPE_ACTION,
+                            _begin, _finish, _fetch);
 
    _plug->browse = &_browse;
 
@@ -188,11 +188,10 @@ evry_plug_actions_shutdown()
    evry_plugin_free(_plug);
 
    /* bypass unregister, because it modifies the list */
-   EINA_LIST_FREE(evry_conf->actions, it)
+   EINA_LIST_FREE (evry_conf->actions, it)
      evry_item_free(it);
 }
 
-
 void
 evry_action_register(Evry_Action *act, int priority)
 {
@@ -221,13 +220,13 @@ _action_free_cb(Evry_Item *it)
 
 Evry_Action *
 evry_action_new(const char *name, const char *label,
-               Evry_Type type_in1, Evry_Type type_in2,
-               const char *icon,
-               int  (*action) (Evry_Action *act),
-               int (*check_item) (Evry_Action *act, const Evry_Item *it))
+                Evry_Type type_in1, Evry_Type type_in2,
+                const char *icon,
+                int (*action)(Evry_Action *act),
+                int (*check_item)(Evry_Action *act, const Evry_Item *it))
 {
    Evry_Action *act = EVRY_ITEM_NEW(Evry_Action, _plug, label,
-                                   NULL, _action_free_cb);
+                                    NULL, _action_free_cb);
    if (icon)
      act->base.icon = eina_stringshare_add(icon);
 
@@ -250,7 +249,6 @@ evry_action_free(Evry_Action *act)
    evry_item_free(EVRY_ITEM(act));
 }
 
-
 /* TODO assign actions to plugins othersie there will be too liitle
    names soon */
 Evry_Action *
@@ -261,7 +259,7 @@ evry_action_find(const char *name)
 
    const char *n = eina_stringshare_add(name);
 
-   EINA_LIST_FOREACH(evry_conf->actions, l, act)
+   EINA_LIST_FOREACH (evry_conf->actions, l, act)
      if (act->name == n)
        break;
 
@@ -269,3 +267,4 @@ evry_action_find(const char *name)
 
    return act;
 }
+
index 8e8017b..06b1c00 100644 (file)
 
 //TODO min input for items not in history
 
-#define MAX_ITEMS 50
+#define MAX_ITEMS  100
+#define MAX_PLUGIN 25
 
 typedef struct _Plugin Plugin;
 
 struct _Plugin
 {
-  Evry_Plugin base;
-  int type;
-  Evry_Window *win;
+   Evry_Plugin base;
 
-  Evry_Item *warning;
+   Evry_Item  *warning;
 };
 
 static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
-   Plugin *p = (Plugin *) plugin;
+   Plugin *p = (Plugin *)plugin;
    Evry_Plugin *pp;
-   Evry_State *s;
    Eina_List *l, *ll, *lp = NULL;
    Evry_Item *it, *it2;
-   int i, top_level = 0, subj_sel = 0, inp_len = 0, cnt = 0;
+   int top_level = 0, subj_sel = 0, cnt = 0;
+   size_t inp_len;
    Eina_List *items = NULL;
    const char *context = NULL;
    char buf[128];
-   Evry_Selector *sel = p->win->selectors[p->type];
+   Evry_State *s = plugin->state;
+   Evry_Selector *sel = s->selector;
+   Evry_Selector **sels = sel->win->selectors;
 
    if (input && input[0])
      inp_len = strlen(input);
    else
      input = NULL;
 
-   EVRY_PLUGIN_ITEMS_FREE(p);
-
-   s = sel->state;
-   if (!s) return 0;
-
-   if (sel == p->win->selectors[0])
-     subj_sel = 1;
-
-   if (!sel->states->next)
+   if ((eina_list_count(sel->states) == 1))
      top_level = 1;
 
-   /* get current items' context ... */
-   for (i = 1; i < 3; i++)
+   /* get current items' context, which is
+    * the previous selectors selected item */
+   if (sel == sels[0])
+     {
+        subj_sel = 1;
+     }
+   else if (sel == sels[1])
+     {
+        it = sels[0]->state->cur_item;
+        if (it) context = it->context;
+     }
+   else if (sel == sels[2])
      {
-       if (sel == p->win->selectors[i])
-         {
-            it = p->win->selectors[i-1]->state->cur_item;
-            if (it) context = it->context;
-         }
+        it = sels[1]->state->cur_item;
+        if (it) context = it->context;
      }
 
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
    /* collect plugins to be shown in aggregator */
-   EINA_LIST_FOREACH(s->cur_plugins, l, pp)
+   EINA_LIST_FOREACH (s->cur_plugins, l, pp)
      {
-       /* dont show in aggregator */
-       if (!pp->config->aggregate)
-         continue;
-       /* do not recurse */
-       if (pp == plugin)
-         continue;
-       /* dont show plugin in top-level */
-       if (top_level && !pp->config->top_level)
-         continue;
-       lp = eina_list_append(lp, pp);
+        /* dont show in aggregator */
+        if (!pp->config->aggregate)
+          continue;
+        /* do not recurse */
+        if (pp == plugin)
+          continue;
+        /* dont show plugin in top-level */
+        if (top_level && !pp->config->top_level)
+          continue;
+        lp = eina_list_append(lp, pp);
      }
 
    /* show non-top-level plugins as item */
-   if (top_level && (!s->trigger_active))
+   if ((top_level) && (!s->trigger_active))
      {
-       EINA_LIST_FOREACH(s->plugins, l, pp)
-         {
-            int min_fuzz = 0;
-            double max_usage = 0.0;
-
-            if (pp->config->top_level)
-              continue;
-
-            if (pp == plugin)
-              continue;
-
-            if (!pp->items)
-              continue;
-
-            /* give plugin item the highest priority of its items */
-            EINA_LIST_FOREACH(pp->items, ll, it)
-              {
-                 if (it->usage >= 0)
-                   evry_history_item_usage_set(it, input, context);
-
-                 if (it->usage && it->usage > max_usage)
-                   max_usage = it->usage;
-
-                 if (it->fuzzy_match == 0)
-                   it->fuzzy_match = evry_fuzzy_match(it->label, input);
-
-                 if ((!min_fuzz) || ((it->fuzzy_match > 0) &&
-                                     (it->fuzzy_match < min_fuzz)))
-                   min_fuzz = it->fuzzy_match;
-              }
-
-            GET_ITEM(it, pp);
-
-            it->hi = NULL;
-            /* TODO get better usage estimate */
-            evry_history_item_usage_set(it, NULL, NULL);
-            it->usage /= 100.0;
-
-            if ((it->usage && max_usage) && (it->usage < max_usage))
-              it->usage = max_usage;
-            it->fuzzy_match = min_fuzz;
-
-            IF_RELEASE(it->detail);
-            snprintf(buf, sizeof(buf), "%d %s", eina_list_count(pp->items), _("Items"));
-            it->detail = eina_stringshare_add(buf);
-
-            items = eina_list_append(items, it);
-         }
-
-       /* only one plugin: show items */
-       if ((eina_list_count(s->cur_plugins)) == 1 && items &&
-           (pp = eina_list_data_get(items)) && (pp->config->aggregate))
-         {
-            eina_list_free(items);
-            items = NULL;
-            EINA_LIST_FOREACH(pp->items, l, it)
-              {
-                 if (it->usage >= 0)
-                   evry_history_item_usage_set(it, input, context);
-                 if (it->fuzzy_match == 0)
-                   it->fuzzy_match = evry_fuzzy_match(it->label, input);
-
-                 items = eina_list_append(items, it);
-              }
-         }
+        EINA_LIST_FOREACH (s->plugins, l, pp)
+          {
+             int min_fuzz = 0;
+             double max_usage = 0.0;
+
+             if (pp->config->top_level)
+               continue;
+
+             if (pp == plugin)
+               continue;
+
+             if (!pp->items)
+               continue;
+
+             /* give plugin item the highest priority of its items */
+             EINA_LIST_FOREACH (pp->items, ll, it)
+               {
+                  if (it->usage >= 0)
+                    evry_history_item_usage_set(it, input, context);
+
+                  if (it->usage && (it->usage > max_usage))
+                    max_usage = it->usage;
+
+                  if (it->fuzzy_match == 0)
+                    it->fuzzy_match = evry_fuzzy_match(it->label, input);
+
+                  if ((!min_fuzz) || ((it->fuzzy_match > 0) &&
+                                      (it->fuzzy_match < min_fuzz)))
+                    min_fuzz = it->fuzzy_match;
+               }
+
+             GET_ITEM(it, pp);
+
+             it->hi = NULL;
+             /* TODO get better usage estimate */
+             evry_history_item_usage_set(it, NULL, NULL);
+             it->usage /= 100.0;
+
+             if ((it->usage && max_usage) && (it->usage < max_usage))
+               it->usage = max_usage;
+             it->fuzzy_match = min_fuzz;
+
+             IF_RELEASE(it->detail);
+             snprintf(buf, sizeof(buf), "%d %s", eina_list_count(pp->items), _("Items"));
+             it->detail = eina_stringshare_add(buf);
+
+             items = eina_list_append(items, it);
+          }
+
+        /* only one plugin: show items */
+        if ((eina_list_count(s->cur_plugins)) == 1 && items &&
+            (pp = eina_list_data_get(items)) && (pp->config->aggregate))
+          {
+             eina_list_free(items);
+             items = NULL;
+             EINA_LIST_FOREACH (pp->items, l, it)
+               {
+                  if (it->usage >= 0)
+                    evry_history_item_usage_set(it, input, context);
+                  if (it->fuzzy_match == 0)
+                    it->fuzzy_match = evry_fuzzy_match(it->label, input);
+
+                  items = eina_list_append(items, it);
+               }
+          }
 
 #if 0
-       /* append all plugins as items (which were not added above) */
-       if (inp_len >= plugin->config->min_query)
-         {
-            EINA_LIST_FOREACH(s->plugins, l, pp)
-              {
-                 if (!strcmp(pp->name, "Actions"))
-                   continue;
-
-                 /* items MUST only conatin plugins here ! */
-                 EINA_LIST_FOREACH(items, ll, pp2)
-                   if (pp2->name == pp->name) break;
-                 if (pp2)
-                   continue;
-
-                 GET_ITEM(it, pp);
-
-                 if ((!input) ||
-                     (it->fuzzy_match = evry_fuzzy_match(it->label, input)))
-                   {
-                      evry_history_item_usage_set(it, input, NULL);
-                      it->usage /= 100.0;
-
-                      EVRY_ITEM(pp)->plugin->state = s;
-                      items = eina_list_append(items, pp);
-                   }
-              }
-         }
+        /* append all plugins as items (which were not added above) */
+        if (inp_len >= plugin->config->min_query)
+          {
+             EINA_LIST_FOREACH (s->plugins, l, pp)
+               {
+                  if (!strcmp(pp->name, "Actions"))
+                    continue;
+
+                  /* items MUST only conatin plugins here ! */
+                  EINA_LIST_FOREACH (items, ll, pp2)
+                    if (pp2->name == pp->name) break;
+                  if (pp2)
+                    continue;
+
+                  GET_ITEM(it, pp);
+
+                  if ((!input) ||
+                      (it->fuzzy_match = evry_fuzzy_match(it->label, input)))
+                    {
+                       evry_history_item_usage_set(it, input, NULL);
+                       it->usage /= 100.0;
+
+                       EVRY_ITEM(pp)->plugin->state = s;
+                       items = eina_list_append(items, pp);
+                    }
+               }
+          }
 #endif
-       if (!lp && (eina_list_count(items) < 2))
-         {
-            if (items) eina_list_free(items);
-            return 0;
-         }
+        if (!lp && (eina_list_count(items) < 2))
+          {
+             if (items) eina_list_free(items);
+             return 0;
+          }
      }
 
    if (!lp && !items)
      return 0;
 
-   /* if there is only one plugin append all items */
-   if (lp && !lp->next)
-     {
-       pp = eina_list_data_get(lp);
-
-       EINA_LIST_FOREACH(pp->items, l, it)
-         {
-            if (it->usage >= 0)
-              evry_history_item_usage_set(it, input, context);
-
-            if (it->fuzzy_match == 0)
-              it->fuzzy_match = evry_fuzzy_match(it->label, input);
-
-            items = eina_list_append(items, it);
-         }
-     }
    /* if there is input append all items that match */
-   else if (input)
+   if (input)
      {
-       EINA_LIST_FOREACH(lp, l, pp)
-         {
-            EINA_LIST_FOREACH(pp->items, ll, it)
-              {
-                 if (it->fuzzy_match == 0)
-                   it->fuzzy_match = evry_fuzzy_match(it->label, input);
-
-                 if (it->usage >= 0)
-                   evry_history_item_usage_set(it, input, context);
-
-                 if ((subj_sel) && (top_level) &&
-                     (!it->usage) && (inp_len < plugin->config->min_query))
-                   continue;
-
-                 items = eina_list_append(items, it);
-              }
-         }
+        EINA_LIST_FOREACH (lp, l, pp)
+          {
+             EINA_LIST_FOREACH (pp->items, ll, it)
+               {
+                  if (it->fuzzy_match == 0)
+                    it->fuzzy_match = evry_fuzzy_match(it->label, input);
+
+                  if (it->usage >= 0)
+                    evry_history_item_usage_set(it, input, context);
+
+                  if ((subj_sel) && (top_level) &&
+                      (!it->usage) && (inp_len < plugin->config->min_query))
+                    continue;
+
+                  items = eina_list_append(items, it);
+               }
+          }
      }
    /* no input: append all items that are in history */
    else
      {
-       EINA_LIST_FOREACH(lp, l, pp)
-        {
-          EINA_LIST_FOREACH(pp->items, ll, it)
-            {
-               if (((it->usage >= 0) &&
-                    (evry_history_item_usage_set(it, input, context))) ||
-                   (!subj_sel))
-                {
-                   it->fuzzy_match = 0;
-                   items = eina_list_append(items, it);
-                }
-            }
-        }
+        EINA_LIST_FOREACH (lp, l, pp)
+          {
+             int cnt = 1;
+             EINA_LIST_FOREACH (pp->items, ll, it)
+               {
+                  if ((!subj_sel) || (it->usage < 0) ||
+                      (evry_history_item_usage_set(it, input, context)))
+                    {
+                       it->fuzzy_match = 0;
+                       items = eina_list_append(items, it);
+                       if (++cnt > MAX_PLUGIN) break;
+                    }
+               }
+          }
      }
 
-   if ((!top_level) && (eina_list_count(items) <  MAX_ITEMS))
+   if ((!top_level) && (eina_list_count(items) < MAX_ITEMS))
      {
-       EINA_LIST_FOREACH(lp, l, pp)
-         {
-            EINA_LIST_FOREACH(pp->items, ll, it)
-              {
-                 if (eina_list_data_find_list(items, it))
-                   continue;
-
-                 items = eina_list_append(items, it);
-              }
-         }
+        EINA_LIST_FOREACH (lp, l, pp)
+          {
+             EINA_LIST_FOREACH (pp->items, ll, it)
+               {
+                  if (eina_list_data_find_list(items, it))
+                    continue;
+
+                  items = eina_list_append(items, it);
+               }
+          }
      }
 
-   items = eina_list_sort(items, -1, evry_items_sort_func);
+   evry_util_items_sort(&items, 0 /* !input */);
 
-   EINA_LIST_FOREACH(items, l, it)
+   EINA_LIST_FOREACH (items, l, it)
      {
-       /* remove duplicates provided by different plugins. e.g.
-          files / places and tracker can find the same files */
-       if (it->id)
-         {
-            EINA_LIST_FOREACH(p->base.items, ll, it2)
-              {
-                 if ((it->plugin->name != it2->plugin->name) &&
-                     (it->type == it2->type) &&
-                     (it->id == it2->id))
-                   break;
-              }
-         }
-
-       if (!it->id || !it2)
-         {
-            evry_item_ref(it);
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-         }
-
-       if (cnt++ > MAX_ITEMS)
-         break;
-
+        /* remove duplicates provided by different plugins. e.g.
+           files / places and tracker can find the same files */
+        if (it->id)
+          {
+             EINA_LIST_FOREACH (p->base.items, ll, it2)
+               {
+                  if ((it->plugin->name != it2->plugin->name) &&
+                      (it->type == it2->type) &&
+                      (it->id == it2->id))
+                    break;
+               }
+          }
+
+        if (!it->id || !it2)
+          {
+             evry_item_ref(it);
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+          }
+
+        if (cnt++ > MAX_ITEMS)
+          break;
      }
 
    if (lp) eina_list_free(lp);
 
    if (items)
      {
-       eina_list_free(items);
+        eina_list_free(items);
+        return EVRY_PLUGIN_HAS_ITEMS(p);
      }
    /* 'text' and 'actions' are always loaded */
    else if ((subj_sel) && (eina_list_count(s->plugins) == 2))
      {
-       evry_item_ref(p->warning);
-       EVRY_PLUGIN_ITEM_APPEND(p, p->warning);
+        evry_item_ref(p->warning);
+        EVRY_PLUGIN_ITEM_APPEND(p, p->warning);
      }
 
-   return !!(p->base.items);
+   return 0;
 }
 
 static void
@@ -298,6 +285,8 @@ _finish(Evry_Plugin *plugin)
 
    EVRY_PLUGIN_ITEMS_FREE(p);
 
+   evry_item_free(p->warning);
+
    E_FREE(p);
 }
 
@@ -309,42 +298,24 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
    GET_PLUGIN(base, plugin);
    EVRY_PLUGIN_INSTANCE(p, plugin);
 
-   p->type = base->type;
-   p->win  = base->win;
-   p->warning = base->warning;
+   p->warning = evry_item_new(NULL, EVRY_PLUGIN(p), N_("No plugins loaded"), NULL, NULL);
+   p->warning->type = EVRY_TYPE_NONE;
 
    return EVRY_PLUGIN(p);
 }
 
-static void
-_free(Evry_Plugin *plugin)
-{
-   GET_PLUGIN(p, plugin);
-
-   evry_item_free(p->warning);
-
-   free(p);
-}
-
 Evry_Plugin *
-evry_aggregator_new(Evry_Window *win, int type)
+evry_aggregator_new(int type)
 {
    Evry_Plugin *p;
 
-   p = EVRY_PLUGIN_NEW(Plugin, N_("All"), NULL, 0, _begin, _finish, _fetch, _free);
+   p = EVRY_PLUGIN_BASE("All", NULL, 0, _begin, _finish, _fetch);
 
    if (evry_plugin_register(p, type, -1))
      {
-       if (type == EVRY_PLUGIN_SUBJECT)
-         p->config->view_mode = VIEW_MODE_THUMB;
+        p->config->view_mode = VIEW_MODE_THUMB;
      }
 
-   GET_PLUGIN(pa, p);
-   pa->win = win;
-   pa->type = type;
-
-   pa->warning = evry_item_new(NULL, p, N_("No plugins loaded"), NULL, NULL);
-   pa->warning->type = EVRY_TYPE_NONE;
-
    return p;
 }
+
index 15aafb3..5f7f59c 100644 (file)
@@ -1,10 +1,10 @@
 #include "e.h"
 #include "evry_api.h"
 
-#define MOD_CONFIG_FILE_EPOCH 0x0001
+#define MOD_CONFIG_FILE_EPOCH      0x0001
 #define MOD_CONFIG_FILE_GENERATION 0x009d
-#define MOD_CONFIG_FILE_VERSION                                 \
-     ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
+#define MOD_CONFIG_FILE_VERSION \
+  ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
 
 // FIXME clear cache on .desktop chage event
 
 
 #define MAX_ITEMS 200
 
-typedef struct _Plugin Plugin;
+typedef struct _Plugin        Plugin;
 typedef struct _Module_Config Module_Config;
-typedef struct _E_Exe E_Exe;
-typedef struct _E_Exe_List E_Exe_List;
+typedef struct _E_Exe         E_Exe;
+typedef struct _E_Exe_List    E_Exe_List;
+typedef struct _Item_Menu     Item_Menu;
 
 struct _Plugin
 {
-  Evry_Plugin   base;
-  const char    *input;
-  Eina_List    *apps_mime;
-  Eina_List    *apps_all;
-  Eina_List    *apps_hist;
-
-  Eina_Hash    *added;
-
-  Evry_Item_App *command;
+   Evry_Plugin    base;
+   Eina_Bool      browse;
+   const char    *input;
+   Eina_List     *apps_mime;
+   Eina_List     *apps_all;
+   Eina_List     *apps_hist;
+   Eina_List     *menu_items;
+
+   Eina_Hash     *added;
+   Efreet_Menu   *menu;
+
+   Evry_Item_App *command;
 };
 
 struct _E_Exe
 {
-  const char   *path;
+   const char *path;
 };
 
 struct _E_Exe_List
 {
-  Eina_List    *list;
+   Eina_List *list;
 };
 
 struct _Module_Config
 {
-  int             version;
-  const char      *cmd_terminal;
-  const char      *cmd_sudo;
+   int              version;
+   const char      *cmd_terminal;
+   const char      *cmd_sudo;
+
+   E_Config_Dialog *cfd;
+   E_Module        *module;
+};
+
+struct _Item_Menu
+{
+   Evry_Item    base;
 
-  E_Config_Dialog *cfd;
-  E_Module       *module;
+   Efreet_Menu *menu;
 };
 
-static const Evry_API   *evry            = NULL;
-static Evry_Module      *evry_module     = NULL;
-static Eina_List        *handlers        = NULL;
+static const Evry_API *evry = NULL;
+static Evry_Module *evry_module = NULL;
+static Eina_List *handlers = NULL;
 
-static Module_Config   *_conf;
+static Module_Config *_conf;
 static char _module_icon[] = "system-run";
-static Eina_List       *_plugins        = NULL;
-static Eina_List       *_actions        = NULL;
-static Evry_Item       *_act_open_with  = NULL;
-static Eina_List       *exe_path        = NULL;
-static Ecore_Idler     *exe_scan_idler  = NULL;
-static E_Config_DD     *exelist_exe_edd = NULL;
-static E_Config_DD     *exelist_edd     = NULL;
-static DIR             *exe_dir         = NULL;
-static Eina_List       *exe_list        = NULL;
-static Eina_List       *exe_list2       = NULL;
-static Eina_List        *apps_cache      = NULL;
+static Eina_List *_plugins = NULL;
+static Eina_List *_actions = NULL;
+static Evry_Item *_act_open_with = NULL;
+static Eina_List *exe_path = NULL;
+static Ecore_Idler *exe_scan_idler = NULL;
+static E_Config_DD *exelist_exe_edd = NULL;
+static E_Config_DD *exelist_edd = NULL;
+static DIR *exe_dir = NULL;
+static Eina_List *exe_list = NULL;
+static Eina_List *exe_list2 = NULL;
+static Eina_List *apps_cache = NULL;
 static void _scan_executables();
 
+#define GET_MENU(_m, _it) Item_Menu * _m = (Item_Menu *)_it
+
 /***************************************************************************/
 
-static void _hash_free(void *data)
+static void
+_hash_free(void *data)
 {
    GET_APP(app, data);
    EVRY_ITEM_FREE(app);
 }
 
-static Evas_Object *
-_icon_get(Evry_Item *it, Evas *e)
-{
-   GET_APP(app, it);
-   Evas_Object *o = NULL;
-
-   if (app->desktop && app->desktop->icon)
-     {
-       if (app->desktop->icon[0] == '/')
-         {
-            o = e_icon_add(e);
-            e_icon_preload_set(o, 1);
-
-            if (!e_icon_file_set(o, app->desktop->icon))
-              {
-                 evas_object_del(o);
-                 o = NULL;
-              }
-         }
-
-       if (!o)
-         o = evry->icon_theme_get(app->desktop->icon, e);
-
-       if (!o)
-         o = e_util_desktop_icon_add(app->desktop, 128, e);
-     }
-
-   if (!o)
-     o = evry->icon_theme_get("system-run", e);
-
-   return o;
-}
-
 static int
 _exec_open_file_action(Evry_Action *act)
 {
    return evry->util_exec_app(EVRY_ITEM(act), act->it1.item);
 }
 
-static void
-_item_free(Evry_Item *item)
-{
-   GET_APP(app, item);
-
-   if (app->desktop)
-     efreet_desktop_free(app->desktop);
-   if (app->file)
-     eina_stringshare_del(app->file);
-
-   E_FREE(app);
-}
-
 static Evry_Item_App *
 _item_new(Plugin *p, const char *label, const char *id)
 {
    Evry_Item_App *app;
 
-   app = EVRY_ITEM_NEW(Evry_Item_App, p, label, _icon_get, _item_free);
+   app = EVRY_ITEM_NEW(Evry_Item_App, p, label, NULL, evry_item_app_free);
    EVRY_ACTN(app)->action = &_exec_open_file_action;
    EVRY_ACTN(app)->it1.type = EVRY_TYPE_FILE;
    EVRY_ITEM(app)->id = eina_stringshare_add(id);
@@ -148,6 +116,24 @@ _item_new(Plugin *p, const char *label, const char *id)
    return app;
 }
 
+static Item_Menu *
+_item_menu_add(Plugin *p, Efreet_Menu *menu)
+{
+   Item_Menu *m;
+
+   m = EVRY_ITEM_NEW(Item_Menu, p, NULL, NULL, NULL);
+   EVRY_ITEM(m)->type = EVRY_TYPE_NONE;
+   EVRY_ITEM(m)->browseable = EINA_TRUE;
+   EVRY_ITEM(m)->label = eina_stringshare_add(menu->name);
+   EVRY_ITEM(m)->icon = eina_stringshare_add(menu->icon);
+   EVRY_ITEM(m)->usage = -1;
+
+   m->menu = menu;
+   p->menu_items = eina_list_append(p->menu_items, m);
+
+   return m;
+}
+
 static int
 _cb_sort(const void *data1, const void *data2)
 {
@@ -155,7 +141,7 @@ _cb_sort(const void *data1, const void *data2)
    const Evry_Item *it2 = data2;
 
    if (it1->usage && it2->usage)
-     return (it1->usage > it2->usage ? -1 : 1);
+     return it1->usage > it2->usage ? -1 : 1;
    if (it1->usage && !it2->usage)
      return -1;
    if (it2->usage && !it1->usage)
@@ -163,14 +149,14 @@ _cb_sort(const void *data1, const void *data2)
 
    if (it1->fuzzy_match || it2->fuzzy_match)
      {
-       if (it1->fuzzy_match && !it2->fuzzy_match)
-         return -1;
+        if (it1->fuzzy_match && !it2->fuzzy_match)
+          return -1;
 
-       if (!it1->fuzzy_match && it2->fuzzy_match)
-         return 1;
+        if (!it1->fuzzy_match && it2->fuzzy_match)
+          return 1;
 
-       if (it1->fuzzy_match - it2->fuzzy_match)
-         return (it1->fuzzy_match - it2->fuzzy_match);
+        if (it1->fuzzy_match - it2->fuzzy_match)
+          return it1->fuzzy_match - it2->fuzzy_match;
      }
 
    return strcasecmp(it1->label, it2->label);
@@ -185,14 +171,14 @@ _item_exe_add(Plugin *p, const char *exe, int match)
 
    if ((app = eina_hash_find(p->added, exe)))
      {
-       if (eina_list_data_find_list(p->base.items, app))
-         return app;
+        if (eina_list_data_find_list(p->base.items, app))
+          return app;
      }
 
    if (!app)
      {
-       app = _item_new(p, ecore_file_file_get(exe), exe);
-       app->file = eina_stringshare_ref(EVRY_ITEM(app)->id);
+        app = _item_new(p, ecore_file_file_get(exe), exe);
+        app->file = eina_stringshare_ref(EVRY_ITEM(app)->id);
      }
 
    EVRY_ITEM(app)->fuzzy_match = match;
@@ -212,29 +198,29 @@ _hist_exe_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data,
    int match;
    const char *exe = key;
 
-   EINA_LIST_FOREACH(he->items, l, hi)
+   EINA_LIST_FOREACH (he->items, l, hi)
      {
-       app = NULL;
-
-       if (strcmp(hi->plugin, EVRY_PLUGIN(p)->name))
-         continue;
-
-       if (!p->input)
-         {
-            app = _item_exe_add(p, exe, 0);
-         }
-       else if ((match = evry->fuzzy_match(exe, p->input)))
-         {
-            app = _item_exe_add(p, exe, match);
-         }
-
-       if (app)
-         {
-            EVRY_ITEM(app)->hi = hi;
-            evry->history_item_usage_set(EVRY_ITEM(app), p->input, NULL);
-         }
-
-       break;
+        app = NULL;
+
+        if (strcmp(hi->plugin, EVRY_PLUGIN(p)->name))
+          continue;
+
+        if (!p->input)
+          {
+             app = _item_exe_add(p, exe, 0);
+          }
+        else if ((match = evry->fuzzy_match(exe, p->input)))
+          {
+             app = _item_exe_add(p, exe, match);
+          }
+
+        if (app)
+          {
+             EVRY_ITEM(app)->hi = hi;
+             evry->history_item_usage_set(EVRY_ITEM(app), p->input, NULL);
+          }
+
+        break;
      }
 
    return EINA_TRUE;
@@ -261,61 +247,61 @@ _fetch_exe(Evry_Plugin *plugin, const char *input)
 
    if (input)
      {
-       if ((tmp = strchr(input, ' ')))
-         end = tmp - input;
-
-       if ((!exe_list) && (!exe_scan_idler))
-         _scan_executables();
-
-       EINA_LIST_FOREACH(exe_list, l, tmp)
-         {
-            tmp_len = strlen(tmp);
-
-            if ((end < len) &&  (tmp_len > end))
-              continue;
-
-            if (!strncmp(input, tmp, end))
-              {
-                 if (query && (cnt++ < 50) && (len != tmp_len))
-                   _item_exe_add(p, tmp, 15);
-
-                 if ((!min) || (tmp_len < min))
-                   {
-                      min = tmp_len;
-                      file = tmp;
-                   }
-                 if ((!query) && (tmp_len == len))
-                   break;
-              }
-         }
-
-       if (file)
-         {
-            GET_ITEM(it, p->command);
-
-            if (strlen(file) < len)
-              file = input;
-
-            EVRY_ITEM_LABEL_SET(it, file);
-            IF_RELEASE(p->command->file);
-            p->command->file = eina_stringshare_ref(it->label);
-            it->fuzzy_match = 11; // prefix match
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-            evry->item_changed(it, 0, 0);
-         }
+        if ((tmp = strchr(input, ' ')))
+          end = tmp - input;
+
+        if ((!exe_list) && (!exe_scan_idler))
+          _scan_executables();
+
+        EINA_LIST_FOREACH (exe_list, l, tmp)
+          {
+             tmp_len = strlen(tmp);
+
+             if ((end < len) && (tmp_len > end))
+               continue;
+
+             if (!strncmp(input, tmp, end))
+               {
+                  if (query && (cnt++ < 50) && (len != tmp_len))
+                    _item_exe_add(p, tmp, 15);
+
+                  if ((!min) || (tmp_len < min))
+                    {
+                       min = tmp_len;
+                       file = tmp;
+                    }
+                  if ((!query) && (tmp_len == len))
+                    break;
+               }
+          }
+
+        if (file)
+          {
+             GET_ITEM(it, p->command);
+
+             if (strlen(file) < len)
+               file = input;
+
+             EVRY_ITEM_LABEL_SET(it, file);
+             IF_RELEASE(p->command->file);
+             p->command->file = eina_stringshare_ref(it->label);
+             it->fuzzy_match = 11; // prefix match
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+             evry->item_changed(it, 0, 0);
+          }
      }
 
-   EINA_LIST_FOREACH(plugin->items, l, it)
+   EINA_LIST_FOREACH (plugin->items, l, it)
      {
-       evry->history_item_usage_set(it, input, NULL);
-       if (input && (it->usage > max) && !strncmp(input, it->label, len))
-         max = it->usage;
+        evry->history_item_usage_set(it, input, NULL);
+        if (input && (it->usage > max) && !strncmp(input, it->label, len))
+          max = it->usage;
      }
    EVRY_ITEM(p->command)->usage = (max * 2.0);
 
    EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
 
-   return !!(plugin->items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 static Evry_Plugin *
@@ -331,7 +317,7 @@ _begin_exe(Evry_Plugin *plugin, const Evry_Item *item)
 
    p->added = eina_hash_string_small_new(_hash_free);
 
-   app = EVRY_ITEM_NEW(Evry_Item_App, p, NULL, _icon_get, _item_free);
+   app = EVRY_ITEM_NEW(Evry_Item_App, p, NULL, NULL, evry_item_app_free);
    EVRY_ACTN(app)->action = &_exec_open_file_action;
    EVRY_ACTN(app)->remember_context = EINA_TRUE;
    EVRY_ITEM(app)->subtype = EVRY_TYPE_ACTION;
@@ -354,20 +340,20 @@ _finish_exe(Evry_Plugin *plugin)
 
    if (exe_dir)
      {
-       closedir(exe_dir);
-       exe_dir = NULL;
+        closedir(exe_dir);
+        exe_dir = NULL;
      }
-   EINA_LIST_FREE(exe_path, str)
+   EINA_LIST_FREE (exe_path, str)
      free(str);
 
    if (exe_scan_idler)
      {
-       ecore_idler_del(exe_scan_idler);
-       exe_scan_idler = NULL;
+        ecore_idler_del(exe_scan_idler);
+        exe_scan_idler = NULL;
      }
-   EINA_LIST_FREE(exe_list, str)
+   EINA_LIST_FREE (exe_list, str)
      free(str);
-   EINA_LIST_FREE(exe_list2, str)
+   EINA_LIST_FREE (exe_list2, str)
      free(str);
 
    E_FREE(p);
@@ -382,24 +368,24 @@ _item_desktop_add(Plugin *p, Efreet_Desktop *desktop, int match)
 
    if ((app = eina_hash_find(p->added, desktop->exec)))
      {
-       if (eina_list_data_find_list(p->base.items, app))
-         return;
+        if (eina_list_data_find_list(p->base.items, app))
+          return;
      }
 
    if (!app)
      {
-       app = _item_new(p, desktop->name, desktop->exec);
-       efreet_desktop_ref(desktop);
-       app->desktop = desktop;
-
-       if (desktop->comment)
-         {
-            EVRY_ITEM_DETAIL_SET(app, desktop->comment);
-         }
-       else if (desktop->generic_name)
-         {
-            EVRY_ITEM_DETAIL_SET(app, desktop->generic_name);
-         }
+        app = _item_new(p, desktop->name, desktop->exec);
+        efreet_desktop_ref(desktop);
+        app->desktop = desktop;
+
+        if (desktop->comment)
+          {
+             EVRY_ITEM_DETAIL_SET(app, desktop->comment);
+          }
+        else if (desktop->generic_name)
+          {
+             EVRY_ITEM_DETAIL_SET(app, desktop->generic_name);
+          }
      }
 
    EVRY_ITEM(app)->fuzzy_match = match;
@@ -415,34 +401,34 @@ _desktop_list_add(Plugin *p, Eina_List *apps, const char *input)
    const char *exec, *end;
    char buf[PATH_MAX];
 
-   EINA_LIST_FOREACH(apps, l, desktop)
+   EINA_LIST_FOREACH (apps, l, desktop)
      {
-       if (eina_list_count(p->base.items) >= MAX_ITEMS) break;
-
-       m1 = m2 = 0;
-
-       if (input)
-         {
-            /* strip path and parameter */
-            exec = ecore_file_file_get(desktop->exec);
-            if ((exec) && (end = strchr(exec, '%')) &&
-                ((end - exec) - 1 > 0))
-              {
-                 strncpy(buf, exec, (end - exec) - 1);
-                 buf[(end - exec) - 1] = '\0';
-                 m1 = evry->fuzzy_match(buf, input);
-              }
-            else
-              {
-                 m1 = evry->fuzzy_match(exec, input);
-              }
-
-            m2 = evry->fuzzy_match(desktop->name, input);
-
-            if (!m1 || (m2 && m2 < m1)) m1 = m2;
-         }
-
-       if (!input || m1) _item_desktop_add(p, desktop, m1);
+        if (eina_list_count(p->base.items) >= MAX_ITEMS) break;
+
+        m1 = m2 = 0;
+
+        if (input)
+          {
+             /* strip path and parameter */
+             exec = ecore_file_file_get(desktop->exec);
+             if ((exec) && (end = strchr(exec, '%')) &&
+                 ((end - exec) - 1 > 0))
+               {
+                  strncpy(buf, exec, (end - exec) - 1);
+                  buf[(end - exec) - 1] = '\0';
+                  m1 = evry->fuzzy_match(buf, input);
+               }
+             else
+               {
+                  m1 = evry->fuzzy_match(exec, input);
+               }
+
+             m2 = evry->fuzzy_match(desktop->name, input);
+
+             if (!m1 || (m2 && m2 < m1)) m1 = m2;
+          }
+
+        if (!input || m1) _item_desktop_add(p, desktop, m1);
      }
 }
 
@@ -458,14 +444,16 @@ _desktop_list_get(void)
 
    /* remove screensaver */
    cat_ss = efreet_util_desktop_category_list("Screensaver");
-   EINA_LIST_FOREACH(cat_ss, l, d)
+   EINA_LIST_FOREACH (cat_ss, l, d)
      {
-       if ((ll = eina_list_data_find_list(apps, d)))
-         {
-            efreet_desktop_free(d);
-            apps = eina_list_remove_list(apps, ll);
-         }
-       efreet_desktop_free(d);
+        if ((ll = eina_list_data_find_list(apps, d)))
+          {
+             efreet_desktop_free(d);
+             apps = eina_list_remove_list(apps, ll);
+          }
+        printf("%d %s\n", d->ref, d->name);
+
+        efreet_desktop_free(d);
      }
 
    return apps;
@@ -481,48 +469,48 @@ _hist_items_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data
    Eina_List *l, *ll;
    const char *exec = key;
 
-   EINA_LIST_FOREACH(he->items, l, hi)
+   EINA_LIST_FOREACH (he->items, l, hi)
      {
-       d = NULL;
-
-       if (hi->transient)
-         continue;
-
-       if (strcmp(hi->plugin, EVRY_PLUGIN(p)->name))
-         continue;
-
-       EINA_LIST_FOREACH(apps_cache, ll, d)
-         if (d->exec && !strcmp(d->exec, exec)) break;
-
-       if (!d)
-         {
-            if (!p->apps_all)
-              p->apps_all = _desktop_list_get();
-
-            EINA_LIST_FOREACH(p->apps_all, ll, d)
-              if (d->exec && !strcmp(d->exec, exec)) break;
-
-            if (d)
-              {
-                 efreet_desktop_ref(d);
-                 apps_cache = eina_list_append(apps_cache, d);
-              }
-            else
-              {
-                 /* remove from history */
-                 /* DBG("no desktop: %s", exec);
-                  * hi->transient = 1; */
-              }
-         }
-
-       if (!d)
-         {
-            DBG("app not found %s", exec);
-            break;
-         }
-
-       p->apps_hist = eina_list_append(p->apps_hist, d);
-       break;
+        d = NULL;
+
+        if (hi->transient)
+          continue;
+
+        if (strcmp(hi->plugin, EVRY_PLUGIN(p)->name))
+          continue;
+
+        EINA_LIST_FOREACH (apps_cache, ll, d)
+          if (d->exec && !strcmp(d->exec, exec)) break;
+
+        if (!d)
+          {
+             if (!p->apps_all)
+               p->apps_all = _desktop_list_get();
+
+             EINA_LIST_FOREACH (p->apps_all, ll, d)
+               if (d->exec && !strcmp(d->exec, exec)) break;
+
+             if (d)
+               {
+                  efreet_desktop_ref(d);
+                  apps_cache = eina_list_append(apps_cache, d);
+               }
+             else
+               {
+                  /* remove from history */
+                  /* DBG("no desktop: %s", exec);
+                   * hi->transient = 1; */
+               }
+          }
+
+        if (!d)
+          {
+             DBG("app not found %s", exec);
+             break;
+          }
+
+        p->apps_hist = eina_list_append(p->apps_hist, d);
+        break;
      }
 
    return EINA_TRUE;
@@ -536,8 +524,30 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item)
    if (item && (item != _act_open_with))
      return NULL;
 
-   EVRY_PLUGIN_INSTANCE(p, plugin)
+   EVRY_PLUGIN_INSTANCE(p, plugin);
    p->added = eina_hash_string_small_new(_hash_free);
+   p->menu = efreet_menu_get();
+
+   return EVRY_PLUGIN(p);
+}
+
+static Evry_Plugin *
+_browse(Evry_Plugin *plugin, const Evry_Item *item)
+{
+   Plugin *p;
+
+   if (!item)
+     return NULL;
+
+   if (!CHECK_TYPE(item, EVRY_TYPE_NONE))
+     return NULL;
+
+   EVRY_PLUGIN_INSTANCE(p, plugin);
+   GET_MENU(m, item);
+
+   p->added = eina_hash_string_small_new(_hash_free);
+   p->menu = m->menu;
+   p->browse = EINA_TRUE;
 
    return EVRY_PLUGIN(p);
 }
@@ -545,22 +555,31 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item)
 static void
 _finish(Evry_Plugin *plugin)
 {
-   GET_PLUGIN(p, plugin);
    Efreet_Desktop *desktop;
+   Evry_Item *it;
+
+   GET_PLUGIN(p, plugin);
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
+   /* TODO share with browse instances */
    if (p->added)
      eina_hash_free(p->added);
 
-   EINA_LIST_FREE(p->apps_all, desktop)
+   if ((!p->browse) && (p->menu))
+     efreet_menu_free(p->menu);
+
+   EINA_LIST_FREE (p->apps_all, desktop)
      efreet_desktop_free(desktop);
 
-   EINA_LIST_FREE(p->apps_hist, desktop);
+   EINA_LIST_FREE (p->apps_hist, desktop) ;
 
-   EINA_LIST_FREE(p->apps_mime, desktop)
+   EINA_LIST_FREE (p->apps_mime, desktop)
      efreet_desktop_free(desktop);
 
+   EINA_LIST_FREE (p->menu_items, it)
+     EVRY_ITEM_FREE(it);
+
    E_FREE(p);
 }
 
@@ -572,37 +591,74 @@ _fetch(Evry_Plugin *plugin, const char *input)
    Evry_Item *it;
    History_Types *ht;
 
+   Efreet_Menu *entry;
+   int i = 1;
+
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   if (input)
+   if (!p->browse)
      {
-       if (!p->apps_all)
-         p->apps_all = _desktop_list_get();
-
-       _desktop_list_add(p, p->apps_all, input);
+        if (input)
+          {
+             if (!p->apps_all)
+               p->apps_all = _desktop_list_get();
+
+             _desktop_list_add(p, p->apps_all, input);
+          }
+        else
+          {
+             _desktop_list_add(p, p->apps_mime, input);
+          }
+
+        if ((!input) && (!plugin->items))
+          {
+             if (!p->apps_hist)
+               {
+                  ht = evry->history_types_get(EVRY_TYPE_APP);
+                  if (ht) eina_hash_foreach(ht->types, _hist_items_get_cb, p);
+               }
+
+             _desktop_list_add(p, p->apps_hist, NULL);
+          }
+
+        EINA_LIST_FOREACH (plugin->items, l, it)
+          evry->history_item_usage_set(it, input, NULL);
+
+        EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
      }
-   else
+
+   if ((p->menu) && (!p->menu_items))
      {
-       _desktop_list_add(p, p->apps_mime, input);
+        EINA_LIST_FOREACH (p->menu->entries, l, entry)
+          {
+             if (entry->type == EFREET_MENU_ENTRY_DESKTOP)
+               {
+                  _item_desktop_add(p, entry->desktop, i++);
+               }
+             else if (entry->type == EFREET_MENU_ENTRY_MENU)
+               {
+                  _item_menu_add(p, entry);
+               }
+             /* else if (entry->type == EFREET_MENU_ENTRY_SEPARATOR)
+              *   continue;
+              * else if (entry->type == EFREET_MENU_ENTRY_HEADER)
+              *   continue; */
+          }
      }
 
-   if (!input && !(plugin->items))
+   EINA_LIST_FOREACH (p->menu_items, l, it)
      {
-       if (!p->apps_hist)
-         {
-            ht = evry->history_types_get(EVRY_TYPE_APP);
-            if (ht) eina_hash_foreach(ht->types, _hist_items_get_cb, p);
-         }
-
-       _desktop_list_add(p, p->apps_hist, NULL);
+        if (!input)
+          {
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+             continue;
+          }
+
+        if ((it->fuzzy_match = evry->fuzzy_match(it->label, input)))
+          EVRY_PLUGIN_ITEM_APPEND(p, it);
      }
 
-   EINA_LIST_FOREACH(plugin->items, l, it)
-     evry->history_item_usage_set(it, input, NULL);
-
-   EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
-
-   return !!(plugin->items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 /***************************************************************************/
@@ -618,28 +674,28 @@ _begin_mime(Evry_Plugin *plugin, const Evry_Item *item)
 
    if (CHECK_TYPE(item, EVRY_TYPE_ACTION))
      {
-       GET_ACTION(act, item);
-       GET_FILE(file, act->it1.item);
+        GET_ACTION(act, item);
+        GET_FILE(file, act->it1.item);
 
-       if (!evry->file_path_get(file))
-         return NULL;
+        if (!evry->file_path_get(file))
+          return NULL;
 
-       path = file->path;
-       mime = file->mime;
+        path = file->path;
+        mime = file->mime;
      }
    else if (CHECK_TYPE(item, EVRY_TYPE_FILE))
      {
-       GET_FILE(file, item);
+        GET_FILE(file, item);
 
-       if (!evry->file_path_get(file))
-         return NULL;
+        if (!evry->file_path_get(file))
+          return NULL;
 
-       path = file->path;
-       mime = file->mime;
+        path = file->path;
+        mime = file->mime;
      }
    else
      {
-       return NULL;
+        return NULL;
      }
 
    if (!path || !mime || !(mime = efreet_mime_type_get(path)))
@@ -651,41 +707,41 @@ _begin_mime(Evry_Plugin *plugin, const Evry_Item *item)
 
    if (strcmp(mime, "text/plain") && (!strncmp(mime, "text/", 5)))
      {
-       l = efreet_util_desktop_mime_list("text/plain");
-
-       EINA_LIST_FREE(l, d)
-         {
-            if (!eina_list_data_find_list(p->apps_mime, d))
-              p->apps_mime = eina_list_append(p->apps_mime, d);
-            else
-              efreet_desktop_free(d);
-         }
+        l = efreet_util_desktop_mime_list("text/plain");
+
+        EINA_LIST_FREE (l, d)
+          {
+             if (!eina_list_data_find_list(p->apps_mime, d))
+               p->apps_mime = eina_list_append(p->apps_mime, d);
+             else
+               efreet_desktop_free(d);
+          }
      }
 
    if (item->browseable && strcmp(mime, "x-directory/normal"))
      {
-       l = efreet_util_desktop_mime_list("x-directory/normal");
-
-       EINA_LIST_FREE(l, d)
-         {
-            if (!eina_list_data_find_list(p->apps_mime, d))
-              p->apps_mime = eina_list_append(p->apps_mime, d);
-            else
-              efreet_desktop_free(d);
-         }
+        l = efreet_util_desktop_mime_list("x-directory/normal");
+
+        EINA_LIST_FREE (l, d)
+          {
+             if (!eina_list_data_find_list(p->apps_mime, d))
+               p->apps_mime = eina_list_append(p->apps_mime, d);
+             else
+               efreet_desktop_free(d);
+          }
      }
 
    if ((d = e_exehist_mime_desktop_get(mime)))
      {
-       if ((l = eina_list_data_find_list(p->apps_mime, d)))
-         {
-            p->apps_mime = eina_list_promote_list(p->apps_mime, l);
-            efreet_desktop_free(d);
-         }
-       else
-         {
-            p->apps_mime = eina_list_prepend(p->apps_mime, d);
-         }
+        if ((l = eina_list_data_find_list(p->apps_mime, d)))
+          {
+             p->apps_mime = eina_list_promote_list(p->apps_mime, l);
+             efreet_desktop_free(d);
+          }
+        else
+          {
+             p->apps_mime = eina_list_prepend(p->apps_mime, d);
+          }
      }
 
    p->added = eina_hash_string_small_new(_hash_free);
@@ -704,7 +760,7 @@ _finish_mime(Evry_Plugin *plugin)
    if (p->added)
      eina_hash_free(p->added);
 
-   EINA_LIST_FREE(p->apps_mime, desktop)
+   EINA_LIST_FREE (p->apps_mime, desktop)
      efreet_desktop_free(desktop);
 
    E_FREE(p);
@@ -722,7 +778,7 @@ _fetch_mime(Evry_Plugin *plugin, const char *input)
    /* add apps for a given mimetype */
    _desktop_list_add(p, p->apps_mime, input);
 
-   EINA_LIST_FOREACH(plugin->items, l, it)
+   EINA_LIST_FOREACH (plugin->items, l, it)
      evry->history_item_usage_set(it, input, NULL);
 
    if (input)
@@ -731,7 +787,6 @@ _fetch_mime(Evry_Plugin *plugin, const char *input)
    return 1;
 }
 
-
 static int
 _complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
 {
@@ -741,11 +796,11 @@ _complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
 
    if (app->desktop)
      {
-       char *space = strchr(app->desktop->exec, ' ');
+        char *space = strchr(app->desktop->exec, ' ');
 
-       snprintf(buf, sizeof(buf), "%s", app->desktop->exec);
-       if (space)
-         buf[1 + space - app->desktop->exec] = '\0';
+        snprintf(buf, sizeof(buf), "%s", app->desktop->exec);
+        if (space)
+          buf[1 + space - app->desktop->exec] = '\0';
      }
    else
      snprintf(buf, sizeof(buf), "%s", app->file);
@@ -786,8 +841,8 @@ _exec_term_action(Evry_Action *act)
 
    tmp = E_NEW(Evry_Item_App, 1);
    snprintf(buf, sizeof(buf), "%s -hold -e %s",
-           _conf->cmd_terminal,
-           (escaped ? escaped : app->file));
+            _conf->cmd_terminal,
+            (escaped ? escaped : app->file));
 
    tmp->file = buf;
    ret = evry->util_exec_app(EVRY_ITEM(tmp), NULL);
@@ -819,8 +874,8 @@ _exec_sudo_action(Evry_Action *act)
 
    tmp = E_NEW(Evry_Item_App, 1);
    snprintf(buf, sizeof(buf), "%s %s",
-           _conf->cmd_sudo,
-           (app->desktop ? app->desktop->exec : app->file));
+            _conf->cmd_sudo,
+            (app->desktop ? app->desktop->exec : app->file));
 
    tmp->file = buf;
    ret = evry->util_exec_app(EVRY_ITEM(tmp), NULL);
@@ -851,12 +906,12 @@ _edit_app_action(Evry_Action *act)
      desktop = app->desktop;
    else
      {
-       char buf[128];
-       snprintf(buf, 128, "%s/.local/share/applications/%s.desktop",
-                e_user_homedir_get(), app->file);
-       desktop = efreet_desktop_empty_new(eina_stringshare_add(buf));
-       /* XXX check if this is freed by efreet*/
-       desktop->exec = strdup(app->file);
+        char buf[128];
+        snprintf(buf, 128, "%s/.local/share/applications/%s.desktop",
+                 e_user_homedir_get(), app->file);
+        desktop = efreet_desktop_empty_new(eina_stringshare_add(buf));
+        /* XXX check if this is freed by efreet*/
+        desktop->exec = strdup(app->file);
      }
 
    e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
@@ -900,14 +955,14 @@ _new_app_action(Evry_Action *act)
 
    for (i = 0; i < 10; i++)
      {
-       snprintf(buf, 4096, "%s/.local/share/applications/%s-%d.desktop",
-                e_user_homedir_get(), name, i);
-       if (ecore_file_exists(buf))
-         {
-            buf[0] = '\0';
-            continue;
-         }
-       else break;
+        snprintf(buf, 4096, "%s/.local/share/applications/%s-%d.desktop",
+                 e_user_homedir_get(), name, i);
+        if (ecore_file_exists(buf))
+          {
+             buf[0] = '\0';
+             continue;
+          }
+        else break;
      }
    free(name);
 
@@ -916,26 +971,26 @@ _new_app_action(Evry_Action *act)
 
    if (!app->desktop)
      {
-       desktop = efreet_desktop_empty_new(buf);
-       desktop->exec = (char *)eina_stringshare_add(app->file);
+        desktop = efreet_desktop_empty_new(buf);
+        desktop->exec = (char *)eina_stringshare_add(app->file);
      }
    else
      {
-       desktop = efreet_desktop_empty_new(buf);
-       if (app->desktop->name)
-         desktop->name = strdup(app->desktop->name);
-       if (app->desktop->comment)
-         desktop->comment = strdup(app->desktop->comment);
-       if (app->desktop->generic_name)
-         desktop->generic_name = strdup(app->desktop->generic_name);
-       if (app->desktop->generic_name)
-         desktop->generic_name = strdup(app->desktop->generic_name);
-       if (app->desktop->exec)
-         desktop->exec = strdup(app->desktop->exec);
-       if (app->desktop->icon)
-         desktop->icon = strdup(app->desktop->icon);
-       if (app->desktop->mime_types)
-         desktop->mime_types = eina_list_clone(app->desktop->mime_types);
+        desktop = efreet_desktop_empty_new(buf);
+        if (app->desktop->name)
+          desktop->name = strdup(app->desktop->name);
+        if (app->desktop->comment)
+          desktop->comment = strdup(app->desktop->comment);
+        if (app->desktop->generic_name)
+          desktop->generic_name = strdup(app->desktop->generic_name);
+        if (app->desktop->generic_name)
+          desktop->generic_name = strdup(app->desktop->generic_name);
+        if (app->desktop->exec)
+          desktop->exec = strdup(app->desktop->exec);
+        if (app->desktop->icon)
+          desktop->icon = strdup(app->desktop->icon);
+        if (app->desktop->mime_types)
+          desktop->mime_types = eina_list_clone(app->desktop->mime_types);
      }
    if (desktop)
      e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
@@ -962,19 +1017,19 @@ _open_term_action(Evry_Action *act)
 
    if (dir)
      {
-       if (!getcwd(cwd, sizeof(cwd)))
-         return 0;
-       if (chdir(dir))
-         return 0;
-
-       tmp = E_NEW(Evry_Item_App, 1);
-       tmp->file = _conf->cmd_terminal;
-
-       ret = evry->util_exec_app(EVRY_ITEM(tmp), NULL);
-       E_FREE(tmp);
-       E_FREE(dir);
-       if (chdir(cwd))
-         return 0;
+        if (!getcwd(cwd, sizeof(cwd)))
+          return 0;
+        if (chdir(dir))
+          return 0;
+
+        tmp = E_NEW(Evry_Item_App, 1);
+        tmp->file = _conf->cmd_terminal;
+
+        ret = evry->util_exec_app(EVRY_ITEM(tmp), NULL);
+        E_FREE(tmp);
+        E_FREE(dir);
+        if (chdir(cwd))
+          return 0;
      }
 
    return ret;
@@ -1004,7 +1059,7 @@ _desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __
 {
    Efreet_Desktop *d;
 
-   EINA_LIST_FREE(apps_cache, d)
+   EINA_LIST_FREE (apps_cache, d)
      efreet_desktop_unref(d);
 
    return EINA_TRUE;
@@ -1017,116 +1072,113 @@ _plugins_init(const Evry_API *api)
    int prio = 0;
    Eina_List *l;
    Evry_Action *act;
-
-   if (evry_module->active)
-     return EINA_TRUE;
+   const char *config_path;
 
    evry = api;
 
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
-   p = EVRY_PLUGIN_NEW(Plugin, N_("Applications"),
-                      _module_icon, EVRY_TYPE_APP,
-                      _begin, _finish, _fetch, NULL);
+   config_path = eina_stringshare_add("launcher/everything-apps");
+
+   p = EVRY_PLUGIN_BASE("Applications", _module_icon, EVRY_TYPE_APP,
+                        _begin, _finish, _fetch);
    p->complete = &_complete;
-   p->config_path = "extensions/everything-apps";
+   p->browse = &_browse;
+   p->config_path = eina_stringshare_ref(config_path);
    evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 1);
    _plugins = eina_list_append(_plugins, p);
 
-
-   p = EVRY_PLUGIN_NEW(Plugin, N_("Exebuf"),
-                      _module_icon, EVRY_TYPE_APP,
-                      _begin_exe, _finish_exe, _fetch_exe, NULL);
+   p = EVRY_PLUGIN_BASE("Exebuf", _module_icon, EVRY_TYPE_APP,
+                        _begin_exe, _finish_exe, _fetch_exe);
    p->complete = &_complete;
-   p->config_path = "extensions/everything-apps";
+   p->config_path = eina_stringshare_ref(config_path);
    _plugins = eina_list_append(_plugins, p);
    if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 3))
-     p->config->min_query = 5;
+     p->config->min_query = 3;
 
-   p = EVRY_PLUGIN_NEW(Plugin, N_("Applications"),
-                      _module_icon, EVRY_TYPE_APP,
-                      _begin_mime, _finish, _fetch, NULL);
+   p = EVRY_PLUGIN_BASE("Applications", _module_icon, EVRY_TYPE_APP,
+                        _begin_mime, _finish, _fetch);
    p->complete = &_complete;
-   p->config_path = "extensions/everything-apps";
+   p->config_path = eina_stringshare_ref(config_path);
    evry->plugin_register(p, EVRY_PLUGIN_OBJECT, 1);
    _plugins = eina_list_append(_plugins, p);
 
-   p = EVRY_PLUGIN_NEW(Plugin, N_("Open With..."),
-                      _module_icon, EVRY_TYPE_APP,
-                      _begin_mime, _finish_mime, _fetch_mime, NULL);
-   p->config_path = "extensions/everything-apps";
+   p = EVRY_PLUGIN_BASE("Open With...", _module_icon, EVRY_TYPE_APP,
+                        _begin_mime, _finish_mime, _fetch_mime);
+   p->config_path = eina_stringshare_ref(config_path);
    evry->plugin_register(p, EVRY_PLUGIN_ACTION, 1);
    _plugins = eina_list_append(_plugins, p);
 
-   act = EVRY_ACTION_NEW(N_("Launch"),
-                        EVRY_TYPE_APP, 0,
-                        "system-run",
-                        _exec_app_action,
-                        _exec_app_check_item);
+   act = EVRY_ACTION_NEW("Launch",
+                         EVRY_TYPE_APP, 0,
+                         "system-run",
+                         _exec_app_action,
+                         _exec_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Open File..."),
-                        EVRY_TYPE_APP, EVRY_TYPE_FILE,
-                        "document-open",
-                        _exec_app_action,
-                        _exec_app_check_item);
+   act = EVRY_ACTION_NEW("Open File...",
+                         EVRY_TYPE_APP, EVRY_TYPE_FILE,
+                         "document-open",
+                         _exec_app_action,
+                         _exec_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Run in Terminal"),
-                        EVRY_TYPE_APP, 0,
-                        "system-run",
-                        _exec_term_action,
-                        _exec_term_check_item);
+   act = EVRY_ACTION_NEW("Run in Terminal",
+                         EVRY_TYPE_APP, 0,
+                         "system-run",
+                         _exec_term_action,
+                         _exec_term_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Edit Application Entry"),
-                        EVRY_TYPE_APP, 0,
-                        "everything-launch",
-                        _edit_app_action,
-                        _edit_app_check_item);
+   act = EVRY_ACTION_NEW("Edit Application Entry",
+                         EVRY_TYPE_APP, 0,
+                         "everything-launch",
+                         _edit_app_action,
+                         _edit_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("New Application Entry"),
-                        EVRY_TYPE_APP, 0,
-                        "everything-launch",
-                        _new_app_action,
-                        _new_app_check_item);
+   act = EVRY_ACTION_NEW("New Application Entry",
+                         EVRY_TYPE_APP, 0,
+                         "everything-launch",
+                         _new_app_action,
+                         _new_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Run with Sudo"),
-                        EVRY_TYPE_APP, 0,
-                        "system-run",
-                        _exec_sudo_action, NULL);
+   act = EVRY_ACTION_NEW("Run with Sudo",
+                         EVRY_TYPE_APP, 0,
+                         "system-run",
+                         _exec_sudo_action, NULL);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Open with..."),
-                        EVRY_TYPE_FILE, EVRY_TYPE_APP,
-                        "everything-launch",
-                        _exec_file_action, NULL);
+   act = EVRY_ACTION_NEW("Open with...",
+                         EVRY_TYPE_FILE, EVRY_TYPE_APP,
+                         "everything-launch",
+                         _exec_file_action, NULL);
    _act_open_with = EVRY_ITEM(act);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Open Terminal here"),
-                        EVRY_TYPE_FILE, 0,
-                        "system-run",
-                        _open_term_action, NULL);
+   act = EVRY_ACTION_NEW("Open Terminal here",
+                         EVRY_TYPE_FILE, 0,
+                         "system-run",
+                         _open_term_action, NULL);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(N_("Run Executable"),
-                        EVRY_TYPE_FILE, 0,
-                        "system-run",
-                        _run_executable,
-                        _check_executable);
+   act = EVRY_ACTION_NEW("Run Executable",
+                         EVRY_TYPE_FILE, 0,
+                         "system-run",
+                         _run_executable,
+                         _check_executable);
    _actions = eina_list_append(_actions, act);
 
-   EINA_LIST_FOREACH(_actions, l, act)
-     evry->action_register(act,  prio++);
+   EINA_LIST_FOREACH (_actions, l, act)
+     evry->action_register(act, prio++);
 
    handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (EFREET_EVENT_DESKTOP_CACHE_UPDATE, _desktop_cache_update, NULL));
+       (handlers, ecore_event_handler_add
+         (EFREET_EVENT_DESKTOP_CACHE_UPDATE, _desktop_cache_update, NULL));
 
+   eina_stringshare_del(config_path);
    return EINA_TRUE;
 }
 
@@ -1138,22 +1190,17 @@ _plugins_shutdown(void)
    Efreet_Desktop *d;
    Ecore_Event_Handler *h;
 
-   if (!evry_module->active)
-     return;
-
-   EINA_LIST_FREE(apps_cache, d)
+   EINA_LIST_FREE (apps_cache, d)
      efreet_desktop_unref(d);
 
-   EINA_LIST_FREE(_plugins, p)
+   EINA_LIST_FREE (_plugins, p)
      EVRY_PLUGIN_FREE(p);
 
-   EINA_LIST_FREE(_actions, act)
+   EINA_LIST_FREE (_actions, act)
      EVRY_ACTION_FREE(act);
 
-   EINA_LIST_FREE(handlers, h)
+   EINA_LIST_FREE (handlers, h)
      ecore_event_handler_del(h);
-
-   evry_module->active = EINA_FALSE;
 }
 
 /***************************************************************************/
@@ -1162,15 +1209,15 @@ static E_Config_DD *conf_edd = NULL;
 
 struct _E_Config_Dialog_Data
 {
-  char *cmd_terminal;
-  char *cmd_sudo;
+   char *cmd_terminal;
+   char *cmd_sudo;
 };
 
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static void _fill_data(E_Config_Dialog_Data *cfdata);
+static void        *_create_data(E_Config_Dialog *cfd);
+static void         _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void         _fill_data(E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int          _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 static E_Config_Dialog *
 _conf_dialog(E_Container *con, const char *params __UNUSED__)
@@ -1189,14 +1236,13 @@ _conf_dialog(E_Container *con, const char *params __UNUSED__)
    v->basic.apply_cfdata = _basic_apply;
 
    cfd = e_config_dialog_new(con, _("Everything Applications"), "everything-apps",
-                            "launcher/everything-apps", _module_icon, 0, v, NULL);
+                             "launcher/everything-apps", _module_icon, 0, v, NULL);
 
    /* e_dialog_resizable_set(cfd->dia, 1); */
    _conf->cfd = cfd;
    return cfd;
 }
 
-/* Local Functions */
 static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
 {
@@ -1240,9 +1286,8 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dialog_Data *cf
 static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
-
 #define CP(_name) cfdata->_name = strdup(_conf->_name);
-#define C(_name) cfdata->_name = _conf->_name;
+#define C(_name)  cfdata->_name = _conf->_name;
    CP(cmd_terminal);
    CP(cmd_sudo);
 #undef CP
@@ -1252,10 +1297,10 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 static int
 _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
-#define CP(_name)                                      \
-   if (_conf->_name)                                   \
-     eina_stringshare_del(_conf->_name);               \
-   _conf->_name = eina_stringshare_add(cfdata->_name);
+#define CP(_name)                        \
+  if (_conf->_name)                      \
+    eina_stringshare_del(_conf->_name);  \
+  _conf->_name = eina_stringshare_add(cfdata->_name);
 #define C(_name) _conf->_name = cfdata->_name;
    CP(cmd_terminal);
    CP(cmd_sudo);
@@ -1273,22 +1318,22 @@ _conf_new(void)
 {
    if (!_conf)
      {
-       _conf = E_NEW(Module_Config, 1);
-       _conf->version = (MOD_CONFIG_FILE_EPOCH << 16);
+        _conf = E_NEW(Module_Config, 1);
+        _conf->version = (MOD_CONFIG_FILE_EPOCH << 16);
      }
 
 #define IFMODCFG(v) if ((_conf->version & 0xffff) < v) {
 #define IFMODCFGEND }
 
-   /* setup defaults */
-   IFMODCFG(0x009d);
-   _conf->cmd_terminal = eina_stringshare_add("/usr/bin/xterm");
-   _conf->cmd_sudo = eina_stringshare_add("/usr/bin/gksudo --preserve-env");
-   IFMODCFGEND;
+    /* setup defaults */
+    IFMODCFG(0x009d);
+    _conf->cmd_terminal = eina_stringshare_add("/usr/bin/xterm");
+    _conf->cmd_sudo = eina_stringshare_add("/usr/bin/gksudo --preserve-env");
+    IFMODCFGEND;
 
-   _conf->version = MOD_CONFIG_FILE_VERSION;
+    _conf->version = MOD_CONFIG_FILE_VERSION;
 
-   /* e_config_save_queue(); */
+    /* e_config_save_queue(); */
 }
 
 static void
@@ -1307,9 +1352,9 @@ _conf_init(E_Module *m)
    char title[4096];
 
    snprintf(title, sizeof(title), "%s: %s", _("Everything Plugin"), _("Applications"));
-   
+
    e_configure_registry_item_add("launcher/everything-apps", 110, title,
-                                NULL, _module_icon, _conf_dialog);
+                                 NULL, _module_icon, _conf_dialog);
 
    conf_edd = E_CONFIG_DD_NEW("Module_Config", Module_Config);
 
@@ -1325,10 +1370,9 @@ _conf_init(E_Module *m)
 
    _conf = e_config_domain_load("module.everything-apps", conf_edd);
 
-
-   if (_conf && !e_util_module_config_check
-       (_("Everything Applications"), _conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+   if (_conf && !e_util_module_config_check(_("Everything Applications"),
+                                            _conf->version,
+                                            MOD_CONFIG_FILE_VERSION))
      _conf_free();
 
    _conf_new();
@@ -1339,7 +1383,7 @@ static void
 _conf_shutdown(void)
 {
    e_configure_registry_item_del("launcher/everything-apps");
-   
+
    _conf_free();
 
    E_CONFIG_DD_FREE(conf_edd);
@@ -1391,7 +1435,6 @@ evry_plug_apps_save(void)
 
 /***************************************************************************/
 
-
 /* taken from e_exebuf.c */
 static Eina_Bool
 _scan_idler(void *data __UNUSED__)
@@ -1404,105 +1447,105 @@ _scan_idler(void *data __UNUSED__)
    /* no more path items left - stop scanning */
    if (!exe_path)
      {
-       Eina_List *l, *l2;
-       E_Exe_List *el;
-       E_Exe *ee;
-       int different = 0;
-
-       /* FIXME: check wheter they match or not */
-       for (l = exe_list, l2 = exe_list2; l && l2; l = l->next, l2 = l2->next)
-         {
-            if (strcmp(l->data, l2->data))
-              {
-                 different = 1;
-                 break;
-              }
-         }
-       if ((l) || (l2)) different = 1;
-       if (exe_list2)
-         {
-            while (exe_list)
-              {
-                 free(eina_list_data_get(exe_list));
-                 exe_list = eina_list_remove_list(exe_list, exe_list);
-              }
-            exe_list = exe_list2;
-            exe_list2 = NULL;
-         }
-       if (different)
-         {
-            el = calloc(1, sizeof(E_Exe_List));
-            if (el)
-              {
-                 el->list = NULL;
-                 for (l = exe_list; l; l = l->next)
-                   {
-                      ee = malloc(sizeof(E_Exe));
-                      if (ee)
-                        {
-                           ee->path = eina_stringshare_add(l->data);
-                           el->list = eina_list_append(el->list, ee);
-                        }
-                   }
-                 e_config_domain_save("exebuf_exelist_cache", exelist_edd, el);
-                 while (el->list)
-                   {
-                      ee = eina_list_data_get(el->list);
-                      eina_stringshare_del(ee->path);
-                      free(ee);
-                      el->list = eina_list_remove_list(el->list, el->list);
-                   }
-                 free(el);
-              }
-         }
-       exe_scan_idler = NULL;
-       return ECORE_CALLBACK_CANCEL;
+        Eina_List *l, *l2;
+        E_Exe_List *el;
+        E_Exe *ee;
+        int different = 0;
+
+        /* FIXME: check wheter they match or not */
+        for (l = exe_list, l2 = exe_list2; l && l2; l = l->next, l2 = l2->next)
+          {
+             if (strcmp(l->data, l2->data))
+               {
+                  different = 1;
+                  break;
+               }
+          }
+        if ((l) || (l2)) different = 1;
+        if (exe_list2)
+          {
+             while (exe_list)
+               {
+                  free(eina_list_data_get(exe_list));
+                  exe_list = eina_list_remove_list(exe_list, exe_list);
+               }
+             exe_list = exe_list2;
+             exe_list2 = NULL;
+          }
+        if (different)
+          {
+             el = calloc(1, sizeof(E_Exe_List));
+             if (el)
+               {
+                  el->list = NULL;
+                  for (l = exe_list; l; l = l->next)
+                    {
+                       ee = malloc(sizeof(E_Exe));
+                       if (ee)
+                         {
+                            ee->path = eina_stringshare_add(l->data);
+                            el->list = eina_list_append(el->list, ee);
+                         }
+                    }
+                  e_config_domain_save("exebuf_exelist_cache", exelist_edd, el);
+                  while (el->list)
+                    {
+                       ee = eina_list_data_get(el->list);
+                       eina_stringshare_del(ee->path);
+                       free(ee);
+                       el->list = eina_list_remove_list(el->list, el->list);
+                    }
+                  free(el);
+               }
+          }
+        exe_scan_idler = NULL;
+        return ECORE_CALLBACK_CANCEL;
      }
    /* no dir is open - open the first path item */
    if (!exe_dir)
      {
-       dir = exe_path->data;
-       exe_dir = opendir(dir);
+        dir = exe_path->data;
+        exe_dir = opendir(dir);
      }
    /* if we have an opened dir - scan the next item */
    if (exe_dir)
      {
-       dir = exe_path->data;
-
-       dp = readdir(exe_dir);
-       if (dp)
-         {
-            if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
-              {
-                 snprintf(buf, sizeof(buf), "%s/%s", dir, dp->d_name);
-                 if ((stat(buf, &st) == 0) &&
-                     ((!S_ISDIR(st.st_mode)) &&
-                      (!access(buf, X_OK))))
-                   {
-                      if (!exe_list)
-                        exe_list = eina_list_append(exe_list, strdup(dp->d_name));
-                      else
-                        exe_list2 = eina_list_append(exe_list2, strdup(dp->d_name));
-                   }
-              }
-         }
-       else
-         {
-            /* we reached the end of a dir - remove the dir at the head
-             * of the path list so we advance and next loop we will pick up
-             * the next item, or if null- abort
-             */
-            closedir(exe_dir);
-            exe_dir = NULL;
-            free(eina_list_data_get(exe_path));
-            exe_path = eina_list_remove_list(exe_path, exe_path);
-         }
+        dir = exe_path->data;
+
+        dp = readdir(exe_dir);
+        if (dp)
+          {
+             if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
+               {
+                  snprintf(buf, sizeof(buf), "%s/%s", dir, dp->d_name);
+                  if ((stat(buf, &st) == 0) &&
+                      ((!S_ISDIR(st.st_mode)) &&
+                       (!access(buf, X_OK))))
+                    {
+                       if (!exe_list)
+                         exe_list = eina_list_append(exe_list, strdup(dp->d_name));
+                       else
+                         exe_list2 = eina_list_append(exe_list2, strdup(dp->d_name));
+                    }
+               }
+          }
+        else
+          {
+             /* we reached the end of a dir - remove the dir at the head
+              * of the path list so we advance and next loop we will pick up
+              * the next item, or if null- abort
+              */
+             closedir(exe_dir);
+             exe_dir = NULL;
+             free(eina_list_data_get(exe_path));
+             exe_path = eina_list_remove_list(exe_path, exe_path);
+          }
      }
    /* obviously the dir open failed - so remove the first path item */
    else
      {
-       free(eina_list_data_get(exe_path));
-       exe_path = eina_list_remove_list(exe_path, exe_path);
+        free(eina_list_data_get(exe_path));
+        exe_path = eina_list_remove_list(exe_path, exe_path);
      }
    /* we have more scannign to do */
    return ECORE_CALLBACK_RENEW;
@@ -1518,34 +1561,35 @@ _scan_executables()
    el = e_config_domain_load("exebuf_exelist_cache", exelist_edd);
    if (el)
      {
-       E_Exe *ee;
-
-       EINA_LIST_FREE(el->list, ee)
-         {
-            exe_list = eina_list_append(exe_list, strdup(ee->path));
-            eina_stringshare_del(ee->path);
-            free(ee);
-         }
-       free(el);
+        E_Exe *ee;
+
+        EINA_LIST_FREE (el->list, ee)
+          {
+             exe_list = eina_list_append(exe_list, strdup(ee->path));
+             eina_stringshare_del(ee->path);
+             free(ee);
+          }
+        free(el);
      }
    path = getenv("PATH");
    if (path)
      {
-       path = strdup(path);
-       last = path;
-       for (pp = path; pp[0]; pp++)
-         {
-            if (pp[0] == ':') pp[0] = '\0';
-            if (pp[0] == 0)
-              {
-                 exe_path = eina_list_append(exe_path, strdup(last));
-                 last = pp + 1;
-              }
-         }
-       if (pp > last)
-         exe_path = eina_list_append(exe_path, strdup(last));
-       free(path);
+        path = strdup(path);
+        last = path;
+        for (pp = path; pp[0]; pp++)
+          {
+             if (pp[0] == ':') pp[0] = '\0';
+             if (pp[0] == 0)
+               {
+                  exe_path = eina_list_append(exe_path, strdup(last));
+                  last = pp + 1;
+               }
+          }
+        if (pp > last)
+          exe_path = eina_list_append(exe_path, strdup(last));
+        free(path);
      }
 
    exe_scan_idler = ecore_idler_add(_scan_idler, NULL);
 }
+
index ed1724e..2ed562c 100644 (file)
@@ -6,12 +6,12 @@ typedef struct _Plugin Plugin;
 
 struct _Plugin
 {
-  Evry_Plugin base;
+   Evry_Plugin base;
 };
 
-static Eina_Bool  _cb_data(void *data, int type, void *event);
-static Eina_Bool  _cb_error(void *data, int type, void *event);
-static Eina_Bool  _cb_del(void *data, int type, void *event);
+static Eina_Bool _cb_data(void *data, int type, void *event);
+static Eina_Bool _cb_error(void *data, int type, void *event);
+static Eina_Bool _cb_del(void *data, int type, void *event);
 
 static const Evry_API *evry = NULL;
 static Evry_Module *evry_module = NULL;
@@ -31,7 +31,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 {
    Evry_Item *it;
    Plugin *p;
-   
+
    if (active)
      return NULL;
 
@@ -39,22 +39,22 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 
    if (history)
      {
-       const char *result;
-
-       EINA_LIST_FREE(history, result)
-         {
-            it = EVRY_ITEM_NEW(Evry_Item, p, result, NULL, NULL);
-            it->context = eina_stringshare_ref(p->base.name);
-            p->base.items = eina_list_prepend(p->base.items, it);
-            eina_stringshare_del(result);
-         }
+        const char *result;
+
+        EINA_LIST_FREE (history, result)
+          {
+             it = EVRY_ITEM_NEW(Evry_Item, p, result, NULL, NULL);
+             it->context = eina_stringshare_ref(p->base.name);
+             p->base.items = eina_list_prepend(p->base.items, it);
+             eina_stringshare_del(result);
+          }
      }
 
    it = EVRY_ITEM_NEW(Evry_Item, p, "0", NULL, NULL);
    it->context = eina_stringshare_ref(p->base.name);
    cur_item = it;
    active = EINA_TRUE;
-   
+
    return EVRY_PLUGIN(p);
 }
 
@@ -62,49 +62,49 @@ static int
 _run_bc(Plugin *p)
 {
    handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EXE_EVENT_DATA, _cb_data, p));
+       (handlers, ecore_event_handler_add
+         (ECORE_EXE_EVENT_DATA, _cb_data, p));
    handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EXE_EVENT_ERROR, _cb_error, p));
+       (handlers, ecore_event_handler_add
+         (ECORE_EXE_EVENT_ERROR, _cb_error, p));
    handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EXE_EVENT_DEL, _cb_del, p));
+       (handlers, ecore_event_handler_add
+         (ECORE_EXE_EVENT_DEL, _cb_del, p));
 
    exe = ecore_exe_pipe_run("bc -l",
-                           ECORE_EXE_PIPE_READ |
-                           ECORE_EXE_PIPE_READ_LINE_BUFFERED |
-                           ECORE_EXE_PIPE_WRITE |
-                           ECORE_EXE_PIPE_ERROR |
-                           ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
-                           NULL);
+                            ECORE_EXE_PIPE_READ |
+                            ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+                            ECORE_EXE_PIPE_WRITE |
+                            ECORE_EXE_PIPE_ERROR |
+                            ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
+                            NULL);
    return !!exe;
 }
 
 static void
 _finish(Evry_Plugin *plugin)
 {
-   GET_PLUGIN(p, plugin);   
+   GET_PLUGIN(p, plugin);
    Ecore_Event_Handler *h;
    Evry_Item *it;
    int items = 0;
 
-   EINA_LIST_FREE(p->base.items, it)
+   EINA_LIST_FREE (p->base.items, it)
      {
-       if ((items++ > 1) && (items < 10))
-         history = eina_list_prepend(history, eina_stringshare_add(it->label));
+        if ((items++ > 1) && (items < 10))
+          history = eina_list_prepend(history, eina_stringshare_add(it->label));
 
-       EVRY_ITEM_FREE(it);
+        EVRY_ITEM_FREE(it);
      }
 
-   EINA_LIST_FREE(handlers, h)
+   EINA_LIST_FREE (handlers, h)
      ecore_event_handler_del(h);
 
    if (exe)
      {
-       ecore_exe_quit(exe);
-       ecore_exe_free(exe);
-       exe = NULL;
+        ecore_exe_quit(exe);
+        ecore_exe_free(exe);
+        exe = NULL;
      }
    active = EINA_FALSE;
 
@@ -128,18 +128,18 @@ _cb_action_performed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
    /* remove duplicates */
    if (p->items->next)
      {
-       it = p->items->data;
-
-       EINA_LIST_FOREACH(p->items->next, l, it2)
-         {
-            if (!strcmp(it->label, it2->label))
-              {
-                 p->items = eina_list_promote_list(p->items, l);
-                 evry->item_changed(it, 0, 1);
-                 EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-                 return ECORE_CALLBACK_PASS_ON;
-              }
-         }
+        it = p->items->data;
+
+        EINA_LIST_FOREACH (p->items->next, l, it2)
+          {
+             if (!strcmp(it->label, it2->label))
+               {
+                  p->items = eina_list_promote_list(p->items, l);
+                  evry->item_changed(it, 0, 1);
+                  EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
+                  return ECORE_CALLBACK_PASS_ON;
+               }
+          }
      }
 
    it_old = p->items->data;
@@ -158,7 +158,7 @@ static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
    GET_PLUGIN(p, plugin);
-   
+
    char buf[1024];
 
    if (!input) return 0;
@@ -176,11 +176,11 @@ _fetch(Evry_Plugin *plugin, const char *input)
       second time...*/
    if (error)
      {
-       ecore_exe_send(exe, buf, strlen(buf));
-       error = 0;
+        ecore_exe_send(exe, buf, strlen(buf));
+        error = 0;
      }
 
-   return !!(p->base.items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 static Eina_Bool
@@ -194,16 +194,17 @@ _cb_data(void *data, int type __UNUSED__, void *event)
 
    if (ev->lines)
      {
-       it = cur_item;
-       eina_stringshare_del(it->label);
-       it->label = eina_stringshare_add(ev->lines->line);
-
-       if (!(it = eina_list_data_get(p->items)) || (it != cur_item))
-         {
-            p->items = eina_list_prepend(p->items, cur_item);
-            EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-         }
-       else if (it) evry->item_changed(it, 0, 0);
+        it = cur_item;
+        eina_stringshare_del(it->label);
+        it->label = eina_stringshare_add(ev->lines->line);
+
+        if (!(it = eina_list_data_get(p->items)) || (it != cur_item))
+          {
+             p->items = eina_list_prepend(p->items, cur_item);
+             EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
+          }
+        else if (it)
+          evry->item_changed(it, 0, 0);
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -214,7 +215,7 @@ _cb_error(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
    Evry_Plugin *p = data;
-   
+
    if (ev->exe != exe)
      return ECORE_CALLBACK_PASS_ON;
 
@@ -240,34 +241,29 @@ _cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 static int
 _plugins_init(const Evry_API *_api)
 {
-   if (evry_module->active)
-     return EINA_TRUE;
-
    evry = _api;
 
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
    action_handler = evry->event_handler_add(EVRY_EVENT_ACTION_PERFORMED,
-                                           _cb_action_performed, NULL);
+                                            _cb_action_performed, NULL);
 
-   _plug = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Calculator"),
-                       _module_icon,
-                       EVRY_TYPE_TEXT,
-                       _begin, _finish, _fetch, NULL);
+   _plug = EVRY_PLUGIN_BASE("Calculator", _module_icon, EVRY_TYPE_TEXT,
+                            _begin, _finish, _fetch);
 
-   _plug->history     = EINA_FALSE;
+   _plug->history = EINA_FALSE;
    _plug->async_fetch = EINA_TRUE;
 
    if (evry->plugin_register(_plug, EVRY_PLUGIN_SUBJECT, 0))
      {
-       Plugin_Config *pc = _plug->config;
-       pc->view_mode = VIEW_MODE_LIST;
-       pc->trigger = eina_stringshare_add("=");
-       pc->trigger_only = EINA_TRUE;
-       pc->aggregate = EINA_FALSE;
-       /* pc->top_level = EINA_FALSE; */
-       /* pc->min_query = 3; */
+        Plugin_Config *pc = _plug->config;
+        pc->view_mode = VIEW_MODE_LIST;
+        pc->trigger = eina_stringshare_add("=");
+        pc->trigger_only = EINA_TRUE;
+        pc->aggregate = EINA_FALSE;
+        /* pc->top_level = EINA_FALSE; */
+        /* pc->min_query = 3; */
      }
 
    return EINA_TRUE;
@@ -276,20 +272,16 @@ _plugins_init(const Evry_API *_api)
 static void
 _plugins_shutdown(void)
 {
-   if (!evry_module->active) return;
-
    ecore_event_handler_del(action_handler);
    action_handler = NULL;
 
    EVRY_PLUGIN_FREE(_plug);
-
-   evry_module->active = EINA_FALSE;
 }
 
 /***************************************************************************/
 
 Eina_Bool
-evry_plug_calc_init(E_Module *m)
+evry_plug_calc_init(E_Module *m __UNUSED__)
 {
    EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
 
@@ -304,3 +296,4 @@ evry_plug_calc_shutdown(void)
 
 void
 evry_plug_calc_save(void){}
+
index f52eb47..0945c4c 100644 (file)
@@ -17,7 +17,7 @@ _action(Evry_Action *act)
 static int
 _check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
 {
-   return (it && it->label && (strlen(it->label) > 0));
+   return it && it->label && (strlen(it->label) > 0);
 }
 
 Eina_Bool
@@ -30,10 +30,10 @@ evry_plug_clipboard_init(void)
    if (!win) return EINA_FALSE;
 
 //FIXME: Icon name doesn't follow FDO Spec
-   act = EVRY_ACTION_NEW(N_("Copy to Clipboard"),
-                        EVRY_TYPE_TEXT, 0,
-                        "everything-clipboard",
-                        _action, _check_item);
+   act = EVRY_ACTION_NEW("Copy to Clipboard",
+                         EVRY_TYPE_TEXT, 0,
+                         "everything-clipboard",
+                         _action, _check_item);
    act->remember_context = EINA_TRUE;
    evry_action_register(act, 10);
 
@@ -48,3 +48,4 @@ evry_plug_clipboard_shutdown(void)
    ecore_x_window_free(clipboard_win);
    evry_action_free(act);
 }
+
index 832d63d..5d334d0 100644 (file)
@@ -1,17 +1,15 @@
 #include "e_mod_main.h"
 
-
 typedef struct _Plugin Plugin;
 
 struct _Plugin
 {
-  Evry_Plugin base;
+   Evry_Plugin base;
 
-  Eina_List *plugins;
+   Eina_List  *plugins;
 };
 
 static Eina_List *plugins = NULL;
-static const char _module_icon[] = "preferences-plugin";
 static Evry_Type COLLECTION_PLUGIN;
 static Plugin_Config plugin_config;
 
@@ -34,12 +32,12 @@ _browse(Evry_Plugin *plugin, const Evry_Item *item)
 
    if (pp->begin && (inst = pp->begin(pp, NULL)))
      {
-       if (!strcmp(plugin->name, "Plugins"))
-         inst->config = &plugin_config;
-       else
-         inst->config = pc;
+        if (!strcmp(plugin->name, "Plugins"))
+          inst->config = &plugin_config;
+        else
+          inst->config = pc;
 
-       return inst;
+        return inst;
      }
 
    return NULL;
@@ -53,16 +51,16 @@ _add_item(Plugin *p, Plugin_Config *pc)
 
    if (pc->enabled && (pp = evry_plugin_find(pc->name)))
      {
-       pc->plugin = pp;
-
-       GET_ITEM(itp, pp);
-       it = EVRY_ITEM_NEW(Evry_Item, EVRY_PLUGIN(p), itp->label, NULL, NULL);
-       if (itp->icon) it->icon = eina_stringshare_ref(itp->icon);
-       it->icon_get = itp->icon_get;
-       it->data = pc;
-       it->browseable = EINA_TRUE;
-       it->detail = eina_stringshare_ref(EVRY_ITEM(p)->label);
-       p->plugins = eina_list_append(p->plugins, it);
+        pc->plugin = pp;
+
+        GET_ITEM(itp, pp);
+        it = EVRY_ITEM_NEW(Evry_Item, EVRY_PLUGIN(p), itp->label, NULL, NULL);
+        if (itp->icon) it->icon = eina_stringshare_ref(itp->icon);
+        it->icon_get = itp->icon_get;
+        it->data = pc;
+        it->browseable = EINA_TRUE;
+        it->detail = eina_stringshare_ref(EVRY_ITEM(p)->label);
+        p->plugins = eina_list_append(p->plugins, it);
      }
    return it;
 }
@@ -76,7 +74,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 
    EVRY_PLUGIN_INSTANCE(p, plugin);
 
-   EINA_LIST_FOREACH(plugin->config->plugins, l, pc)
+   EINA_LIST_FOREACH (plugin->config->plugins, l, pc)
      _add_item(p, pc);
 
    return EVRY_PLUGIN(p);
@@ -91,15 +89,15 @@ _begin_all(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 
    EVRY_PLUGIN_INSTANCE(p, plugin);
 
-   EINA_LIST_FOREACH(evry_conf->conf_subjects, l, pc)
+   EINA_LIST_FOREACH (evry_conf->conf_subjects, l, pc)
      {
-       if (!strcmp(pc->name, "All") ||
-           !strcmp(pc->name, "Actions") ||
-           !strcmp(pc->name, "Calculator") ||
-           !strcmp(pc->name, "Plugins"))
-         continue;
+        if (!strcmp(pc->name, "All") ||
+            !strcmp(pc->name, "Actions") ||
+            !strcmp(pc->name, "Calculator") ||
+            !strcmp(pc->name, "Plugins"))
+          continue;
 
-     _add_item(p, pc);
+        _add_item(p, pc);
      }
 
    return EVRY_PLUGIN(p);
@@ -114,9 +112,9 @@ _finish(Evry_Plugin *plugin)
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   EINA_LIST_FREE(p->plugins, it)
+   EINA_LIST_FREE (p->plugins, it)
      EVRY_ITEM_FREE(it);
-   
+
    E_FREE(p);
 }
 
@@ -129,7 +127,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
 
    EVRY_PLUGIN_ITEMS_ADD(p, p->plugins, input, 1, 0);
 
-   return !!(plugin->items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 static Evry_Plugin *
@@ -139,9 +137,8 @@ _add_plugin(const char *name)
    char path[4096];
    char title[4096];
 
-   p = EVRY_PLUGIN_NEW(Evry_Plugin, N_(name),
-                      _module_icon, COLLECTION_PLUGIN,
-                      _begin, _finish, _fetch, NULL);
+   p = EVRY_PLUGIN_BASE(name, NULL, COLLECTION_PLUGIN,
+                        _begin, _finish, _fetch);
    p->browse = &_browse;
 
    snprintf(path, sizeof(path), "launcher/everything-%s", p->name);
@@ -174,21 +171,24 @@ evry_plug_collection_init(void)
 
    p = _add_plugin("Plugins");
    p->begin = &_begin_all;
+   EVRY_ITEM_ICON_SET(p, "preferences-plugin");
+
    if (evry_plugin_register(p, EVRY_PLUGIN_SUBJECT, 100))
      {
-       p->config->aggregate = EINA_TRUE;
-       p->config->top_level = EINA_TRUE;
-       p->config->view_mode = VIEW_MODE_THUMB;
+        p->config->aggregate = EINA_TRUE;
+        p->config->top_level = EINA_TRUE;
+        p->config->view_mode = VIEW_MODE_THUMB;
      }
 
-   EINA_LIST_FOREACH(evry_conf->collections, l, pc)
+   EINA_LIST_FOREACH (evry_conf->collections, l, pc)
      {
-       p = _add_plugin(pc->name); 
-       p->config = pc;
-       pc->plugin = p;
+        p = _add_plugin(pc->name);
+        EVRY_ITEM_ICON_SET(p, "start-here");
+        p->config = pc;
+        pc->plugin = p;
 
-       if (evry_plugin_register(p, EVRY_PLUGIN_SUBJECT, 1))
-         p->config->aggregate = EINA_FALSE;
+        if (evry_plugin_register(p, EVRY_PLUGIN_SUBJECT, 1))
+          p->config->aggregate = EINA_FALSE;
      }
 
    return EINA_TRUE;
@@ -199,14 +199,15 @@ evry_plug_collection_shutdown(void)
 {
    Evry_Plugin *p;
 
-   EINA_LIST_FREE(plugins, p)
+   EINA_LIST_FREE (plugins, p)
      {
-       if (p->config_path)
-         {
-            e_configure_registry_item_del(p->config_path);
-            eina_stringshare_del(p->config_path);
-         }
+        if (p->config_path)
+          {
+             e_configure_registry_item_del(p->config_path);
+             eina_stringshare_del(p->config_path);
+          }
 
-       EVRY_PLUGIN_FREE(p);
+        EVRY_PLUGIN_FREE(p);
      }
 }
+
index b714e2d..c0b5971 100644 (file)
@@ -1,93 +1,93 @@
 /***************************************************
-  TODO option for maximum items to cache
-  TODO keep common list for recent file instances
-FIXME
-*/
+   TODO option for maximum items to cache
+   TODO keep common list for recent file instances
+   FIXME
+ */
 
 #include "e.h"
 #include "evry_api.h"
 #include <Efreet_Trash.h>
 
-#define MOD_CONFIG_FILE_EPOCH 0x0001
+#define MOD_CONFIG_FILE_EPOCH      0x0001
 #define MOD_CONFIG_FILE_GENERATION 0x008d
-#define MOD_CONFIG_FILE_VERSION                                 \
-     ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
+#define MOD_CONFIG_FILE_VERSION \
+  ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
 
-#define MAX_ITEMS 10
-#define MAX_SHOWN 300
-#define TERM_ACTION_DIR "%s"
+#define MAX_ITEMS                  10
+#define MAX_SHOWN                  300
+#define TERM_ACTION_DIR            "%s"
 
-#define CMD_NONE        0
-#define CMD_SHOW_ROOT   1
-#define CMD_SHOW_HIDDEN 2
-#define CMD_SHOW_PARENT 3
+#define CMD_NONE                   0
+#define CMD_SHOW_ROOT              1
+#define CMD_SHOW_HIDDEN            2
+#define CMD_SHOW_PARENT            3
 
-#define ACT_TRASH      1
-#define ACT_DELETE     2
-#define ACT_COPY       3
-#define ACT_MOVE       4
-#define ACT_SORT_DATE  5
-#define ACT_SORT_NAME  6
+#define ACT_TRASH                  1
+#define ACT_DELETE                 2
+#define ACT_COPY                   3
+#define ACT_MOVE                   4
+#define ACT_SORT_DATE              5
+#define ACT_SORT_NAME              6
 
-#define ONE_DAY  86400.0
-#define SIX_DAYS_AGO (ecore_time_unix_get() - ONE_DAY * 6)
-#define MIN_USAGE 0.0
+#define ONE_DAY                    86400.0
+#define SIX_DAYS_AGO               (ecore_time_unix_get() - ONE_DAY * 6)
+#define MIN_USAGE                  0.0
 
 /* #undef DBG
  * #define DBG(...) ERR(__VA_ARGS__) */
 
-typedef struct _Plugin Plugin;
-typedef struct _Data Data;
+typedef struct _Plugin        Plugin;
+typedef struct _Data          Data;
 typedef struct _Module_Config Module_Config;
 
 struct _Plugin
 {
-  Evry_Plugin base;
-
-  Eina_List *files;
-  const char *directory;
-  const char *input;
-  unsigned int command;
-  unsigned int min_query;
-  Eina_Bool parent;
-  Eina_Bool show_hidden;
-  Eina_Bool dirs_only;
-  Eina_Bool show_recent;
-  Eina_Bool sort_by_date;
-
-  Ecore_Thread *thread;
-  Ecore_File_Monitor *dir_mon;
-  int wait_finish;
+   Evry_Plugin         base;
+
+   Eina_List          *files;
+   const char         *directory;
+   const char         *input;
+   unsigned int        command;
+   unsigned int        min_query;
+   Eina_Bool           parent;
+   Eina_Bool           show_hidden;
+   Eina_Bool           dirs_only;
+   Eina_Bool           show_recent;
+   Eina_Bool           sort_by_date;
+
+   Ecore_Thread       *thread;
+   Ecore_File_Monitor *dir_mon;
+   int                 waiting_to_finish;
 };
 
 struct _Data
 {
-  Plugin *plugin;
-  char *directory;
-  long id;
-  int level;
-  int cnt;
-  Eina_List *files;
-  DIR *dirp;
-  int run_cnt;
+   Plugin    *plugin;
+   char      *directory;
+   long       id;
+   int        level;
+   int        cnt;
+   Eina_List *files;
+   DIR       *dirp;
+   int        run_cnt;
 };
 
 struct _Module_Config
 {
-  int version;
+   int              version;
 
-  unsigned char show_homedir;
-  unsigned char show_recent;
-  unsigned char search_recent;
-  unsigned char cache_dirs;
-  unsigned char search_cache;
+   unsigned char    show_homedir;
+   unsigned char    show_recent;
+   unsigned char    search_recent;
+   unsigned char    cache_dirs;
+   unsigned char    search_cache;
 
-  // TODO
-  int sort_by;
-  Eina_List *search_dirs;
+   // TODO
+   int              sort_by;
+   Eina_List       *search_dirs;
 
-  E_Config_Dialog *cfd;
-  E_Module *module;
+   E_Config_Dialog *cfd;
+   E_Module        *module;
 };
 
 static const Evry_API *evry = NULL;
@@ -109,12 +109,12 @@ _item_fill(Evry_Item_File *file)
 {
    if (!file->mime)
      {
-       const char *mime = efreet_mime_type_get(file->path);
+        const char *mime = efreet_mime_type_get(file->path);
 
-       if (mime)
-         file->mime = eina_stringshare_ref(mime);
-       else
-         file->mime = eina_stringshare_add("unknown");
+        if (mime)
+          file->mime = eina_stringshare_ref(mime);
+        else
+          file->mime = eina_stringshare_add("unknown");
      }
 
    if ((file->mime == _mime_dir) ||
@@ -126,8 +126,7 @@ _item_fill(Evry_Item_File *file)
    if (!EVRY_ITEM(file)->detail)
      evry->util_file_detail_set(file);
 
-
-     evry->util_file_detail_set(file);
+   evry->util_file_detail_set(file);
 }
 
 static int
@@ -144,7 +143,7 @@ _cb_sort(const void *data1, const void *data2)
 
    if (it1->fuzzy_match && it2->fuzzy_match)
      if (it1->fuzzy_match - it2->fuzzy_match)
-       return (it1->fuzzy_match - it2->fuzzy_match);
+       return it1->fuzzy_match - it2->fuzzy_match;
 
    return strcasecmp(it1->label, it2->label);
 }
@@ -159,18 +158,6 @@ _cb_sort_date(const void *data1, const void *data2)
 }
 
 static void
-_item_free(Evry_Item *it)
-{
-   GET_FILE(file, it);
-
-   IF_RELEASE(file->url);
-   IF_RELEASE(file->path);
-   IF_RELEASE(file->mime);
-
-   E_FREE(file);
-}
-
-static void
 _scan_func(void *data, Ecore_Thread *thread)
 {
    Data *d = data;
@@ -181,22 +168,22 @@ _scan_func(void *data, Ecore_Thread *thread)
    if (!(ls = eina_file_stat_ls(d->directory)))
      return;
 
-   EINA_ITERATOR_FOREACH(ls, info)
+   EINA_ITERATOR_FOREACH (ls, info)
      {
-       if ((d->plugin->show_hidden) != (*(info->path + info->name_start) == '.'))
-         continue;
+        if ((d->plugin->show_hidden) != (*(info->path + info->name_start) == '.'))
+          continue;
 
-       file = EVRY_ITEM_NEW(Evry_Item_File, d->plugin, NULL, NULL, _item_free);
-       file->path = strdup(info->path);
-       EVRY_ITEM(file)->label = strdup(info->path + info->name_start);
-       EVRY_ITEM(file)->browseable = (info->type == EINA_FILE_DIR);
+        file = EVRY_ITEM_NEW(Evry_Item_File, d->plugin, NULL, NULL, evry_item_file_free);
+        file->path = strdup(info->path);
+        EVRY_ITEM(file)->label = strdup(info->path + info->name_start);
+        EVRY_ITEM(file)->browseable = (info->type == EINA_FILE_DIR);
 
-       d->files = eina_list_append(d->files, file);
-       /* TODO dont append files in thread, run mime scan
-        * simultaneously. ecore_thread_feedback(thread, file); */
+        d->files = eina_list_append(d->files, file);
+        /* TODO dont append files in thread, run mime scan
+         * simultaneously. ecore_thread_feedback(thread, file); */
 
-       if (ecore_thread_check(thread))
-         break;
+        if (ecore_thread_check(thread))
+          break;
      }
 
    eina_iterator_free(ls);
@@ -210,21 +197,21 @@ _scan_mime_func(void *data, Ecore_Thread *thread)
    Eina_List *l;
    int cnt = 0;
 
-   EINA_LIST_FOREACH(d->files, l, file)
+   EINA_LIST_FOREACH (d->files, l, file)
      {
-       if (ecore_thread_check(thread))
-         break;
-
-       if ((file->mime = efreet_mime_type_get(file->path)))
-         {
-            if (!strncmp(file->mime, "inode/", 6) &&
-                ecore_file_is_dir(file->path))
-              EVRY_ITEM(file)->browseable = EINA_TRUE;
-         }
-       else
-         file->mime = _mime_unknown;
-
-       if (cnt++ > MAX_ITEMS * d->run_cnt) break;
+        if (ecore_thread_check(thread))
+          break;
+
+        if ((file->mime = efreet_mime_type_get(file->path)))
+          {
+             if (!strncmp(file->mime, "inode/", 6) &&
+                 ecore_file_is_dir(file->path))
+               EVRY_ITEM(file)->browseable = EINA_TRUE;
+          }
+        else
+          file->mime = _mime_unknown;
+
+        if (cnt++ > MAX_ITEMS * d->run_cnt) break;
      }
 }
 
@@ -241,34 +228,34 @@ _files_filter(Plugin *p)
 
    if (!p->command && p->min_query)
      {
-       if (!p->input)
-         return 0;
-       if (len < p->min_query)
-         return 0;
+        if (!p->input)
+          return 0;
+        if (len < p->min_query)
+          return 0;
      }
 
-   EINA_LIST_FOREACH(p->files, l, it)
+   EINA_LIST_FOREACH (p->files, l, it)
      {
-       if (cnt >= MAX_SHOWN) break;
-
-       if (p->dirs_only && !it->browseable)
-         continue;
-
-       if (len && (match = evry->fuzzy_match(it->label, p->input)))
-         {
-            it->fuzzy_match = match;
-            if (!it->browseable)
-              it->priority = 1;
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-            cnt++;
-         }
-       else if (len == 0)
-         {
-            if (!it->browseable)
-              it->priority = 1;
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-            cnt++;
-         }
+        if (cnt >= MAX_SHOWN) break;
+
+        if (p->dirs_only && !it->browseable)
+          continue;
+
+        if (len && (match = evry->fuzzy_match(it->label, p->input)))
+          {
+             it->fuzzy_match = match;
+             if (!it->browseable)
+               it->priority = 1;
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+             cnt++;
+          }
+        else if (len == 0)
+          {
+             if (!it->browseable)
+               it->priority = 1;
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+             cnt++;
+          }
      }
    return cnt;
 }
@@ -280,19 +267,19 @@ _scan_cancel_func(void *data, Ecore_Thread *thread __UNUSED__)
    Plugin *p = d->plugin;
    Evry_Item_File *file;
 
-   EINA_LIST_FREE(p->files, file)
-     EVRY_ITEM_FREE(file);
+   /* EINA_LIST_FREE(p->files, file)
+    *   EVRY_ITEM_FREE(file); */
 
-   EINA_LIST_FREE(d->files, file)
+   EINA_LIST_FREE (d->files, file)
      {
-       if (file->base.label) free((char *)(file->base.label));
-       if (file->path) free((char *)file->path);
-       E_FREE(file);
+        if (file->base.label) free((char *)(file->base.label));
+        if (file->path) free((char *)file->path);
+        E_FREE(file);
      }
 
    p->thread = NULL;
 
-   if (p->wait_finish)
+   if (p->waiting_to_finish)
      E_FREE(p);
 
    free(d->directory);
@@ -308,18 +295,18 @@ _cache_mime_get(History_Types *ht, Evry_Item_File *file)
 
    if ((he = eina_hash_find(ht->types, file->path)))
      {
-       EINA_LIST_FOREACH(he->items, l, hi)
-         {
-            if (!hi->data)
-              continue;
-
-            if (!file->mime)
-              file->mime = hi->data;
-
-            hi->transient = 0;
-            EVRY_ITEM(file)->hi = hi;
-            break;
-         }
+        EINA_LIST_FOREACH (he->items, l, hi)
+          {
+             if (!hi->data)
+               continue;
+
+             if (!file->mime)
+               file->mime = hi->data;
+
+             hi->transient = 0;
+             EVRY_ITEM(file)->hi = hi;
+             break;
+          }
      }
 }
 
@@ -331,24 +318,24 @@ _cache_dir_add(Eina_List *files)
    History_Item *hi;
    int cnt = 0;
 
-   EINA_LIST_REVERSE_FOREACH(files, l, item)
+   EINA_LIST_REVERSE_FOREACH (files, l, item)
      {
-       GET_FILE(file, item);
-
-       if (!(item->hi) &&
-           (hi = evry->history_item_add(item, NULL, NULL)))
-         {
-            hi->last_used = SIX_DAYS_AGO;
-            hi->usage = MIN_USAGE * (double) cnt++;
-            hi->data = eina_stringshare_ref(file->mime);
-            item->hi = hi;
-         }
-       else if (item->hi && (item->hi->count == 1) &&
-                (item->hi->last_used < SIX_DAYS_AGO))
-         {
-            item->hi->last_used = SIX_DAYS_AGO;
-            item->hi->usage = MIN_USAGE * (double) cnt++;
-         }
+        GET_FILE(file, item);
+
+        if (!(item->hi) &&
+            (hi = evry->history_item_add(item, NULL, NULL)))
+          {
+             hi->last_used = SIX_DAYS_AGO;
+             hi->usage = MIN_USAGE * (double)cnt++;
+             hi->data = eina_stringshare_ref(file->mime);
+             item->hi = hi;
+          }
+        else if (item->hi && (item->hi->count == 1) &&
+                 (item->hi->last_used < SIX_DAYS_AGO))
+          {
+             item->hi->last_used = SIX_DAYS_AGO;
+             item->hi->usage = MIN_USAGE * (double)cnt++;
+          }
      }
 }
 
@@ -358,7 +345,7 @@ _file_add(Plugin *p, Evry_Item *item)
    GET_FILE(file, item);
 
    char *filename = (char *)item->label;
-   char *path = (char *) file->path;
+   char *path = (char *)file->path;
 
    file->path = eina_stringshare_add(path);
    file->mime = eina_stringshare_ref(file->mime);
@@ -390,53 +377,53 @@ _scan_end_func(void *data, Ecore_Thread *thread __UNUSED__)
 
    if (!d->run_cnt) /* _scan_func finished */
      {
-       EINA_LIST_FOREACH_SAFE(d->files, l, ll, item)
-         {
-            GET_FILE(file, item);
-
-            if (item->browseable)
-              file->mime = _mime_dir;
-            else if (ht)
-              _cache_mime_get(ht, file);
-
-            if (file->mime)
-              {
-                 d->files = eina_list_remove_list(d->files, l);
-                 _file_add(p, item);
-              }
-         }
-
-       /* sort files by name for mimetypes scan */
-       if (d->files)
-         d->files = eina_list_sort(d->files, -1, _cb_sort);
+        EINA_LIST_FOREACH_SAFE (d->files, l, ll, item)
+          {
+             GET_FILE(file, item);
+
+             if (item->browseable)
+               file->mime = _mime_dir;
+             else if (ht)
+               _cache_mime_get(ht, file);
+
+             if (file->mime)
+               {
+                  d->files = eina_list_remove_list(d->files, l);
+                  _file_add(p, item);
+               }
+          }
+
+        /* sort files by name for mimetypes scan */
+        if (d->files)
+          d->files = eina_list_sort(d->files, -1, _cb_sort);
      }
-   else        /* _scan_mime_func finished */
+   else /* _scan_mime_func finished */
      {
-       EINA_LIST_FREE(d->files, file)
-         {
-            if (!file->mime) break;
-            _file_add(p, (Evry_Item*) file);
-         }
+        EINA_LIST_FREE (d->files, file)
+          {
+             if (!file->mime) break;
+             _file_add(p, (Evry_Item *)file);
+          }
      }
 
    if (d->files) /* scan mimetypes */
      {
-       d->run_cnt++;
-       p->thread = ecore_thread_run(_scan_mime_func,
-                                    _scan_end_func,
-                                    _scan_cancel_func, d);
+        d->run_cnt++;
+        p->thread = ecore_thread_run(_scan_mime_func,
+                                     _scan_end_func,
+                                     _scan_cancel_func, d);
 
-       /* wait for first mime scan to finish */
-       if (d->run_cnt == 1) return;
+        /* wait for first mime scan to finish */
+        if (d->run_cnt == 1) return;
      }
    else /* finished all file/mime scan */
      {
-       free(d->directory);
-       E_FREE(d);
-       p->thread = NULL;
+        free(d->directory);
+        E_FREE(d);
+        p->thread = NULL;
 
-       if (_conf->cache_dirs && !(p->command == CMD_SHOW_HIDDEN))
-         _cache_dir_add(p->files);
+        if (_conf->cache_dirs && !(p->command == CMD_SHOW_HIDDEN))
+          _cache_dir_add(p->files);
      }
 
    p->files = eina_list_sort(p->files, -1, _cb_sort);
@@ -457,43 +444,42 @@ _dir_watcher(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event eve
    switch (event)
      {
       case ECORE_FILE_EVENT_DELETED_SELF:
-        EINA_LIST_FREE(p->files, file)
-         evry->item_free(EVRY_ITEM(file));
-       break;
+        EINA_LIST_FREE (p->files, file)
+          evry->item_free(EVRY_ITEM(file));
+        break;
 
       case ECORE_FILE_EVENT_CREATED_DIRECTORY:
       case ECORE_FILE_EVENT_CREATED_FILE:
-        label = ecore_file_file_get(path);
+        label = ecore_file_file_get(path);
 
-        file = EVRY_ITEM_NEW(Evry_Item_File, p, label, NULL, _item_free);
-        file->path = eina_stringshare_add(path);
+        file = EVRY_ITEM_NEW(Evry_Item_File, p, label, NULL, evry_item_file_free);
+        file->path = eina_stringshare_add(path);
 
-        if (event == ECORE_FILE_EVENT_CREATED_DIRECTORY)
-          file->mime = eina_stringshare_ref(_mime_dir);
+        if (event == ECORE_FILE_EVENT_CREATED_DIRECTORY)
+          file->mime = eina_stringshare_ref(_mime_dir);
 
-        _item_fill(file);
-        p->files = eina_list_append(p->files, file);
-
-        break;
+        _item_fill(file);
+        p->files = eina_list_append(p->files, file);
+        break;
 
       case ECORE_FILE_EVENT_DELETED_FILE:
       case ECORE_FILE_EVENT_DELETED_DIRECTORY:
-        label = eina_stringshare_add(path);
+        label = eina_stringshare_add(path);
 
-        EINA_LIST_FOREACH_SAFE(p->files, l, ll, file)
-          {
-             if (file->path != label) continue;
+        EINA_LIST_FOREACH_SAFE (p->files, l, ll, file)
+          {
+             if (file->path != label) continue;
 
-             p->files = eina_list_remove_list(p->files, l);
+             p->files = eina_list_remove_list(p->files, l);
 
-             EVRY_ITEM_FREE(file);
-             break;
-          }
-        eina_stringshare_del(label);
-        break;
+             EVRY_ITEM_FREE(file);
+             break;
+          }
+        eina_stringshare_del(label);
+        break;
 
       default:
-        return;
+        return;
      }
 
    _files_filter(p);
@@ -548,55 +534,55 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it)
 
    if (it)
      {
-       const char *dir = NULL;
-
-       if ((CHECK_TYPE(it, EVRY_TYPE_FILE)) ||
-           (CHECK_SUBTYPE(it, EVRY_TYPE_FILE)))
-         {
-            /* browse */
-            GET_FILE(file, it);
-            if (!evry->file_path_get(file))
-              return NULL;
-
-            if (!ecore_file_is_dir(file->path))
-              {
-                 char *tmp = ecore_file_dir_get(file->path);
-                 dir = eina_stringshare_add(tmp);
-                 E_FREE(tmp);
-              }
-            else
-              {
-                 dir = eina_stringshare_add(file->path);
-              }
-         }
-       else
-         {
-            /* provide object */
-            if (!CHECK_TYPE(it, EVRY_TYPE_ACTION))
-              return NULL;
-         }
-
-       if (!dir)
-         dir = eina_stringshare_add(e_user_homedir_get());
-
-       EVRY_PLUGIN_INSTANCE(p, plugin);
-       p->directory = dir;
-       p->parent = EINA_FALSE;
-       p->min_query = 0;
-       _read_directory(p);
-
-       return EVRY_PLUGIN(p);
+        const char *dir = NULL;
+
+        if ((CHECK_TYPE(it, EVRY_TYPE_FILE)) ||
+            (CHECK_SUBTYPE(it, EVRY_TYPE_FILE)))
+          {
+             /* browse */
+             GET_FILE(file, it);
+             if (!evry->file_path_get(file))
+               return NULL;
+
+             if (!ecore_file_is_dir(file->path))
+               {
+                  char *tmp = ecore_file_dir_get(file->path);
+                  dir = eina_stringshare_add(tmp);
+                  E_FREE(tmp);
+               }
+             else
+               {
+                  dir = eina_stringshare_add(file->path);
+               }
+          }
+        else
+          {
+             /* provide object */
+             if (!CHECK_TYPE(it, EVRY_TYPE_ACTION))
+               return NULL;
+          }
+
+        if (!dir)
+          dir = eina_stringshare_add(e_user_homedir_get());
+
+        EVRY_PLUGIN_INSTANCE(p, plugin);
+        p->directory = dir;
+        p->parent = EINA_FALSE;
+        p->min_query = 0;
+        _read_directory(p);
+
+        return EVRY_PLUGIN(p);
      }
    else
      {
-       /* provide subject */
-       EVRY_PLUGIN_INSTANCE(p, plugin);
-       p->parent = EINA_FALSE;
-       p->directory = eina_stringshare_add(e_user_homedir_get());
-       p->min_query = plugin->config->min_query;
-       _read_directory(p);
-
-       return EVRY_PLUGIN(p);
+        /* provide subject */
+        EVRY_PLUGIN_INSTANCE(p, plugin);
+        p->parent = EINA_FALSE;
+        p->directory = eina_stringshare_add(e_user_homedir_get());
+        p->min_query = plugin->config->min_query;
+        _read_directory(p);
+
+        return EVRY_PLUGIN(p);
      }
 
    return NULL;
@@ -607,7 +593,7 @@ _folder_item_add(Plugin *p, const char *path, int prio)
 {
    Evry_Item_File *file;
 
-   file = EVRY_ITEM_NEW(Evry_Item_File, p, path, NULL, _item_free);
+   file = EVRY_ITEM_NEW(Evry_Item_File, p, path, NULL, evry_item_file_free);
    file->path = eina_stringshare_add(path);
    file->mime = eina_stringshare_ref(_mime_dir);
    EVRY_ITEM(file)->browseable = EINA_TRUE;
@@ -628,7 +614,7 @@ _free_files(Plugin *p)
      ecore_thread_cancel(p->thread);
    p->thread = NULL;
 
-   EINA_LIST_FREE(p->files, file)
+   EINA_LIST_FREE (p->files, file)
      EVRY_ITEM_FREE(file);
 
    if (p->dir_mon)
@@ -645,15 +631,11 @@ _finish(Evry_Plugin *plugin)
    IF_RELEASE(p->directory);
 
    if (p->thread)
-     {
-       ecore_thread_cancel(p->thread);
-       p->wait_finish = 1;
-       p->thread = NULL;
-     }
+     p->waiting_to_finish = 1;
 
    _free_files(p);
 
-   if (!p->wait_finish)
+   if (!p->waiting_to_finish)
      E_FREE(p);
 }
 
@@ -670,94 +652,94 @@ _fetch(Evry_Plugin *plugin, const char *input)
 
    if (!p->parent && input && !strncmp(input, "/", 1))
      {
-       char *path = NULL;
+        char *path = NULL;
 
-       if (p->command != CMD_SHOW_ROOT)
-         {
-            _free_files(p);
+        if (p->command != CMD_SHOW_ROOT)
+          {
+             _free_files(p);
 
-            IF_RELEASE(p->directory);
+             IF_RELEASE(p->directory);
 
-            if (path)
-              {
-                 p->directory = eina_stringshare_add(path);
-                 free(path);
-              }
-            else
-              {
-                 p->directory = eina_stringshare_add("/");
-              }
+             if (path)
+               {
+                  p->directory = eina_stringshare_add(path);
+                  free(path);
+               }
+             else
+               {
+                  p->directory = eina_stringshare_add("/");
+               }
 
-            _read_directory(p);
+             _read_directory(p);
 
-            p->command = CMD_SHOW_ROOT;
+             p->command = CMD_SHOW_ROOT;
 
-            return 0;
-         }
-       int len = strlen(p->directory);
-       len = (len == 1) ? len : len+1;
+             return 0;
+          }
+        int len = strlen(p->directory);
+        len = (len == 1) ? len : len + 1;
 
-       p->input = eina_stringshare_add(input + len);
+        p->input = eina_stringshare_add(input + len);
      }
    else if (p->directory && input && !strncmp(input, "..", 2))
      {
-       if (p->command != CMD_SHOW_PARENT)
-         {
-            char *dir;
-            char buf[PATH_MAX];
-            int prio = 0;
+        if (p->command != CMD_SHOW_PARENT)
+          {
+             char *dir;
+             char buf[PATH_MAX];
+             int prio = 0;
 
-            if (strncmp(p->directory, "/", 1))
-              return 0;
+             if (strncmp(p->directory, "/", 1))
+               return 0;
 
-            _free_files(p);
+             _free_files(p);
 
-            strncpy(buf, p->directory, PATH_MAX);
+             strncpy(buf, p->directory, PATH_MAX);
 
-            _folder_item_add(p, p->directory, prio++);
+             _folder_item_add(p, p->directory, prio++);
 
-            while (strlen(buf) > 1)
-              {
-                 buf[PATH_MAX - 1] = 0;
-                 dir = dirname(buf);
-                 _folder_item_add(p, dir, prio++);
-                 strncpy(buf, dir, PATH_MAX);
-              }
+             while (strlen(buf) > 1)
+               {
+                  buf[PATH_MAX - 1] = 0;
+                  dir = dirname(buf);
+                  _folder_item_add(p, dir, prio++);
+                  strncpy(buf, dir, PATH_MAX);
+               }
 
-            p->command = CMD_SHOW_PARENT;
-         }
-       return 1;
+             p->command = CMD_SHOW_PARENT;
+          }
+        return 1;
      }
    else if (p->directory && input && !strncmp(input, ".", 1))
      {
-       if (p->command != CMD_SHOW_HIDDEN)
-         {
-            _free_files(p);
+        if (p->command != CMD_SHOW_HIDDEN)
+          {
+             _free_files(p);
 
-            p->show_hidden = EINA_TRUE;
-            _read_directory(p);
+             p->show_hidden = EINA_TRUE;
+             _read_directory(p);
 
-            p->command = CMD_SHOW_HIDDEN;
+             p->command = CMD_SHOW_HIDDEN;
 
-            return 0;
-         }
-       p->input = eina_stringshare_add(input);
+             return 0;
+          }
+        p->input = eina_stringshare_add(input);
      }
    else if (p->command)
      {
-       /* clear command items */
-       _free_files(p);
+        /* clear command items */
+        _free_files(p);
 
-       if (p->command == CMD_SHOW_ROOT)
-         {
-            IF_RELEASE(p->directory);
-            p->directory = eina_stringshare_add(e_user_homedir_get());
-         }
+        if (p->command == CMD_SHOW_ROOT)
+          {
+             IF_RELEASE(p->directory);
+             p->directory = eina_stringshare_add(e_user_homedir_get());
+          }
 
-       p->command = CMD_NONE;
-       p->show_hidden = EINA_FALSE;
+        p->command = CMD_NONE;
+        p->show_hidden = EINA_FALSE;
 
-       _read_directory(p);
+        _read_directory(p);
      }
 
    if (input && !p->command)
@@ -766,7 +748,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
    if ((p->command) || (!p->min_query) || (len >= p->min_query))
      _files_filter(p);
 
-   return !!(EVRY_PLUGIN(p)->items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 /***************************************************************************/
@@ -785,11 +767,11 @@ _cb_sort_recent(const void *data1, const void *data2)
      return 1;
 
    if (it1->hi && it2->hi)
-     return (it1->hi->last_used > it2->hi->last_used ? -1 : 1);
+     return it1->hi->last_used > it2->hi->last_used ? -1 : 1;
 
    if (it1->fuzzy_match && it2->fuzzy_match)
      if (it1->fuzzy_match - it2->fuzzy_match)
-       return (it1->fuzzy_match - it2->fuzzy_match);
+       return it1->fuzzy_match - it2->fuzzy_match;
 
    return strcasecmp(it1->label, it2->label);
 }
@@ -804,42 +786,49 @@ _recentf_files_filter(Plugin *p)
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   EINA_LIST_FOREACH(p->files, l, it)
+   EINA_LIST_FOREACH (p->files, l, it)
      {
-       if (p->dirs_only && !it->browseable)
-         continue;
-
-       if (it->fuzzy_match <= 0)
-         {
-            if ((match = evry->fuzzy_match(it->label, p->input)) ||
-                (match = evry->fuzzy_match(EVRY_FILE(it)->path, p->input)))
-              it->fuzzy_match = match;
-            else
-              it->fuzzy_match = 0;
-
-            DBG("check match %d %s", it->fuzzy_match, it->label);
-         }
-
-       if (_conf->show_recent || it->fuzzy_match)
-         {
-            if (!it->browseable)
-              it->priority = 1;
-            new = eina_list_append(new, it);
-         }
+        if (p->dirs_only && !it->browseable)
+          continue;
+
+        if (!p->input)
+          {
+             if (!it->browseable)
+               it->priority = 1;
+             new = eina_list_append(new, it);
+             continue;
+          }
+
+        if (it->fuzzy_match <= 0)
+          {
+             if ((match = evry->fuzzy_match(it->label, p->input)) ||
+                 (match = evry->fuzzy_match(EVRY_FILE(it)->path, p->input)))
+               it->fuzzy_match = match;
+             else
+               it->fuzzy_match = 0;
+
+             DBG("check match %d %s", it->fuzzy_match, it->label);
+          }
+
+        if (it->fuzzy_match)
+          {
+             if (!it->browseable)
+               it->priority = 1;
+             new = eina_list_append(new, it);
+          }
      }
 
    new = eina_list_sort(new, -1, _cb_sort_recent);
 
-   EINA_LIST_FREE(new, it)
+   EINA_LIST_FREE (new, it)
      {
-       if (cnt++ < MAX_SHOWN)
-         EVRY_PLUGIN_ITEM_APPEND(p, it);
+        if (cnt++ < MAX_SHOWN)
+          EVRY_PLUGIN_ITEM_APPEND(p, it);
      }
 
    return cnt;
 }
 
-
 #if 0
 /* use thread only to not block ui for ecore_file_exists ... */
 
@@ -850,14 +839,14 @@ _recentf_func(void *data)
    Eina_List *l;
    Evry_Item_File *file;
 
-   EINA_LIST_FOREACH(d->files, l, file)
+   EINA_LIST_FOREACH (d->files, l, file)
      {
-       if ((!evry->file_path_get(file)) ||
-           (!ecore_file_exists(file->path)))
-         {
-            EVRY_ITEM(file)->hi->last_used -= ONE_DAY;
-            EVRY_ITEM(file)->hi = NULL;
-         }
+        if ((!evry->file_path_get(file)) ||
+            (!ecore_file_exists(file->path)))
+          {
+             EVRY_ITEM(file)->hi->last_used -= ONE_DAY;
+             EVRY_ITEM(file)->hi = NULL;
+          }
      }
 }
 
@@ -868,14 +857,12 @@ _recentf_cancel_func(void *data)
    Plugin *p = d->plugin;
    Evry_Item_File *file;
 
-   EINA_LIST_FREE(d->files, file)
-     {
-       EVRY_ITEM_FREE(file);
-     }
+   EINA_LIST_FREE (d->files, file)
+     EVRY_ITEM_FREE(file);
 
    E_FREE(d);
 
-   if (p->wait_finish)
+   if (p->waiting_to_finish)
      E_FREE(p);
 }
 
@@ -886,22 +873,22 @@ _recentf_end_func(void *data)
    Plugin *p = d->plugin;
    Evry_Item *it;
 
-   EINA_LIST_FREE(d->files, it)
+   EINA_LIST_FREE (d->files, it)
      {
-       GET_FILE(file, it);
+        GET_FILE(file, it);
 
-       if (!it->hi)
-         {
-            evry->item_free(it);
-            continue;
-         }
+        if (!it->hi)
+          {
+             evry->item_free(it);
+             continue;
+          }
 
-       _item_fill(file);
+        _item_fill(file);
 
-       if (!it->hi->data)
-         it->hi->data = eina_stringshare_ref(file->mime);
+        if (!it->hi->data)
+          it->hi->data = eina_stringshare_ref(file->mime);
 
-       p->files = eina_list_append(p->files, it);
+        p->files = eina_list_append(p->files, it);
      }
 
    _recentf_files_filter(p);
@@ -911,6 +898,7 @@ _recentf_end_func(void *data)
    p->thread = NULL;
    E_FREE(d);
 }
+
 #endif
 
 static Eina_Bool
@@ -927,11 +915,11 @@ _recentf_items_add_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *d
    const char *path;
    int match = 0;
 
-   EINA_LIST_FOREACH(he->items, l, hi2)
+   EINA_LIST_FOREACH (he->items, l, hi2)
      if (hi2->last_used > last_used)
        {
-         last_used = hi2->last_used;
-         hi = hi2;
+          last_used = hi2->last_used;
+          hi = hi2;
        }
 
    if (!hi)
@@ -939,17 +927,17 @@ _recentf_items_add_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *d
 
    if (clear_cache)
      {
-       DBG("clear %s", (char *)key);
+        DBG("clear %s", (char *)key);
 
-       /* transient marks them for deletion */
-       if (hi->count == 1)
-         {
-            hi->usage = 0;
-            hi->count = 0;
-            hi->transient = 1;
-         }
+        /* transient marks them for deletion */
+        if (hi->count == 1)
+          {
+             hi->usage = 0;
+             hi->count = 0;
+             hi->transient = 1;
+          }
 
-       return EINA_TRUE;
+        return EINA_TRUE;
      }
 
    if (hi->transient)
@@ -957,50 +945,50 @@ _recentf_items_add_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *d
 
    if (!_conf->search_cache)
      {
-       if ((hi->count == 1) && (hi->last_used < SIX_DAYS_AGO))
-         return EINA_TRUE;
+        if ((hi->count == 1) && (hi->last_used < SIX_DAYS_AGO))
+          return EINA_TRUE;
      }
 
-   path = (const char *) key;
+   path = (const char *)key;
 
    if (!(label = ecore_file_file_get(path)))
      return EINA_TRUE;
 
    path = eina_stringshare_add(path);
 
-   EINA_LIST_FOREACH(p->files, ll, file)
+   EINA_LIST_FOREACH (p->files, ll, file)
      {
-       if (file->path == path)
-         {
-            eina_stringshare_del(path);
-            EVRY_ITEM(file)->fuzzy_match = -1;
-            return EINA_TRUE;
-         }
+        if (file->path == path)
+          {
+             eina_stringshare_del(path);
+             EVRY_ITEM(file)->fuzzy_match = -1;
+             return EINA_TRUE;
+          }
      }
 
    /* searching subdirs */
    if (p->directory)
      {
-       /* dont show recent files from same dir */
-       int len = strlen(p->directory);
-       char *end = strrchr(path, '/');
-       if (strncmp(path, p->directory, len) ||
-           (end - path) <= len)
-         {
-            /* DBG("not in dir %s", path); */
-            eina_stringshare_del(path);
-            return EINA_TRUE;
-         }
+        /* dont show recent files from same dir */
+        int len = strlen(p->directory);
+        char *end = strrchr(path, '/');
+        if (strncmp(path, p->directory, len) ||
+            (end - path) <= len)
+          {
+             /* DBG("not in dir %s", path); */
+             eina_stringshare_del(path);
+             return EINA_TRUE;
+          }
      }
 
    if (!(match = evry->fuzzy_match(label, p->input)) &&
        !(match = evry->fuzzy_match(path, p->input)))
      {
-       eina_stringshare_del(path);
-       return EINA_TRUE;
+        eina_stringshare_del(path);
+        return EINA_TRUE;
      }
 
-   file = EVRY_ITEM_NEW(Evry_Item_File, p, label, NULL, _item_free);
+   file = EVRY_ITEM_NEW(Evry_Item_File, p, label, NULL, evry_item_file_free);
    file->path = path;
 
    if (hi->data)
@@ -1057,21 +1045,21 @@ _recentf_begin(Evry_Plugin *plugin, const Evry_Item *it)
 
    if (it)
      {
-       /* provide object */
+        /* provide object */
      }
    else
      {
-       /* provide subject */
-       p->min_query = plugin->config->min_query;
+        /* provide subject */
+        p->min_query = plugin->config->min_query;
 
-       if (clear_cache)
-         {
-            History_Types *ht = evry->history_types_get(EVRY_TYPE_FILE);
-            if (ht)
-              eina_hash_foreach(ht->types, _recentf_items_add_cb, p);
+        if (clear_cache)
+          {
+             History_Types *ht = evry->history_types_get(EVRY_TYPE_FILE);
+             if (ht)
+               eina_hash_foreach(ht->types, _recentf_items_add_cb, p);
 
-            clear_cache = EINA_FALSE;
-         }
+             clear_cache = EINA_FALSE;
+          }
      }
 
    return EVRY_PLUGIN(p);
@@ -1083,7 +1071,7 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input)
    GET_PLUGIN(p, plugin);
    Evry_Item_File *file;
    History_Types *ht;
-   int len = (input ? strlen(input) : 0);
+   size_t len = (input ? strlen(input) : 0);
 
    IF_RELEASE(p->input);
 
@@ -1092,30 +1080,30 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input)
     * p->thread = NULL; */
 
    if (input && isspace(input[len - 1]))
-     return !!(plugin->items);
+     return EVRY_PLUGIN_HAS_ITEMS(p);
 
    if (len >= plugin->config->min_query)
      {
-       if (input)
-         p->input = eina_stringshare_add(input);
-
-       if ((ht = evry->history_types_get(EVRY_TYPE_FILE)))
-         {
-            Data *d = E_NEW(Data, 1);
-            d->plugin = p;
-            eina_hash_foreach(ht->types, _recentf_items_add_cb, d);
-            EINA_LIST_FREE(d->files, file)
-              p->files = eina_list_append(p->files, file);
-            E_FREE(d);
-
-            _recentf_files_filter(p);
-
-            /* _recentf_end_func(d);
-             * p->thread = NULL; */
-            /* p->thread = ecore_thread_run(_recentf_func, _recentf_end_func,
-             *                                   _recentf_cancel_func, d); */
-         }
-       return !!(plugin->items);
+        if (input)
+          p->input = eina_stringshare_add(input);
+
+        if ((ht = evry->history_types_get(EVRY_TYPE_FILE)))
+          {
+             Data *d = E_NEW(Data, 1);
+             d->plugin = p;
+             eina_hash_foreach(ht->types, _recentf_items_add_cb, d);
+             EINA_LIST_FREE (d->files, file)
+               p->files = eina_list_append(p->files, file);
+             E_FREE(d);
+
+             _recentf_files_filter(p);
+
+             /* _recentf_end_func(d);
+              * p->thread = NULL; */
+             /* p->thread = ecore_thread_run(_recentf_func, _recentf_end_func,
+              *           _recentf_cancel_func, d); */
+          }
+        return EVRY_PLUGIN_HAS_ITEMS(p);
      }
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
@@ -1129,7 +1117,7 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input)
 static int
 _open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it)
 {
-   return (it->browseable && e_action_find("fileman"));
+   return it->browseable && e_action_find("fileman");
 }
 
 static int
@@ -1151,14 +1139,14 @@ _open_folder_action(Evry_Action *act)
 
    if (!IS_BROWSEABLE(file))
      {
-       dir = ecore_file_dir_get(file->path);
-       if (!dir) return 0;
-       action->func.go(E_OBJECT(m->data), dir);
-       free(dir);
+        dir = ecore_file_dir_get(file->path);
+        if (!dir) return 0;
+        action->func.go(E_OBJECT(m->data), dir);
+        free(dir);
      }
    else
      {
-       action->func.go(E_OBJECT(m->data), file->path);
+        action->func.go(E_OBJECT(m->data), file->path);
      }
 
    return 1;
@@ -1180,11 +1168,11 @@ _file_trash_action(Evry_Action *act)
 
    if (euri)
      {
-       ok = efreet_trash_delete_uri(euri, force);
-       efreet_uri_free(euri);
+        ok = efreet_trash_delete_uri(euri, force);
+        efreet_uri_free(euri);
      }
 
-   return (ok > 0);
+   return ok > 0;
 }
 
 static int
@@ -1216,11 +1204,11 @@ _file_copy_action(Evry_Action *act)
 
    if (EVRY_ITEM_DATA_INT_GET(act) == ACT_COPY)
      {
-       return ecore_file_cp(src->path, buf);
+        return ecore_file_cp(src->path, buf);
      }
    else if (EVRY_ITEM_DATA_INT_GET(act) == ACT_MOVE)
      {
-       return ecore_file_mv(src->path, buf);
+        return ecore_file_mv(src->path, buf);
      }
 
    return 0;
@@ -1233,37 +1221,36 @@ _sort_by_date(Plugin *p)
    Evry_Item_File *file;
    struct stat s;
 
-   EINA_LIST_FOREACH(p->files, l, file)
+   EINA_LIST_FOREACH (p->files, l, file)
      {
-       if (file->modified)
-         continue;
+        if (file->modified)
+          continue;
 
-       if (lstat(file->path, &s) == 0)
-         file->modified = s.st_mtime;
+        if (lstat(file->path, &s) == 0)
+          file->modified = s.st_mtime;
 
-       EVRY_ITEM(file)->usage = -1;
+        EVRY_ITEM(file)->usage = -1;
      }
 
    p->files = eina_list_sort(p->files, -1, _cb_sort_date);
    _files_filter(p);
 
    EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-
 }
+
 static void
 _sort_by_name(Plugin *p)
 {
    Eina_List *l;
    Evry_Item *it;
 
-   EINA_LIST_FOREACH(p->files, l, it)
+   EINA_LIST_FOREACH (p->files, l, it)
      it->usage = 0;
 
    p->files = eina_list_sort(p->files, -1, _cb_sort);
    _files_filter(p);
 
    EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-
 }
 
 static int
@@ -1274,11 +1261,11 @@ _file_sort_action(Evry_Action *act)
 
    if (EVRY_ITEM_DATA_INT_GET(act) == ACT_SORT_DATE)
      {
-       _sort_by_date(p);
+        _sort_by_date(p);
      }
    else
      {
-       _sort_by_name(p);
+        _sort_by_name(p);
      }
 
    return 0;
@@ -1291,118 +1278,121 @@ _cb_key_down(Evry_Plugin *plugin, const Ecore_Event_Key *ev)
 
    if (!strcmp(ev->key, "F1"))
      {
-       _sort_by_name(p);
-       return 1;
+        _sort_by_name(p);
+        return 1;
      }
    if (!strcmp(ev->key, "F2"))
      {
-       _sort_by_date(p);
-       return 1;
+        _sort_by_date(p);
+        return 1;
      }
 
    return 0;
 }
 
-
 static int
 _plugins_init(const Evry_API *api)
 {
    Evry_Action *act, *act_sort_date, *act_sort_name;
    Evry_Plugin *p;
    int prio = 0;
-
-   if (evry_module->active)
-     return EINA_TRUE;
+   const char *config_path;
 
    evry = api;
 
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
-   _mime_dir     = eina_stringshare_add("inode/directory");
-   _mime_mount   = eina_stringshare_add("inode/mountpoint");
+   config_path = eina_stringshare_add("launcher/everything-files");
+   _mime_dir = eina_stringshare_add("inode/directory");
+   _mime_mount = eina_stringshare_add("inode/mountpoint");
    _mime_unknown = eina_stringshare_add("unknown");
 
-#define ACTION_NEW(_name, _type2, _icon, _act, _check, _register)      \
-   act = EVRY_ACTION_NEW(_name, EVRY_TYPE_FILE, _type2, _icon, _act, _check); \
-   if (_register) evry->action_register(act, prio++);                  \
-   _actions = eina_list_append(_actions, act);                         \
+#define ACTION_NEW(_name, _type2, _icon, _act, _check, _register)            \
+  act = EVRY_ACTION_NEW(_name, EVRY_TYPE_FILE, _type2, _icon, _act, _check); \
+  if (_register) evry->action_register(act, prio++);                         \
+  _actions = eina_list_append(_actions, act);                                \
 
-   ACTION_NEW(N_("Copy To ..."), EVRY_TYPE_FILE, "go-next",
-             _file_copy_action, NULL, 1);
+   ACTION_NEW("Copy To ...", EVRY_TYPE_FILE, "go-next",
+              _file_copy_action, NULL, 1);
    act->it2.subtype = EVRY_TYPE_DIR;
    EVRY_ITEM_DATA_INT_SET(act, ACT_COPY);
 
-   ACTION_NEW(N_("Move To ..."), EVRY_TYPE_FILE, "go-next",
-             _file_copy_action, NULL, 1);
+   ACTION_NEW("Move To ...", EVRY_TYPE_FILE, "go-next",
+              _file_copy_action, NULL, 1);
    act->it2.subtype = EVRY_TYPE_DIR;
    EVRY_ITEM_DATA_INT_SET(act, ACT_MOVE);
 
-   ACTION_NEW(N_("Move to Trash"), 0, "user-trash",
-             _file_trash_action, NULL, 1);
+   ACTION_NEW("Move to Trash", 0, "user-trash",
+              _file_trash_action, NULL, 1);
    EVRY_ITEM_DATA_INT_SET(act, ACT_TRASH);
 
-   ACTION_NEW(N_("Open Folder (EFM)"), 0, "folder-open",
-             _open_folder_action, _open_folder_check, 1);
+   ACTION_NEW("Open Folder (EFM)", 0, "folder-open",
+              _open_folder_action, _open_folder_check, 1);
    act->remember_context = EINA_TRUE;
 
-   ACTION_NEW(N_("Sort by Date"), 0, "go-up",
-             _file_sort_action, NULL, 0);
+   ACTION_NEW("Sort by Date", 0, "go-up",
+              _file_sort_action, NULL, 0);
    EVRY_ITEM_DATA_INT_SET(act, ACT_SORT_DATE);
    act_sort_date = act;
 
-   ACTION_NEW(N_("Sort by Name"), 0, "go-up",
-             _file_sort_action, NULL, 0);
+   ACTION_NEW("Sort by Name", 0, "go-up",
+              _file_sort_action, NULL, 0);
    EVRY_ITEM_DATA_INT_SET(act, ACT_SORT_NAME);
    act_sort_name = act;
 
 #undef ACTION_NEW
 
-#define PLUGIN_NEW(_name, _icon, _begin, _finish, _fetch, _browse) \
-   p = EVRY_PLUGIN_NEW(Evry_Plugin, _name, _icon, EVRY_TYPE_FILE,  \
-                      _begin, _finish, _fetch, NULL);             \
-   p->browse = &_browse;                                          \
-   p->config_path = "extensions/everything-files";                \
-   _plugins = eina_list_append(_plugins, p);                      \
-
-
-   PLUGIN_NEW(N_("Files"), _module_icon, _begin, _finish, _fetch, _browse);
+   p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
+                        _begin, _finish, _fetch);
    p->input_type = EVRY_TYPE_FILE;
    p->cb_key_down = &_cb_key_down;
+   p->browse = &_browse;
+   p->config_path = eina_stringshare_ref(config_path);
    p->actions = eina_list_append(p->actions, act_sort_date);
    p->actions = eina_list_append(p->actions, act_sort_name);
+   _plugins = eina_list_append(_plugins, p);
+
    if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 2))
      p->config->min_query = 1;
 
-
-   PLUGIN_NEW(N_("Files"), _module_icon, _begin, _finish, _fetch, _browse);
+   p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
+                        _begin, _finish, _fetch);
    p->cb_key_down = &_cb_key_down;
+   p->browse = &_browse;
+   p->config_path = eina_stringshare_ref(config_path);
    p->actions = eina_list_append(p->actions, act_sort_date);
    p->actions = eina_list_append(p->actions, act_sort_name);
+   _plugins = eina_list_append(_plugins, p);
    evry->plugin_register(p, EVRY_PLUGIN_OBJECT, 2);
 
-   if (_conf->show_recent || _conf->search_recent)
+   if (!_conf->show_recent && !_conf->search_recent)
+     return EINA_TRUE;
+
+   p = EVRY_PLUGIN_BASE("Recent Files", _module_icon, EVRY_TYPE_FILE,
+                        _recentf_begin, _finish, _recentf_fetch);
+   p->browse = &_recentf_browse;
+   p->config_path = eina_stringshare_ref(config_path);
+
+   if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 3))
      {
-       PLUGIN_NEW(N_("Recent Files"), _module_icon,
-                  _recentf_begin, _finish, _recentf_fetch, _recentf_browse);
-
-       if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 3))
-         {
-            p->config->top_level = EINA_FALSE;
-            p->config->min_query = 3;
-         }
-
-       PLUGIN_NEW(N_("Recent Files"), _module_icon,
-                  _recentf_begin, _finish, _recentf_fetch, _recentf_browse);
-
-       if (evry->plugin_register(p, EVRY_PLUGIN_OBJECT, 3))
-         {
-            p->config->top_level = EINA_FALSE;
-            p->config->min_query = 3;
-         }
+        p->config->top_level = EINA_FALSE;
+        p->config->min_query = 3;
      }
+   _plugins = eina_list_append(_plugins, p);
+
+   p = EVRY_PLUGIN_BASE("Recent Files", _module_icon, EVRY_TYPE_FILE,
+                        _recentf_begin, _finish, _recentf_fetch);
+   p->browse = &_recentf_browse;
+   p->config_path = eina_stringshare_ref(config_path);
 
-#undef PLUGIN_NEW
+   if (evry->plugin_register(p, EVRY_PLUGIN_OBJECT, 3))
+     {
+        p->config->top_level = EINA_FALSE;
+        p->config->min_query = 3;
+     }
+   _plugins = eina_list_append(_plugins, p);
+   eina_stringshare_del(config_path);
 
    return EINA_TRUE;
 }
@@ -1413,45 +1403,39 @@ _plugins_shutdown(void)
    Evry_Action *act;
    Evry_Plugin *p;
 
-   if (!evry_module->active)
-     return;
-
    eina_stringshare_del(_mime_dir);
    eina_stringshare_del(_mime_mount);
    eina_stringshare_del(_mime_unknown);
 
-   EINA_LIST_FREE(_plugins, p)
+   EINA_LIST_FREE (_plugins, p)
      {
-       if (p->actions)
-         eina_list_free(p->actions);
-       EVRY_PLUGIN_FREE(p);
+        if (p->actions)
+          eina_list_free(p->actions);
+        EVRY_PLUGIN_FREE(p);
      }
 
-   EINA_LIST_FREE(_actions, act)
+   EINA_LIST_FREE (_actions, act)
      evry->action_free(act);
-
-   evry_module->active = EINA_FALSE;
 }
 
-
 /***************************************************************************/
 
 static E_Config_DD *conf_edd = NULL;
 
 struct _E_Config_Dialog_Data
 {
-  int show_homedir;
-  int show_recent;
-  int search_recent;
-  int search_cache;
-  int cache_dirs;
+   int show_homedir;
+   int show_recent;
+   int search_recent;
+   int search_cache;
+   int cache_dirs;
 };
 
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static void _fill_data(E_Config_Dialog_Data *cfdata);
+static void        *_create_data(E_Config_Dialog *cfd);
+static void         _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void         _fill_data(E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int          _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 static E_Config_Dialog *
 _conf_dialog(E_Container *con, const char *params __UNUSED__)
@@ -1470,7 +1454,7 @@ _conf_dialog(E_Container *con, const char *params __UNUSED__)
    v->basic.apply_cfdata = _basic_apply;
 
    cfd = e_config_dialog_new(con, _("Everything Files"), "everything-files",
-                            "extensions/everything-files", _module_icon, 0, v, NULL);
+                             "extensions/everything-files", _module_icon, 0, v, NULL);
 
    _conf->cfd = cfd;
    return cfd;
@@ -1493,44 +1477,43 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    e_widget_framelist_content_align_set(of, 0.0, 0.0);
 
    /* ow = e_widget_check_add(evas, _("Show home directory"),
-    *                     &(cfdata->show_homedir));
+    *          &(cfdata->show_homedir));
     * e_widget_framelist_object_append(of, ow); */
 
    ow = e_widget_check_add(evas, _("Show recent files"),
-                          &(cfdata->show_recent));
+                           &(cfdata->show_recent));
    e_widget_framelist_object_append(of, ow);
 
    ow = e_widget_check_add(evas, _("Search recent files"),
-                          &(cfdata->search_recent));
+                           &(cfdata->search_recent));
    e_widget_framelist_object_append(of, ow);
 
    ow = e_widget_check_add(evas, _("Search cached files"),
-                          &(cfdata->search_cache));
+                           &(cfdata->search_cache));
    e_widget_framelist_object_append(of, ow);
 
    ow = e_widget_check_add(evas, _("Cache visited directories"),
-                          &(cfdata->cache_dirs));
+                           &(cfdata->cache_dirs));
    e_widget_framelist_object_append(of, ow);
 
    ow = e_widget_button_add(evas, _("Clear cache"), NULL,
-                          _clear_cache_cb,
-                          NULL, NULL);
+                            _clear_cache_cb,
+                            NULL, NULL);
    e_widget_framelist_object_append(of, ow);
 
-
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    return o;
 }
 
 static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
-  {
-     E_Config_Dialog_Data *cfdata = NULL;
+{
+   E_Config_Dialog_Data *cfdata = NULL;
 
-     cfdata = E_NEW(E_Config_Dialog_Data, 1);
-     _fill_data(cfdata);
-     return cfdata;
-  }
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(cfdata);
+   return cfdata;
+}
 
 static void
 _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
@@ -1576,16 +1559,16 @@ _conf_new(void)
 #define IFMODCFG(v) if ((_conf->version & 0xffff) < v) {
 #define IFMODCFGEND }
 
-   /* setup defaults */
-   IFMODCFG(0x008d);
-   _conf->show_recent = 0;
-   _conf->show_homedir = 1;
-   _conf->search_recent = 1;
-   _conf->cache_dirs = 0;
-   _conf->search_cache = 0;
-   IFMODCFGEND;
+    /* setup defaults */
+    IFMODCFG(0x008d);
+    _conf->show_recent = 0;
+    _conf->show_homedir = 1;
+    _conf->search_recent = 1;
+    _conf->cache_dirs = 0;
+    _conf->search_cache = 0;
+    IFMODCFGEND;
 
-   _conf->version = MOD_CONFIG_FILE_VERSION;
+    _conf->version = MOD_CONFIG_FILE_VERSION;
 }
 
 static void
@@ -1602,7 +1585,7 @@ _conf_init(E_Module *m)
    snprintf(title, sizeof(title), "%s: %s", _("Everything Plugin"), _("Files"));
 
    e_configure_registry_item_add("launcher/everything-files", 110, title,
-                                NULL, _module_icon, _conf_dialog);
+                                 NULL, _module_icon, _conf_dialog);
 
    conf_edd = E_CONFIG_DD_NEW("Module_Config", Module_Config);
 
@@ -1621,10 +1604,10 @@ _conf_init(E_Module *m)
 
    _conf = e_config_domain_load("module.everything-files", conf_edd);
 
-   if (_conf && !e_util_module_config_check
-       (_("Everything Files"), _conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
-         _conf_free();
+   if (_conf && !e_util_module_config_check(_("Everything Files"),
+                                            _conf->version,
+                                            MOD_CONFIG_FILE_VERSION))
+     _conf_free();
 
    if (!_conf) _conf_new();
 
@@ -1635,7 +1618,7 @@ static void
 _conf_shutdown(void)
 {
    e_configure_registry_item_del("launcher/everything-files");
-   
+
    E_FREE(_conf);
    E_CONFIG_DD_FREE(conf_edd);
 }
@@ -1665,3 +1648,4 @@ evry_plug_files_save(void)
 {
    e_config_domain_save("module.everything-files", conf_edd, _conf);
 }
+
index e8be787..81f7186 100644 (file)
@@ -1,23 +1,23 @@
 #include "e.h"
 #include "evry_api.h"
 
-typedef struct _Plugin Plugin;
+typedef struct _Plugin        Plugin;
 typedef struct _Settings_Item Settings_Item;
 
 struct _Plugin
 {
-  Evry_Plugin base;
-  Eina_List  *items;
-  Eina_List  *categories;
-  Eina_Bool   parent;
+   Evry_Plugin base;
+   Eina_List  *items;
+   Eina_List  *categories;
+   Eina_Bool   parent;
 };
 
 struct _Settings_Item
 {
-  Evry_Item base;
-  
-  E_Configure_Cat *ecat;
-  E_Configure_It *eci;  
+   Evry_Item        base;
+
+   E_Configure_Cat *ecat;
+   E_Configure_It  *eci;
 };
 
 static const Evry_API *evry = NULL;
@@ -31,33 +31,30 @@ _finish(Evry_Plugin *plugin)
 {
    Settings_Item *it;
    GET_PLUGIN(p, plugin);
-     
+
    EVRY_PLUGIN_ITEMS_CLEAR(p);
-   
-   EINA_LIST_FREE(p->items, it)
+
+   EINA_LIST_FREE (p->items, it)
      EVRY_ITEM_FREE(it);
 
-   EINA_LIST_FREE(p->categories, it)
+   EINA_LIST_FREE (p->categories, it)
      EVRY_ITEM_FREE(it);
 
    E_FREE(p);
 }
 
 static Evas_Object *
-_icon_get(Evry_Item *item, Evas *e)
+_icon_get(Evry_Item *item, Evas *e __UNUSED__)
 {
-   Evas_Object *o;
-   Settings_Item *it = (Settings_Item *) item;
-   
-   if (it->eci && it->eci->icon &&
-       ((o = evry->icon_theme_get(it->eci->icon, e)) ||
-       (o = e_util_icon_add(it->eci->icon, e))))
-     return o;
-
-   if (it->ecat->icon &&
-       ((o = evry->icon_theme_get(it->ecat->icon, e)) ||
-       (o = e_util_icon_add(it->ecat->icon, e))))
-     return o;
+   Settings_Item *it = (Settings_Item *)item;
+
+   if (!item->icon)
+     {
+        if (it->eci && it->eci->icon)
+          item->icon = eina_stringshare_add(it->eci->icon);
+        else if (it->ecat->icon)
+          item->icon = eina_stringshare_add(it->ecat->icon);
+     }
 
    return NULL;
 }
@@ -72,22 +69,22 @@ _browse(Evry_Plugin *plugin, const Evry_Item *item)
    if (!CHECK_TYPE(item, E_SETTINGS))
      return NULL;
 
-   it = (Settings_Item *) item;
-     
+   it = (Settings_Item *)item;
+
    EVRY_PLUGIN_INSTANCE(p, plugin);
    p->parent = EINA_TRUE;
-   
+
    GET_PLUGIN(parent, item->plugin);
-   
-   EINA_LIST_FOREACH(parent->items, l, it2)
+
+   EINA_LIST_FOREACH (parent->items, l, it2)
      {
-       if (it2->ecat == it->ecat)
-         {
-            EVRY_ITEM_REF(it2);
-            p->items = eina_list_append(p->items, it2);
-         }
+        if (it2->ecat == it->ecat)
+          {
+             EVRY_ITEM_REF(it2);
+             p->items = eina_list_append(p->items, it2);
+          }
      }
-   
+
    return EVRY_PLUGIN(p);
 }
 
@@ -97,51 +94,51 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
    Plugin *p;
 
    EVRY_PLUGIN_INSTANCE(p, plugin);
-   
+
    return EVRY_PLUGIN(p);
 }
 
 static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
-   int len = input ? strlen(input) : 0;
-   
+   size_t len = input ? strlen(input) : 0;
+
    GET_PLUGIN(p, plugin);
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
-   
+
    if ((!p->parent) && (len < plugin->config->min_query))
      return 0;
-   
+
    if (!p->categories && !p->items)
      {
-       Settings_Item *it;
-       Eina_List *l, *ll;
-       E_Configure_Cat *ecat;
-       E_Configure_It *eci;
-
-       EINA_LIST_FOREACH(e_configure_registry, l, ecat)
-         {
-            if ((ecat->pri < 0) || (!ecat->items)) continue;
-            if (!strcmp(ecat->cat, "system")) continue;
-
-            it = EVRY_ITEM_NEW(Settings_Item, p, ecat->label, _icon_get, NULL);
-            it->ecat = ecat;
-            EVRY_ITEM(it)->browseable = EINA_TRUE;
-            p->categories = eina_list_append(p->categories, it);
-       
-            EINA_LIST_FOREACH(ecat->items, ll, eci)
-              {
-                 if (eci->pri < 0) continue;
-
-                 it = EVRY_ITEM_NEW(Settings_Item, p, eci->label, _icon_get, NULL);
-                 it->eci = eci;
-                 it->ecat = ecat;
-                 EVRY_ITEM_DETAIL_SET(it, ecat->label);
-   
-                 p->items = eina_list_append(p->items, it);
-              }
-         }
+        Settings_Item *it;
+        Eina_List *l, *ll;
+        E_Configure_Cat *ecat;
+        E_Configure_It *eci;
+
+        EINA_LIST_FOREACH (e_configure_registry, l, ecat)
+          {
+             if ((ecat->pri < 0) || (!ecat->items)) continue;
+             if (!strcmp(ecat->cat, "system")) continue;
+
+             it = EVRY_ITEM_NEW(Settings_Item, p, ecat->label, _icon_get, NULL);
+             it->ecat = ecat;
+             EVRY_ITEM(it)->browseable = EINA_TRUE;
+             p->categories = eina_list_append(p->categories, it);
+
+             EINA_LIST_FOREACH (ecat->items, ll, eci)
+               {
+                  if (eci->pri < 0) continue;
+
+                  it = EVRY_ITEM_NEW(Settings_Item, p, eci->label, _icon_get, NULL);
+                  it->eci = eci;
+                  it->ecat = ecat;
+                  EVRY_ITEM_DETAIL_SET(it, ecat->label);
+
+                  p->items = eina_list_append(p->items, it);
+               }
+          }
      }
 
    EVRY_PLUGIN_ITEMS_ADD(p, p->categories, input, 1, 1);
@@ -149,13 +146,13 @@ _fetch(Evry_Plugin *plugin, const char *input)
    if (input || p->parent)
      EVRY_PLUGIN_ITEMS_ADD(p, p->items, input, 1, 1);
 
-   return !!(plugin->items);
+   return EVRY_PLUGIN_HAS_ITEMS(p);
 }
 
 static int
 _action_check(Evry_Action *act __UNUSED__, const Evry_Item *item)
 {
-   return !!(((Settings_Item*)item)->eci);
+   return !!(((Settings_Item *)item)->eci);
 }
 
 static int
@@ -164,7 +161,7 @@ _action(Evry_Action *act)
    char buf[1024];
    Settings_Item *it;
 
-   it = (Settings_Item *) act->it1.item;
+   it = (Settings_Item *)act->it1.item;
 
    snprintf(buf, sizeof(buf), "%s/%s", it->ecat->cat, it->eci->item);
 
@@ -175,28 +172,21 @@ _action(Evry_Action *act)
 
 static int
 _plugins_init(const Evry_API *_api)
-{   
-   if (evry_module->active) 
-     return EINA_TRUE;
-
+{
    evry = _api;
-   
+
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
    E_SETTINGS = evry->type_register("E_SETTINGS");
-   
-   p = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Settings"),
-                      "configure", E_SETTINGS,
-                      _begin, _finish, _fetch, NULL);
+
+   p = EVRY_PLUGIN_BASE("Settings", "configure", E_SETTINGS, _begin, _finish, _fetch);
    p->browse = &_browse;
    evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 10);
 
-   act = EVRY_ACTION_NEW(N_("Show Dialog"), E_SETTINGS, 0,
-                        "preferences-advanced", _action, _action_check);
+   act = EVRY_ACTION_NEW("Show Dialog", E_SETTINGS, 0,
+                         "preferences-advanced", _action, _action_check);
 
-   /* p->actions = eina_list_append(p->actions, act); */
-   
    evry->action_register(act, 0);
 
    return EINA_TRUE;
@@ -205,16 +195,11 @@ _plugins_init(const Evry_API *_api)
 static void
 _plugins_shutdown(void)
 {
-   if (!evry_module->active) return;
-   
    EVRY_PLUGIN_FREE(p);
 
    EVRY_ACTION_FREE(act);
-
-   evry_module->active = EINA_FALSE;
 }
 
-
 /***************************************************************************/
 
 Eina_Bool
@@ -235,3 +220,4 @@ evry_plug_settings_shutdown(void)
 
 void
 evry_plug_settings_save(void){}
+
index 660bc02..5dfc9ee 100644 (file)
@@ -4,7 +4,7 @@ typedef struct _Plugin Plugin;
 
 struct _Plugin
 {
-  Evry_Plugin base;
+   Evry_Plugin base;
 };
 
 static Evry_Plugin *p1, *p2;
@@ -15,7 +15,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
    Plugin *p;
 
    EVRY_PLUGIN_INSTANCE(p, plugin);
-   
+
    return EVRY_PLUGIN(p);
 }
 
@@ -23,7 +23,7 @@ static void
 _finish(Evry_Plugin *plugin)
 {
    GET_PLUGIN(p, plugin);
-   
+
    EVRY_PLUGIN_ITEMS_FREE(p);
    E_FREE(p);
 }
@@ -32,55 +32,54 @@ static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
    Evry_Item *it;
-   
+
    GET_PLUGIN(p, plugin);
 
    if (input)
      {
-       if (!p->base.items)
-         {
-            it = evry_item_new(NULL, EVRY_PLUGIN(p), input, NULL, NULL);
-            it->fuzzy_match = 999;
-            EVRY_PLUGIN_ITEM_APPEND(p, it);
-         }
-       else
-         {
-            it = p->base.items->data;
-            EVRY_ITEM_LABEL_SET(it, input);
-            evry_item_changed(it, 0, 0);
-         }
-       return 1;
+        if (!p->base.items)
+          {
+             it = evry_item_new(NULL, EVRY_PLUGIN(p), input, NULL, NULL);
+             it->fuzzy_match = 999;
+             EVRY_PLUGIN_ITEM_APPEND(p, it);
+          }
+        else
+          {
+             it = p->base.items->data;
+             EVRY_ITEM_LABEL_SET(it, input);
+             evry_item_changed(it, 0, 0);
+          }
+        return 1;
      }
+
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
    return 0;
 }
 
 Eina_Bool
 evry_plug_text_init(void)
 {
-   p1 = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Text"),
-                       "accessories-text-editor", EVRY_TYPE_TEXT,
-                       _begin, _finish, _fetch, NULL);
+   p1 = EVRY_PLUGIN_BASE("Text", "accessories-text-editor",
+                         EVRY_TYPE_TEXT, _begin, _finish, _fetch);
 
-   p2 = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Text"),
-                       "accessories-text-editor", EVRY_TYPE_TEXT,
-                       _begin, _finish, _fetch, NULL);
+   p2 = EVRY_PLUGIN_BASE("Text", "accessories-text-editor",
+                         EVRY_TYPE_TEXT, _begin, _finish, _fetch);
 
-   if (evry_plugin_register(p1, EVRY_PLUGIN_OBJECT,999))
+   if (evry_plugin_register(p1, EVRY_PLUGIN_OBJECT, 999))
      {
-       /* p1->config->trigger_only = 1; */
-       p1->config->trigger = eina_stringshare_add(" ");
-       p1->config->aggregate = EINA_FALSE;
-       p1->config->top_level = EINA_FALSE;
-       p1->config->view_mode = VIEW_MODE_LIST;
+        p1->config->trigger = eina_stringshare_add(" ");
+        p1->config->aggregate = EINA_FALSE;
+        p1->config->top_level = EINA_FALSE;
+        p1->config->view_mode = VIEW_MODE_LIST;
      }
 
    if (evry_plugin_register(p2, EVRY_PLUGIN_SUBJECT, 999))
      {
-       /* p2->config->trigger_only = 1; */
-       p2->config->trigger = eina_stringshare_add(" ");
-       p2->config->aggregate = EINA_FALSE;
-       p2->config->top_level = EINA_FALSE;
-       p2->config->view_mode = VIEW_MODE_LIST;
+        p2->config->trigger = eina_stringshare_add(" ");
+        p2->config->aggregate = EINA_FALSE;
+        p2->config->top_level = EINA_FALSE;
+        p2->config->view_mode = VIEW_MODE_LIST;
      }
 
    return EINA_TRUE;
@@ -92,3 +91,4 @@ evry_plug_text_shutdown(void)
    EVRY_PLUGIN_FREE(p1);
    EVRY_PLUGIN_FREE(p2);
 }
+
index fe6f0b9..be93091 100644 (file)
@@ -1,31 +1,29 @@
 #include "e.h"
 #include "evry_api.h"
 
-#define BORDER_SHOW            1
-#define BORDER_HIDE            2
-#define BORDER_FULLSCREEN      3
-#define BORDER_TODESK          4
-#define BORDER_CLOSE           5
+#define BORDER_SHOW       1
+#define BORDER_HIDE       2
+#define BORDER_FULLSCREEN 3
+#define BORDER_TODESK     4
+#define BORDER_CLOSE      5
 
-typedef struct _Plugin Plugin;
+typedef struct _Plugin      Plugin;
 typedef struct _Border_Item Border_Item;
 
 struct _Plugin
 {
-  Evry_Plugin base;
-  Eina_List *borders;
-  Eina_List *handlers;
-  const char *input;
+   Evry_Plugin base;
+   Eina_List  *borders;
+   Eina_List  *handlers;
+   const char *input;
 };
 
 struct _Border_Item
 {
-  Evry_Item base;
-  E_Border *border;
+   Evry_Item base;
+   E_Border *border;
 };
 
-#define GET_BORDER(_bd, _it) Border_Item *_bd = (Border_Item *)_it;
-
 static const Evry_API *evry = NULL;
 static Evry_Module *evry_module = NULL;
 static Evry_Plugin *_plug;
@@ -35,6 +33,8 @@ static Evas_Object *_icon_get(Evry_Item *it, Evas *e);
 
 /***************************************************************************/
 
+#define GET_BORDER(_bd, _it) Border_Item * _bd = (Border_Item *)_it;
+
 static void
 _border_item_free(Evry_Item *it)
 {
@@ -56,10 +56,12 @@ _border_item_add(Plugin *p, E_Border *bd)
    if (bd->client.netwm.state.skip_pager)
      return 0;
 
-   bi = EVRY_ITEM_NEW(Border_Item, p, e_border_name_get(bd), _icon_get, _border_item_free);
+   bi = EVRY_ITEM_NEW(Border_Item, p, e_border_name_get(bd),
+                      _icon_get, _border_item_free);
+
    snprintf(buf, sizeof(buf), "%d:%d %s",
-           bd->desk->x, bd->desk->y,
-           (bd->desktop ? bd->desktop->name : ""));
+            bd->desk->x, bd->desk->y,
+            (bd->desktop ? bd->desktop->name : ""));
    EVRY_ITEM_DETAIL_SET(bi, buf);
 
    bi->border = bd;
@@ -71,75 +73,68 @@ _border_item_add(Plugin *p, E_Border *bd)
 }
 
 static Eina_Bool
-_cb_border_remove(void *data, __UNUSED__ int type,  void *event)
+_cb_border_remove(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev = event;
    Border_Item *bi;
    Eina_List *l;
    Plugin *p = data;
 
-   EINA_LIST_FOREACH(p->borders, l, bi)
+   EINA_LIST_FOREACH (p->borders, l, bi)
      if (bi->border == ev->border)
        break;
 
    if (!bi) return ECORE_CALLBACK_PASS_ON;
 
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
    p->borders = eina_list_remove(p->borders, bi);
-   p->base.items = eina_list_remove(p->base.items, bi);
    EVRY_ITEM_FREE(bi);
 
+   EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0);
+
    EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
 
    return ECORE_CALLBACK_PASS_ON;
 }
+
 static Eina_Bool
-_cb_border_add(void *data, __UNUSED__ int type,  void *event)
+_cb_border_add(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev = event;
    Plugin *p = data;
-   unsigned int min;
 
    if (!_border_item_add(p, ev->border))
      return ECORE_CALLBACK_PASS_ON;
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   min = EVRY_PLUGIN(p)->config->min_query;
-
-   if ((!p->input && (min == 0)) ||
-       (p->input && (strlen(p->input) >= min)))
-     {
-       EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0);
+   EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0);
 
-       EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-     }
+   EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
 
    return ECORE_CALLBACK_PASS_ON;
 }
 
-static void
-_get_borderlist(Plugin *p)
+static Evry_Plugin *
+_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 {
+   Plugin *p;
    E_Border *bd;
    Eina_List *l;
 
+   EVRY_PLUGIN_INSTANCE(p, plugin);
+
    p->handlers = eina_list_append
-     (p->handlers, ecore_event_handler_add
-      (E_EVENT_BORDER_REMOVE, _cb_border_remove, p));
+       (p->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_REMOVE, _cb_border_remove, p));
 
    p->handlers = eina_list_append
-     (p->handlers, ecore_event_handler_add
-      (E_EVENT_BORDER_ADD, _cb_border_add, p));
+       (p->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ADD, _cb_border_add, p));
 
-   EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
+   EINA_LIST_FOREACH (e_border_focus_stack_get(), l, bd)
      _border_item_add(p, bd);
-}
-
-static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
-{
-   Plugin *p;
-   EVRY_PLUGIN_INSTANCE(p, plugin);
 
    return EVRY_PLUGIN(p);
 }
@@ -156,10 +151,10 @@ _finish(Evry_Plugin *plugin)
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   EINA_LIST_FREE(p->borders, bi)
+   EINA_LIST_FREE (p->borders, bi)
      EVRY_ITEM_FREE(bi);
 
-   EINA_LIST_FREE(p->handlers, h)
+   EINA_LIST_FREE (p->handlers, h)
      ecore_event_handler_del(h);
 
    E_FREE(p);
@@ -168,26 +163,21 @@ _finish(Evry_Plugin *plugin)
 static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
-   int len = (input ? strlen(input) : 0);
-
    GET_PLUGIN(p, plugin);
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
-   if (len >= plugin->config->min_query)
-     {
-       IF_RELEASE(p->input);
-
-       if (input)
-         p->input = eina_stringshare_add(input);
+   EVRY_PLUGIN_MIN_QUERY(p, input)
+   {
+      IF_RELEASE(p->input);
 
-       if (!p->handlers)
-         _get_borderlist(p);
+      if (input)
+        p->input = eina_stringshare_add(input);
 
-       EVRY_PLUGIN_ITEMS_ADD(p, p->borders, input, 1, 0);
-     }
+      return EVRY_PLUGIN_ITEMS_ADD(p, p->borders, input, 1, 0);
+   }
 
-   return !!(p->base.items);
+   return 0;
 }
 
 static Evas_Object *
@@ -200,71 +190,91 @@ _icon_get(Evry_Item *it, Evas *e)
 
    if (bd->internal)
      {
-       o = edje_object_add(e);
-       if (!bd->internal_icon)
-         e_util_edje_icon_set(o, "enlightenment/e");
-       else if (!bd->internal_icon_key)
-         {
-            char *ext;
-            ext = strrchr(bd->internal_icon, '.');
-            if ((ext) && ((!strcmp(ext, ".edj"))))
-              {
-                 if (!edje_object_file_set(o, bd->internal_icon, "icon"))
-                   e_util_edje_icon_set(o, "enlightenment/e");
-              }
-            else if (ext)
-              {
-                 evas_object_del(o);
-                 o = e_icon_add(e);
-                 e_icon_file_set(o, bd->internal_icon);
-              }
-            else
-              {
-                 if (!e_util_edje_icon_set(o, bd->internal_icon))
-                   e_util_edje_icon_set(o, "enlightenment/e");
-              }
-         }
-       else
-         {
-            edje_object_file_set(o, bd->internal_icon,
-                                 bd->internal_icon_key);
-         }
-       return o;
+        if (!bd->internal_icon)
+          {
+             o = e_icon_add(e);
+             e_util_icon_theme_set(o, "enlightenment");
+          }
+        else if (!bd->internal_icon_key)
+          {
+             char *ext;
+             ext = strrchr(bd->internal_icon, '.');
+             if ((ext) && ((!strcmp(ext, ".edj"))))
+               {
+                  o = edje_object_add(e);
+                  if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+                    e_util_icon_theme_set(o, "enlightenment");
+               }
+             else if (ext)
+               {
+                  o = e_icon_add(e);
+                  e_icon_file_set(o, bd->internal_icon);
+               }
+             else
+               {
+                  o = e_icon_add(e);
+                  e_icon_scale_size_set(o, 128);
+                  if (!e_util_icon_theme_set(o, bd->internal_icon))
+                    e_util_icon_theme_set(o, "enlightenment");
+               }
+          }
+        else
+          {
+             o = edje_object_add(e);
+             edje_object_file_set(o, bd->internal_icon, bd->internal_icon_key);
+          }
+
+        return o;
+     }
+
+   if (bd->client.netwm.icons)
+     {
+        if (e_config->use_app_icon)
+          goto _use_netwm_icon;
+
+        if (bd->remember && (bd->remember->prop.icon_preference == E_ICON_PREF_NETWM))
+          goto _use_netwm_icon;
      }
 
-   if (!o && bd->desktop)
-     o = e_util_desktop_icon_add(bd->desktop, 128, e);
+   if (bd->desktop)
+     {
+        o = e_util_desktop_icon_add(bd->desktop, 128, e);
+        if (o) return o;
+     }
 
-   if (!o && bd->client.netwm.icons)
+_use_netwm_icon:
+   if (bd->client.netwm.icons)
      {
-       int i, size, tmp, found = 0;
-       o = e_icon_add(e);
-
-       size = bd->client.netwm.icons[0].width;
-
-       for (i = 1; i < bd->client.netwm.num_icons; i++)
-         {
-            if ((tmp = bd->client.netwm.icons[i].width) > size)
-              {
-                 size = tmp;
-                 found = i;
-              }
-         }
-
-       e_icon_data_set(o, bd->client.netwm.icons[found].data,
-                       bd->client.netwm.icons[found].width,
-                       bd->client.netwm.icons[found].height);
-       e_icon_alpha_set(o, 1);
-       return o;
+        int i, size, tmp, found = 0;
+        o = e_icon_add(e);
+
+        size = bd->client.netwm.icons[0].width;
+
+        for (i = 1; i < bd->client.netwm.num_icons; i++)
+          {
+             if ((tmp = bd->client.netwm.icons[i].width) > size)
+               {
+                  size = tmp;
+                  found = i;
+               }
+          }
+
+        e_icon_data_set(o, bd->client.netwm.icons[found].data,
+                        bd->client.netwm.icons[found].width,
+                        bd->client.netwm.icons[found].height);
+        e_icon_alpha_set(o, 1);
+        return o;
      }
 
-   if (!o)
-     o = e_border_icon_add(bd, e);
+   o = e_border_icon_add(bd, e);
+   if (o) return o;
+
+   o = edje_object_add(e);
+   e_util_icon_theme_set(o, "unknown");
 
    return o;
 }
 
-
 /***************************************************************************/
 
 static int
@@ -278,36 +288,36 @@ _check_border(Evry_Action *act, const Evry_Item *it)
 
    if (!bd)
      {
-       ERR("no border");
-       return 0;
+        ERR("no border");
+        return 0;
      }
 
    switch (action)
      {
       case BORDER_CLOSE:
-        if (bd->lock_close)
-          return 0;
-        break;
+        if (bd->lock_close)
+          return 0;
+        break;
 
       case BORDER_SHOW:
-        if (bd->lock_focus_in)
-          return 0;
-        break;
+        if (bd->lock_focus_in)
+          return 0;
+        break;
 
       case BORDER_HIDE:
-        if (bd->lock_user_iconify)
-          return 0;
-        break;
+        if (bd->lock_user_iconify)
+          return 0;
+        break;
 
       case BORDER_FULLSCREEN:
-        if (!bd->lock_user_fullscreen)
-          return 0;
-        break;
+        if (!bd->lock_user_fullscreen)
+          return 0;
+        break;
 
       case BORDER_TODESK:
-        if (bd->desk == (e_desk_current_get(zone)))
-          return 0;
-        break;
+        if (bd->desk == (e_desk_current_get(zone)))
+          return 0;
+        break;
      }
 
    return 1;
@@ -325,77 +335,78 @@ _act_border(Evry_Action *act)
 
    if (!bd)
      {
-       ERR("no border");
-       return 0;
+        ERR("no border");
+        return 0;
      }
 
    switch (action)
      {
       case BORDER_CLOSE:
-       e_border_act_close_begin(bd);
-       break;
+        e_border_act_close_begin(bd);
+        break;
 
       case BORDER_SHOW:
-        if (bd->desk != (e_desk_current_get(zone)))
-          e_desk_show(bd->desk);
-        focus = 1;
-        break;
+        if (bd->desk != (e_desk_current_get(zone)))
+          e_desk_show(bd->desk);
+        focus = 1;
+        break;
 
       case BORDER_HIDE:
-        e_border_iconify(bd);
-        break;
+        e_border_iconify(bd);
+        break;
 
       case BORDER_FULLSCREEN:
-        if (!bd->fullscreen)
-          e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
-        else
-          e_border_unfullscreen(bd);
-        break;
+        if (!bd->fullscreen)
+          e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
+        else
+          e_border_unfullscreen(bd);
+        break;
 
       case BORDER_TODESK:
-        if (bd->desk != (e_desk_current_get(zone)))
-          e_border_desk_set(bd, e_desk_current_get(zone));
-        focus = 1;
-        break;
+        if (bd->desk != (e_desk_current_get(zone)))
+          e_border_desk_set(bd, e_desk_current_get(zone));
+        focus = 1;
+        break;
+
       default:
-        break;
+        break;
      }
 
    if (focus)
      {
-       if (bd->shaded)
-         e_border_unshade(bd, E_DIRECTION_UP);
-
-       if (bd->iconic)
-         e_border_uniconify(bd);
-       else
-         e_border_raise(bd);
-
-       if (!bd->lock_focus_out)
-         {
-            e_border_focus_set(bd, 1, 1);
-            e_border_focus_latest_set(bd);
-         }
-
-       if ((e_config->focus_policy != E_FOCUS_CLICK) ||
-           (e_config->winlist_warp_at_end) ||
-           (e_config->winlist_warp_while_selecting))
-         {
-            int warp_to_x = bd->x + (bd->w / 2);
-            if (warp_to_x < (bd->zone->x + 1))
-              warp_to_x = bd->zone->x + ((bd->x + bd->w - bd->zone->x) / 2);
-            else if (warp_to_x >= (bd->zone->x + bd->zone->w - 1))
-              warp_to_x = (bd->zone->x + bd->zone->w + bd->x) / 2;
-
-            int warp_to_y = bd->y + (bd->h / 2);
-            if (warp_to_y < (bd->zone->y + 1))
-              warp_to_y = bd->zone->y + ((bd->y + bd->h - bd->zone->y) / 2);
-            else if (warp_to_y >= (bd->zone->y + bd->zone->h - 1))
-              warp_to_y = (bd->zone->y + bd->zone->h + bd->y) / 2;
-
-            ecore_x_pointer_warp(bd->zone->container->win, warp_to_x, warp_to_y);
-         }
-       /* e_border_focus_set_with_pointer(bd); */
+        if (bd->shaded)
+          e_border_unshade(bd, E_DIRECTION_UP);
+
+        if (bd->iconic)
+          e_border_uniconify(bd);
+        else
+          e_border_raise(bd);
+
+        if (!bd->lock_focus_out)
+          {
+             e_border_focus_set(bd, 1, 1);
+             e_border_focus_latest_set(bd);
+          }
+
+        if ((e_config->focus_policy != E_FOCUS_CLICK) ||
+            (e_config->winlist_warp_at_end) ||
+            (e_config->winlist_warp_while_selecting))
+          {
+             int warp_to_x = bd->x + (bd->w / 2);
+             if (warp_to_x < (bd->zone->x + 1))
+               warp_to_x = bd->zone->x + ((bd->x + bd->w - bd->zone->x) / 2);
+             else if (warp_to_x >= (bd->zone->x + bd->zone->w - 1))
+               warp_to_x = (bd->zone->x + bd->zone->w + bd->x) / 2;
+
+             int warp_to_y = bd->y + (bd->h / 2);
+             if (warp_to_y < (bd->zone->y + 1))
+               warp_to_y = bd->zone->y + ((bd->y + bd->h - bd->zone->y) / 2);
+             else if (warp_to_y >= (bd->zone->y + bd->zone->h - 1))
+               warp_to_y = (bd->zone->y + bd->zone->h + bd->y) / 2;
+
+             ecore_x_pointer_warp(bd->zone->container->win, warp_to_x, warp_to_y);
+          }
+        /* e_border_focus_set_with_pointer(bd); */
      }
 
    return 1;
@@ -406,53 +417,48 @@ _plugins_init(const Evry_API *_api)
 {
    Evry_Action *act;
 
-   if (evry_module->active)
-     return EINA_TRUE;
-
    evry = _api;
 
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
-   _plug = EVRY_PLUGIN_NEW(Plugin, N_("Windows"),
-                          "preferences-system-windows",
-                          EVRY_TYPE_BORDER,
-                          _begin, _finish, _fetch, NULL);
+   _plug = EVRY_PLUGIN_BASE("Windows", "preferences-system-windows",
+                            EVRY_TYPE_BORDER, _begin, _finish, _fetch);
    _plug->transient = EINA_TRUE;
    evry->plugin_register(_plug, EVRY_PLUGIN_SUBJECT, 2);
 
-   act = EVRY_ACTION_NEW(_("Switch to Window"),
-                        EVRY_TYPE_BORDER, 0, "go-next",
-                        _act_border, _check_border);
+   act = EVRY_ACTION_NEW("Switch to Window",
+                         EVRY_TYPE_BORDER, 0, "go-next",
+                         _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_SHOW);
    evry->action_register(act, 1);
 
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW(_("Iconify"),
-                        EVRY_TYPE_BORDER, 0, "go-down",
-                        _act_border, _check_border);
+   act = EVRY_ACTION_NEW("Iconify",
+                         EVRY_TYPE_BORDER, 0, "go-down",
+                         _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_HIDE);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 2);
 
-   act = EVRY_ACTION_NEW(_("Toggle Fullscreen"),
-                        EVRY_TYPE_BORDER, 0, "view-fullscreen",
-                        _act_border, _check_border);
+   act = EVRY_ACTION_NEW("Toggle Fullscreen",
+                         EVRY_TYPE_BORDER, 0, "view-fullscreen",
+                         _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_FULLSCREEN);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 4);
 
-   act = EVRY_ACTION_NEW(_("Close"),
-                        EVRY_TYPE_BORDER, 0, "list-remove",
-                        _act_border, _check_border);
+   act = EVRY_ACTION_NEW("Close",
+                         EVRY_TYPE_BORDER, 0, "list-remove",
+                         _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_CLOSE);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 3);
 
-   act = EVRY_ACTION_NEW(_("Send to Desktop"),
-                        EVRY_TYPE_BORDER, 0, "go-previous",
-                        _act_border, _check_border);
+   act = EVRY_ACTION_NEW("Send to Desktop",
+                         EVRY_TYPE_BORDER, 0, "go-previous",
+                         _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_TODESK);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 3);
@@ -465,20 +471,16 @@ _plugins_shutdown(void)
 {
    Evry_Action *act;
 
-   if (!evry_module->active) return;
-
    EVRY_PLUGIN_FREE(_plug);
 
-   EINA_LIST_FREE(_actions, act)
+   EINA_LIST_FREE (_actions, act)
      EVRY_ACTION_FREE(act);
-
-   evry_module->active = EINA_FALSE;
 }
 
 /***************************************************************************/
 
 Eina_Bool
-evry_plug_windows_init(E_Module *m)
+evry_plug_windows_init(E_Module *m __UNUSED__)
 {
    EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
 
@@ -493,3 +495,4 @@ evry_plug_windows_shutdown(void)
 
 void
 evry_plug_windows_save(void){}
+
index daed468..939aa51 100644 (file)
@@ -13,11 +13,10 @@ evry_plugins_shutdown(void)
 {
    Evry_Action *act;
 
-   EINA_LIST_FREE(actions, act)
+   EINA_LIST_FREE (actions, act)
      evry_action_free(act);
 }
 
-
 static int
 _evry_cb_plugin_sort(const void *data1, const void *data2)
 {
@@ -38,19 +37,15 @@ _evry_plugin_free(Evry_Item *it)
    if (p->config) p->config->plugin = NULL;
    if (p->name) eina_stringshare_del(p->name);
 
-   if (p->free)
-     p->free(p);
-   else
-     E_FREE(p);
+   E_FREE(p);
 }
 
 Evry_Plugin *
 evry_plugin_new(Evry_Plugin *base, const char *name, const char *label,
-               const char *icon, Evry_Type item_type,
-               Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
-               void (*finish) (Evry_Plugin *p),
-               int  (*fetch) (Evry_Plugin *p, const char *input),
-               void (*cb_free) (Evry_Plugin *p))
+                const char *icon, Evry_Type item_type,
+                Evry_Plugin *(*begin)(Evry_Plugin * p, const Evry_Item * item),
+                void (*finish)(Evry_Plugin *p),
+                int (*fetch)(Evry_Plugin *p, const char *input))
 {
    Evry_Plugin *p;
    Evry_Item *it;
@@ -63,21 +58,19 @@ evry_plugin_new(Evry_Plugin *base, const char *name, const char *label,
    it = evry_item_new(EVRY_ITEM(p), NULL, label, NULL, _evry_plugin_free);
    it->plugin = p;
    it->browseable = EINA_TRUE;
-   it->type  = EVRY_TYPE_PLUGIN;
+   it->type = EVRY_TYPE_PLUGIN;
    if (item_type)
      it->subtype = item_type;
    if (icon)
      it->icon = eina_stringshare_add(icon);
 
-   p->name   = eina_stringshare_add(name);
-   p->begin  = begin;
+   p->name = eina_stringshare_add(name);
+   p->begin = begin;
    p->finish = finish;
-   p->fetch  = fetch;
+   p->fetch = fetch;
 
    p->async_fetch = EINA_FALSE;
-   p->history     = EINA_TRUE;
-
-   p->free = cb_free;
+   p->history = EINA_TRUE;
 
    return p;
 }
@@ -107,10 +100,10 @@ _evry_plugin_action_browse(Evry_Action *act)
 
    if ((p = pp->begin(pp, it)))
      {
-       plugins = eina_list_append(plugins, p);
+        plugins = eina_list_append(plugins, p);
 
-       if (!evry_state_push(sel, plugins))
-         eina_list_free(plugins);
+        if (!evry_state_push(sel, plugins))
+          eina_list_free(plugins);
      }
 
    return 0;
@@ -134,37 +127,37 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
    else if (type == EVRY_PLUGIN_OBJECT)
      conf = evry_conf->conf_objects;
 
-   EINA_LIST_FOREACH(conf, l, pc)
+   EINA_LIST_FOREACH (conf, l, pc)
      if (pc->name && p->name && !strcmp(pc->name, p->name))
        break;
 
    /* check if module of same name is already loaded */
    /* if ((pc) && (pc->plugin))
     *   return 0; */
-   
+
    /* collection plugin sets its own config */
    if (!pc && p->config)
      {
-       conf = eina_list_append(conf, p->config);
-       pc = p->config;
+        conf = eina_list_append(conf, p->config);
+        pc = p->config;
      }
    else if (!pc)
      {
-       new_conf = 1;
-       pc = E_NEW(Plugin_Config, 1);
-       pc->name = eina_stringshare_add(p->name);
-       pc->enabled = 1;
-       pc->priority = priority ? priority : 100;
-       pc->view_mode = VIEW_MODE_NONE;
-       pc->aggregate = EINA_TRUE;
-       pc->top_level = EINA_TRUE;
-
-       conf = eina_list_append(conf, pc);
+        new_conf = 1;
+        pc = E_NEW(Plugin_Config, 1);
+        pc->name = eina_stringshare_add(p->name);
+        pc->enabled = 1;
+        pc->priority = priority ? priority : 100;
+        pc->view_mode = VIEW_MODE_NONE;
+        pc->aggregate = EINA_TRUE;
+        pc->top_level = EINA_TRUE;
+
+        conf = eina_list_append(conf, pc);
      }
    if (pc->trigger && strlen(pc->trigger) == 0)
      {
-       eina_stringshare_del(pc->trigger);
-       pc->trigger = NULL;
+        eina_stringshare_del(pc->trigger);
+        pc->trigger = NULL;
      }
 
    p->config = pc;
@@ -178,28 +171,28 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
      evry_conf->conf_actions = conf;
    else if (type == EVRY_PLUGIN_OBJECT)
      evry_conf->conf_objects = conf;
-   
-   if ((type == EVRY_PLUGIN_SUBJECT) && (strcmp(p->name, "All")))
+
+   if ((type == EVRY_PLUGIN_SUBJECT) && (p->name && strcmp(p->name, "All")))
      {
-       char buf[256];
-       snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
+        char buf[256];
+        snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
 
-       e_action_predef_name_set(_("Everything Launcher"), buf,
-                                "everything", p->name, NULL, 1);
+        e_action_predef_name_set(_("Everything Launcher"), buf,
+                                 "everything", p->name, NULL, 1);
      }
 
    if (p->input_type)
      {
-       Evry_Action *act;
-       char buf[256];
-       snprintf(buf, sizeof(buf), _("Browse %s"), EVRY_ITEM(p)->label);
-
-       act = EVRY_ACTION_NEW(buf, p->input_type, 0, EVRY_ITEM(p)->icon,
-                             _evry_plugin_action_browse, NULL);
-       EVRY_ITEM(act)->icon_get = EVRY_ITEM(p)->icon_get;
-       EVRY_ITEM(act)->data = p;
-       evry_action_register(act, 1);
-       actions = eina_list_append(actions, act);
+        Evry_Action *act;
+        char buf[256];
+        snprintf(buf, sizeof(buf), _("Browse %s"), EVRY_ITEM(p)->label);
+
+        act = EVRY_ACTION_NEW(buf, p->input_type, 0, EVRY_ITEM(p)->icon,
+                              _evry_plugin_action_browse, NULL);
+        EVRY_ITEM(act)->icon_get = EVRY_ITEM(p)->icon_get;
+        EVRY_ITEM(act)->data = p;
+        evry_action_register(act, 1);
+        actions = eina_list_append(actions, act);
      }
 
    return new_conf;
@@ -213,10 +206,10 @@ evry_plugin_unregister(Evry_Plugin *p)
 
    if (l && eina_list_data_find_list(l, p->config))
      {
-       char buf[256];
-       snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
+        char buf[256];
+        snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
 
-       e_action_predef_name_del(_("Everything"), buf);
+        e_action_predef_name_del(_("Everything"), buf);
      }
 }
 
@@ -227,11 +220,11 @@ evry_plugin_find(const char *name)
    Eina_List *l;
    const char *n = eina_stringshare_add(name);
 
-   EINA_LIST_FOREACH(evry_conf->conf_subjects, l, pc)
+   EINA_LIST_FOREACH (evry_conf->conf_subjects, l, pc)
      {
-       if (!pc->plugin) continue;
-       if (pc->name == n)
-         break;
+        if (!pc->plugin) continue;
+        if (pc->name == n)
+          break;
      }
 
    eina_stringshare_del(n);
@@ -240,3 +233,4 @@ evry_plugin_find(const char *name)
 
    return pc->plugin;
 }
+
index ed7a62d..93036aa 100644 (file)
@@ -11,6 +11,7 @@ typedef struct _History_Item          History_Item;
 typedef struct _History_Entry          History_Entry;
 typedef struct _History_Types          History_Types;
 typedef struct _Evry_State             Evry_State;
+typedef struct _Evry_View              Evry_View;
 
 typedef unsigned int Evry_Type;
 
@@ -136,29 +137,42 @@ struct _Evry_Plugin
 {
   Evry_Item base;
 
+  /* not to be set by plugin! */
+  Plugin_Config *config;
+  unsigned int request;
+  Evry_State *state;
+
   /* identifier */
   const char *name;
 
-  /* list of items visible for everything after fetch */
+  /* list of items visible to everything */
   Eina_List *items;
 
-  /* required: get candidates matching string, fill 'items' list */
+  /* required:
+     Called each time Evry updates the state to which this plugin
+     instance belongs to, i.e. when the user typed something.
+     Query for candidates matching string.
+     return positive when items were found, zero otherwise. */
   int  (*fetch) (Evry_Plugin *p, const char *input);
 
-  /* required: run when state is removed in which this plugin is
-     active. free 'items' here */
-  void (*finish) (Evry_Plugin *p);
-
-  /* plugin is added to the list of current plugins and
-     queried for results when not returning NULL. The previous
-     selectors item is passed, i.e. a plugin registered as action
-     receives the subject, a plugin registered as object receives the
-     action item. here you can check wheter the plugin can be queried,
-     for given context (provided by item) */
+  /* required:
+     Called when an Evry_State is created in which this plugin could
+     be querid.  Return a new instance of base plugin 'p'. The plugin
+     instance is added to the list of current plugins and queried for
+     results when not returning NULL.
+     The previous selectors 'item' is passed, i.e. a plugin registered
+     as action receives the subject, a plugin registered as object
+     receives the action item. here you can check wheter the plugin
+     should be queried in given context (provided by item) */
   Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item);
 
-  /* optional: provide a list of subitems of 'item'. this function
-     must return a new instance which must be freed in 'finish' */
+  /* required:
+     Called when the Evry_State to which the plugin instance belongs
+     to is destroyed.
+     Free instance returned by 'begin' */
+  void (*finish) (Evry_Plugin *p);
+
+  /* optional: provide a list of subitems to 'item'. */
   Evry_Plugin *(*browse) (Evry_Plugin *p, const Evry_Item *item);
 
   /* optional: try to complete current item:
@@ -167,17 +181,13 @@ struct _Evry_Plugin
   int  (*complete) (Evry_Plugin *p, const Evry_Item *item, char **input);
 
   /* optional: handle key events: return positive when key was
-     handled */
+     handled by plugin */
   int  (*cb_key_down)  (Evry_Plugin *p, const Ecore_Event_Key *ev);
 
-  /* optional: use this when begin returned a new instance or you
-     have extended plugin struct */
-  void (*free) (Evry_Plugin *p);
-
-  /* optiona: actions only used with this plugin, dont require */
+  /* optional: list of Evry_Action that are specific for items of this plugin */
   Eina_List *actions;
   
-  /* optional: set type which the plugin can handle in begin */
+  /* optional: set type which the plugin can handle in 'begin' */
   Evry_Type input_type;
 
   /* optional: whether the plugin uses evry_async_update to add new items */
@@ -196,13 +206,11 @@ struct _Evry_Plugin
      'configure' button in everything config */
   const char *config_path;
 
-  /* set theme file to fetch icons from */
+  /* optional: set theme file to fetch icons from */
   const char *theme_path;
 
-  /* not to be set by plugin! */
-  Plugin_Config *config;
-  unsigned int request;
-  Evry_State *state;
+  /* optional: provide a view that is specific for this plugins' items */
+  Evry_View *view;
 };
 
 struct _Plugin_Config
@@ -242,6 +250,26 @@ struct _Plugin_Config
   Eina_List *plugins;
 };
 
+struct _Evry_View
+{
+  Evry_View  *id;
+  const char *name;
+  const char *trigger;
+  int active;
+  Evas_Object *o_list;
+  Evas_Object *o_bar;
+
+  Evry_View *(*create) (Evry_View *view, const Evry_State *s, const Evas_Object *swallow);
+  void (*destroy)      (Evry_View *view);
+  int  (*cb_key_down)  (Evry_View *view, const Ecore_Event_Key *ev);
+  int  (*update)       (Evry_View *view);
+  void (*clear)        (Evry_View *view);
+
+  int priority;
+
+  Evry_State *state;
+};
+
 struct _History_Item
 {
   const char *plugin;
@@ -264,4 +292,7 @@ struct _History_Types
   Eina_Hash *types;
 };
 
+void evry_item_app_free(Evry_Item_App *it);
+void evry_item_file_free(Evry_Item_File *it);
+
 #endif
index 20ae4c4..310098a 100644 (file)
@@ -1,10 +1,10 @@
 #include "e_mod_main.h"
 #include "md5.h"
 
-#define MAX_FUZZ 100
+#define MAX_FUZZ  100
 #define MAX_WORDS 5
 
-static const char  *home_dir = NULL;
+static const char *home_dir = NULL;
 static int home_dir_len;
 static char dir_buf[1024];
 static char thumb_buf[4096];
@@ -20,8 +20,8 @@ evry_util_file_detail_set(Evry_Item_File *file)
 
    if (!home_dir)
      {
-       home_dir = e_user_homedir_get();
-       home_dir_len = strlen(home_dir);
+        home_dir = e_user_homedir_get();
+        home_dir_len = strlen(home_dir);
      }
 
    dir = ecore_file_dir_get(file->path);
@@ -29,21 +29,21 @@ evry_util_file_detail_set(Evry_Item_File *file)
 
    if (!strncmp(dir, home_dir, home_dir_len))
      {
-       tmp = dir + home_dir_len;
+        tmp = dir + home_dir_len;
 
-       if (*(tmp) == '\0')
-         snprintf(dir_buf, sizeof(dir_buf), "~%s", tmp);
-       else
-         snprintf(dir_buf, sizeof(dir_buf), "~%s/", tmp);
+        if (*(tmp) == '\0')
+          snprintf(dir_buf, sizeof(dir_buf), "~%s", tmp);
+        else
+          snprintf(dir_buf, sizeof(dir_buf), "~%s/", tmp);
 
-       EVRY_ITEM(file)->detail = eina_stringshare_add(dir_buf);
+        EVRY_ITEM(file)->detail = eina_stringshare_add(dir_buf);
      }
    else
      {
-       if (!strncmp(dir, "//", 2))
-         EVRY_ITEM(file)->detail = eina_stringshare_add(dir + 1);
-       else
-         EVRY_ITEM(file)->detail = eina_stringshare_add(dir);
+        if (!strncmp(dir, "//", 2))
+          EVRY_ITEM(file)->detail = eina_stringshare_add(dir + 1);
+        else
+          EVRY_ITEM(file)->detail = eina_stringshare_add(dir);
      }
 
    E_FREE(dir);
@@ -73,15 +73,15 @@ evry_fuzzy_match(const char *str, const char *match)
      return 0;
 
    /* remove white spaces at the beginning */
-   for (; (*match != 0) && isspace(*match); match++);
-   for (; (*str != 0)   && isspace(*str);   str++);
+   for (; (*match != 0) && isspace(*match); match++) ;
+   for (; (*str != 0) && isspace(*str); str++) ;
 
    /* count words in match */
-   for (m = match; (*m != 0) && (m_num < MAX_WORDS);)
+   for (m = match; (*m != 0) && (m_num < MAX_WORDS); )
      {
-       for (; (*m != 0) && !isspace(*m); m++);
-       for (; (*m != 0) &&  isspace(*m); m++);
-       m_min[m_num++] = MAX_FUZZ;
+        for (; (*m != 0) && !isspace(*m); m++) ;
+        for (; (*m != 0) && isspace(*m); m++) ;
+        m_min[m_num++] = MAX_FUZZ;
      }
    for (m = match; ip && (*m != 0); m++)
      if (ip && ispunct(*m)) ip = 0;
@@ -94,128 +94,128 @@ evry_fuzzy_match(const char *str, const char *match)
    next = str;
    m = match;
 
-   while((m_cnt < m_num) && (*next != 0))
+   while ((m_cnt < m_num) && (*next != 0))
      {
-       /* reset match */
-       if (m_cnt == 0) m = match;
-
-       /* end of matching */
-       if (*m == 0) break;
-
-       offset = 0;
-       last = 0;
-       min = 1;
-       first = 0;
-       /* m_len = 0; */
-
-       /* match current word of string against current match */
-       for (p = next; *next != 0; p++)
-         {
-            /* new word of string begins */
-            if ((*p == 0) || isspace(*p) || (ip && ispunct(*p)))
-              {
-                 if (m_cnt < m_num - 1)
-                   {
-                      /* test next match */
-                      for (; (*m != 0) && !isspace(*m); m++);
-                      for (; (*m != 0) &&  isspace(*m); m++);
-                      m_cnt++;
-                      break;
-                   }
-                 else
-                   {
-                      /* go to next word */
-                      for (; (*p != 0) && ((isspace(*p) || (ip && ispunct(*p)))); p++);
-                      cnt++;
-                      next = p;
-                      m_cnt = 0;
-                      break;
-                   }
-              }
-
-            /* current char matches? */
-            if (tolower(*p) != tolower(*m))
-              {
-                 if (!first)
-                   offset += 1;
-                 else
-                   offset += 3;
-
-                 /* m_len++; */
-
-                 if (offset <= m_len * 3)
-                   continue;
-              }
-
-            if (min < MAX_FUZZ && offset <= m_len * 3)
-              {
-                 /* first offset of match in word */
-                 if (!first)
-                   {
-                      first = 1;
-                      last = offset;
-                   }
-
-                 min += offset + (offset - last) * 5;
-                 last = offset;
-
-                 /* try next char of match */
-                 if (*(++m) != 0 && !isspace(*m))
-                   continue;
-
-                 /* end of match: store min weight of match */
-                 min += (cnt - m_cnt) > 0 ? (cnt - m_cnt) : 0;
-
-                 if (min < m_min[m_cnt])
-                   m_min[m_cnt] = min;
-              }
-            else
-              {
-                 /* go to next match */
-                 for (; (*m != 0) && !isspace(*m); m++);
-              }
-
-            if (m_cnt < m_num - 1)
-              {
-                 /* test next match */
-                 for (; (*m != 0) && isspace(*m); m++);
-                 m_cnt++;
-                 break;
-              }
-            else if(*p != 0)
-              {
-                 /* go to next word */
-                 for (; (*p != 0) && !((isspace(*p) || (ip && ispunct(*p)))); p++);
-                 for (; (*p != 0) &&  ((isspace(*p) || (ip && ispunct(*p)))); p++);
-                 cnt++;
-                 next = p;
-                 m_cnt = 0;
-                 break;
-              }
-            else
-              {
-                 next = p;
-                 break;
-              }
-         }
+        /* reset match */
+        if (m_cnt == 0) m = match;
+
+        /* end of matching */
+        if (*m == 0) break;
+
+        offset = 0;
+        last = 0;
+        min = 1;
+        first = 0;
+        /* m_len = 0; */
+
+        /* match current word of string against current match */
+        for (p = next; *next != 0; p++)
+          {
+             /* new word of string begins */
+             if ((*p == 0) || isspace(*p) || (ip && ispunct(*p)))
+               {
+                  if (m_cnt < m_num - 1)
+                    {
+                       /* test next match */
+                       for (; (*m != 0) && !isspace(*m); m++) ;
+                       for (; (*m != 0) && isspace(*m); m++) ;
+                       m_cnt++;
+                       break;
+                    }
+                  else
+                    {
+                       /* go to next word */
+                       for (; (*p != 0) && ((isspace(*p) || (ip && ispunct(*p)))); p++) ;
+                       cnt++;
+                       next = p;
+                       m_cnt = 0;
+                       break;
+                    }
+               }
+
+             /* current char matches? */
+             if (tolower(*p) != tolower(*m))
+               {
+                  if (!first)
+                    offset += 1;
+                  else
+                    offset += 3;
+
+                  /* m_len++; */
+
+                  if (offset <= m_len * 3)
+                    continue;
+               }
+
+             if (min < MAX_FUZZ && offset <= m_len * 3)
+               {
+                  /* first offset of match in word */
+                  if (!first)
+                    {
+                       first = 1;
+                       last = offset;
+                    }
+
+                  min += offset + (offset - last) * 5;
+                  last = offset;
+
+                  /* try next char of match */
+                  if (*(++m) != 0 && !isspace(*m))
+                    continue;
+
+                  /* end of match: store min weight of match */
+                  min += (cnt - m_cnt) > 0 ? (cnt - m_cnt) : 0;
+
+                  if (min < m_min[m_cnt])
+                    m_min[m_cnt] = min;
+               }
+             else
+               {
+                  /* go to next match */
+                  for (; (*m != 0) && !isspace(*m); m++) ;
+               }
+
+             if (m_cnt < m_num - 1)
+               {
+                  /* test next match */
+                  for (; (*m != 0) && isspace(*m); m++) ;
+                  m_cnt++;
+                  break;
+               }
+             else if (*p != 0)
+               {
+                  /* go to next word */
+                  for (; (*p != 0) && !((isspace(*p) || (ip && ispunct(*p)))); p++) ;
+                  for (; (*p != 0) && ((isspace(*p) || (ip && ispunct(*p)))); p++) ;
+                  cnt++;
+                  next = p;
+                  m_cnt = 0;
+                  break;
+               }
+             else
+               {
+                  next = p;
+                  break;
+               }
+          }
      }
 
    for (m_cnt = 0; m_cnt < m_num; m_cnt++)
      {
-       sum += m_min[m_cnt];
+        sum += m_min[m_cnt];
 
-       if (sum >= MAX_FUZZ)
-         {
-            sum = 0;
-            break;
-         }
+        if (sum >= MAX_FUZZ)
+          {
+             sum = 0;
+             break;
+          }
      }
 
    if (sum > 0)
      {
-       /* exact match ? */
-       if (strcmp(match, str))
-         sum += 10;
+        /* exact match ? */
+        if (strcmp(match, str))
+          sum += 10;
      }
 
    return sum;
@@ -228,18 +228,18 @@ _evry_fuzzy_match_sort_cb(const void *data1, const void *data2)
    const Evry_Item *it2 = data2;
 
    if (it1->priority - it2->priority)
-     return (it1->priority - it2->priority);
+     return it1->priority - it2->priority;
 
    if (it1->fuzzy_match || it2->fuzzy_match)
      {
-       if (it1->fuzzy_match && !it2->fuzzy_match)
-         return -1;
+        if (it1->fuzzy_match && !it2->fuzzy_match)
+          return -1;
 
-       if (!it1->fuzzy_match && it2->fuzzy_match)
-         return 1;
+        if (!it1->fuzzy_match && it2->fuzzy_match)
+          return 1;
 
-       if (it1->fuzzy_match - it2->fuzzy_match)
-         return (it1->fuzzy_match - it2->fuzzy_match);
+        if (it1->fuzzy_match - it2->fuzzy_match)
+          return it1->fuzzy_match - it2->fuzzy_match;
      }
 
    return 0;
@@ -251,140 +251,159 @@ evry_fuzzy_match_sort(Eina_List *items)
    return eina_list_sort(items, -1, _evry_fuzzy_match_sort_cb);
 }
 
-int
-evry_items_sort_func(const void *data1, const void *data2)
+static int _sort_flags = 0;
+
+static int
+_evry_items_sort_func(const void *data1, const void *data2)
 {
    const Evry_Item *it1 = data1;
    const Evry_Item *it2 = data2;
 
-   if ((it1->type == EVRY_TYPE_ACTION ||
-       it1->subtype == EVRY_TYPE_ACTION) &&
-       (it2->type == EVRY_TYPE_ACTION ||
-       it2->subtype == EVRY_TYPE_ACTION))
+   /* if (!((!_sort_flags) &&
+    *       (it1->type == EVRY_TYPE_ACTION) &&
+    *       (it2->type == EVRY_TYPE_ACTION)))
+    *   { */
+   /* only sort actions when there is input otherwise show default order */
+
+   if (((it1->type == EVRY_TYPE_ACTION) || (it1->subtype == EVRY_TYPE_ACTION)) &&
+       ((it2->type == EVRY_TYPE_ACTION) || (it2->subtype == EVRY_TYPE_ACTION)))
      {
-       const Evry_Action *act1 = data1;
-       const Evry_Action *act2 = data2;
-
-       /* sort actions that match the specific type before
-          those matching general type */
-       if (act1->it1.item && act2->it1.item)
-         {
-            if ((act1->it1.type == act1->it1.item->type) &&
-                (act2->it1.type != act2->it1.item->type))
-              return -1;
-
-            if ((act1->it1.type != act1->it1.item->type) &&
-                (act2->it1.type == act2->it1.item->type))
-              return 1;
-         }
-
-       /* sort context specific actions before
-          general actions */
-       if (act1->remember_context)
-         {
-            if (!act2->remember_context)
-              return -1;
-         }
-       else
-         {
-            if (act2->remember_context)
-              return 1;
-         }
+        const Evry_Action *act1 = data1;
+        const Evry_Action *act2 = data2;
+
+        /* sort actions that match the specific type before
+           those matching general type */
+        if (act1->it1.item && act2->it1.item)
+          {
+             if ((act1->it1.type == act1->it1.item->type) &&
+                 (act2->it1.type != act2->it1.item->type))
+               return -1;
+
+             if ((act1->it1.type != act1->it1.item->type) &&
+                 (act2->it1.type == act2->it1.item->type))
+               return 1;
+          }
+
+        /* sort context specific actions before
+           general actions */
+        if (act1->remember_context)
+          {
+             if (!act2->remember_context)
+               return -1;
+          }
+        else
+          {
+             if (act2->remember_context)
+               return 1;
+          }
      }
+   /* } */
 
-   /* if (it1->type == EVRY_TYPE_PLUGIN &&
-    *     it2->type != EVRY_TYPE_PLUGIN)
-    *   {
-    *  return (it1->usage > it2->usage ? -1 : 1);
-    *   }
-    * else if (it2->type == EVRY_TYPE_PLUGIN &&
-    *      it1->type != EVRY_TYPE_PLUGIN)
-    *   {
-    *  return (it1->usage > it2->usage ? -1 : 1);
-    *   } */
+   if (_sort_flags)
+     {
+        /* when there is no input sort items with higher
+         * plugin priority first */
+        if (it1->type != EVRY_TYPE_ACTION &&
+            it2->type != EVRY_TYPE_ACTION)
+          {
+             int prio1 = it1->plugin->config->priority;
+             int prio2 = it2->plugin->config->priority;
+
+             if (prio1 - prio2)
+               return prio1 - prio2;
+          }
+     }
 
    /* sort items which match input or which
       match much better first */
    if (it1->fuzzy_match > 0 || it2->fuzzy_match > 0)
      {
-       if (it2->fuzzy_match <= 0)
-         return -1;
+        if (it2->fuzzy_match <= 0)
+          return -1;
 
-       if (it1->fuzzy_match <= 0)
-         return 1;
+        if (it1->fuzzy_match <= 0)
+          return 1;
 
-       if (abs (it1->fuzzy_match - it2->fuzzy_match) > 5)
-         return (it1->fuzzy_match - it2->fuzzy_match);
+        if (abs (it1->fuzzy_match - it2->fuzzy_match) > 5)
+          return it1->fuzzy_match - it2->fuzzy_match;
      }
 
    /* sort recently/most frequently used items first */
    if (it1->usage > 0.0 || it2->usage > 0.0)
      {
-       return (it1->usage > it2->usage ? -1 : 1);
+        return it1->usage > it2->usage ? -1 : 1;
      }
 
    /* sort items which match input better first */
    if (it1->fuzzy_match > 0 || it2->fuzzy_match > 0)
      {
-       if (it1->fuzzy_match - it2->fuzzy_match)
-         return (it1->fuzzy_match - it2->fuzzy_match);
+        if (it1->fuzzy_match - it2->fuzzy_match)
+          return it1->fuzzy_match - it2->fuzzy_match;
      }
 
    /* sort itemswith higher priority first */
    if ((it1->plugin == it2->plugin) &&
        (it1->priority - it2->priority))
-     return (it1->priority - it2->priority);
+     return it1->priority - it2->priority;
 
    /* sort items with higher plugin priority first */
    if (it1->type != EVRY_TYPE_ACTION &&
        it2->type != EVRY_TYPE_ACTION)
      {
-       int prio1 = it1->plugin->config->priority;
-       int prio2 = it2->plugin->config->priority;
+        int prio1 = it1->plugin->config->priority;
+        int prio2 = it2->plugin->config->priority;
 
-       if (prio1 - prio2)
-         return (prio1 - prio2);
+        if (prio1 - prio2)
+          return prio1 - prio2;
      }
 
    return strcasecmp(it1->label, it2->label);
 }
 
+void
+evry_util_items_sort(Eina_List **items, int flags)
+{
+   _sort_flags = flags;
+   *items = eina_list_sort(*items, -1, _evry_items_sort_func);
+   _sort_flags = 0;
+}
+
 int
 evry_util_plugin_items_add(Evry_Plugin *p, Eina_List *items, const char *input,
-                     int match_detail, int set_usage)
+                           int match_detail, int set_usage)
 {
    Eina_List *l;
    Evry_Item *it;
    int match = 0;
 
-   EINA_LIST_FOREACH(items, l, it)
+   EINA_LIST_FOREACH (items, l, it)
      {
-       it->fuzzy_match = 0;
+        it->fuzzy_match = 0;
 
-       if (set_usage)
-         evry_history_item_usage_set(it, input, NULL);
+        if (set_usage)
+          evry_history_item_usage_set(it, input, NULL);
 
-       if (!input)
-         {
-            p->items = eina_list_append(p->items, it);
-            continue;
-         }
+        if (!input)
+          {
+             p->items = eina_list_append(p->items, it);
+             continue;
+          }
 
-       it->fuzzy_match = evry_fuzzy_match(it->label, input);
+        it->fuzzy_match = evry_fuzzy_match(it->label, input);
 
-       if (match_detail)
-         {
-            match = evry_fuzzy_match(it->detail, input);
+        if (match_detail)
+          {
+             match = evry_fuzzy_match(it->detail, input);
 
-            if (!(it->fuzzy_match) || (match && (match < it->fuzzy_match)))
-              it->fuzzy_match = match;
-         }
+             if (!(it->fuzzy_match) || (match && (match < it->fuzzy_match)))
+               it->fuzzy_match = match;
+          }
 
-       if (it->fuzzy_match)
-         p->items = eina_list_append(p->items, it);
+        if (it->fuzzy_match)
+          p->items = eina_list_append(p->items, it);
      }
 
-   p->items = eina_list_sort(p->items, -1, evry_items_sort_func);
+   p->items = eina_list_sort(p->items, -1, _evry_items_sort_func);
 
    return !!(p->items);
 }
@@ -392,145 +411,123 @@ evry_util_plugin_items_add(Evry_Plugin *p, Eina_List *items, const char *input,
 Evas_Object *
 evry_icon_theme_get(const char *icon, Evas *e)
 {
-   Evas_Object *obj = e_icon_add(e);
-   e_icon_preload_set(obj, 1);
-   e_icon_scale_size_set(obj, 128); 
-
-   if (!e_util_icon_theme_set(obj, icon))
-     {
-       evas_object_del(obj);
-       obj = NULL;
-     }
-
-   return obj;
-}
-
-static Evas_Object *
-_evry_icon_mime_theme_get(const char *mime, Evas *e)
-{
    Evas_Object *o = NULL;
 
-   char buf[1024];
-   const char *file;
-
-   if (snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", mime) >= (int)sizeof(buf))
+   if (!icon)
      return NULL;
 
-   file = e_theme_edje_file_get("base/theme/icons", buf);
-   if (file && file[0])
+   o = e_icon_add(e);
+   e_icon_scale_size_set(o, 128);
+   e_icon_preload_set(o, 1);
+
+   if (icon[0] == '/')
+     {
+        if (!e_icon_file_set(o, icon))
+          {
+             evas_object_del(o);
+             o = NULL;
+          }
+     }
+   else if (!e_util_icon_theme_set(o, icon))
      {
-       o = edje_object_add(e);
-       if (!o) return NULL;
-       if (!edje_object_file_set(o, file, buf))
-         {
-            evas_object_del(o);
-            return NULL;
-         }
-       return o;
+        evas_object_del(o);
+        o = NULL;
      }
 
-   return NULL;
+   return o;
 }
 
 Evas_Object *
-evry_icon_mime_get(const char *mime, Evas *e)
-{
-   Evas_Object *o = NULL;
-   const char *icon;
-
-   if (!e_config->icon_theme_overrides)
-     o = _evry_icon_mime_theme_get(mime, e);
-
-   if (o) return o;
-
-   icon = efreet_mime_type_icon_get(mime, e_config->icon_theme, 128);
-   if (icon)
-     o = e_util_icon_add(icon, e);
-   if (o) return o;
-
-   return _evry_icon_mime_theme_get(mime, e);
-}
-
-static Evas_Object *
-_file_icon_get(Evry_Item *it, Evas *e)
+evry_util_icon_get(Evry_Item *it, Evas *e)
 {
    Evas_Object *o = NULL;
-   GET_FILE(file, it);
 
-   if (it->icon)
+   if (it->icon_get)
      {
-       if (it->icon[0] == '/')
-         {
-            o = e_icon_add(e);
-            e_icon_preload_set(o, 1);
-
-            if (!e_icon_file_set(o, it->icon))
-              {
-                 evas_object_del(o);
-                 o = NULL;
-              }
-         }
+        o = it->icon_get(it, e);
+        if (o) return o;
      }
 
-   if (!(o) && (!it->icon) && file->mime &&
-       (/*(!strncmp(file->mime, "image/", 6)) || */
-       (!strncmp(file->mime, "video/", 6)) ||
-       (!strncmp(file->mime, "application/pdf", 15))) &&
-       (evry_file_url_get(file)))
+   if ((it->icon) && (it->icon[0] == '/'))
      {
-       char *sum = evry_util_md5_sum(file->url);
-
-       snprintf(thumb_buf, sizeof(thumb_buf),
-                "%s/.thumbnails/normal/%s.png",
-                e_user_homedir_get(), sum);
-       free(sum);
-
-       if (ecore_file_exists(thumb_buf))
-         it->icon = eina_stringshare_add(thumb_buf);
-       else
-         it->icon = eina_stringshare_add("");
+        o = evry_icon_theme_get(it->icon, e);
+        if (o) return o;
      }
 
-   if (!(o) &&it->browseable)
-     o = evry_icon_theme_get("folder", e);
-
-   if (!(o) && file->mime)
-     o = evry_icon_mime_get(file->mime, e);
-
-   if (!o)
-     o = evry_icon_mime_get("unknown", e);
-
-   return o;
-}
+   if (CHECK_TYPE(it, EVRY_TYPE_FILE))
+     {
+        const char *icon;
+        char *sum;
+
+        GET_FILE(file, it);
+
+        if (it->browseable)
+          {
+             o = evry_icon_theme_get("folder", e);
+             if (o) return o;
+          }
+
+        if ((!it->icon) && (file->mime) &&
+            ( /*(!strncmp(file->mime, "image/", 6)) || */
+              (!strncmp(file->mime, "video/", 6)) ||
+              (!strncmp(file->mime, "application/pdf", 15))) &&
+            (evry_file_url_get(file)))
+          {
+             sum = evry_util_md5_sum(file->url);
+
+             snprintf(thumb_buf, sizeof(thumb_buf),
+                      "%s/.thumbnails/normal/%s.png",
+                      e_user_homedir_get(), sum);
+             free(sum);
+
+             if ((o = evry_icon_theme_get(thumb_buf, e)))
+               {
+                  it->icon = eina_stringshare_add(thumb_buf);
+                  return o;
+               }
+          }
+
+        if ((!it->icon) && (file->mime))
+          {
+             icon = efreet_mime_type_icon_get(file->mime, e_config->icon_theme, 128);
+             /* XXX can do _ref ?*/
+             if ((o = evry_icon_theme_get(icon, e)))
+               {
+                  /* it->icon = eina_stringshare_add(icon); */
+                  return o;
+               }
+          }
+
+        if ((icon = efreet_mime_type_icon_get("unknown", e_config->icon_theme, 128)))
+          it->icon = eina_stringshare_add(icon);
+        else
+          it->icon = eina_stringshare_add("");
+     }
 
-Evas_Object *
-evry_util_icon_get(Evry_Item *it, Evas *e)
-{
-   Evas_Object *o = NULL;
+   if (CHECK_TYPE(it, EVRY_TYPE_APP))
+     {
+        GET_APP(app, it);
 
-   if (!o && it->icon_get)
-     o = it->icon_get(it, e);
-   if (o) return o;
+        o = e_util_desktop_icon_add(app->desktop, 128, e);
+        if (o) return o;
 
-   if (CHECK_TYPE(it, EVRY_TYPE_FILE))
-     o = _file_icon_get(it, e);
-   if (o) return o;
+        o = evry_icon_theme_get("system-run", e);
+        if (o) return o;
+     }
 
-   if (!o && it->icon && it->icon[0] == '/')
+   if (it->icon)
      {
-       o = e_icon_add(e);
-       e_icon_preload_set(o, 1);
-
-       if (!e_icon_file_set(o, it->icon))
-         {
-            evas_object_del(o);
-            o = NULL;
-         }
+        o = evry_icon_theme_get(it->icon, e);
+        if (o) return o;
      }
 
-   if (!o && it->icon)
-     o = evry_icon_theme_get(it->icon, e);
+   if (it->browseable)
+     {
+        o = evry_icon_theme_get("folder", e);
+        if (o) return o;
+     }
 
+   o = evry_icon_theme_get("unknown", e);
    return o;
 }
 
@@ -550,79 +547,79 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
 
    if (app->desktop)
      {
-       if (file && evry_file_path_get(file))
-         {
-            Eina_List *l;
-            char *mime;
-            int open_folder = 0;
-
-            /* when the file is no a directory and the app
-               opens folders, pass only the dir */
-            if (!IS_BROWSEABLE(file))
-              {
-                 EINA_LIST_FOREACH(app->desktop->mime_types, l, mime)
-                   {
-                      if (!mime)
-                        continue;
-
-                      if (!strcmp(mime, "x-directory/normal"))
-                        open_folder = 1;
-
-                      if (file->mime && !strcmp(mime, file->mime))
-                        {
-                           open_folder = 0;
-                           break;
-                        }
-                   }
-              }
-
-            if (open_folder)
-              {
-                 tmp = ecore_file_dir_get(file->path);
-                 files = eina_list_append(files, tmp);
-              }
-            else
-              {
-                 files = eina_list_append(files, file->path);
-              }
-
-            e_exec(zone, app->desktop, NULL, files, NULL);
-
-            if (file && file->mime && !open_folder)
-              e_exehist_mime_desktop_add(file->mime, app->desktop);
-
-            if (files)
-              eina_list_free(files);
-
-            E_FREE(tmp);
-         }
-       else if (app->file)
-         {
-            files = eina_list_append(files, app->file);
-            e_exec(zone, app->desktop, NULL, files, NULL);
-            eina_list_free(files);
-         }
-       else
-         {
-            e_exec(zone, app->desktop, NULL, NULL, NULL);
-         }
+        if (file && evry_file_path_get(file))
+          {
+             Eina_List *l;
+             char *mime;
+             int open_folder = 0;
+
+             /* when the file is no a directory and the app
+                opens folders, pass only the dir */
+             if (!IS_BROWSEABLE(file))
+               {
+                  EINA_LIST_FOREACH (app->desktop->mime_types, l, mime)
+                    {
+                       if (!mime)
+                         continue;
+
+                       if (!strcmp(mime, "x-directory/normal"))
+                         open_folder = 1;
+
+                       if (file->mime && !strcmp(mime, file->mime))
+                         {
+                            open_folder = 0;
+                            break;
+                         }
+                    }
+               }
+
+             if (open_folder)
+               {
+                  tmp = ecore_file_dir_get(file->path);
+                  files = eina_list_append(files, tmp);
+               }
+             else
+               {
+                  files = eina_list_append(files, file->path);
+               }
+
+             e_exec(zone, app->desktop, NULL, files, NULL);
+
+             if (file && file->mime && !open_folder)
+               e_exehist_mime_desktop_add(file->mime, app->desktop);
+
+             if (files)
+               eina_list_free(files);
+
+             E_FREE(tmp);
+          }
+        else if (app->file)
+          {
+             files = eina_list_append(files, app->file);
+             e_exec(zone, app->desktop, NULL, files, NULL);
+             eina_list_free(files);
+          }
+        else
+          {
+             e_exec(zone, app->desktop, NULL, NULL, NULL);
+          }
      }
    else if (app->file)
      {
-       if (file && evry_file_path_get(file))
-         {
-            int len;
-            len = strlen(app->file) + strlen(file->path) + 4;
-            exe = malloc(len);
-            snprintf(exe, len, "%s \'%s\'", app->file, file->path);
-            e_exec(zone, NULL, exe, NULL, NULL);
-            E_FREE(exe);
-         }
-       else
-         {
-            exe = (char *) app->file;
-            e_exec(zone, NULL, exe, NULL, NULL);
-         }
+        if (file && evry_file_path_get(file))
+          {
+             int len;
+             len = strlen(app->file) + strlen(file->path) + 4;
+             exe = malloc(len);
+             snprintf(exe, len, "%s \'%s\'", app->file, file->path);
+             e_exec(zone, NULL, exe, NULL, NULL);
+             E_FREE(exe);
+          }
+        else
+          {
+             exe = (char *)app->file;
+             e_exec(zone, NULL, exe, NULL, NULL);
+          }
      }
 
    return 1;
@@ -638,44 +635,44 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
  * If length == 0, the length is assumed to be strlen(string).
  * If olen == NULL, no output length is stored.
  */
-#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define ISXDIGIT(x) (isxdigit((int)((unsigned char)x)))
 
 char *
 evry_util_url_unescape(const char *string, int length)
 {
-   int alloc = (length?length:(int)strlen(string))+1;
+   int alloc = (length ? length : (int)strlen(string)) + 1;
    char *ns = malloc(alloc);
    unsigned char in;
-   int strindex=0;
+   int strindex = 0;
    unsigned long hex;
 
-   if( !ns )
+   if ( !ns )
      return NULL;
 
-   while(--alloc > 0)
+   while (--alloc > 0)
      {
-       in = *string;
-       if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2]))
-         {
-            /* this is two hexadecimal digits following a '%' */
-            char hexstr[3];
-            char *ptr;
-            hexstr[0] = string[1];
-            hexstr[1] = string[2];
-            hexstr[2] = 0;
-
-            hex = strtoul(hexstr, &ptr, 16);
-            in = (unsigned char)(hex & (unsigned long) 0xFF);
-            // in = ultouc(hex); /* this long is never bigger than 255 anyway */
-
-            string+=2;
-            alloc-=2;
-         }
-
-       ns[strindex++] = in;
-       string++;
+        in = *string;
+        if (('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2]))
+          {
+             /* this is two hexadecimal digits following a '%' */
+             char hexstr[3];
+             char *ptr;
+             hexstr[0] = string[1];
+             hexstr[1] = string[2];
+             hexstr[2] = 0;
+
+             hex = strtoul(hexstr, &ptr, 16);
+             in = (unsigned char)(hex & (unsigned long)0xFF);
+             // in = ultouc(hex); /* this long is never bigger than 255 anyway */
+
+             string += 2;
+             alloc -= 2;
+          }
+
+        ns[strindex++] = in;
+        string++;
      }
-   ns[strindex]=0; /* terminate it */
+   ns[strindex] = 0; /* terminate it */
 
    return ns;
 }
@@ -687,21 +684,72 @@ _isalnum(unsigned char in)
 {
    switch (in)
      {
-      case '0': case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-      case 'a': case 'b': case 'c': case 'd': case 'e':
-      case 'f': case 'g': case 'h': case 'i': case 'j':
-      case 'k': case 'l': case 'm': case 'n': case 'o':
-      case 'p': case 'q': case 'r': case 's': case 't':
-      case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
-      case 'A': case 'B': case 'C': case 'D': case 'E':
-      case 'F': case 'G': case 'H': case 'I': case 'J':
-      case 'K': case 'L': case 'M': case 'N': case 'O':
-      case 'P': case 'Q': case 'R': case 'S': case 'T':
-      case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
-        return EINA_TRUE;
+      case '0':
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+      case '8':
+      case '9':
+      case 'a':
+      case 'b':
+      case 'c':
+      case 'd':
+      case 'e':
+      case 'f':
+      case 'g':
+      case 'h':
+      case 'i':
+      case 'j':
+      case 'k':
+      case 'l':
+      case 'm':
+      case 'n':
+      case 'o':
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+      case 't':
+      case 'u':
+      case 'v':
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+      case 'A':
+      case 'B':
+      case 'C':
+      case 'D':
+      case 'E':
+      case 'F':
+      case 'G':
+      case 'H':
+      case 'I':
+      case 'J':
+      case 'K':
+      case 'L':
+      case 'M':
+      case 'N':
+      case 'O':
+      case 'P':
+      case 'Q':
+      case 'R':
+      case 'S':
+      case 'T':
+      case 'U':
+      case 'V':
+      case 'W':
+      case 'X':
+      case 'Y':
+      case 'Z':
+        return EINA_TRUE;
+
       default:
-        break;
+        break;
      }
    return EINA_FALSE;
 }
@@ -709,57 +757,57 @@ _isalnum(unsigned char in)
 char *
 evry_util_url_escape(const char *string, int inlength)
 {
-   size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
+   size_t alloc = (inlength ? (size_t)inlength : strlen(string)) + 1;
    char *ns;
    char *testing_ptr = NULL;
    unsigned char in; /* we need to treat the characters unsigned */
    size_t newlen = alloc;
-   int strindex=0;
+   int strindex = 0;
    size_t length;
 
    ns = malloc(alloc);
-   if(!ns)
+   if (!ns)
      return NULL;
 
-   length = alloc-1;
-   while(length--)
+   length = alloc - 1;
+   while (length--)
      {
-       in = *string;
-
-       if (_isalnum(in))
-         {
-            /* just copy this */
-            ns[strindex++]=in;
-         }
-       else {
-          /* encode it */
-          newlen += 2; /* the size grows with two, since this'll become a %XX */
-          if(newlen > alloc)
-            {
-               alloc *= 2;
-               testing_ptr = realloc(ns, alloc);
-               if(!testing_ptr)
-                 {
-                    free( ns );
-                    return NULL;
-                 }
-               else
-                 {
-                    ns = testing_ptr;
-                 }
-            }
-
-          snprintf(&ns[strindex], 4, "%%%02X", in);
-
-          strindex+=3;
-       }
-       string++;
+        in = *string;
+
+        if (_isalnum(in))
+          {
+             /* just copy this */
+             ns[strindex++] = in;
+          }
+        else {
+             /* encode it */
+             newlen += 2; /* the size grows with two, since this'll become a %XX */
+             if (newlen > alloc)
+               {
+                  alloc *= 2;
+                  testing_ptr = realloc(ns, alloc);
+                  if (!testing_ptr)
+                    {
+                       free(ns);
+                       return NULL;
+                    }
+                  else
+                    {
+                       ns = testing_ptr;
+                    }
+               }
+
+             snprintf(&ns[strindex], 4, "%%%02X", in);
+
+             strindex += 3;
+          }
+        string++;
      }
-   ns[strindex]=0; /* terminate it */
+   ns[strindex] = 0; /* terminate it */
    return ns;
 }
 
-const char*
+const char *
 evry_file_path_get(Evry_Item_File *file)
 {
    const char *tmp;
@@ -785,7 +833,7 @@ evry_file_path_get(Evry_Item_File *file)
    return file->path;
 }
 
-const char*
+const char *
 evry_file_url_get(Evry_Item_File *file)
 {
    char dest[PATH_MAX * 3 + 7];
@@ -805,13 +853,13 @@ evry_file_url_get(Evry_Item_File *file)
    /* Most app doesn't handle the hostname in the uri so it's put to NULL */
    for (i = 7, p = file->path; *p != '\0'; p++, i++)
      {
-       if (isalnum(*p) || strchr("/$-_.+!*'()", *p))
-         dest[i] = *p;
-       else
-         {
-            snprintf(&(dest[i]), 4, "%%%02X", (unsigned char)*p);
-            i += 2;
-         }
+        if (isalnum(*p) || strchr("/$-_.+!*'()", *p))
+          dest[i] = *p;
+        else
+          {
+             snprintf(&(dest[i]), 4, "%%%02X", (unsigned char)*p);
+             i += 2;
+          }
      }
 
    file->url = eina_stringshare_add(dest);
@@ -851,16 +899,17 @@ evry_util_md5_sum(const char *str)
    int n;
    char md5out[(2 * MD5_HASHBYTES) + 1];
    MD5Init (&ctx);
-   MD5Update (&ctx, (unsigned char const*)str,
-             (unsigned)strlen (str));
+   MD5Update (&ctx, (unsigned char const *)str,
+              (unsigned)strlen (str));
    MD5Final (hash, &ctx);
 
    for (n = 0; n < MD5_HASHBYTES; n++)
      {
-       md5out[2 * n] = hex[hash[n] >> 4];
-       md5out[2 * n + 1] = hex[hash[n] & 0x0f];
+        md5out[2 * n] = hex[hash[n] >> 4];
+        md5out[2 * n + 1] = hex[hash[n] & 0x0f];
      }
    md5out[2 * n] = '\0';
 
    return strdup(md5out);
 }
+
index ea30da2..a50ec26 100644 (file)
@@ -1,86 +1,88 @@
 #include "e_mod_main.h"
 
-typedef struct _View View;
+typedef struct _View       View;
 typedef struct _Smart_Data Smart_Data;
-typedef struct _Item Item;
+typedef struct _Item       Item;
 
-#define SIZE_LIST 28
+#define SIZE_LIST   28
 #define SIZE_DETAIL 36
 
-
 struct _View
 {
-  Evry_View view;
-  Tab_View *tabs;
+   Evry_View          view;
+   Tab_View          *tabs;
+
+   const Evry_State  *state;
+   const Evry_Plugin *plugin;
 
-  const Evry_State *state;
-  const Evry_Plugin *plugin;
+   Evas              *evas;
+   Evas_Object       *bg, *sframe, *span;
+   int                iw, ih;
+   int                zoom;
+   int                mode;
+   int                mode_prev;
 
-  Evas *evas;
-  Evas_Object *bg, *sframe, *span;
-  int          iw, ih;
-  int          zoom;
-  int         mode;
-  int         mode_prev;
+   Eina_List         *handlers;
 
-  Eina_List *handlers;
+   Eina_Bool          hiding;
 };
 
 /* smart object based on wallpaper module */
 struct _Smart_Data
 {
-  View        *view;
-  Eina_List   *items;
-  Item        *cur_item;
-  Ecore_Idle_Enterer *idle_enter;
-  Ecore_Idle_Enterer *thumb_idler;
-  Evas_Coord   x, y, w, h;
-  Evas_Coord   cx, cy, cw, ch;
-  Evas_Coord   sx, sy;
-  Eina_List   *queue;
-
-  double last_select;
-  double scroll_align;
-  double scroll_align_to;
-  Ecore_Animator *animator;
-
-  int slide_offset;
-  double slide;
-  double slide_to;
-
-  int    sliding;
-  int    mouse_act;
-  int    mouse_x;
-  int    mouse_y;
-  int    mouse_button;
-  Item  *it_down;
+   View               *view;
+   Eina_List          *items;
+   Item               *cur_item;
+   Ecore_Idle_Enterer *idle_enter;
+   Evas_Coord          x, y, w, h;
+   Evas_Coord          cx, cy, cw, ch;
+   Evas_Coord          sx, sy;
+
+   double              last_select;
+   double              scroll_align;
+   double              scroll_align_to;
+   Ecore_Animator     *animator;
+
+   int                 slide_offset;
+   double              slide;
+   double              slide_to;
+
+   int                 sliding;
+   int                 mouse_act;
+   int                 mouse_x;
+   int                 mouse_y;
+   int                 mouse_button;
+   Item               *it_down;
+
+   Eina_Bool           place;
 };
 
 struct _Item
 {
-  Evry_Item *item;
-  Evas_Object *obj;
-  Evas_Coord x, y, w, h;
-  Evas_Object *frame, *image, *thumb;
-  Eina_Bool selected : 1;
-  Eina_Bool have_thumb : 1;
-  Eina_Bool do_thumb : 1;
-  Eina_Bool get_thumb : 1;
-  Eina_Bool showing : 1;
-  Eina_Bool visible : 1;
-  Eina_Bool changed : 1;
-  int pos;
+   Evry_Item   *item;
+   Evas_Object *obj;
+   Evas_Coord   x, y, w, h;
+   Evas_Object *frame, *image, *thumb;
+   Eina_Bool    selected : 1;
+   Eina_Bool    have_thumb : 1;
+   Eina_Bool    do_thumb : 1;
+   Eina_Bool    get_thumb : 1;
+   Eina_Bool    showing : 1;
+   Eina_Bool    visible : 1;
+   Eina_Bool    changed : 1;
+   int          pos;
+   int          max_w, max_h;
 };
 
 static View *view = NULL;
 
-static void _view_clear(Evry_View *view);
-static void _pan_item_select(Evas_Object *obj, Item *it, int scroll);
-static void _animator_del(Evas_Object *obj);
+static void      _view_clear(Evry_View *view);
+static void      _pan_item_select(Evas_Object *obj, Item *it, int scroll);
+static void      _animator_del(Evas_Object *obj);
 static Eina_Bool _animator(void *data);
 
 static void
-_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_cb_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Coord w, h;
    Item *it = data;
@@ -89,6 +91,8 @@ _thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
    e_icon_size_get(it->thumb, &w, &h);
    edje_extern_object_aspect_set(it->thumb, EDJE_ASPECT_CONTROL_BOTH, w, h);
+   evas_object_size_hint_max_set(it->thumb, w, h);
+   edje_object_part_unswallow(it->frame, it->image);
    edje_object_part_swallow(it->frame, "e.swallow.thumb", it->thumb);
    evas_object_show(it->thumb);
    edje_object_signal_emit(it->frame, "e,action,thumb,show_delayed", "e");
@@ -100,6 +104,18 @@ _thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    it->image = NULL;
 }
 
+static void
+_cb_preload(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Item *it = data;
+
+   if (!it->frame) return;
+   printf("preload callback!!!!\n");
+
+   edje_object_part_swallow(it->frame, "e.swallow.icon", it->image);
+   /* evas_object_show(it->image); */
+}
+
 static int
 _check_item(const Evry_Item *it)
 {
@@ -119,87 +135,6 @@ _check_item(const Evry_Item *it)
    return 0;
 }
 
-static int _sort_pos_cb(const void *d1, const void *d2)
-{
-   const Item *it1 = d1;
-   const Item *it2 = d2;
-   return ((it1->x + it1->y * 4) - (it2->x + it2->y * 4));
-}
-
-static Eina_Bool
-_thumb_idler(void *data)
-{
-   Smart_Data *sd = data;
-   Eina_List *l, *ll;
-   Item *it;
-   char *suffix;
-   int w, h;
-   int cnt = 0;
-   
-   sd->queue = eina_list_sort(sd->queue, -1, _sort_pos_cb);
-
-   EINA_LIST_FOREACH_SAFE(sd->queue, l, ll, it)
-     {
-       if (!it->image && !it->have_thumb)
-         {
-            it->image = evry_util_icon_get(it->item, sd->view->evas);
-
-            if (it->image)
-              {
-                 e_icon_size_get(it->image, &w, &h);
-                 if (w && h)
-                   edje_extern_object_aspect_set(it->thumb, EDJE_ASPECT_CONTROL_BOTH, w, h);
-
-                 edje_object_part_swallow(it->frame, "e.swallow.icon", it->image);
-                 evas_object_show(it->image);
-                 edje_object_signal_emit(it->frame, "e,action,thumb,show", "e");
-              }
-            else it->have_thumb = EINA_TRUE;
-         }
-
-       if ((CHECK_TYPE(it->item, EVRY_TYPE_FILE)) &&
-           ((!it->thumb && !(it->have_thumb || it->do_thumb)) &&
-           (it->get_thumb || _check_item(it->item) ||
-            (it->item->icon && it->item->icon[0] == '/'))))
-         {
-            it->get_thumb = EINA_TRUE;
-
-            it->thumb = e_thumb_icon_add(sd->view->evas);
-
-            GET_FILE(file, it->item);
-
-            evas_object_smart_callback_add(it->thumb, "e_thumb_gen", _thumb_gen, it);
-
-            e_thumb_icon_size_set(it->thumb, it->w, it->h);
-            
-            if (it->item->icon && it->item->icon[0])
-              e_thumb_icon_file_set(it->thumb, it->item->icon, NULL);
-            else if ((suffix = strrchr(file->path, '.')) && (!strncmp(suffix, ".edj", 4)))
-              {
-                 e_thumb_icon_file_set(it->thumb, file->path, "e/desktop/background");
-                 e_thumb_icon_size_set(it->thumb, 128, 80);
-              }
-            else
-              e_thumb_icon_file_set(it->thumb, file->path, NULL);
-
-            e_thumb_icon_begin(it->thumb);
-            it->do_thumb = EINA_TRUE;
-         }
-
-       sd->queue = eina_list_remove_list(sd->queue, l);
-
-       if (cnt++ > 10)
-         {
-            e_util_wakeup();
-            return ECORE_CALLBACK_RENEW;
-         }
-     }
-
-   sd->thumb_idler = NULL;
-
-   return ECORE_CALLBACK_CANCEL;
-}
-
 static void
 _item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
@@ -217,21 +152,21 @@ _item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
 
    if ((ev->button == 1) && (ev->flags & EVAS_BUTTON_DOUBLE_CLICK))
      {
-       if (it != sd->cur_item)
-         {
-            evry_item_select(s, it->item);
-            _pan_item_select(it->obj, it, 0);
-         }
-
-       if (it->item->browseable)
-         evry_browse_item(it->item);
-       else
-         evry_plugin_action(s->selector->win, 1);
+        if (it != sd->cur_item)
+          {
+             evry_item_select(s, it->item);
+             _pan_item_select(it->obj, it, 0);
+          }
+
+        if (it->item->browseable)
+          evry_browse_item(it->item);
+        else
+          evry_plugin_action(s->selector->win, 1);
      }
    else
      {
-       sd->mouse_x = ev->canvas.x;
-       sd->mouse_y = ev->canvas.y;
+        sd->mouse_x = ev->canvas.x;
+        sd->mouse_y = ev->canvas.y;
      }
 }
 
@@ -257,19 +192,19 @@ _item_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    if (ev->button == 1)
      {
-       if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) &&
-           (it != sd->cur_item))
-         {
-            evry_item_select(s, it->item);
-            _pan_item_select(it->obj, it, 0);
-         }
+        if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) &&
+            (it != sd->cur_item))
+          {
+             evry_item_select(s, it->item);
+             _pan_item_select(it->obj, it, 0);
+          }
      }
    else if (ev->button == 3)
      {
-       evry_item_select(s, it->item);
-       _pan_item_select(it->obj, it, 0);
+        evry_item_select(s, it->item);
+        _pan_item_select(it->obj, it, 0);
 
-       evry_plugin_action(s->selector->win, 0);
+        evry_plugin_action(s->selector->win, 0);
      }
 }
 
@@ -281,18 +216,18 @@ _item_select(Item *it)
 
    if (it->thumb)
      {
-       if (strcmp(evas_object_type_get(it->thumb), "e_icon"))
-         edje_object_signal_emit(it->thumb, "e,state,selected", "e");
-       else
-         e_icon_selected_set(it->thumb, EINA_TRUE);
+        if (strcmp(evas_object_type_get(it->thumb), "e_icon"))
+          edje_object_signal_emit(it->thumb, "e,state,selected", "e");
+        else
+          e_icon_selected_set(it->thumb, EINA_TRUE);
      }
 
    if (it->image)
      {
-       if (strcmp(evas_object_type_get(it->image), "e_icon"))
-         edje_object_signal_emit(it->image, "e,state,selected", "e");
-       else
-         e_icon_selected_set(it->image, EINA_TRUE);
+        if (strcmp(evas_object_type_get(it->image), "e_icon"))
+          edje_object_signal_emit(it->image, "e,state,selected", "e");
+        else
+          e_icon_selected_set(it->image, EINA_TRUE);
      }
 }
 
@@ -304,54 +239,59 @@ _item_unselect(Item *it)
 
    if (it->thumb)
      {
-       if (strcmp(evas_object_type_get(it->thumb), "e_icon"))
-         edje_object_signal_emit(it->thumb, "e,state,unselected", "e");
-       else
-         e_icon_selected_set(it->thumb, EINA_FALSE);
+        if (strcmp(evas_object_type_get(it->thumb), "e_icon"))
+          edje_object_signal_emit(it->thumb, "e,state,unselected", "e");
+        else
+          e_icon_selected_set(it->thumb, EINA_FALSE);
      }
 
    if (it->image)
      {
-       if (strcmp(evas_object_type_get(it->image), "e_icon"))
-         edje_object_signal_emit(it->image, "e,state,unselected", "e");
-       else
-         e_icon_selected_set(it->image, EINA_FALSE);
+        if (strcmp(evas_object_type_get(it->image), "e_icon"))
+          edje_object_signal_emit(it->image, "e,state,unselected", "e");
+        else
+          e_icon_selected_set(it->image, EINA_FALSE);
      }
 }
 
+//static double _icon_time;
+
 static void
 _item_show(View *v, Item *it, Evas_Object *list)
 {
+   if (it->visible)
+     return;
+
    if (!it->frame)
      {
-       it->frame = edje_object_add(v->evas);
-       if (v->mode == VIEW_MODE_THUMB)
-         {
-            e_theme_edje_object_set(it->frame, "base/theme/modules/everything",
-                                    "e/modules/everything/thumbview/item/thumb");
-         }
-       else
-         {
-            e_theme_edje_object_set(it->frame, "base/theme/modules/everything",
-                                    "e/modules/everything/thumbview/item/list");
-
-            if (v->mode == VIEW_MODE_DETAIL)
-              edje_object_signal_emit(it->frame, "e,state,detail,show", "e");
-         }
-
-       evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_DOWN,
-                                      _item_down, it);
-       evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_UP,
-                                      _item_up, it);
-       evas_object_smart_member_add(it->frame, list);
-
-       evas_object_clip_set(it->frame, evas_object_clip_get(list));
-
-       if (it->item->selected)
-         _item_select(it);
-
-       if (it->item->marked)
-         edje_object_signal_emit(it->frame, "e,state,marked", "e");
+        it->frame = edje_object_add(v->evas);
+        if (v->mode == VIEW_MODE_THUMB)
+          {
+             e_theme_edje_object_set(it->frame, "base/theme/modules/everything",
+                                     "e/modules/everything/thumbview/item/thumb");
+          }
+        else
+          {
+             e_theme_edje_object_set(it->frame, "base/theme/modules/everything",
+                                     "e/modules/everything/thumbview/item/list");
+
+             if (v->mode == VIEW_MODE_DETAIL)
+               edje_object_signal_emit(it->frame, "e,state,detail,show", "e");
+          }
+
+        evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_DOWN,
+                                       _item_down, it);
+        evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_UP,
+                                       _item_up, it);
+        evas_object_smart_member_add(it->frame, list);
+
+        evas_object_clip_set(it->frame, evas_object_clip_get(list));
+
+        if (it->item->selected)
+          _item_select(it);
+
+        if (it->item->marked)
+          edje_object_signal_emit(it->frame, "e,state,marked", "e");
      }
 
    edje_object_part_text_set(it->frame, "e.text.label", it->item->label);
@@ -364,6 +304,65 @@ _item_show(View *v, Item *it, Evas_Object *list)
    if (it->item->browseable)
      edje_object_signal_emit(it->frame, "e,state,browseable", "e");
 
+   if (!it->image && !it->have_thumb)
+     {
+        //double t = ecore_time_get();
+        it->image = evry_util_icon_get(it->item, v->evas);
+        //_icon_time += ecore_time_get() - t;
+
+        if (it->image)
+          {
+             if (it->max_w == 0)
+               e_icon_size_get(it->image, &it->max_w, &it->max_h);
+
+             if ((it->max_w > 0) && (it->max_h > 0))
+               evas_object_size_hint_max_set(it->image, it->max_w * 2, it->max_h * 2);
+             else
+               it->max_w = -1;
+
+             if (0 && e_icon_preload_get(it->image) && !evas_object_visible_get(it->image))
+               {
+                  evas_object_smart_callback_add(it->image, "preloaded", _cb_preload, it);
+               }
+             else
+               {
+                  edje_object_part_swallow(it->frame, "e.swallow.icon", it->image);
+                  evas_object_show(it->image);
+               }
+          }
+        else it->have_thumb = EINA_TRUE;
+     }
+
+   if ((it->get_thumb) || (CHECK_TYPE(it->item, EVRY_TYPE_FILE) && _check_item(it->item)))
+     {
+        char *suffix;
+
+        it->get_thumb = EINA_TRUE;
+
+        it->thumb = e_thumb_icon_add(v->evas);
+
+        GET_FILE(file, it->item);
+
+        evas_object_smart_callback_add(it->thumb, "e_thumb_gen", _cb_thumb_gen, it);
+
+        e_thumb_icon_size_set(it->thumb, it->w, it->h);
+
+        if (it->item->icon && it->item->icon[0])
+          e_thumb_icon_file_set(it->thumb, it->item->icon, NULL);
+        else if ((suffix = strrchr(file->path, '.')) && (!strncmp(suffix, ".edj", 4)))
+          {
+             e_thumb_icon_file_set(it->thumb, file->path, "e/desktop/background");
+             e_thumb_icon_size_set(it->thumb, 128, 80);
+          }
+        else
+          e_thumb_icon_file_set(it->thumb, file->path, NULL);
+
+        e_thumb_icon_begin(it->thumb);
+        it->do_thumb = EINA_TRUE;
+     }
+
+   edje_object_signal_emit(it->frame, "e,action,thumb,show", "e");
+
    it->visible = EINA_TRUE;
 }
 
@@ -385,175 +384,161 @@ _item_hide(Item *it)
    it->visible = EINA_FALSE;
 }
 
-static Eina_Bool
-_e_smart_reconfigure_do(void *data)
+static int
+_place_items(Smart_Data *sd)
 {
-   Evas_Object *obj = data;
-   Smart_Data *sd = evas_object_smart_data_get(obj);
    Eina_List *l;
    Item *it;
-   int iw, changed = 0;
-   Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox = 0, oy = 0;
-   Evas_Coord aspect_w, aspect_h;
-
-   if (!sd) return ECORE_CALLBACK_CANCEL;
-
-   sd->idle_enter = NULL;
-   if (sd->w < 1) return ECORE_CALLBACK_CANCEL;
-
-   if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
-   if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
-   if (sd->cx < 0) sd->cx = 0;
-   if (sd->cy < 0) sd->cy = 0;
-
-   aspect_w = sd->w;
-   aspect_h = sd->h;
+   int div;
+   Evas_Coord x = 0, y = 0, ww, hh, mw = 0, mh = 0;
 
    if (sd->view->mode == VIEW_MODE_LIST)
      {
-       iw = sd->w;
-       hh = SIZE_LIST;
+        ww = sd->w;
+        hh = SIZE_LIST;
      }
    else if (sd->view->mode == VIEW_MODE_DETAIL)
      {
-       iw = sd->w;
-       hh = SIZE_DETAIL;
+        ww = sd->w;
+        hh = SIZE_DETAIL;
      }
    else
      {
-       int size;
-       int cnt = eina_list_count(sd->items);
-       double col = 1;
-       int width = sd->w - 8;
-
-       if (cnt < 5)
-         {
-            col = 2;
-            aspect_w = width * 2;
-         }
-       else if ((cnt < 9) && (sd->w < (double)sd->h * 1.2))
-         {
-            col = 2;
-            aspect_w = width * 3;
-         }
-       else if (cnt < 10)
-         {
-            col = 3;
-            aspect_w = width * 3;
-         }
-       else if (sd->view->zoom == 0)
-         {
-            size = 96;
-            aspect_w = width  * (1 + (sd->h / size));
-            col = width / size;
-         }
-       else if (sd->view->zoom == 1)
-         {
-            size = 128;
-            col = width / size;
-            aspect_w = width  * (1 + (sd->h / size));
-         }
-
-       else /* if (sd->view->zoom == 2) */
-         {
-            size = 192;
-            col = width / size;
-            aspect_w = width * (1 + (sd->h / size));
-         }
-
-       if (col < 1) col = 1;
-
-       iw = width / col;
-       aspect_w /= col;
+        int w, h;
+        Evas_Object *o = edje_object_add(sd->view->evas);
+        e_theme_edje_object_set(o, "base/theme/modules/everything",
+                                "e/modules/everything/thumbview/item/thumb");
+        edje_object_size_min_get(o, &w, &h);
+        evas_object_del(o);
+
+        if ((w > 0) && (h > 0))
+          {
+             div = sd->w / w;
+             if (div < 1) div = 1;
+             ww = w + (sd->w - div * w) / div;
+             hh = ((double)h / (double)w * (double)ww);
+          }
+        else
+          {
+             if (sd->view->zoom == 0)
+               ww = 96;
+             else if (sd->view->zoom == 1)
+               ww = 128;
+             else
+               ww = 192;
+
+             div = sd->w / ww;
+             if (div < 1) div = 1;
+             ww += (sd->w - div * ww) / div;
+
+             div = sd->h / ww;
+             if (div < 1) div = 1;
+             hh = ww + (sd->h - div * ww) / div;
+
+             if (hh > ww)
+               hh = ww + (sd->h - (div + 1) * ww) / (div + 1);
+          }
      }
 
-   if (aspect_w <= 0) aspect_w = 1;
-   if (aspect_h <= 0) aspect_h = 1;
+   EINA_LIST_FOREACH (sd->items, l, it)
+     {
+        it->x = x;
+        it->y = y;
+        it->w = ww;
+        it->h = hh;
 
-   x = 0;
-   y = 0;
-   ww = iw;
+        if ((x + ww) > mw) mw = x + ww;
+        if ((y + hh) > mh) mh = y + hh;
+        x += ww;
 
-   if (sd->view->mode == VIEW_MODE_THUMB)
-     hh = (aspect_h * iw) / (aspect_w);
+        if (x <= (sd->w - ww))
+          continue;
 
-   mw = mh = 0;
-   EINA_LIST_FOREACH(sd->items, l, it)
-     {
-       if (x > (sd->w - ww))
-         {
-            x = 0;
-            y += hh;
-         }
-
-       it->x = x;
-       it->y = y;
-       it->w = ww;
-       it->h = hh;
-
-       if ((x + ww) > mw) mw = x + ww;
-       if ((y + hh) > mh) mh = y + hh;
-       x += ww;
+        x = 0;
+        y += hh;
      }
 
-   if (sd->view->mode == VIEW_MODE_LIST ||
-       sd->view->mode == VIEW_MODE_DETAIL)
+   if ((sd->view->mode == VIEW_MODE_LIST) ||
+       (sd->view->mode == VIEW_MODE_DETAIL))
      mh += sd->h % hh;
 
    if ((mw != sd->cw) || (mh != sd->ch))
      {
-       sd->cw = mw;
-       sd->ch = mh;
-
-       if (sd->cx > (sd->cw - sd->w))
-         sd->cx = sd->cw - sd->w;
-       if (sd->cy > (sd->ch - sd->h))
-         sd->cy = sd->ch - sd->h;
-       if (sd->cx < 0)
-         sd->cx = 0;
-       if (sd->cy < 0)
-         sd->cy = 0;
-
-       changed = 1;
+        sd->cw = mw;
+        sd->ch = mh;
+
+        if (sd->cx > (sd->cw - sd->w))
+          sd->cx = sd->cw - sd->w;
+        if (sd->cy > (sd->ch - sd->h))
+          sd->cy = sd->ch - sd->h;
+        if (sd->cx < 0)
+          sd->cx = 0;
+        if (sd->cy < 0)
+          sd->cy = 0;
+
+        return 1;
      }
 
-   if (sd->view->mode == VIEW_MODE_THUMB)
-     {
-       if (sd->w > sd->cw) ox = (sd->w - sd->cw) / 2;
-       if (sd->h > sd->ch) oy = (sd->h - sd->ch) / 2;
-     }
+   return 0;
+}
+
+static Eina_Bool
+_e_smart_reconfigure_do(void *data)
+{
+   Evas_Object *obj = data;
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   Eina_List *l;
+   Item *it;
+   Evas_Coord xx, yy;
+   double time;
+
+   if (!sd)
+     return ECORE_CALLBACK_CANCEL;
+
+   sd->idle_enter = NULL;
+
+   if (sd->w < 1)
+     return ECORE_CALLBACK_CANCEL;
 
-   EINA_LIST_FOREACH(sd->items, l, it)
+   if (sd->view->hiding)
+     return ECORE_CALLBACK_CANCEL;
+
+   if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
+   if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
+   if (sd->cx < 0) sd->cx = 0;
+   if (sd->cy < 0) sd->cy = 0;
+
+   if (sd->place && _place_items(sd))
      {
-       xx = sd->x - sd->cx + it->x + ox;
-       yy = sd->y - sd->cy + it->y + oy;
-
-       if (E_INTERSECTS(xx, yy, it->w, it->h, 0, sd->y - it->h,
-                        sd->x + sd->w, sd->y + sd->h + it->h))
-         {
-            if (!it->visible)
-              _item_show(sd->view, it, obj);
-
-            evas_object_move(it->frame, xx, yy);
-            evas_object_resize(it->frame, it->w, it->h);
-
-            if (!(it->image || it->do_thumb || it->have_thumb) &&
-                !eina_list_data_find(sd->queue, it))
-              sd->queue = eina_list_append(sd->queue, it);
-         }
-       else if (it->visible)
-         {
-            sd->queue = eina_list_remove(sd->queue, it);
-            _item_hide(it);
-         }
-       it->changed = EINA_FALSE;
+        evas_object_smart_callback_call(obj, "changed", NULL);
+        return ECORE_CALLBACK_RENEW;
      }
 
-   if (changed)
-     evas_object_smart_callback_call(obj, "changed", NULL);
+   time = ecore_time_get();
 
-   if (!sd->thumb_idler)
-     sd->thumb_idler = ecore_idle_enterer_add(_thumb_idler, sd);
+   EINA_LIST_FOREACH (sd->items, l, it)
+     {
+        xx = sd->x - sd->cx + it->x;
+        yy = sd->y - sd->cy + it->y;
+
+        if (E_INTERSECTS(xx, yy, it->w, it->h, 0, sd->y - it->h * 3,
+                         sd->x + sd->w, sd->y + sd->h + it->h * 6))
+          {
+             if (!it->visible)
+               _item_show(sd->view, it, obj);
+
+             evas_object_move(it->frame, xx, yy);
+             evas_object_resize(it->frame, it->w, it->h);
+          }
+        else if (it->visible)
+          {
+             _item_hide(it);
+          }
+        it->changed = EINA_FALSE;
+
+        if (ecore_time_get() - time > 0.03)
+          return ECORE_CALLBACK_RENEW;
+     }
 
    sd->idle_enter = NULL;
 
@@ -587,9 +572,6 @@ _e_smart_del(Evas_Object *obj)
    if (sd->idle_enter)
      ecore_idle_enterer_del(sd->idle_enter);
 
-   if (sd->thumb_idler)
-     ecore_idle_enterer_del(sd->thumb_idler);
-
    _animator_del(obj);
 
    free(sd);
@@ -612,8 +594,10 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    Smart_Data *sd = evas_object_smart_data_get(obj);
    sd->w = w;
    sd->h = h;
+
+   sd->place = EINA_TRUE;
    _e_smart_reconfigure(obj);
-   evas_object_smart_callback_call(obj, "changed", NULL);
+   /* evas_object_smart_callback_call(obj, "changed", NULL); */
 }
 
 static void
@@ -626,7 +610,7 @@ static void
 _e_smart_color_set(Evas_Object *obj __UNUSED__, int r __UNUSED__, int g __UNUSED__, int b __UNUSED__, int a __UNUSED__){}
 
 static void
-_e_smart_clip_set(Evas_Object *obj __UNUSED__, Evas_Object * clip __UNUSED__){}
+_e_smart_clip_set(Evas_Object *obj __UNUSED__, Evas_Object *clip __UNUSED__){}
 
 static void
 _e_smart_clip_unset(Evas_Object *obj __UNUSED__){}
@@ -636,26 +620,26 @@ _pan_add(Evas *evas)
 {
    static Evas_Smart *smart = NULL;
    static const Evas_Smart_Class sc =
-     {
-       "wp_pan",
-       EVAS_SMART_CLASS_VERSION,
-       _e_smart_add,
-       _e_smart_del,
-       _e_smart_move,
-       _e_smart_resize,
-       _e_smart_show,
-       _e_smart_hide,
-       _e_smart_color_set,
-       _e_smart_clip_set,
-       _e_smart_clip_unset,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL
-     };
+   {
+      "wp_pan",
+      EVAS_SMART_CLASS_VERSION,
+      _e_smart_add,
+      _e_smart_del,
+      _e_smart_move,
+      _e_smart_resize,
+      _e_smart_show,
+      _e_smart_hide,
+      _e_smart_color_set,
+      _e_smart_clip_set,
+      _e_smart_clip_unset,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   };
    smart = evas_smart_class_new(&sc);
    return evas_object_smart_add(evas, smart);
 }
@@ -688,13 +672,13 @@ _pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
    Smart_Data *sd = evas_object_smart_data_get(obj);
    if (x)
      {
-       if (sd->w < sd->cw) *x = sd->cw - sd->w;
-       else *x = 0;
+        if (sd->w < sd->cw) *x = sd->cw - sd->w;
+        else *x = 0;
      }
    if (y)
      {
-       if (sd->h < sd->ch) *y = sd->ch - sd->h;
-       else *y = 0;
+        if (sd->h < sd->ch) *y = sd->ch - sd->h;
+        else *y = 0;
      }
 }
 
@@ -729,6 +713,7 @@ _pan_item_add(Evas_Object *obj, Evry_Item *item)
 
    evry_item_ref(item);
 
+   sd->place = EINA_TRUE;
    _e_smart_reconfigure(obj);
 
    return it;
@@ -740,12 +725,12 @@ _pan_item_remove(Evas_Object *obj, Item *it)
    Smart_Data *sd = evas_object_smart_data_get(obj);
 
    sd->items = eina_list_remove(sd->items, it);
-   sd->queue = eina_list_remove(sd->queue, it);
 
    _item_hide(it);
 
    evry_item_free(it->item);
 
+   sd->place = EINA_TRUE;
    _e_smart_reconfigure(obj);
 
    E_FREE(it);
@@ -766,26 +751,26 @@ _animator(void *data)
    if (!sd) return ECORE_CALLBACK_CANCEL;
 
    double da;
-   double spd = ((25.0/ (double)e_config->framerate) /
-                (double) (1 + sd->view->zoom));
+   double spd = ((25.0 / (double)e_config->framerate) /
+                 (double)(1 + sd->view->zoom));
    if (spd > 0.9) spd = 0.9;
 
    int wait = 0;
 
    if (sd->scroll_align != sd->scroll_align_to)
      {
-       sd->scroll_align = ((sd->scroll_align * (1.0 - spd)) +
-                           (sd->scroll_align_to * spd));
-
-       da = sd->scroll_align - sd->scroll_align_to;
-       if (da < 0.0) da = -da;
-       if (da < 0.02)
-         sd->scroll_align = sd->scroll_align_to;
-       else
-         wait++;
-
-       e_scrollframe_child_pos_set(sd->view->sframe,
-                                   0, sd->scroll_align);
+        sd->scroll_align = ((sd->scroll_align * (1.0 - spd)) +
+                            (sd->scroll_align_to * spd));
+
+        da = sd->scroll_align - sd->scroll_align_to;
+        if (da < 0.0) da = -da;
+        if (da < 0.02)
+          sd->scroll_align = sd->scroll_align_to;
+        else
+          wait++;
+
+        e_scrollframe_child_pos_set(sd->view->sframe,
+                                    0, sd->scroll_align);
      }
 
    if (wait)
@@ -794,7 +779,6 @@ _animator(void *data)
    _animator_del(data);
 
    return ECORE_CALLBACK_CANCEL;
-
 }
 
 static int
@@ -815,8 +799,8 @@ _child_region_get(Evas_Object *obj, Evas_Coord y, Evas_Coord h)
    if (y < py) ny = y;
    else if ((y + h) > (py + (ch - my)))
      {
-       ny = y + h - (ch - my);
-       if (ny > y) ny = y;
+        ny = y + h - (ch - my);
+        if (ny > y) ny = y;
      }
 
    if (ny < 0) ny = 0;
@@ -829,13 +813,11 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll)
 {
    Smart_Data *sd = evas_object_smart_data_get(obj);
    double align = -1;
-   int prev = -1;
 
    if (sd->cur_item)
      {
-       prev = sd->cur_item->y / (1 + sd->cur_item->h);
-       _item_unselect(sd->cur_item);
-       sd->cur_item = NULL;
+        _item_unselect(sd->cur_item);
+        sd->cur_item = NULL;
      }
 
    if (!it) return;
@@ -845,15 +827,15 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll)
 
    if (evry_conf->scroll_animate)
      {
-       double now = ecore_time_get();
+        double now = ecore_time_get();
 
-       if (now - sd->last_select < 0.08)
-         {
-            sd->scroll_align = sd->scroll_align_to;
-            scroll = 0;
-         }
+        if (now - sd->last_select < 0.08)
+          {
+             sd->scroll_align = sd->scroll_align_to;
+             scroll = 0;
+          }
 
-       sd->last_select = now;
+        sd->last_select = now;
      }
    else scroll = 0;
 
@@ -862,36 +844,36 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll)
 
    if (sd->view->mode == VIEW_MODE_THUMB)
      {
-       if (sd->view->zoom < 2)
-         align = _child_region_get(obj, it->y - it->h, it->h * 3);
-       else
-         align = _child_region_get(obj, it->y, it->h);
+        if (sd->view->zoom < 2)
+          align = _child_region_get(obj, it->y - it->h, it->h * 3);
+        else
+          align = _child_region_get(obj, it->y, it->h);
      }
    else
      {
-       align = _child_region_get(obj, it->y - it->h*2, it->h * 5);
+        align = _child_region_get(obj, it->y - it->h * 2, it->h * 5);
      }
 
    if (scroll && evry_conf->scroll_animate)
      {
-       sd->scroll_align_to = align;
+        sd->scroll_align_to = align;
 
-       if (align != sd->cy && !sd->animator)
-         sd->animator = ecore_animator_add(_animator, obj);
+        if (align != sd->cy && !sd->animator)
+          sd->animator = ecore_animator_add(_animator, obj);
      }
    else
      {
-       sd->scroll_align = sd->scroll_align_to;
+        sd->scroll_align = sd->scroll_align_to;
 
-       if (align >= 0)
-         {
-            sd->scroll_align = align;
-            sd->scroll_align_to = align;
-            e_scrollframe_child_pos_set(sd->view->sframe,
-                                        0, sd->scroll_align);
-         }
+        if (align >= 0)
+          {
+             sd->scroll_align = align;
+             sd->scroll_align_to = align;
+             e_scrollframe_child_pos_set(sd->view->sframe,
+                                         0, sd->scroll_align);
+          }
 
-       _animator_del(obj);
+        _animator_del(obj);
      }
 
    _e_smart_reconfigure(obj);
@@ -906,22 +888,14 @@ _clear_items(Evas_Object *obj)
 
    _animator_del(obj);
 
-   EINA_LIST_FOREACH(sd->items, l, it)
+   EINA_LIST_FOREACH (sd->items, l, it)
      _item_hide(it);
-
-   if (sd->queue)
-     eina_list_free(sd->queue);
-   sd->queue = NULL;
-
-   if (sd->thumb_idler)
-     ecore_idle_enterer_del(sd->thumb_idler);
-   sd->thumb_idler = NULL;
 }
 
 static void
 _view_clear(Evry_View *view)
 {
-   View *v = (View*) view;
+   View *v = (View *)view;
    Smart_Data *sd = evas_object_smart_data_get(v->span);
    Item *it;
    if (!sd) return;
@@ -935,13 +909,14 @@ _view_clear(Evry_View *view)
 
    if (sd->items)
      {
-       EINA_LIST_FREE(sd->items, it)
-         {
-            evry_item_free(it->item);
-            E_FREE(it);
-         }
+        EINA_LIST_FREE (sd->items, it)
+          {
+             evry_item_free(it->item);
+             E_FREE(it);
+          }
      }
 
+   sd->place = EINA_TRUE;
    _e_smart_reconfigure(v->span);
 
    v->tabs->clear(v->tabs);
@@ -967,6 +942,7 @@ _update_frame(Evas_Object *obj)
 
    e_scrollframe_child_pos_set(sd->view->sframe, 0, sd->scroll_align);
 
+   sd->place = EINA_TRUE;
    _e_smart_reconfigure_do(obj);
 
    _pan_item_select(obj, sd->cur_item, 0);
@@ -989,113 +965,114 @@ _view_update(Evry_View *view)
    Evry_Plugin *p = v->state->plugin;
 
    if (!sd) return 0;
-
    sd->cur_item = NULL;
    sd->it_down = NULL;
    sd->mouse_act = 0;
    sd->mouse_x = 0;
    sd->mouse_y = 0;
 
+   v->hiding = EINA_FALSE;
+
    if (!p)
      {
-       _view_clear(view);
-       return 1;
+        _view_clear(view);
+        return 1;
      }
 
    if (p != v->plugin && (v->plugin || (v->mode == VIEW_MODE_NONE)))
      {
-       if (p->config->view_mode != v->mode)
-         {
-            _clear_items(v->span);
-
-            if (p->config->view_mode < 0)
-              v->mode = evry_conf->view_mode;
-            else
-              v->mode = p->config->view_mode;
-         }
+        if (p->config->view_mode != v->mode)
+          {
+             _clear_items(v->span);
+
+             if (p->config->view_mode < 0)
+               v->mode = evry_conf->view_mode;
+             else
+               v->mode = p->config->view_mode;
+          }
      }
 
    /* go through current view items */
-   EINA_LIST_FOREACH(sd->items, l, v_it)
+   EINA_LIST_FOREACH (sd->items, l, v_it)
      {
-       last_pos = v_it->pos;
-       v_it->pos = 0;
-       pos = 1;
-
-       /* go through plugins current items */
-       EINA_LIST_FOREACH(p->items, ll, p_it)
-         {
-            if (v_it->item == p_it)
-              {
-                 if (pos != last_pos)
-                   v_it->changed = EINA_TRUE;
-
-                 v_it->pos = pos;
-
-                 if (p_it->selected)
-                   {
-                      sd->cur_item = v_it;
-                      v_it->selected = EINA_TRUE;
-                   }
-                 else
-                   {
-                      if (v_it->selected && v_it->frame)
-                        edje_object_signal_emit
-                          (v_it->frame,"e,state,unselected", "e");
-                      v_it->selected = EINA_FALSE;
-                   }
-                 break;
-              }
-            pos++;
-         }
-
-       if (v_it->visible)
-         {
-            if (!first_vis) first_vis = v_it->pos;
-            last_vis = v_it->pos;
-         }
-
-       /* view item is in list of current items */
-       if (v_it->pos)
-         {
-            v_items = eina_list_append(v_items, v_it->item);
-
-            if (v_it->visible && v_it->changed)
-              update = EINA_TRUE;
-         }
-       else
-         {
-            if (v_it->visible) update = EINA_TRUE;
-            v_remove = eina_list_append(v_remove, v_it);
-         }
+        last_pos = v_it->pos;
+        v_it->pos = 0;
+        pos = 1;
+
+        /* go through plugins current items */
+        EINA_LIST_FOREACH (p->items, ll, p_it)
+          {
+             if (v_it->item == p_it)
+               {
+                  if (pos != last_pos)
+                    v_it->changed = EINA_TRUE;
+
+                  v_it->pos = pos;
+
+                  if (p_it->selected)
+                    {
+                       sd->cur_item = v_it;
+                       v_it->selected = EINA_TRUE;
+                    }
+                  else
+                    {
+                       if (v_it->selected && v_it->frame)
+                         edje_object_signal_emit
+                           (v_it->frame, "e,state,unselected", "e");
+                       v_it->selected = EINA_FALSE;
+                    }
+                  break;
+               }
+             pos++;
+          }
+
+        if (v_it->visible)
+          {
+             if (!first_vis) first_vis = v_it->pos;
+             last_vis = v_it->pos;
+          }
+
+        /* view item is in list of current items */
+        if (v_it->pos)
+          {
+             v_items = eina_list_append(v_items, v_it->item);
+
+             if (v_it->visible && v_it->changed)
+               update = EINA_TRUE;
+          }
+        else
+          {
+             if (v_it->visible) update = EINA_TRUE;
+             v_remove = eina_list_append(v_remove, v_it);
+          }
      }
 
-   EINA_LIST_FREE(v_remove, v_it)
+   EINA_LIST_FREE (v_remove, v_it)
      _pan_item_remove(v->span, v_it);
 
    /* go through plugins current items */
    pos = 1;
-   EINA_LIST_FOREACH(p->items, l, p_it)
+   EINA_LIST_FOREACH (p->items, l, p_it)
      {
-       /* item is not already in view */
-       if (!eina_list_data_find_list(v_items, p_it))
-         {
-            v_it = _pan_item_add(v->span, p_it);
+        /* item is not already in view */
+        if (!eina_list_data_find_list(v_items, p_it))
+          {
+             v_it = _pan_item_add(v->span, p_it);
 
-            if (!v_it) continue;
+             if (!v_it) continue;
 
-            v_it->pos = pos;
+             v_it->pos = pos;
 
-            if (p_it == v->state->cur_item)
-              {
-                 sd->cur_item = v_it;
-                 v_it->selected = EINA_TRUE;
-              }
+             if (p_it == v->state->cur_item)
+               {
+                  sd->cur_item = v_it;
+                  v_it->selected = EINA_TRUE;
+               }
 
-            if (pos > first_vis && pos < last_vis)
-              update = EINA_TRUE;
-         }
-       pos++;
+             if (pos > first_vis && pos < last_vis)
+               update = EINA_TRUE;
+          }
+        pos++;
      }
    if (v_items) eina_list_free(v_items);
 
@@ -1103,8 +1080,8 @@ _view_update(Evry_View *view)
 
    if (update || !last_vis || v->plugin != p)
      {
-       v->plugin = p;
-       _update_frame(v->span);
+        v->plugin = p;
+        _update_frame(v->span);
      }
 
    v->tabs->update(v->tabs);
@@ -1115,7 +1092,7 @@ _view_update(Evry_View *view)
 static int
 _cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
 {
-   View *v = (View *) view;
+   View *v = (View *)view;
    Smart_Data *sd = evas_object_smart_data_get(v->span);
    Eina_List *l = NULL, *ll;
    Item *it = NULL;
@@ -1132,143 +1109,143 @@ _cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
    sd->mouse_y = 0;
 
    if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
-       (!strcmp(key, "2")))
+       (!strcmp(key, "2")))
      {
-       if (v->mode == VIEW_MODE_LIST)
-         v->mode = VIEW_MODE_DETAIL;
-       else
-         v->mode = VIEW_MODE_LIST;
-
-       v->zoom = 0;
-       _clear_items(v->span);
-       _update_frame(v->span);
-       goto end;
+        if (v->mode == VIEW_MODE_LIST)
+          v->mode = VIEW_MODE_DETAIL;
+        else
+          v->mode = VIEW_MODE_LIST;
+
+        v->zoom = 0;
+        _clear_items(v->span);
+        _update_frame(v->span);
+        goto end;
      }
    else if (((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
-            (!strcmp(key, "3"))) || !strcmp(key, "XF86Forward"))
+             (!strcmp(key, "3"))) || !strcmp(key, "XF86Forward"))
      {
-       if (v->mode != VIEW_MODE_THUMB)
-         {
-            v->zoom = 0;
-            v->mode = VIEW_MODE_THUMB;
-            _clear_items(v->span);
-         }
-       else
-         {
-            v->zoom++;
-            if (v->zoom > 2) v->zoom = 0;
-            if (v->zoom == 2)
-              _clear_items(v->span);
-         }
-       _update_frame(v->span);
-       goto end;
+        if (v->mode != VIEW_MODE_THUMB)
+          {
+             v->zoom = 0;
+             v->mode = VIEW_MODE_THUMB;
+             _clear_items(v->span);
+          }
+        else
+          {
+             v->zoom++;
+             if (v->zoom > 2) v->zoom = 0;
+             if (v->zoom == 2)
+               _clear_items(v->span);
+          }
+        _update_frame(v->span);
+        goto end;
      }
    else if (!strcmp(key, "XF86Back"))
      {
-       if (v->mode == VIEW_MODE_LIST ||
-           v->mode == VIEW_MODE_DETAIL)
-         {
-            v->zoom = 0;
-            v->mode = VIEW_MODE_THUMB;
-         }
-       else
-         {
-            v->mode = VIEW_MODE_DETAIL;
-         }
-
-       _clear_items(v->span);
-       _update_frame(v->span);
-       goto end;
+        if (v->mode == VIEW_MODE_LIST ||
+            v->mode == VIEW_MODE_DETAIL)
+          {
+             v->zoom = 0;
+             v->mode = VIEW_MODE_THUMB;
+          }
+        else
+          {
+             v->mode = VIEW_MODE_DETAIL;
+          }
+
+        _clear_items(v->span);
+        _update_frame(v->span);
+        goto end;
      }
 
    if (((ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) ||
-       (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) &&
+        (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) &&
        (!strcmp(key, "Up")))
      {
-       if (!sd->items) goto end;
-       it = sd->items->data;
+        if (!sd->items) goto end;
+        it = sd->items->data;
 
-       _pan_item_select(v->span, it, 1);
-       evry_item_select(s, it->item);
-       goto end;
+        _pan_item_select(v->span, it, 1);
+        evry_item_select(s, it->item);
+        goto end;
      }
    else if (((ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) ||
-            (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) &&
-           (!strcmp(key, "Down")))
+             (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) &&
+            (!strcmp(key, "Down")))
      {
-       if (!sd->items) goto end;
+        if (!sd->items) goto end;
 
-       it = eina_list_last(sd->items)->data;
-       _pan_item_select(v->span, it, 1);
-       evry_item_select(s, it->item);
-       goto end;
+        it = eina_list_last(sd->items)->data;
+        _pan_item_select(v->span, it, 1);
+        evry_item_select(s, it->item);
+        goto end;
      }
 
    if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
        (!strcmp(key, "plus")))
      {
-       EINA_LIST_FOREACH(sd->items, ll, it)
-         {
-            if (!it->item->marked)
-              {
-                 if (it->frame)
-                   edje_object_signal_emit(it->frame, "e,state,marked", "e");
-                 evry_item_mark(s, it->item, 1);
-              }
-         }
-       goto end;
+        EINA_LIST_FOREACH (sd->items, ll, it)
+          {
+             if (!it->item->marked)
+               {
+                  if (it->frame)
+                    edje_object_signal_emit(it->frame, "e,state,marked", "e");
+                  evry_item_mark(s, it->item, 1);
+               }
+          }
+        goto end;
      }
    else if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
-           (!strcmp(key, "minus")))
+            (!strcmp(key, "minus")))
      {
-       EINA_LIST_FOREACH(sd->items, ll, it)
-         {
-            if (it->item->marked)
-              {
-                 if (it->frame)
-                   edje_object_signal_emit(it->frame, "e,state,unmarked", "e");
-                 evry_item_mark(s, it->item, 0);
-              }
-         }
-       goto end;
+        EINA_LIST_FOREACH (sd->items, ll, it)
+          {
+             if (it->item->marked)
+               {
+                  if (it->frame)
+                    edje_object_signal_emit(it->frame, "e,state,unmarked", "e");
+                  evry_item_mark(s, it->item, 0);
+               }
+          }
+        goto end;
      }
    else if (!strcmp(key, "comma") || !strcmp(key, "semicolon"))
      {
-       if (!sd->cur_item)
-         goto end;
-
-       if (!sd->cur_item->item->marked)
-         {
-            edje_object_signal_emit(sd->cur_item->frame, "e,state,marked", "e");
-            evry_item_mark(s, sd->cur_item->item, 1);
-         }
-       else
-         {
-            edje_object_signal_emit(sd->cur_item->frame, "e,state,unmarked", "e");
-            evry_item_mark(s, sd->cur_item->item, 0);
-         }
-
-       if (v->mode == VIEW_MODE_THUMB)
-         {
-            if (!strcmp(key, "comma"))
-              key = "Right";
-            else
-              key = "Left";
-         }
-       else
-         {
-            if (!strcmp(key, "comma"))
-              key = "Down";
-            else
-              key = "Up";
-         }
+        if (!sd->cur_item)
+          goto end;
+
+        if (!sd->cur_item->item->marked)
+          {
+             edje_object_signal_emit(sd->cur_item->frame, "e,state,marked", "e");
+             evry_item_mark(s, sd->cur_item->item, 1);
+          }
+        else
+          {
+             edje_object_signal_emit(sd->cur_item->frame, "e,state,unmarked", "e");
+             evry_item_mark(s, sd->cur_item->item, 0);
+          }
+
+        if (v->mode == VIEW_MODE_THUMB)
+          {
+             if (!strcmp(key, "comma"))
+               key = "Right";
+             else
+               key = "Left";
+          }
+        else
+          {
+             if (!strcmp(key, "comma"))
+               key = "Down";
+             else
+               key = "Up";
+          }
      }
 
    if ((slide = v->tabs->key_down(v->tabs, ev)))
      {
-       /* _view_update(view, -slide); */
-       _view_update(view);
-       return 1;
+        /* _view_update(view, -slide); */
+        _view_update(view);
+        return 1;
      }
 
    if (sd->items)
@@ -1278,125 +1255,125 @@ _cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
 
    if (v->mode == VIEW_MODE_THUMB && !evry_conf->cycle_mode)
      {
-       if (!strcmp(key, "Right"))
-         {
-            if (l && l->next)
-              it = l->next->data;
-
-            if (it)
-              {
-                 _pan_item_select(v->span, it, 1);
-                 evry_item_select(s, it->item);
-              }
-            goto end;
-         }
-       else if (!strcmp(key, "Left"))
-         {
-            if (l && l->prev)
-              it = l->prev->data;
-
-            if (it)
-              {
-                 _pan_item_select(v->span, it, 1);
-                 evry_item_select(s, it->item);
-              }
-            goto end;
-         }
+        if (!strcmp(key, "Right"))
+          {
+             if (l && l->next)
+               it = l->next->data;
+
+             if (it)
+               {
+                  _pan_item_select(v->span, it, 1);
+                  evry_item_select(s, it->item);
+               }
+             goto end;
+          }
+        else if (!strcmp(key, "Left"))
+          {
+             if (l && l->prev)
+               it = l->prev->data;
+
+             if (it)
+               {
+                  _pan_item_select(v->span, it, 1);
+                  evry_item_select(s, it->item);
+               }
+             goto end;
+          }
      }
    if (!strcmp(key, "Down"))
      {
-       if (v->mode == VIEW_MODE_THUMB &&
-           (!evry_conf->cycle_mode) &&
-           (sd->cur_item))
-         {
-            EINA_LIST_FOREACH(l, ll, it)
-              {
-                 if (it->y > sd->cur_item->y &&
-                     it->x >= sd->cur_item->x)
-                   break;
-              }
-         }
-
-       if (!it && l && l->next)
-         it = l->next->data;
-
-       if (it)
-         {
-            _pan_item_select(v->span, it, 1);
-            evry_item_select(s, it->item);
-         }
-       goto end;
+        if (v->mode == VIEW_MODE_THUMB &&
+            (!evry_conf->cycle_mode) &&
+            (sd->cur_item))
+          {
+             EINA_LIST_FOREACH (l, ll, it)
+               {
+                  if (it->y > sd->cur_item->y &&
+                      it->x >= sd->cur_item->x)
+                    break;
+               }
+          }
+
+        if (!it && l && l->next)
+          it = l->next->data;
+
+        if (it)
+          {
+             _pan_item_select(v->span, it, 1);
+             evry_item_select(s, it->item);
+          }
+        goto end;
      }
    else if (!strcmp(key, "Up"))
      {
-       if (v->mode == VIEW_MODE_THUMB &&
-           (!evry_conf->cycle_mode) &&
-           (sd->cur_item))
-         {
-            for(ll = l; ll; ll = ll->prev)
-              {
-                 it = ll->data;
-
-                 if (it->y < sd->cur_item->y &&
-                     it->x <= sd->cur_item->x)
-                   break;
-              }
-         }
-
-       if (!it && l && l->prev)
-         it = l->prev->data;
-
-       if (it)
-         {
-            _pan_item_select(v->span, it, 1);
-            evry_item_select(s, it->item);
-         }
-       goto end;
+        if (v->mode == VIEW_MODE_THUMB &&
+            (!evry_conf->cycle_mode) &&
+            (sd->cur_item))
+          {
+             for (ll = l; ll; ll = ll->prev)
+               {
+                  it = ll->data;
+
+                  if (it->y < sd->cur_item->y &&
+                      it->x <= sd->cur_item->x)
+                    break;
+               }
+          }
+
+        if (!it && l && l->prev)
+          it = l->prev->data;
+
+        if (it)
+          {
+             _pan_item_select(v->span, it, 1);
+             evry_item_select(s, it->item);
+          }
+        goto end;
      }
    else if ((!strcmp(key, "Prior") || (!strcmp(key, "Next"))))
      {
-       int cur = 0;
-       int next = (!strcmp(key, "Next"));
-       if (sd->cur_item)
-         cur = sd->cur_item->y;
-
-       EINA_LIST_FOREACH(sd->items, l, it)
-         {
-            if (next)
-              {
-                 if (it->y >= cur + sd->h) break;
-              }
-            else
-              {
-                 if (it->y + it->h >= cur - sd->h) break;
-              }
-
-            if (!l->next)
-              break;
-         }
-
-       if (it)
-         {
-            _pan_item_select(v->span, it, 0);
-            evry_item_select(s, it->item);
-         }
-       goto end;
+        int cur = 0;
+        int next = (!strcmp(key, "Next"));
+        if (sd->cur_item)
+          cur = sd->cur_item->y;
+
+        EINA_LIST_FOREACH (sd->items, l, it)
+          {
+             if (next)
+               {
+                  if (it->y >= cur + sd->h) break;
+               }
+             else
+               {
+                  if (it->y + it->h >= cur - sd->h) break;
+               }
+
+             if (!l->next)
+               break;
+          }
+
+        if (it)
+          {
+             _pan_item_select(v->span, it, 0);
+             evry_item_select(s, it->item);
+          }
+        goto end;
      }
    else if (!ev->modifiers && !strcmp(key, "Return"))
      {
-       if (v->mode == VIEW_MODE_THUMB)
-         {
-            if (!sd->cur_item)
-              goto end;
-
-            if (evry_browse_item(sd->cur_item->item))
-              goto end;
-         }
+        if (v->mode == VIEW_MODE_THUMB)
+          {
+             if (!sd->cur_item)
+               goto end;
+
+             if (evry_browse_item(sd->cur_item->item))
+               goto end;
+          }
      }
 
    return 0;
 
- end:
+end:
    return 1;
 }
 
@@ -1410,7 +1387,7 @@ _cb_item_changed(void *data, int type __UNUSED__, void *event)
    Smart_Data *sd = evas_object_smart_data_get(v->span);
    if (!sd) return ECORE_CALLBACK_PASS_ON;
 
-   EINA_LIST_FOREACH(sd->items, l, it)
+   EINA_LIST_FOREACH (sd->items, l, it)
      if (it->item == ev->item)
        break;
 
@@ -1419,8 +1396,8 @@ _cb_item_changed(void *data, int type __UNUSED__, void *event)
 
    if (ev->changed_selection)
      {
-       _pan_item_select(v->span, it, 1);
-       evry_item_select(v->state, ev->item);
+        _pan_item_select(v->span, it, 1);
+        evry_item_select(v->state, ev->item);
      }
 
    if (!it->visible)
@@ -1430,21 +1407,43 @@ _cb_item_changed(void *data, int type __UNUSED__, void *event)
 
    if (ev->changed_icon)
      {
-       if (it->do_thumb) e_thumb_icon_end(it->thumb);
-       if (it->thumb) evas_object_del(it->thumb);
-       if (it->image) evas_object_del(it->image);
+        if (it->do_thumb) e_thumb_icon_end(it->thumb);
+        if (it->thumb) evas_object_del(it->thumb);
+        if (it->image) evas_object_del(it->image);
+
+        it->thumb = NULL;
+        it->image = NULL;
 
-       it->thumb = NULL;
-       it->image = NULL;
+        it->have_thumb = EINA_FALSE;
+        it->do_thumb = EINA_FALSE;
+     }
 
-       it->have_thumb = EINA_FALSE;
-       it->do_thumb = EINA_FALSE;
+   return ECORE_CALLBACK_PASS_ON;
+}
 
-       if (!eina_list_data_find(sd->queue, it))
-         sd->queue = eina_list_append(sd->queue, it);
+static Eina_Bool
+_cb_action_performed(void *data, int type __UNUSED__, void *event)
+{
+   Evry_Event_Action_Performed *ev = event;
+   View *v = data;
+   Eina_List *l;
+   Item *it;
+   Smart_Data *sd;
+
+   sd = evas_object_smart_data_get(v->span);
+   if (!sd) return ECORE_CALLBACK_PASS_ON;
+
+   EINA_LIST_FOREACH (sd->items, l, it)
+     {
+        if ((it->item == ev->it1) ||
+            (it->item == ev->it2))
+          break;
+     }
 
-       if (!sd->thumb_idler)
-         sd->thumb_idler = ecore_idle_enterer_add(_thumb_idler, sd);
+   if (it && it->visible)
+     {
+        evas_object_raise(it->frame);
+        edje_object_signal_emit(it->frame, "e,action,go", "e");
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -1458,9 +1457,9 @@ _view_cb_mouse_wheel(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj
    if (!sd) return;
    if (ev->z)
      {
-       if (sd->cur_item)
-         _item_select(sd->cur_item);
-       sd->mouse_act = 1;
+        if (sd->cur_item)
+          _item_select(sd->cur_item);
+        sd->mouse_act = 1;
      }
 }
 
@@ -1511,11 +1510,11 @@ _view_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
    diff_x = abs(ev->cur.canvas.x - sd->mouse_x);
    diff_y = abs(ev->cur.canvas.y - sd->mouse_y);
 
-   if (diff_y > 15 + (diff_x/2))
+   if (diff_y > 15 + (diff_x / 2))
      {
-       edje_object_signal_emit(sd->view->bg, "e,action,hide,into", "e");
-       edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
-       goto end;
+        edje_object_signal_emit(sd->view->bg, "e,action,hide,into", "e");
+        edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
+        goto end;
      }
 
    if ((sel->states->next) || (sel != sel->win->selectors[0]))
@@ -1523,57 +1522,73 @@ _view_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 
    if (sd->it_down)
      {
-       if ((sd->it_down->item->browseable) ||
-           (sel != sel->win->selectors[2]))
-         edje_object_signal_emit(sd->view->bg, "e,action,show,into", "e");
-
-       if ((sd->cur_item != sd->it_down) && (diff_x > 10))
-         {
-            evry_item_select(sd->view->state, sd->it_down->item);
-            _pan_item_select(data, sd->it_down, 0);
-         }
+        if ((sd->it_down->item->browseable) ||
+            (sel != sel->win->selectors[2]))
+          edje_object_signal_emit(sd->view->bg, "e,action,show,into", "e");
+
+        if ((sd->cur_item != sd->it_down) && (diff_x > 10))
+          {
+             evry_item_select(sd->view->state, sd->it_down->item);
+             _pan_item_select(data, sd->it_down, 0);
+          }
      }
 
    if (sd->mouse_button == 1)
      {
-       if (ev->cur.canvas.x - sd->mouse_x > SLIDE_RESISTANCE)
-         {
-            sd->it_down = NULL;
-            sd->mouse_x = 0;
-            sd->mouse_y = 0;
-            if (sel->states->next)
-              evry_browse_back(sel);
-            else
-              evry_selectors_switch(sel->win, -1, EINA_TRUE);
-         }
-       else if ((sd->it_down && (sd->cur_item == sd->it_down)) &&
-                (sd->mouse_x - ev->cur.canvas.x > SLIDE_RESISTANCE))
-         {
-            edje_object_signal_emit(sd->view->bg, "e,action,hide,into", "e");
-            edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
-
-            if (sd->it_down->item->browseable)
-              {
-                 evry_browse_item(sd->it_down->item);
-              }
-            else
-              {
-                 evry_selectors_switch(sel->win, 1, EINA_TRUE);
-              }
-
-            sd->it_down = NULL;
-            sd->mouse_x = 0;
-            sd->mouse_y = 0;
-         }
+        if (ev->cur.canvas.x - sd->mouse_x > SLIDE_RESISTANCE)
+          {
+             sd->it_down = NULL;
+             sd->mouse_x = 0;
+             sd->mouse_y = 0;
+             if (sel->states->next)
+               evry_browse_back(sel);
+             else
+               evry_selectors_switch(sel->win, -1, EINA_TRUE);
+          }
+        else if ((sd->it_down && (sd->cur_item == sd->it_down)) &&
+                 (sd->mouse_x - ev->cur.canvas.x > SLIDE_RESISTANCE))
+          {
+             edje_object_signal_emit(sd->view->bg, "e,action,hide,into", "e");
+             edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
+
+             if (sd->it_down->item->browseable)
+               {
+                  evry_browse_item(sd->it_down->item);
+               }
+             else
+               {
+                  evry_selectors_switch(sel->win, 1, EINA_TRUE);
+               }
+
+             sd->it_down = NULL;
+             sd->mouse_x = 0;
+             sd->mouse_y = 0;
+          }
      }
    return;
 
- end:
+end:
    sd->it_down = NULL;
    sd->mouse_x = 0;
    sd->mouse_y = 0;
 }
 
+static void
+_cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   View *v = data;
+
+   v->hiding = EINA_TRUE;
+}
+
+static void
+_cb_list_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   View *v = data;
+
+   v->hiding = EINA_FALSE;
+}
+
 static Evry_View *
 _view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
 {
@@ -1589,21 +1604,21 @@ _view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
 
    if (s->plugin)
      {
-       if ((s->selector->states->next) &&
-           ((s->plugin->config->view_mode < 0) ||
-            (!strcmp(s->plugin->name, N_("All")))))
-         v->mode = parent->mode;
-       else if (s->plugin->config->view_mode >= 0)
-         v->mode = s->plugin->config->view_mode;
-       else
-         v->mode = evry_conf->view_mode;
+        if ((s->selector->states->next) &&
+            ((s->plugin->config->view_mode < 0) ||
+             (!strcmp(s->plugin->name, N_("All")))))
+          v->mode = parent->mode;
+        else if (s->plugin->config->view_mode >= 0)
+          v->mode = s->plugin->config->view_mode;
+        else
+          v->mode = evry_conf->view_mode;
      }
    else
      {
-       if (s->selector->states->next)
-         v->mode = parent->mode;
-       else
-         v->mode = evry_conf->view_mode;
+        if (s->selector->states->next)
+          v->mode = parent->mode;
+        else
+          v->mode = evry_conf->view_mode;
      }
 
    v->plugin = s->plugin;
@@ -1612,29 +1627,29 @@ _view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
 
    v->bg = edje_object_add(v->evas);
    e_theme_edje_object_set(v->bg, "base/theme/modules/everything",
-                          "e/modules/everything/thumbview/main/window");
+                           "e/modules/everything/thumbview/main/window");
    // scrolled thumbs
    v->span = _pan_add(v->evas);
    _pan_view_set(v->span, v);
    evas_object_event_callback_add(v->span, EVAS_CALLBACK_MOUSE_WHEEL,
-                                 _view_cb_mouse_wheel, NULL);
+                                  _view_cb_mouse_wheel, NULL);
 
    evas_object_event_callback_add(v->bg, EVAS_CALLBACK_MOUSE_MOVE,
-                                 _view_cb_mouse_move, v->span);
+                                  _view_cb_mouse_move, v->span);
    evas_object_event_callback_add(v->bg, EVAS_CALLBACK_MOUSE_DOWN,
-                                 _view_cb_mouse_down, v->span);
+                                  _view_cb_mouse_down, v->span);
    evas_object_event_callback_add(v->bg, EVAS_CALLBACK_MOUSE_UP,
-                                 _view_cb_mouse_up, v->span);
+                                  _view_cb_mouse_up, v->span);
 
    // the scrollframe holding the scrolled thumbs
    v->sframe = e_scrollframe_add(v->evas);
    e_scrollframe_custom_theme_set(v->sframe, "base/theme/modules/everything",
-                                 "e/modules/everything/thumbview/main/scrollframe");
+                                  "e/modules/everything/thumbview/main/scrollframe");
    e_scrollframe_thumbscroll_force(v->sframe, 1);
 
    e_scrollframe_extern_pan_set(v->sframe, v->span,
-                               _pan_set, _pan_get, _pan_max_get,
-                               _pan_child_size_get);
+                                _pan_set, _pan_get, _pan_max_get,
+                                _pan_child_size_get);
    edje_object_part_swallow(v->bg, "e.swallow.list", v->sframe);
 
    evas_object_show(v->sframe);
@@ -1647,7 +1662,11 @@ _view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
 
    h = evry_event_handler_add(EVRY_EVENT_ITEM_CHANGED, _cb_item_changed, v);
    v->handlers = eina_list_append(v->handlers, h);
+   h = evry_event_handler_add(EVRY_EVENT_ACTION_PERFORMED, _cb_action_performed, v);
+   v->handlers = eina_list_append(v->handlers, h);
 
+   edje_object_signal_callback_add(v->bg, "e,action,hide,list", "e", _cb_list_hide, v);
+   edje_object_signal_callback_add(v->bg, "e,action,show,list", "e", _cb_list_show, v);
    return EVRY_VIEW(v);
 }
 
@@ -1666,7 +1685,7 @@ _view_destroy(Evry_View *view)
 
    evry_tab_view_free(v->tabs);
 
-   EINA_LIST_FREE(v->handlers, h)
+   EINA_LIST_FREE (v->handlers, h)
      ecore_event_handler_del(h);
 
    E_FREE(v);
@@ -1702,3 +1721,4 @@ evry_view_shutdown(void)
    evry_view_unregister(EVRY_VIEW(view));
    E_FREE(view);
 }
+
index d87891e..de7e6c2 100644 (file)
@@ -27,30 +27,30 @@ _cb_key_down(Evry_View *v, const Ecore_Event_Key *ev)
 
    if (!strcmp(ev->key, "Down"))
      {
-       o = v->o_list;
-       evas_object_geometry_get(o, NULL, NULL, NULL, &h);
-       if (!h) h = 1;
-       e_box_align_get(o, NULL, &align);
+        o = v->o_list;
+        evas_object_geometry_get(o, NULL, NULL, NULL, &h);
+        if (!h) h = 1;
+        e_box_align_get(o, NULL, &align);
 
-       align = align - 10.0/(double)h;
-       if (align < 0.0) align = 0.0;
+        align = align - 10.0 / (double)h;
+        if (align < 0.0) align = 0.0;
 
-       e_box_align_set(v->o_list, 0.5, align);
+        e_box_align_set(v->o_list, 0.5, align);
 
-       return 1;
+        return 1;
      }
    else if (!strcmp(ev->key, "Up"))
      {
-       o = v->o_list;
-       evas_object_geometry_get(o, NULL, NULL, NULL, &h);
-       if (!h) h = 1;
-       e_box_align_get(o, NULL, &align);
+        o = v->o_list;
+        evas_object_geometry_get(o, NULL, NULL, NULL, &h);
+        if (!h) h = 1;
+        e_box_align_get(o, NULL, &align);
 
-       align = align + 10.0/(double)h;
-       if (align > 1.0) align = 1.0;
+        align = align + 10.0 / (double)h;
+        if (align > 1.0) align = 1.0;
 
-       e_box_align_set(v->o_list, 0.5, align);
-       return 1;
+        e_box_align_set(v->o_list, 0.5, align);
+        return 1;
      }
 
    evry_view_toggle(v->state, NULL);
@@ -62,7 +62,7 @@ _view_create(Evry_View *v, const Evry_State *s __UNUSED__, const Evas_Object *sw
 {
    Evas_Object *o;
    int mw, mh;
-   
+
    char *text =
      _("  Ok, here comes the explanation of <hilight>everything</hilight>...<br>"
        "  Just type a few letters of the thing you are looking for. <br>"
@@ -93,7 +93,7 @@ _view_create(Evry_View *v, const Evry_State *s __UNUSED__, const Evas_Object *sw
    e_box_freeze(v->o_list);
    o = edje_object_add(evas_object_evas_get(swallow));
    e_theme_edje_object_set(o, "base/theme/widgets",
-                          "e/modules/everything/textblock");
+                           "e/modules/everything/textblock");
 
    edje_object_part_text_set(o, "e.textblock.text", text);
    e_box_pack_start(v->o_list, o);
@@ -141,3 +141,4 @@ evry_view_help_shutdown(void)
    evry_view_unregister(view);
    E_FREE(view);
 }
+
index 82ac2d7..99a668d 100644 (file)
@@ -1,15 +1,14 @@
 #include "e_mod_main.h"
 
-
 typedef struct _Tab Tab;
 
 struct _Tab
 {
-  Tab_View *tab_view;
-  Evry_Plugin *plugin;
-  Evas_Object *o_tab;
+   Tab_View    *tab_view;
+   Evry_Plugin *plugin;
+   Evas_Object *o_tab;
 
-  int cw, mw;
+   int          cw, mw;
 };
 
 static void _tabs_update(Tab_View *v);
@@ -46,14 +45,15 @@ _tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
 
    if (tab->plugin)
      {
-       _plugin_select(v, tab->plugin);
-       v->view->update(v->view);
+        _plugin_select(v, tab->plugin);
+        v->view->update(v->view);
      }
    else
      {
-       evry_browse_back(v->state->selector);
+        evry_browse_back(v->state->selector);
      }
 }
+
 static void
 _tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
@@ -62,15 +62,16 @@ _tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
 
    if (ev->z > 0)
      {
-       _plugin_next(v);
-       v->view->update(v->view);
+        _plugin_next(v);
+        v->view->update(v->view);
      }
    else if (ev->z < 0)
      {
-       _plugin_prev(v);
-       v->view->update(v->view);
+        _plugin_prev(v);
+        v->view->update(v->view);
      }
 }
+
 static Tab *
 _add_tab(Tab_View *v, Evry_Plugin *p)
 {
@@ -81,25 +82,25 @@ _add_tab(Tab_View *v, Evry_Plugin *p)
    o = edje_object_add(v->evas);
    if (p)
      {
-       e_theme_edje_object_set(o, "base/theme/modules/everything",
-             "e/modules/everything/tab_item");
-       edje_object_part_text_set(o, "e.text.label", EVRY_ITEM(p)->label);
+        e_theme_edje_object_set(o, "base/theme/modules/everything",
+                                "e/modules/everything/tab_item");
+        edje_object_part_text_set(o, "e.text.label", EVRY_ITEM(p)->label);
      }
    else
      {
-       e_theme_edje_object_set(o, "base/theme/modules/everything",
-             "e/modules/everything/tab_item/back");
-       edje_object_part_text_set(o, "e.text.label", _("Back"));
+        e_theme_edje_object_set(o, "base/theme/modules/everything",
+                                "e/modules/everything/tab_item/back");
+        edje_object_part_text_set(o, "e.text.label", _("Back"));
      }
 
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
-                                 _tab_cb_down, tab);
+                                  _tab_cb_down, tab);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
-                                 _tab_cb_up, tab);
+                                  _tab_cb_up, tab);
    tab->o_tab = o;
 
    edje_object_size_min_calc(o, &tab->cw, NULL);
-   edje_object_size_min_get(o,  &tab->mw, NULL);
+   edje_object_size_min_get(o, &tab->mw, NULL);
 
    v->tabs = eina_list_append(v->tabs, tab);
 
@@ -119,86 +120,85 @@ _tabs_update(Tab_View *v)
 
    if (s->delete_me)
      return;
-   
+
    edje_object_calc_force(v->o_tabs);
    evas_object_geometry_get(v->o_tabs, &x, NULL, &w, NULL);
 
    if (!w && !v->timer)
      {
-       v->timer = ecore_timer_add(0.001, _timer_cb, v); 
-       return;
+        v->timer = ecore_timer_add(0.001, _timer_cb, v);
+        return;
      }
 
    /* remove tabs for not active plugins */
    e_box_freeze(v->o_tabs);
 
-   EINA_LIST_FOREACH(v->tabs, l, tab)
+   EINA_LIST_FOREACH (v->tabs, l, tab)
      {
-       if (!tab->plugin)
-         continue;
+        if (!tab->plugin)
+          continue;
 
-       e_box_unpack(tab->o_tab);
-       evas_object_hide(tab->o_tab);
+        e_box_unpack(tab->o_tab);
+        evas_object_hide(tab->o_tab);
      }
 
    if (s->selector->states->next)
      {
-       cur++;
-       i++;
-
-       if (!(tab = eina_list_data_get(v->tabs)))
-         {
-            tab = _add_tab(v, NULL);
-
-            o = tab->o_tab;
-            evas_object_show(o);
-            e_box_pack_end(v->o_tabs, o);
-            e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5, w/4, 10, w/3, 9999);
-         }
+        cur++;
+        i++;
+
+        if (!(tab = eina_list_data_get(v->tabs)))
+          {
+             tab = _add_tab(v, NULL);
+
+             o = tab->o_tab;
+             evas_object_show(o);
+             e_box_pack_end(v->o_tabs, o);
+             e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5, w / 4, 10, w / 3, 9999);
+          }
      }
 
-   for(l = s->cur_plugins; l; l = l->next, cur++)
+   for (l = s->cur_plugins; l; l = l->next, cur++)
      if (l->data == s->plugin) break;
 
    if (cur > 2)
      {
-       if ((cur + 1) == eina_list_count(s->cur_plugins))
-         plugins = eina_list_nth_list(s->cur_plugins, cur - 3);
-       else
-         plugins = eina_list_nth_list(s->cur_plugins, cur - 2);
+        if ((cur + 1) == eina_list_count(s->cur_plugins))
+          plugins = eina_list_nth_list(s->cur_plugins, cur - 3);
+        else
+          plugins = eina_list_nth_list(s->cur_plugins, cur - 2);
      }
    else
      {
-       plugins = s->cur_plugins;
+        plugins = s->cur_plugins;
      }
 
    /* show/update tabs of active plugins */
-   EINA_LIST_FOREACH(plugins, l, p)
+   EINA_LIST_FOREACH (plugins, l, p)
      {
-       EINA_LIST_FOREACH(v->tabs, ll, tab)
-         if (tab->plugin == p) break;
+        EINA_LIST_FOREACH (v->tabs, ll, tab)
+          if (tab->plugin == p) break;
 
-       if (!tab && !(tab = _add_tab(v, p)))
-         continue;
+        if (!tab && !(tab = _add_tab(v, p)))
+          continue;
 
-       o = tab->o_tab;
-       evas_object_show(o);
-       e_box_pack_end(v->o_tabs, o);
-       e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5, w/4, 10, w/3, 9999);
+        o = tab->o_tab;
+        evas_object_show(o);
+        e_box_pack_end(v->o_tabs, o);
+        e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5, w / 4, 10, w / 3, 9999);
 
-       if (s->plugin == p)
-         edje_object_signal_emit(o, "e,state,selected", "e");
-       else
-         edje_object_signal_emit(o, "e,state,unselected", "e");
+        if (s->plugin == p)
+          edje_object_signal_emit(o, "e,state,selected", "e");
+        else
+          edje_object_signal_emit(o, "e,state,unselected", "e");
 
-       if (++i > 3) break;
+        if (++i > 3) break;
      }
 
    e_box_align_set(v->o_tabs, 0.0, 0.5);
    e_box_thaw(v->o_tabs);
 }
 
-
 static void
 _tabs_clear(Tab_View *v)
 {
@@ -206,13 +206,13 @@ _tabs_clear(Tab_View *v)
    Tab *tab;
 
    e_box_freeze(v->o_tabs);
-   EINA_LIST_FOREACH(v->tabs, l, tab)
+   EINA_LIST_FOREACH (v->tabs, l, tab)
      {
-       if (!tab->plugin)
-         continue;
+        if (!tab->plugin)
+          continue;
 
-       e_box_unpack(tab->o_tab);
-       evas_object_hide(tab->o_tab);
+        e_box_unpack(tab->o_tab);
+        evas_object_hide(tab->o_tab);
      }
    e_box_thaw(v->o_tabs);
 }
@@ -254,23 +254,23 @@ _plugin_next_by_name(Tab_View *v, const char *key)
 
    if (!s->plugin) return;
 
-   EINA_LIST_FOREACH(s->cur_plugins, l, p)
+   EINA_LIST_FOREACH (s->cur_plugins, l, p)
      {
-       /* if (!p)
-        *   {
-        *      // FIXME how can this happen?
-        *      ERR("plugin == NULL");
-        *      continue;
-        *   } */
-
-       if (EVRY_ITEM(p)->label && (!strncasecmp(EVRY_ITEM(p)->label, key, 1)))
-         {
-            if (!first) first = p;
-
-            if (found && !next)
-              next = p;
-         }
-       if (p == s->plugin) found = 1;
+        /* if (!p)
+         *   {
+         *      // FIXME how can this happen?
+         *      ERR("plugin == NULL");
+         *      continue;
+         *   } */
+
+        if (EVRY_ITEM(p)->label && (!strncasecmp(EVRY_ITEM(p)->label, key, 1)))
+          {
+             if (!first) first = p;
+
+             if (found && !next)
+               next = p;
+          }
+        if (p == s->plugin) found = 1;
      }
 
    if (next)
@@ -298,15 +298,14 @@ _plugin_prev(Tab_View *v)
      p = l->prev->data;
    else
      {
-       l = eina_list_last(s->cur_plugins);
-       if (s->plugin != l->data)
-         p = l->data;
+        l = eina_list_last(s->cur_plugins);
+        if (s->plugin != l->data)
+          p = l->data;
      }
 
    if (p) _plugin_select(v, p);
 }
 
-
 static int
 _tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
 {
@@ -316,40 +315,39 @@ _tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
 
    if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
      {
-       if (!strcmp(key, "Next"))
-         {
-            _plugin_next(v);
-            return 1;
-         }
-       else if (!strcmp(key, "Prior"))
-         {
-            _plugin_prev(v);
-            return 1;
-         }
+        if (!strcmp(key, "Next"))
+          {
+             _plugin_next(v);
+             return 1;
+          }
+        else if (!strcmp(key, "Prior"))
+          {
+             _plugin_prev(v);
+             return 1;
+          }
      }
    else if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
      {
-       if (!strcmp(key, "Left"))
-         {
-            _plugin_prev(v);
-            return 1;
-         }
-       else if (!strcmp(key, "Right"))
-         {
-            _plugin_next(v);
-            return 1;
-         }
-       else if (ev->compose)
-         {
-            _plugin_next_by_name(v, key);
-            return 1;
-         }
+        if (!strcmp(key, "Left"))
+          {
+             _plugin_prev(v);
+             return 1;
+          }
+        else if (!strcmp(key, "Right"))
+          {
+             _plugin_next(v);
+             return 1;
+          }
+        else if (ev->compose)
+          {
+             _plugin_next_by_name(v, key);
+             return 1;
+          }
      }
 
    return 0;
 }
 
-
 Tab_View *
 evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
 {
@@ -357,8 +355,8 @@ evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
    Evas_Object *o;
 
    v = E_NEW(Tab_View, 1);
-   v->update   = &_tabs_update;
-   v->clear    = &_tabs_clear;
+   v->update = &_tabs_update;
+   v->clear = &_tabs_clear;
    v->key_down = &_tabs_key_down;
    v->view = view;
    v->state = s;
@@ -368,7 +366,7 @@ evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
    e_box_orientation_set(o, 1);
    e_box_homogenous_set(o, 1);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
-                                 _tabs_cb_wheel, v);
+                                  _tabs_cb_wheel, v);
    v->o_tabs = o;
 
    return v;
@@ -379,11 +377,11 @@ evry_tab_view_free(Tab_View *v)
 {
    Tab *tab;
 
-   EINA_LIST_FREE(v->tabs, tab)
+   EINA_LIST_FREE (v->tabs, tab)
      {
-       e_box_unpack(tab->o_tab);
-       evas_object_del(tab->o_tab);
-       E_FREE(tab);
+        e_box_unpack(tab->o_tab);
+        evas_object_del(tab->o_tab);
+        E_FREE(tab);
      }
 
    evas_object_del(v->o_tabs);
@@ -396,3 +394,4 @@ evry_tab_view_free(Tab_View *v)
 
    E_FREE(v);
 }
+
index b62a9ff..89f0405 100644 (file)
 #include "config.h"
 #endif
 
-#include <string.h>            /* for memcpy() */
+#include <string.h> /* for memcpy() */
 #include "md5.h"
 
 #if (__BYTE_ORDER == 1234)
-#define byteReverse(buf, len)  /* Nothing */
+#define byteReverse(buf, len) /* Nothing */
 #else
 void byteReverse(unsigned char *buf, unsigned longs);
 
 /*
  * Note: this code is harmless on little-endian machines.
  */
-void byteReverse(unsigned char *buf, unsigned longs)
+void
+byteReverse(unsigned char *buf, unsigned longs)
 {
-    uint32_t t;
-    do {
-       t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-           ((unsigned) buf[1] << 8 | buf[0]);
-       *(uint32_t *) buf = t;
-       buf += 4;
-    } while (--longs);
+   uint32_t t;
+   do {
+        t = (uint32_t)((unsigned)buf[3] << 8 | buf[2]) << 16 |
+          ((unsigned)buf[1] << 8 | buf[0]);
+        *(uint32_t *)buf = t;
+        buf += 4;
+     } while (--longs);
 }
+
 #endif
 
 /*
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
  * initialization constants.
  */
-void MD5Init(MD5_CTX *ctx)
+void
+MD5Init(MD5_CTX *ctx)
 {
-    ctx->buf[0] = 0x67452301;
-    ctx->buf[1] = 0xefcdab89;
-    ctx->buf[2] = 0x98badcfe;
-    ctx->buf[3] = 0x10325476;
+   ctx->buf[0] = 0x67452301;
+   ctx->buf[1] = 0xefcdab89;
+   ctx->buf[2] = 0x98badcfe;
+   ctx->buf[3] = 0x10325476;
 
-    ctx->bits[0] = 0;
-    ctx->bits[1] = 0;
+   ctx->bits[0] = 0;
+   ctx->bits[1] = 0;
 }
 
 /*
  * Update context to reflect the concatenation of another buffer full
  * of bytes.
  */
-void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
+void
+MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
 {
-    uint32_t t;
-
-    /* Update bitcount */
-
-    t = ctx->bits[0];
-    if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
-       ctx->bits[1]++;         /* Carry from low to high */
-    ctx->bits[1] += len >> 29;
-
-    t = (t >> 3) & 0x3f;       /* Bytes already in shsInfo->data */
-
-    /* Handle any leading odd-sized chunks */
-
-    if (t) {
-       unsigned char *p = (unsigned char *) ctx->in + t;
-
-       t = 64 - t;
-       if (len < t) {
-           memcpy(p, buf, len);
-           return;
-       }
-       memcpy(p, buf, t);
-       byteReverse(ctx->in, 16);
-       MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-       buf += t;
-       len -= t;
-    }
-    /* Process data in 64-byte chunks */
-
-    while (len >= 64) {
-       memcpy(ctx->in, buf, 64);
-       byteReverse(ctx->in, 16);
-       MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-       buf += 64;
-       len -= 64;
-    }
-
-    /* Handle any remaining bytes of data. */
-
-    memcpy(ctx->in, buf, len);
+   uint32_t t;
+
+   /* Update bitcount */
+
+   t = ctx->bits[0];
+   if ((ctx->bits[0] = t + ((uint32_t)len << 3)) < t)
+     ctx->bits[1]++;  /* Carry from low to high */
+   ctx->bits[1] += len >> 29;
+
+   t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
+
+   /* Handle any leading odd-sized chunks */
+
+   if (t)
+     {
+        unsigned char *p = (unsigned char *)ctx->in + t;
+
+        t = 64 - t;
+        if (len < t)
+          {
+             memcpy(p, buf, len);
+             return;
+          }
+        memcpy(p, buf, t);
+        byteReverse(ctx->in, 16);
+        MD5Transform(ctx->buf, (uint32_t *)ctx->in);
+        buf += t;
+        len -= t;
+     }
+   /* Process data in 64-byte chunks */
+
+   while (len >= 64) {
+        memcpy(ctx->in, buf, 64);
+        byteReverse(ctx->in, 16);
+        MD5Transform(ctx->buf, (uint32_t *)ctx->in);
+        buf += 64;
+        len -= 64;
+     }
+
+   /* Handle any remaining bytes of data. */
+
+   memcpy(ctx->in, buf, len);
 }
 
 /*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
-void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
+void
+MD5Final(unsigned char digest[16], MD5_CTX *ctx)
 {
-    unsigned count;
-    unsigned char *p;
-
-    /* Compute number of bytes mod 64 */
-    count = (ctx->bits[0] >> 3) & 0x3F;
-
-    /* Set the first char of padding to 0x80.  This is safe since there is
-       always at least one byte free */
-    p = ctx->in + count;
-    *p++ = 0x80;
-
-    /* Bytes of padding needed to make 64 bytes */
-    count = 64 - 1 - count;
-
-    /* Pad out to 56 mod 64 */
-    if (count < 8) {
-       /* Two lots of padding:  Pad the first block to 64 bytes */
-       memset(p, 0, count);
-       byteReverse(ctx->in, 16);
-       MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-
-       /* Now fill the next block with 56 bytes */
-       memset(ctx->in, 0, 56);
-    } else {
-       /* Pad block to 56 bytes */
-       memset(p, 0, count - 8);
-    }
-    byteReverse(ctx->in, 14);
-
-    /* Append length in bits and transform */
-    ((uint32_t *) ctx->in)[14] = ctx->bits[0];
-    ((uint32_t *) ctx->in)[15] = ctx->bits[1];
-
-    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-    byteReverse((unsigned char *) ctx->buf, 4);
-    memcpy(digest, ctx->buf, 16);
-    memset((char *) ctx, 0, sizeof(ctx));      /* In case it's sensitive */
+   unsigned count;
+   unsigned char *p;
+
+   /* Compute number of bytes mod 64 */
+   count = (ctx->bits[0] >> 3) & 0x3F;
+
+   /* Set the first char of padding to 0x80.  This is safe since there is
+      always at least one byte free */
+   p = ctx->in + count;
+   *p++ = 0x80;
+
+   /* Bytes of padding needed to make 64 bytes */
+   count = 64 - 1 - count;
+
+   /* Pad out to 56 mod 64 */
+   if (count < 8)
+     {
+        /* Two lots of padding:  Pad the first block to 64 bytes */
+        memset(p, 0, count);
+        byteReverse(ctx->in, 16);
+        MD5Transform(ctx->buf, (uint32_t *)ctx->in);
+
+        /* Now fill the next block with 56 bytes */
+        memset(ctx->in, 0, 56);
+     }
+   else {
+        /* Pad block to 56 bytes */
+        memset(p, 0, count - 8);
+     }
+   byteReverse(ctx->in, 14);
+
+   /* Append length in bits and transform */
+   ((uint32_t *)ctx->in)[14] = ctx->bits[0];
+   ((uint32_t *)ctx->in)[15] = ctx->bits[1];
+
+   MD5Transform(ctx->buf, (uint32_t *)ctx->in);
+   byteReverse((unsigned char *)ctx->buf, 4);
+   memcpy(digest, ctx->buf, 16);
+   memset((char *)ctx, 0, sizeof(ctx)); /* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
@@ -160,92 +169,94 @@ void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
 
 /* This is the central step in the MD5 algorithm. */
 #define MD5STEP(f, w, x, y, z, data, s) \
-       ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+  (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x)
 
 /*
  * The core of the MD5 algorithm, this alters an existing MD5 hash to
  * reflect the addition of 16 longwords of new data.  MD5Update blocks
  * the data and converts bytes into longwords for this routine.
  */
-void MD5Transform(uint32_t buf[4], uint32_t const in[16])
+void
+MD5Transform(uint32_t buf[4], uint32_t const in[16])
 {
-    register uint32_t a, b, c, d;
-
-    a = buf[0];
-    b = buf[1];
-    c = buf[2];
-    d = buf[3];
-
-    MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-    MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-    MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-    MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-    MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-    MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-    MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-    MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-    MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-    MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-    MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-    MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-    MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-    MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-    MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-    MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-    MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-    MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-    MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-    MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-    MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-    MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-    MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-    MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-    MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-    MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-    MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-    MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-    MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-    MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-    MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-    MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-    MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-    MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-    MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-    MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-    MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-    MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-    MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-    MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-    MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-    MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-    MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-    MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-    MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-    MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-    MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-    MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-    MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-    MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-    MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-    MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-    MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-    MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-    MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-    MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-    MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-    MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-    MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-    MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-    MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-    MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-    MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-    MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
+   register uint32_t a, b, c, d;
+
+   a = buf[0];
+   b = buf[1];
+   c = buf[2];
+   d = buf[3];
+
+   MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+   MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+   MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+   MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+   MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+   MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+   MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+   MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+   MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+   MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+   MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+   MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+   MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+   MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+   MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+   MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+   MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+   MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+   MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+   MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+   MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+   MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+   MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+   MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+   MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+   MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+   MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+   MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+   MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+   MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+   MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+   MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+   MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+   MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+   MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+   MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+   MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+   MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+   MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+   MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+   MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+   MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+   MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+   MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+   MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+   MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+   MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+   MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+   MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+   MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+   MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+   MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+   MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+   MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+   MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+   MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+   MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+   MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+   MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+   MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+   MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+   MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+   MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+   MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+   buf[0] += a;
+   buf[1] += b;
+   buf[2] += c;
+   buf[3] += d;
 }
+
diff --git a/src/modules/fileman/.cvsignore b/src/modules/fileman/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index e1c6b65..461875b 100644 (file)
@@ -20,16 +20,17 @@ pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
-                        e_mod_config.c \
-                        e_mod_config.h \
-                        e_mod_dbus.c \
-                        e_mod_dbus.h \
-                        e_fwin.c \
+                         e_mod_config.c \
+                         e_mod_config.h \
+                         e_mod_dbus.c \
+                         e_mod_dbus.h \
+                         e_fwin.c \
                          e_fwin.h \
                          e_int_config_mime.c \
                          e_int_config_mime.h \
                          e_int_config_mime_edit.c \
-                         e_int_config_mime_edit.h
+                         e_int_config_mime_edit.h \
+                         e_fwin_nav.c
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
index 3e8cf67..671e276 100644 (file)
  * multi-selecting)
  */
 
+#define DEFAULT_WIDTH 600
+#define DEFAULT_HEIGHT 350
+  
+
 typedef struct _E_Fwin             E_Fwin;
 typedef struct _E_Fwin_Page        E_Fwin_Page;
 typedef struct _E_Fwin_Apps_Dialog E_Fwin_Apps_Dialog;
@@ -440,8 +444,8 @@ _e_fwin_new(E_Container *con,
    E_Fwin *fwin;
    E_Fwin_Page *page;
    Evas_Object *o;
-   char buf[PATH_MAX];
-
+   E_Zone *zone;
+   
    fwin = E_OBJECT_ALLOC(E_Fwin, E_FWIN_TYPE, _e_fwin_free);
    if (!fwin) return NULL;
    fwin->win = e_win_new(con);
@@ -482,11 +486,19 @@ _e_fwin_new(E_Container *con,
 
    e_fm2_path_set(page->fm_obj, dev, path);
    _e_fwin_window_title_set(page);
-   snprintf(buf, sizeof(buf), "e_fwin::%s", e_fm2_real_path_get(fwin->cur_page->fm_obj));
-   e_win_name_class_set(fwin->win, "E", buf);
 
    e_win_size_min_set(fwin->win, 24, 24);
-   e_win_resize(fwin->win, 280 * e_scale, 200 * e_scale);
+
+   zone = e_util_zone_current_get(e_manager_current_get()); 
+   if ((zone) && (zone->w < DEFAULT_WIDTH))
+     {
+       int w, h;
+       e_zone_useful_geometry_get(zone, NULL, NULL, &w, &h);
+       e_win_resize(fwin->win, w, h);
+     }
+   else
+     e_win_resize(fwin->win, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+
    e_win_show(fwin->win);
    if (fwin->win->evas_win)
      e_drop_xdnd_register_set(fwin->win->evas_win, 1);
@@ -1029,7 +1041,7 @@ _e_fwin_config_set(E_Fwin_Page *page)
 static void
 _e_fwin_window_title_set(E_Fwin_Page *page)
 {
-   char buf[4096];
+   char buf[PATH_MAX];
    const char *file;
 
    if (!page) return;
@@ -1045,6 +1057,9 @@ _e_fwin_window_title_set(E_Fwin_Page *page)
         eina_strlcpy(buf, file, sizeof(buf));
         e_win_title_set(page->fwin->win, buf);
      }
+
+   snprintf(buf, sizeof(buf), "e_fwin::%s", e_fm2_real_path_get(page->fm_obj));
+   e_win_name_class_set(page->fwin->win, "E", buf);
 }
 
 static void
@@ -1165,10 +1180,10 @@ _e_fwin_cb_delete(E_Win *win)
 static void
 _e_fwin_cb_move(E_Win *win)
 {
-   E_Fwin *fwin;
+//   E_Fwin *fwin;
 
    if (!win) return;  //safety
-   fwin = win->data;
+//   fwin = win->data;
    /* _e_fwin_geom_save(fwin); */
 }
 
@@ -1496,7 +1511,7 @@ _e_fwin_cb_page_obj_del(void            *data,
    E_Fwin_Page *page;
    
    page = data;
-   printf("------ page obj del %p %p\n", page, page->fm_obj);
+
    evas_object_smart_callback_del(page->fm_obj, "dir_changed",
                                   _e_fwin_changed);
    evas_object_smart_callback_del(page->fm_obj, "dir_deleted",
@@ -1570,15 +1585,13 @@ _e_fwin_zone_del(void *data,
 
 /* fm menu extend */
 static void
-_e_fwin_menu_extend(void                 *data,
+_e_fwin_menu_extend(void                 *data __UNUSED__,
                     Evas_Object          *obj,
                     E_Menu               *m,
                     E_Fm2_Icon_Info *info __UNUSED__)
 {
-   E_Fwin_Page *page;
    E_Menu_Item *mi;
 
-   page = data;
    if (e_fm2_has_parent_get(obj))
      {
         mi = e_menu_item_new(m);
@@ -1891,14 +1904,14 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
                                  /* TODO add config for preffered
                                     initial size? */
                                  w = 5 * iw * e_scale;
-                                 if (w > 400)
-                                   w = 400;
+                                 if (w > DEFAULT_WIDTH)
+                                   w = DEFAULT_WIDTH;
                                  if (w > zw)
                                    w = zw;
 
                                  h = 4 * ih * e_scale;
-                                 if (h > 300)
-                                   h = 300;
+                                 if (h > DEFAULT_HEIGHT)
+                                   h = DEFAULT_HEIGHT;
                                  if (h > zh)
                                    h = zh;
 
@@ -1921,7 +1934,6 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
                }
           }
         if (!need_dia) return;
-        need_dia = 0;
      }
 
    apps = _e_fwin_suggested_apps_list_get(files, &mlist);
index c2724d7..09060ab 100644 (file)
@@ -13,5 +13,9 @@ void e_fwin_all_unsel     (void *data);
 void e_fwin_reload_all    (void);
 int  e_fwin_zone_find     (E_Zone *zone);
 
+Eina_Bool e_fwin_nav_init(void);
+Eina_Bool e_fwin_nav_shutdown(void);
+
+
 #endif
 #endif
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
new file mode 100644 (file)
index 0000000..15977c6
--- /dev/null
@@ -0,0 +1,600 @@
+#include <e.h>
+#include "e_mod_main.h"
+
+typedef struct _Instance Instance;
+
+struct _Instance
+{
+  E_Gadcon_Client *gcc;
+
+  E_Toolbar *tbar;
+
+  Evas_Object *o_base, *o_box, *o_fm, *o_scroll;
+
+  // buttons
+  Eina_List *l_buttons;
+  Eina_List *history, *current;
+  int ignore_dir;
+
+  const char *theme;
+
+  Ecore_Idle_Enterer *idler;
+};
+
+
+/* local function protos */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _cb_back_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_forward_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_up_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_refresh_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_favorites_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_changed(void *data, Evas_Object *obj, void *event_info);
+static void _cb_dir_changed(void *data, Evas_Object *obj, void *event_info);
+static void _cb_button_click(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info);
+static void _box_button_append(Instance *inst, const char *label, void (*func)(void *data, Evas_Object *obj, const char *emission, const char *source));
+
+static Eina_List *instances = NULL;
+static const char *_nav_mod_dir = NULL;
+
+/* local gadcon functions */
+static const E_Gadcon_Client_Class _gc_class =
+{
+   GADCON_CLIENT_CLASS_VERSION, "efm_navigation",
+     {
+        _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
+          e_gadcon_site_is_efm_toolbar
+     }, E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+Eina_Bool
+e_fwin_nav_init(void)
+{
+   e_gadcon_provider_register(&_gc_class);
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+e_fwin_nav_shutdown(void)
+{
+   e_gadcon_provider_unregister(&_gc_class);
+
+   return EINA_TRUE;
+}
+
+static void _cb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Instance *inst;
+   int w, h;
+
+   inst = data;
+   evas_object_geometry_get(inst->gcc->gadcon->o_container, 0, 0, &w, &h);
+   e_gadcon_client_min_size_set(inst->gcc, w, h);
+   e_gadcon_client_aspect_set(inst->gcc, w, h);
+}
+
+static Eina_Bool
+_cb_initial_dir(void *data)
+{
+   Instance *inst = data;
+
+   _cb_dir_changed(inst, NULL, NULL);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+{
+   Instance *inst = NULL;
+   char buf[PATH_MAX];
+   int w, h;
+   E_Toolbar *tbar;
+   Eina_List *l;
+   Evas_Object *o_fm;
+
+   tbar = e_gadcon_toolbar_get(gc);
+   if (!tbar) return NULL;
+
+   o_fm = e_toolbar_fm2_get(tbar);
+   if (!o_fm) return NULL;
+
+   /* make sure only one instance exists in toolbar */
+   EINA_LIST_FOREACH(instances, l, inst)
+     if (inst->tbar == tbar) return NULL;
+
+   inst = E_NEW(Instance, 1);
+   if (!inst) return NULL;
+
+   inst->tbar = tbar;
+   inst->o_fm = o_fm;
+
+   snprintf(buf, sizeof(buf), "%s/e-module-efm_nav.edj", _nav_mod_dir);
+   inst->theme = eina_stringshare_add(buf);
+
+   inst->o_base = edje_object_add(gc->evas);
+   e_theme_edje_object_set(inst->o_base, "base/theme/modules/efm_navigation",
+                          "modules/efm_navigation/main");
+
+   edje_object_signal_callback_add(inst->o_base, "e,action,back,click", "",
+                                  _cb_back_click, inst);
+   edje_object_signal_callback_add(inst->o_base, "e,action,forward,click", "",
+                                  _cb_forward_click, inst);
+   edje_object_signal_callback_add(inst->o_base, "e,action,up,click", "",
+                                  _cb_up_click, inst);
+   edje_object_signal_callback_add(inst->o_base, "e,action,refresh,click", "",
+                                  _cb_refresh_click, inst);
+   edje_object_signal_callback_add(inst->o_base, "e,action,favorites,click", "",
+                                  _cb_favorites_click, inst);
+   evas_object_show(inst->o_base);
+
+   inst->o_scroll = e_scrollframe_add(gc->evas);
+   e_scrollframe_custom_theme_set(inst->o_scroll,
+                                      "base/theme/modules/efm_navigation",
+                                 "modules/efm_navigation/pathbar_scrollframe");
+
+   e_scrollframe_single_dir_set(inst->o_scroll, 1);
+   e_scrollframe_policy_set(inst->o_scroll, E_SCROLLFRAME_POLICY_AUTO,
+                           E_SCROLLFRAME_POLICY_OFF);
+   e_scrollframe_thumbscroll_force(inst->o_scroll, 1);
+   evas_object_show(inst->o_scroll);
+
+   inst->o_box = e_box_add(gc->evas);
+   e_box_orientation_set(inst->o_box, 1);
+   e_box_homogenous_set(inst->o_box, 0);
+   e_scrollframe_child_set(inst->o_scroll, inst->o_box);
+   evas_object_show(inst->o_box);
+
+   evas_object_event_callback_add(inst->o_scroll, EVAS_CALLBACK_RESIZE,
+                                 _cb_scroll_resize, inst);
+   
+   edje_object_part_swallow(inst->o_base, "e.swallow.pathbar", inst->o_scroll);
+
+   inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_base);
+   inst->gcc->data = inst;
+
+   /* add the hooks to get signals from efm */
+   evas_object_event_callback_add(inst->o_fm, EVAS_CALLBACK_KEY_DOWN,
+                                 _cb_key_down, inst);
+   evas_object_smart_callback_add(inst->o_fm, "changed",
+                                 _cb_changed, inst);
+   evas_object_smart_callback_add(inst->o_fm, "dir_changed",
+                                 _cb_dir_changed, inst);
+
+   evas_object_event_callback_add(inst->o_base,
+                                 EVAS_CALLBACK_MOUSE_DOWN,
+                                 _cb_mouse_down, inst);
+   if (!inst->gcc->resizable)
+     {
+       evas_object_geometry_get(inst->gcc->gadcon->o_container, 0, 0, &w, &h);
+       e_gadcon_client_min_size_set(inst->gcc, w, h);
+       e_gadcon_client_aspect_set(inst->gcc, w, h);
+       evas_object_event_callback_add(inst->gcc->gadcon->o_container,
+                                      EVAS_CALLBACK_RESIZE,
+                                      _cb_resize, inst);
+     }
+
+   edje_object_signal_emit(inst->o_base, "e,state,back,disabled", "e");
+   edje_object_signal_emit(inst->o_base, "e,state,forward,disabled", "e");
+   edje_object_message_signal_process(inst->o_base);
+
+   instances = eina_list_append(instances, inst);
+
+   inst->idler = ecore_idle_enterer_add(_cb_initial_dir, inst);
+
+   return inst->gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   Instance *inst = NULL;
+   const char *s;
+   Evas_Object *btn;
+
+   inst = gcc->data;
+   if (!inst) return;
+   instances = eina_list_remove(instances, inst);
+
+   evas_object_event_callback_del_full(inst->o_fm,
+                                      EVAS_CALLBACK_KEY_DOWN,
+                                      _cb_key_down, inst);
+
+   evas_object_smart_callback_del(inst->o_fm, "changed", _cb_changed);
+   evas_object_smart_callback_del(inst->o_fm, "dir_changed", _cb_dir_changed);
+
+   EINA_LIST_FREE(inst->history, s)
+     eina_stringshare_del(s);
+
+   if (gcc->gadcon->o_container)
+     evas_object_event_callback_del_full(gcc->gadcon->o_container,
+                                        EVAS_CALLBACK_RESIZE,
+                                        _cb_resize, inst);
+
+   EINA_LIST_FREE(inst->l_buttons, btn)
+     {
+        e_box_unpack(btn);
+        evas_object_del(btn);
+     }
+
+   if (inst->o_base) evas_object_del(inst->o_base);
+   if (inst->o_box) evas_object_del(inst->o_box);
+   if (inst->o_scroll) evas_object_del(inst->o_scroll);
+
+   eina_stringshare_del(inst->theme);
+
+   E_FREE(inst);
+}
+
+static void
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
+{
+   Instance *inst;
+
+   inst = gcc->data;
+   switch (orient)
+     {
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_BOTTOM:
+        /* e_gadcon_client_aspect_set(gcc, 16 * 4, 16); */
+       break;
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_RIGHT:
+       /* e_gadcon_client_aspect_set(gcc, 16, 16 * 4); */
+       break;
+      default:
+       break;
+     }
+   /* e_gadcon_client_min_size_set(gcc, 16, 16); */
+}
+
+static const char *
+_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _("EFM Navigation");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+{
+   return e_util_icon_theme_icon_add("system-file-manager", 48, evas);
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name,
+           (eina_list_count(instances) + 1));
+   return strdup(buf);
+}
+
+/* local functions */
+static void
+_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
+{
+   Instance *inst;
+   Evas_Event_Key_Down *ev;
+
+   inst = data;
+   ev = event_info;
+   if (evas_key_modifier_is_set(ev->modifiers, "Alt"))
+     {
+        if (!strcmp(ev->key, "Left"))
+          _cb_back_click(inst, obj, "e,action,click", "e");
+        else if (!strcmp(ev->key, "Right"))
+          _cb_forward_click(inst, obj, "e,action,click", "e");
+        else if (!strcmp(ev->key, "Up"))
+          _cb_up_click(inst, obj, "e,action,click", "e");
+     }
+   else if (evas_key_modifier_is_set(ev->modifiers, "Control"))
+     {
+        if (!strcmp(ev->key, "r"))
+          _cb_refresh_click(inst, obj, "e,action,click", "e");
+     }
+}
+
+static void
+_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Instance *inst;
+   Evas_Event_Mouse_Down *ev;
+   E_Menu *m;
+   E_Zone *zone;
+   int x, y;
+
+   inst = data;
+   ev = event_info;
+   if ((ev->button != 3) || (inst->gcc->menu)) return;
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   m = e_menu_new();
+   m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
+   ecore_x_pointer_xy_get(zone->container->win, &x, &y);
+   e_menu_activate_mouse(m, zone, x, y, 1, 1,
+                        E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+}
+
+static void
+_cb_back_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst;
+
+   inst = data;
+
+   if ((!inst->current) || (inst->current == eina_list_last(inst->history))) return;
+   inst->current = eina_list_next(inst->current);
+
+   inst->ignore_dir = 1;
+   e_fm2_path_set(inst->o_fm, eina_list_data_get(inst->current), "/");
+}
+
+static void
+_cb_forward_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst;
+
+   inst = data;
+
+   if ((!inst->current) || (inst->current == inst->history)) return;
+   inst->current = eina_list_prev(inst->current);
+
+   inst->ignore_dir = 1;
+   e_fm2_path_set(inst->o_fm, eina_list_data_get(inst->current), "/");
+}
+
+static void
+_cb_refresh_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst;
+
+   inst = data;
+
+   // Don't destroy forward history when refreshing
+   inst->ignore_dir = 1;
+   e_fm2_path_set(inst->o_fm, NULL, e_fm2_real_path_get(inst->o_fm));
+}
+
+static void
+_cb_up_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst;
+   char *p, *t;
+
+   inst = data;
+
+   t = strdup(e_fm2_real_path_get(inst->o_fm));
+   p = strrchr(t, '/');
+   if (p)
+     {
+        *p = 0;
+        p = t;
+        if (p[0] == 0) p = "/";
+        e_fm2_path_set(inst->o_fm, NULL, p);
+     }
+   else
+     {
+        edje_object_signal_emit(inst->o_base, "e,state,up,disabled", "e");
+     }
+
+   free(t);
+}
+
+static void
+_cb_favorites_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst;
+
+   inst = data;
+
+   e_fm2_path_set(inst->o_fm, "favorites", "/");
+}
+
+static void
+_cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Instance *inst;
+
+   inst = data;
+   inst->tbar = event_info;
+}
+
+static void
+_cb_button_click(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Instance *inst = data;
+   Eina_List *l;
+   Evas_Object *btn;
+   char path[PATH_MAX] = "";
+
+   EINA_LIST_FOREACH(inst->l_buttons, l, btn)
+     {
+        strcat(path, edje_object_part_text_get(btn, "e.text.label"));
+        if (btn == obj) break;
+        strcat(path, "/");
+     }
+   e_fm2_path_set(inst->o_fm, "/", path);
+}
+
+static void
+_cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Instance *inst = data;
+   Evas_Coord mw = 0, mh = 0;
+   
+   evas_object_geometry_get(inst->o_box, NULL, NULL, &mw, NULL);
+   evas_object_geometry_get(inst->o_scroll, NULL, NULL, NULL, &mh);
+   evas_object_resize(inst->o_box, mw, mh);
+}
+
+static void
+_box_button_append(Instance *inst, const char *label, void (*func)(void *data, Evas_Object *obj, const char *emission, const char *source))
+{
+   Evas_Object *o;
+   Evas_Coord mw = 0, mh = 0;
+
+   if (!inst || !label || !*label || !func)
+     return;
+
+   o = edje_object_add(evas_object_evas_get(inst->o_box));
+
+   e_theme_edje_object_set(o, "base/theme/modules/efm_navigation",
+                          "modules/efm_navigation/pathbar_button");
+
+   edje_object_signal_callback_add(o, "e,action,click", "", func, inst);
+   edje_object_part_text_set(o, "e.text.label", label);
+   edje_object_size_min_calc(o, &mw, &mh);
+   e_box_pack_end(inst->o_box, o);
+   evas_object_show(o);
+   e_box_pack_options_set(o, 1, 0, 0, 0, 0.5, 0.5, mw, mh, 9999, 9999);
+   e_box_size_min_get(inst->o_box, &mw, NULL);
+   evas_object_geometry_get(inst->o_scroll, NULL, NULL, NULL, &mh);
+   evas_object_resize(inst->o_box, mw, mh);
+
+   inst->l_buttons = eina_list_append(inst->l_buttons, o);
+}
+
+static void
+_cb_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Instance *inst;
+   const char *realpath;
+   char *path, *dir, *p;
+   Eina_List *l, *ll, *sel = NULL;
+   Evas_Object *btn;
+   int mw, sw, changed = 0;
+
+   inst = data;
+
+   if (!(realpath = e_fm2_real_path_get(inst->o_fm))) return;
+
+   /* update pathbar */
+   if (!inst->l_buttons)
+     _box_button_append(inst, "/", _cb_button_click);
+   
+   sel = inst->l_buttons;
+   l = eina_list_next(sel);
+   p = path = ecore_file_realpath(realpath);
+
+   while (p)
+     {
+       dir = strsep(&p, "/");
+
+        if (!(*dir)) continue;
+
+       if (l && (btn = eina_list_data_get(l)))
+         {
+            if (strcmp(dir, edje_object_part_text_get(btn, "e.text.label")))
+              {
+                 changed = 1;
+
+                 while (l)
+                   {
+                      e_box_unpack(btn);
+                      evas_object_del(btn);
+                      ll = l;
+                      l = eina_list_next(l);
+                      btn = eina_list_data_get(l);
+
+                      inst->l_buttons =
+                        eina_list_remove_list(inst->l_buttons, ll);
+                   }
+              }
+            else
+              {
+                 if (!p) sel = l;
+                 l = eina_list_next(l);
+                 continue;
+              }
+         }
+
+       _box_button_append(inst, dir, _cb_button_click);
+       if (!p) sel = eina_list_last(inst->l_buttons);
+       changed = 1;
+     }
+
+   free(path);
+
+   if (changed)
+     {
+       evas_object_geometry_get(inst->o_box, NULL, NULL, &mw, NULL);
+       edje_object_size_min_calc(e_scrollframe_edje_object_get(inst->o_scroll), &sw, NULL);
+
+       evas_object_size_hint_max_set(inst->o_scroll, mw + sw, 32);
+     }
+
+   EINA_LIST_FOREACH(inst->l_buttons, l, btn)
+     if (l == sel)
+       edje_object_signal_emit(btn, "e,state,selected", "e");
+     else
+       edje_object_signal_emit(btn, "e,state,default", "e");
+
+   /* scroll to selected button */
+   if (sel)
+     {
+        Evas_Coord x, y, w, h, xx, yy, ww = 1;
+        btn = eina_list_data_get(sel);
+        evas_object_geometry_get(btn, &x, &y, &w, &h);
+
+       /* show buttons around selected */
+       if (sel->next)
+         {
+            btn = eina_list_data_get(sel->next);
+            evas_object_geometry_get(btn, NULL, NULL, &ww, NULL);
+            w += ww;
+         }
+       if (sel->prev)
+         {
+            btn = eina_list_data_get(sel->prev);
+            evas_object_geometry_get(btn, NULL, NULL, &ww, NULL);
+            x -= ww;
+            w += ww;
+         }
+
+       evas_object_geometry_get(inst->o_box, &xx, &yy, NULL, NULL);
+        e_scrollframe_child_region_show(inst->o_scroll, x - xx, y - yy, w, h);
+     }
+
+   /* update history */
+   if ((!inst->ignore_dir) && (eina_list_data_get(inst->current) != realpath))
+     {
+       if (inst->current)
+         {
+            while (inst->history != inst->current)
+              {
+                 eina_stringshare_del(eina_list_data_get(inst->history));
+                 inst->history =
+                   eina_list_remove_list(inst->history, inst->history);
+              }
+         }
+       inst->history =
+         eina_list_prepend(inst->history, eina_stringshare_ref(realpath));
+       inst->current = inst->history;
+     }
+   inst->ignore_dir = 0;
+
+   if (!strcmp(realpath, "/"))
+     edje_object_signal_emit(inst->o_base, "e,state,up,disabled", "e");
+   else
+     edje_object_signal_emit(inst->o_base, "e,state,up,enabled", "e");
+
+   if ((!inst->history) || (eina_list_last(inst->history) == inst->current))
+     edje_object_signal_emit(inst->o_base, "e,state,back,disabled", "e");
+   else
+     edje_object_signal_emit(inst->o_base, "e,state,back,enabled", "e");
+
+   if ((!inst->history) || (inst->history == inst->current))
+     edje_object_signal_emit(inst->o_base, "e,state,forward,disabled", "e");
+   else
+     edje_object_signal_emit(inst->o_base, "e,state,forward,enabled", "e");
+}
index 358f662..3be17b1 100644 (file)
@@ -78,38 +78,31 @@ e_int_config_mime_edit_done(void *data)
 static void
 _fill_data(E_Config_Dialog_Data *cfdata) 
 {
-   const char *homedir;
+   const char *s, *homedir;
+   Eina_List *l;
    char buf[4096];
 
    if (!cfdata) return;
    homedir = e_user_homedir_get();
 
    snprintf(buf, sizeof(buf), "/usr/local/etc/mime.types");
-   if (ecore_file_exists(buf))
-     _load_mimes(cfdata, buf);
-
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
    snprintf(buf, sizeof(buf), "/etc/mime.types");
-   if (ecore_file_exists(buf))
-     _load_mimes(cfdata, buf);
-
-   snprintf(buf, sizeof(buf), "/usr/local/share/mime/globs");
-   if (ecore_file_exists(buf))
-     _load_globs(cfdata, buf);
-
-   snprintf(buf, sizeof(buf), "/usr/share/mime/globs");
-   if (ecore_file_exists(buf))
-     _load_globs(cfdata, buf);
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
 
+   EINA_LIST_FOREACH(efreet_config_dirs_get(), l, s)
+     {
+        snprintf(buf, sizeof(buf), "%s/mime/globs", s);
+        if (ecore_file_exists(buf)) _load_globs(cfdata, buf);
+     }
+   
    snprintf(buf, sizeof(buf), "%s/.mime.types", homedir);
-   if (ecore_file_exists(buf))
-     _load_mimes(cfdata, buf);
-
-   snprintf(buf, sizeof(buf), "%s/.local/share/mime/globs", homedir);
-   if (ecore_file_exists(buf))
-     _load_globs(cfdata, buf);
-
+   if (ecore_file_exists(buf)) _load_mimes(cfdata, buf);
+   
+   snprintf(buf, sizeof(buf), "%s/mime/globs", efreet_data_home_get());
+   if (ecore_file_exists(buf)) _load_globs(cfdata, buf);
+   
    cfdata->mimes = eina_list_sort(cfdata->mimes, 0, _sort_mimes);
-
    _fill_types(cfdata);
 }
 
@@ -343,7 +336,7 @@ _load_mimes(E_Config_Dialog_Data *cfdata, char *file)
                            cfdata->mimes = eina_list_append(cfdata->mimes, mime);
                         }
                    }
-              }
+               }
          }
        while ((*p != '\n') && (*p != 0));
      }
@@ -493,36 +486,14 @@ static Config_Mime *
 _find_mime(E_Config_Dialog_Data *cfdata, char *mime) 
 {
    Config_Mime *cm;
-   const char *tmp;
    Eina_List *l;
-
+                    
    if (!cfdata) return NULL;
-
-   if (eina_list_count(cfdata->mimes) > 10)
-     {
-       tmp = eina_stringshare_add(mime);
-
-       EINA_LIST_FOREACH(cfdata->mimes, l, cm)
-         {
-            if (!cm) continue;
-            if (cm->mime != mime) continue;
-
-            eina_stringshare_del(tmp);
-            return cm;
-         }
-
-       eina_stringshare_del(tmp);
-     }
-   else
+   EINA_LIST_FOREACH(cfdata->mimes, l, cm)
      {
-       EINA_LIST_FOREACH(cfdata->mimes, l, cm)
-         {
-            if (!cm) continue;
-            if (strcmp(cm->mime, mime)) continue;
-            return cm;
-         }
+        if (!cm) continue;
+        if (!strcmp(cm->mime, mime)) return cm;
      }
-
    return NULL;
 }
 
index 2610238..ec49a26 100644 (file)
@@ -197,7 +197,7 @@ _e_fileman_dbus_daemon_new(void)
       E_DBus_Method_Cb func;
    } *itr, desc[] = {
       {"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb},
-      {NULL}
+      {NULL, NULL, NULL, NULL}
    };
 
    for (itr = desc; itr->method; itr++)
index eae9d82..61a23ae 100644 (file)
@@ -111,6 +111,8 @@ e_modapi_init(E_Module *m)
 
    e_fileman_dbus_init();
 
+   e_fwin_nav_init();
+   
    return m;
 }
 
@@ -144,6 +146,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
           }
      }
 
+   e_fwin_nav_shutdown();
+   
    /* remove module-supplied menu additions */
    if (maug)
      {
@@ -518,8 +522,9 @@ _e_mod_fileman_config_load(void)
     fileman_config->selection.windows_modifiers = 0;
     IFMODCFGEND;
 
-    IFMODCFG(0x0101);
-    fileman_config->view.show_toolbar = 0;
+    IFMODCFG(0x0103);
+    fileman_config->view.show_toolbar = 1;
+    fileman_config->view.open_dirs_in_place = 1;
     IFMODCFGEND;
 
     fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
index bd50860..8314caa 100644 (file)
@@ -16,7 +16,7 @@ typedef struct _Instance
 static E_Gadcon_Client *_gc_init    (E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient  (E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char            *_gc_label   (E_Gadcon_Client_Class *client_class);
+static const char      *_gc_label   (E_Gadcon_Client_Class *client_class);
 static Evas_Object     *_gc_icon    (E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char      *_gc_id_new  (E_Gadcon_Client_Class *client_class);
 
@@ -336,11 +336,17 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    E_Gadcon_Client *gcc;
    Instance *inst;
    int mw, mh;
+   int r;
 
    inst = E_NEW(Instance, 1);
 
-   asprintf(&inst->theme_file, "%s/e-module-fileman_opinfo.edj",
-            e_module_dir_get(opinfo_module));
+   r = asprintf(&inst->theme_file, "%s/e-module-fileman_opinfo.edj",
+                e_module_dir_get(opinfo_module));
+   if (r < 0)
+     {
+        E_FREE(inst);
+        return NULL;
+     }
 
    // main object
    inst->o_box = e_box_add(gc->evas);
@@ -403,7 +409,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("EFM Operation Info");
diff --git a/src/modules/gadman/.cvsignore b/src/modules/gadman/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 07540e0..7163949 100644 (file)
@@ -132,7 +132,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    
    
    e_widget_toolbook_page_append(otb, NULL, _("Add Gadget"), o, 1, 1, 1, 1, 0.5, 0.0);
-   o = e_widget_list_add(evas, 0, 0);
    ft = e_widget_table_add(evas, 0);
 
    //Background mode
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/src/modules/ibar/.cvsignore b/src/modules/ibar/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index e93ccf2..7d4ddd9 100644 (file)
@@ -13,7 +13,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
@@ -115,8 +115,6 @@ static Eina_Bool  _ibar_cb_config_icons(void *data, int ev_type, void *ev);
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_item_edd = NULL;
 
-static int uuid = 0;
-
 Config *ibar_config = NULL;
 
 static E_Gadcon_Client *
@@ -207,7 +205,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("IBar");
@@ -436,27 +434,9 @@ static Config_Item *
 _ibar_config_item_get(const char *id)
 {
    Config_Item *ci;
-   char buf[128];
 
-   if (!id)
-     {
-       snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, ++uuid);
-       id = buf;
-     }
-   else
-     {
-       const Eina_List *l;
+   GADCON_CLIENT_CONFIG_GET(Config_Item, ibar_config->items, _gadcon_class, id);
 
-       /* Find old config, or reuse supplied id */
-       EINA_LIST_FOREACH(ibar_config->items, l, ci)
-         {
-            if ((ci->id) && (!strcmp(ci->id, id)))
-              {
-                 if (!ci->dir) ci->dir = eina_stringshare_add("default");
-                 return ci;
-              }
-         }
-     }
    ci = E_NEW(Config_Item, 1);
    ci->id = eina_stringshare_add(id);
    ci->dir = eina_stringshare_add("default");
@@ -1205,57 +1185,6 @@ e_modapi_init(E_Module *m)
        ci->eap_label = 0;
        ibar_config->items = eina_list_append(ibar_config->items, ci);
      }
-   else
-     {
-       Eina_List *removes = NULL;
-       const Eina_List *l;
-       Config_Item *ci;
-
-       EINA_LIST_FOREACH(ibar_config->items, l, ci)
-         {
-            if (!ci->id)
-              removes = eina_list_append(removes, ci);
-            else if (!ci->dir)
-              removes = eina_list_append(removes, ci);
-            else
-              {
-                 const Eina_List *ll;
-                 Config_Item *ci2;
-
-                 EINA_LIST_FOREACH(l->next, ll, ci2)
-                   {
-                      if ((ci2->id) && (!strcmp(ci->id, ci2->id)))
-                        {
-                           removes = eina_list_append(removes, ci);
-                           break;
-                        }
-                   }
-              }
-         }
-       EINA_LIST_FREE(removes, ci)
-         {
-            ibar_config->items = eina_list_remove(ibar_config->items, ci);
-            if (ci->id) eina_stringshare_del(ci->id);
-            if (ci->dir) eina_stringshare_del(ci->dir);
-            E_FREE(ci);
-          }
-       EINA_LIST_FOREACH(ibar_config->items, l, ci)
-          {
-            if (ci->id)
-              {
-                 const char *p;
-
-                 p = strrchr(ci->id, '.');
-                 if (p)
-                   {
-                      int id;
-
-                      id = atoi(p + 1);
-                      if (id > uuid) uuid = id;
-                   }
-              }
-         }
-     }
  
    ibar_config->module = m;
 
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/src/modules/ibox/.cvsignore b/src/modules/ibox/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index b44ac50..70de870 100644 (file)
@@ -5,7 +5,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
@@ -117,8 +117,6 @@ static Config_Item *_ibox_config_item_get(const char *id);
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_item_edd = NULL;
 
-static int uuid = 0;
-
 Config *ibox_config = NULL;
 
 static E_Gadcon_Client *
@@ -212,7 +210,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("IBox");
@@ -654,12 +652,10 @@ _ibox_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
 }
 
 static void
-_ibox_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_ibox_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Event_Mouse_Out *ev;
    IBox_Icon *ic;
 
-   ev = event_info;
    ic = data;
    _ibox_icon_signal_emit(ic, "e,state,unfocused", "e");
    if (ic->ibox->inst->ci->show_label)
@@ -1229,25 +1225,10 @@ _ibox_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event
 static Config_Item *
 _ibox_config_item_get(const char *id)
 {
-   Eina_List *l;
    Config_Item *ci;
-   char buf[128];
 
-   if (!id)
-     {
-       snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, ++uuid);
-       id = buf;
-     }
-   else
-     {
-       /* Find old config */
-       for (l = ibox_config->items; l; l = l->next)
-         {
-            ci = l->data;
-            if ((ci->id) && (!strcmp(ci->id, id)))
-              return ci;
-         }
-     }
+   GADCON_CLIENT_CONFIG_GET(Config_Item, ibox_config->items, _gadcon_class, id);
+
    ci = E_NEW(Config_Item, 1);
    ci->id = eina_stringshare_add(id);
    ci->show_label = 0;
@@ -1343,56 +1324,6 @@ e_modapi_init(E_Module *m)
        ci->icon_label = 0;
        ibox_config->items = eina_list_append(ibox_config->items, ci);
      }
-   else
-     {
-    Eina_List *removes = NULL;
-       Eina_List *l;
-       
-       for (l = ibox_config->items; l; l = l->next)
-         {
-            Config_Item *ci = l->data;
-            if (!ci->id)
-              removes = eina_list_append(removes, ci);
-            else
-              {
-                 Eina_List *ll;
-                 
-                 for (ll = l->next; ll; ll = ll->next)
-                   {
-                      Config_Item *ci2 = ll->data;
-                      if ((ci2->id) && (!strcmp(ci->id, ci2->id)))
-                        {
-                           removes = eina_list_append(removes, ci);
-                           break;
-                        }
-                   }
-              }
-         }
-       while (removes)
-         {
-            Config_Item *ci = removes->data;
-            removes = eina_list_remove_list(removes, removes);
-            ibox_config->items = eina_list_remove(ibox_config->items, ci);
-            if (ci->id) eina_stringshare_del(ci->id);
-            free(ci);
-         }
-       for (l = ibox_config->items; l; l = l->next)
-         {
-            Config_Item *ci = l->data;
-            if (ci->id)
-              {
-                 const char *p;
-                 p = strrchr(ci->id, '.');
-                 if (p)
-                   {
-                      int id;
-                      
-                      id = atoi(p + 1);
-                      if (id > uuid) uuid = id;
-                   }
-              }
-         }
-     }
    
    ibox_config->module = m;
    
old mode 100755 (executable)
new mode 100644 (file)
index f521f04..dda513c 100644 (file)
@@ -14,7 +14,7 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static Eina_Bool _cb_poll(void *data);
@@ -89,7 +89,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume Bluetooth");
@@ -169,7 +169,7 @@ _get_interface_class(int iclass)
                }
              fclose(f);
           }
-       free(name);
+        free(name);
      }
    return 0;
 }
old mode 100755 (executable)
new mode 100644 (file)
index 95eaf42..9d33f53 100644 (file)
@@ -12,7 +12,7 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static void _cb_action_home(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -64,14 +64,14 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    inst = E_NEW(Instance, 1);
    inst->o_toggle = edje_object_add(gc->evas);
    e_theme_edje_object_set(inst->o_toggle, 
-                          "base/theme/modules/illume_home_toggle",
-                          "e/modules/illume_home_toggle/main");
+                           "base/theme/modules/illume_home_toggle",
+                           "e/modules/illume_home_toggle/main");
 
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_toggle);
    inst->gcc->data = inst;
 
    edje_object_signal_callback_add(inst->o_toggle, "e,action,home", "",
-                                  _cb_action_home, inst);
+                                   _cb_action_home, inst);
 
    instances = eina_list_append(instances, inst);
    return inst->gcc;
@@ -95,7 +95,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Home-Toggle");
index 1cca793..adb9c8d 100644 (file)
@@ -254,9 +254,9 @@ _il_home_desks_populate(void)
 
              if (sm->type != EFREET_MENU_ENTRY_DESKTOP) continue;
              if (!(desktop = sm->desktop)) continue;
-            if ((settings) && (sys) && 
-                (eina_list_data_find(settings, desktop)) && 
-                (eina_list_data_find(sys, desktop))) continue;
+             if ((settings) && (sys) && 
+                 (eina_list_data_find(settings, desktop)) && 
+                 (eina_list_data_find(sys, desktop))) continue;
              if ((kbd) && (eina_list_data_find(kbd, desktop))) 
                continue;
              efreet_desktop_ref(desktop);
@@ -650,7 +650,7 @@ _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
                }
              exes = eina_list_remove_list(exes, l);
              if (exe->timeout) ecore_timer_del(exe->timeout);
-            if (exe->desktop) efreet_desktop_free(exe->desktop);
+             if (exe->desktop) efreet_desktop_free(exe->desktop);
              E_FREE(exe);
              break;
           }
@@ -740,17 +740,17 @@ _il_home_cb_bg_change(void *data __UNUSED__, int type, void *event __UNUSED__)
 
    EINA_LIST_FOREACH(hwins, l, hwin) 
      {
-       E_Zone *zone;
-       E_Desk *desk;
-       const char *bgfile;
-
-       zone = hwin->zone;
-       desk = e_desk_current_get(zone);
-       if (desk)
-         bgfile = e_bg_file_get(zone->container->num, zone->num, desk->x, desk->y);
-       else
-         bgfile = e_bg_file_get(zone->container->num, zone->num, -1, -1);
-       edje_object_file_set(hwin->o_bg, bgfile, "e/desktop/background");
+        E_Zone *zone;
+        E_Desk *desk;
+        const char *bgfile;
+
+        zone = hwin->zone;
+        desk = e_desk_current_get(zone);
+        if (desk)
+          bgfile = e_bg_file_get(zone->container->num, zone->num, desk->x, desk->y);
+        else
+          bgfile = e_bg_file_get(zone->container->num, zone->num, -1, -1);
+        edje_object_file_set(hwin->o_bg, bgfile, "e/desktop/background");
      }
 
    return ECORE_CALLBACK_PASS_ON;
old mode 100755 (executable)
new mode 100644 (file)
index eb3c558..4a593fd 100644 (file)
@@ -153,6 +153,8 @@ e_mod_ind_win_new(E_Zone *zone)
    /* set this window on proper zone */
    e_border_zone_set(iwin->win->border, zone);
    iwin->win->border->user_skip_winlist = 1;
+   iwin->win->border->lock_focus_in = 1;
+   iwin->win->border->lock_focus_out = 1;
 
    /* set this window to be a dock window. This needs to be done after show 
     * as E will sometimes reset the window type */
@@ -392,9 +394,9 @@ _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj
         /* tell edj we are going to start moving */
         edje_object_signal_emit(iwin->o_base, "e,action,move,start", "e");
 
-       /* tell quickpanel to hide because we are going to drag */
-       ecore_x_e_illume_quickpanel_state_send(bd->zone->black_win, 
-                                             ECORE_X_ILLUME_QUICKPANEL_STATE_OFF);
+        /* tell quickpanel to hide because we are going to drag */
+        ecore_x_e_illume_quickpanel_state_send(bd->zone->black_win, 
+                                              ECORE_X_ILLUME_QUICKPANEL_STATE_OFF);
 
         /* send message that we are going to start dragging */
         ecore_x_e_illume_drag_start_send(bd->client.win);
old mode 100755 (executable)
new mode 100644 (file)
index d1b88b9..6f9b5d0 100644 (file)
@@ -14,7 +14,7 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static void _cb_action_vkbd_enable(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -71,16 +71,16 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    inst = E_NEW(Instance, 1);
    inst->o_toggle = edje_object_add(gc->evas);
    e_theme_edje_object_set(inst->o_toggle, 
-                          "base/theme/modules/illume_kbd_toggle",
-                          "e/modules/illume_kbd_toggle/main");
+                           "base/theme/modules/illume_kbd_toggle",
+                           "e/modules/illume_kbd_toggle/main");
 
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_toggle);
    inst->gcc->data = inst;
 
    edje_object_signal_callback_add(inst->o_toggle, "e,action,vkbd,enable", "",
-                                  _cb_action_vkbd_enable, inst);
+                                   _cb_action_vkbd_enable, inst);
    edje_object_signal_callback_add(inst->o_toggle, "e,action,vkbd,disable", "",
-                                  _cb_action_vkbd_disable, inst);
+                                   _cb_action_vkbd_disable, inst);
 
    inst->handlers = 
      eina_list_append(inst->handlers, 
@@ -120,7 +120,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Keyboard-Toggle");
@@ -160,7 +160,7 @@ _cb_action_vkbd_enable(void *data, Evas_Object *obj __UNUSED__, const char *emis
    if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) return;
 
    ecore_x_e_virtual_keyboard_state_set(bd->client.win,
-                                       ECORE_X_VIRTUAL_KEYBOARD_STATE_ON);
+                                        ECORE_X_VIRTUAL_KEYBOARD_STATE_ON);
 }
 
 static void
@@ -175,7 +175,7 @@ _cb_action_vkbd_disable(void *data, Evas_Object *obj __UNUSED__, const char *emi
    if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) return;
 
    ecore_x_e_virtual_keyboard_state_set(bd->client.win,
-                                       ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF);
+                                        ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF);
 }
 
 static Eina_Bool
old mode 100755 (executable)
new mode 100644 (file)
index bd4d0ba..e8ee4e4 100644 (file)
@@ -1,13 +1,25 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = keyboards dicts
+MAINTAINERCLEANFILES = Makefile.in module.desktop
+SUBDIRS = keyboards dicts images
 MODULE = illume-keyboard
 
+EDJE_CC = @edje_cc@
+EDJE_FLAGS_VERBOSE_ =
+EDJE_FLAGS_VERBOSE_0 =
+EDJE_FLAGS_VERBOSE_1 = -v
+EDJE_FLAGS = $(EDJE_FLAGS_$(V)) \
+             -id $(top_srcdir)/src/modules/$(MODULE)/images \
+             @EDJE_DEF@
+
+
+
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
 e-module-$(MODULE).edj module.desktop
 
-EXTRA_DIST = $(files_DATA)
+EXTRA_DIST = \
+             e-module-$(MODULE).edc \
+             module.desktop.in
 
 # the module .so file
 INCLUDES               = -I. \
@@ -36,5 +48,13 @@ module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
+e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
+       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
+       $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
+
+clean-local:
+       rm -f *.edj
+
 uninstall:
        rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-keyboard/e-module-illume-keyboard.edc b/src/modules/illume-keyboard/e-module-illume-keyboard.edc
new file mode 100755 (executable)
index 0000000..132ebea
--- /dev/null
@@ -0,0 +1,891 @@
+collections 
+{
+   group 
+     {
+        images.image: "module_icon.png" COMP;
+        name: "icon";
+        max: 128 128;
+        parts 
+          {
+             part 
+               {
+                  name: "base";
+                  mouse_events: 0;
+                  description 
+                    {
+                       state: "default" 0.0;
+                       aspect: 1.0 1.0;
+                       aspect_preference: BOTH;
+                       image.normal: "module_icon.png";
+                    }
+               }
+          }
+     }
+   group { name: "e/modules/kbd/base/default";
+      images {
+        image: "k_wtgr.png" COMP;
+        image: "k_tpsh.png" COMP;
+        image: "k_tabl.png" COMP;
+        image: "k_tabr.png" COMP;
+        image: "k_tabhl.png" COMP;
+        image: "k_tabhm.png" COMP;
+        image: "k_tabhr.png" COMP;
+        image: "k_grad.png" COMP;
+//      image: "k_ltgry.png" COMP;
+//      image: "grill_dark_tiny_pattern.png" COMP;
+        image: "big_arrow_up.png" COMP;
+         image: "bt_basew.png" COMP;
+         image: "bt_base2.png" COMP;
+        image: "bt_hilightw.png" COMP;
+      }
+//      data.item: "shaped" "1";
+      parts {
+        part { name: "base";
+           description { state: "default" 0.0;
+              rel1 {
+                 to_y: "compose_bg";
+                 relative: 0.0 1.0;
+                 offset: 0 0;
+              }
+              image.normal: "k_grad.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0 1.0;
+                     offset: 36 0;
+                  }
+               }
+           }
+        }
+/*      
+        part { name: "base";
+           type: RECT;
+           description { state: "default" 0.0;
+              color: 51 51 51 255;
+           }
+        }
+        part { name: "grill";
+           description { state: "default" 0.0;
+              rel1 {
+                 to_y: "compose_bg";
+                 relative: 0.0 1.0;
+                 offset: 0 0;
+              }
+              image.normal: "grill_dark_tiny_pattern.png";
+               fill {
+                  size {
+                     relative: 0 0;
+                     offset: 144 144;
+                  }
+               }
+           }
+        }
+        part { name: "light";
+           description { state: "default" 0.0;
+              rel1.to: "grill";
+              rel2.to: "grill";
+              image.normal: "k_ltgry.png";
+              fill {
+                 smooth: 0;
+                 size {
+                    relative: 0 1.0;
+                    offset: 36 0;
+                 }
+              }
+           }
+        }
+ */
+        part { name: "compose_bg";
+           description { state: "default" 0.0;
+              image.normal: "k_wtgr.png";
+              rel2.to: "e.swallow.label";
+              rel2.offset: 1 2;
+              fill {
+                 smooth: 0;
+                 size {
+                    relative: 0 1.0;
+                    offset: 36 0;
+                 }
+              }
+           }
+        }
+        part { name: "e.text.label";
+           type: TEXT;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              visible: 0;
+              rel1.to_x: "tl_tab";
+              rel1.relative: 1.0 0.0;
+               rel1.offset: 1 8;
+              rel2.to_x: "rt_tab";
+              rel2.relative: 0.0 0.0;
+              rel2.offset: -2 8;
+              align: 0.5 0.0;
+              fixed: 0 1;
+              text {
+                  font: "Sans";
+                 size: 10;
+                 min: 0 1;
+              }
+           }
+        }
+        part { name: "e.swallow.label";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+               rel1.to: "e.text.label";
+              rel1.offset: -8 -8;
+               rel2.to: "e.text.label";
+              rel2.offset: 7 7;
+              align: 0.5 0.0;
+           }
+        }
+        part { name: "compose_sh";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tpsh.png";
+              rel1 {
+                 to_x: "tl_tab";
+                 relative: 1.0 0.0;
+                 offset: -12 0;
+              }
+              rel2 {
+                 to_x: "rt_tab";
+                 to_y: "compose_bg";
+                 relative: 0.0 1.0;
+                 offset: 11 -1;
+              }
+              image.border: 12 12 12 12;
+              fill.smooth: 0;
+           }
+        }
+        part { name: "tl_tab";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tabl.png";
+              image.border: 0 12 6 6;
+              fill.smooth: 0;
+              rel1.to: "lprev";
+              rel2.to: "lprev";
+              rel2.offset: 13 -1;
+           }
+        }
+        part { name: "rt_tab";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tabr.png";
+              image.border: 12 0 6 6;
+              fill.smooth: 0;
+              rel1.to: "lnext";
+              rel1.offset: -12 0;
+              rel2.to: "lnext";
+           }
+        }
+        part { name: "lprev";
+           type: RECT;
+           description { state: "default" 0.0;
+              aspect: 1.5 1.5;
+              align: 0.0 0.5;
+              aspect_preference: VERTICAL;
+              color: 0 0 0 0;
+               rel2 {
+                 to_y: "compose_bg";
+                 relative: 0.0 1.0;
+                 offset: 0 -1;
+              }
+           }
+        }
+        part { name: "lnext";
+           type: RECT;
+           description { state: "default" 0.0;
+              aspect: 1.5 1.5;
+              align: 1.0 0.5;
+              aspect_preference: VERTICAL;
+              color: 0 0 0 0;
+              rel1 {
+                 relative: 1.0 0.0;
+                 offset: -1 0;
+              }
+              rel2 {
+                 to_y: "compose_bg";
+                 relative: 1.0 1.0;
+                 offset: -1 -1;
+              }
+           }
+        }
+        
+        part { name: "tl_tabh";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tabhl.png";
+              image.border: 0 12 6 20;
+              fill.smooth: 0;
+              rel1.to: "tl_tab";
+              rel2.to: "tl_tab";
+              rel2.offset: -2 15;
+           }
+        }
+        part { name: "tr_tabh";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tabhr.png";
+              image.border: 12 0 6 20;
+              fill.smooth: 0;
+              rel1.to: "rt_tab";
+              rel1.offset: 1 0;
+              rel2.to: "rt_tab";
+              rel2.offset: -1 15;
+           }
+        }
+        part { name: "t_h";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "k_tabhm.png";
+              fill.smooth: 0;
+              rel1 {
+                 to: "tl_tabh";
+                 relative: 1.0 1.0;
+                 offset: 0 -15;
+              }
+              rel2 {
+                 to: "tr_tabh";
+                 relative: 0.0 1.0;
+                 offset: -1 -1;
+              }
+           }
+        }
+        // dict/selection selector
+        part { name: "lprev2";
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              max: 22 22;
+              aspect: 1.39393939 1.39393939;
+              aspect_preference: BOTH;
+              image.normal: "big_arrow_up.png";
+              color: 255 255 255 255;
+              align: 0.5 0.5;
+              rel1.to: "lprev";
+              rel2.to: "lprev";
+           }
+        }
+        
+        // layout selector icon/config 
+         part { name: "button_image";
+            type: IMAGE;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "lnext";
+               rel1.offset: 0 1;
+               rel2.to: "lnext";
+rel2.offset: -4 -1;
+               image.normal: "bt_basew.png";
+               image.border: 7 7 7 7;
+               fill.smooth: 0;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_base2.png";
+               image.border: 7 7 7 7;
+               fill.smooth: 0;
+            }
+         }
+        part { name: "e.swallow.layout";
+           type: SWALLOW;
+           mouse_events: 0;
+           description { state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+           }
+        }
+         part { name: "over";
+            type: IMAGE;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "button_image";         
+               rel2.to: "button_image";
+               rel2.relative: 1.0 0.5;
+               image.normal: "bt_hilightw.png";
+               image.border: 7 7 7 0;
+               fill.smooth: 0;
+            }
+         }
+        part { name: "e.swallow.content";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              rel1 {
+                 to_y: "e.swallow.label";
+                 relative: 0.0 1.0;
+                 offset: 0 4;
+              }
+              rel2 {
+                 relative: 1.0 1.0;
+                 offset: -1 -1;
+              }
+           }
+        }
+      }
+      programs {
+        program { name: "lprev";
+           signal: "mouse,down,1";
+           source: "lprev";
+            action: SIGNAL_EMIT "e,action,do,matches" "";
+        }
+        program { name: "lnext";
+           signal: "mouse,up,1";
+           source: "lnext";
+            action: SIGNAL_EMIT "e,action,do,layouts" "";
+        }
+         program { name: "clicked";
+            signal: "mouse,down,1";
+            source: "lnext";
+            action: STATE_SET active 0.0;
+            target: "button_image";
+         }
+         program { name: "released";
+            signal: "mouse,up,1";
+            source: "lnext";
+            action: STATE_SET default 0.0;
+            target: "button_image";
+         }
+      }
+   }
+
+   group { name: "e/modules/kbd/match/word";
+      images {
+         image: "bt_basew.png" COMP;
+        image: "bt_base2.png" COMP;
+        image: "bt_hilight.png" COMP;
+        image: "bt_shine.png" COMP;
+        image: "bt_glow.png" COMP;
+image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+        part { name: "button_image";
+           mouse_events: 1;
+           description { state: "default" 0.0;
+              rel1.to: "e.text.label";
+              rel1.offset: -3 -3;
+              rel2.to_x: "e.text.label";
+              rel2.offset: 2 2;
+              image {
+                 normal: "bt_basew.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "active" 0.0;
+              inherit: "default" 0.0;
+              image.normal: "bt_base2.png";
+           }
+        }
+        part { name: "e.text.label";
+           type: TEXT;
+            effect: SOFT_SHADOW;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              color: 0 0 0 255;
+               color3: 0 0 0 0;
+              min: 32 0;
+              rel1 {
+                 relative: 0.0 0.0;
+                 offset:   3   3;
+              }
+              rel2 {
+                 relative: 1.0 1.0;
+                 offset:   -4  -4;
+              }
+              text {
+                  font: "Sans"; 
+                 size: 10;
+                 min: 1 1;
+              }
+           }
+           description { state: "active" 0.0;
+              inherit: "default" 0.0;
+              color: 224 224 224 255;
+              color3: 0 0 0 64;
+           }
+        }
+         part { name: "over1";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              rel2.relative: 1.0 0.5;
+              image {
+                 normal: "bt_hilight.png";
+                 border: 7 7 7 0;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit:  "default" 0.0;
+              image {
+                 normal: "bt_dis_hilight.png";
+                 border: 4 4 4 0;
+              }
+           }
+        }
+        part { name: "over2";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              image {
+                 normal: "bt_shine.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit:  "default" 0.0;
+              visible: 0;
+           }
+        }
+        part { name: "over3";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+              image {
+                 normal: "bt_glow.png";
+                 border: 12 12 12 12;
+              }
+               fill.smooth : 0;
+           }
+           description { state: "clicked" 0.0;
+              inherit:  "default" 0.0;
+              visible: 1;
+               color: 255 255 255 255;
+           }
+        }
+      }
+      programs {
+        program { name: "select";
+           signal: "mouse,up,1";
+           source: "button_image";
+            action: SIGNAL_EMIT "e,action,do,select" "";
+        }
+        program { name: "default";
+           signal: "e,state,selected";
+           source: "e";
+            action: STATE_SET "active" 0.0;
+           target: "button_image";
+            target: "e.text.label";
+        }
+        program { name: "select2";
+           signal: "mouse,down,1";
+           source: "button_image";
+            action: STATE_SET "active" 0.0;
+           target: "button_image";
+           target: "e.text.label";
+        }
+        program { name: "select3";
+           signal: "mouse,up,1";
+           source: "button_image";
+            action: STATE_SET "default" 0.0;
+           target: "button_image";
+           target: "over3";
+           target: "e.text.label";
+        }
+        program { name: "select4";
+           signal: "mouse,down,1";
+           source: "button_image";
+            action: STATE_SET "clicked" 0.0;
+           target: "over3";
+        }
+      }
+   }
+
+   group { name: "e/modules/kbd/key/default";
+      images {
+        image: "bt_base2.png" COMP;
+         image: "bt_basew.png" COMP;
+         image: "bt_hilightw.png" COMP;
+        image: "bt_shine.png" COMP;
+      }
+      parts {
+        part { name: "button_image";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "e.swallow.content";
+              rel1.offset: -3 -3;
+              rel2.to_x: "e.swallow.content";
+              rel2.offset: 2 2;
+              image {
+                 normal: "bt_basew.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "active" 0.0;
+              inherit: "default" 0.0;
+              image {
+                 normal: "bt_base2.png";
+                 border: 7 7 7 7;
+              }
+           }
+        }
+        part { name: "content_clip";
+            type: RECT;
+           description { state: "default" 0.0;
+              color: 0 0 0 255;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+           }
+           description { state: "active" 0.0;
+               inherit: "default" 0.0;
+              color: 255 255 255 255;
+           }
+        }
+        part {
+           name: "e.swallow.content";
+           type: SWALLOW;
+           clip_to: "content_clip";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1 {
+                 relative: 0.0 0.0;
+                 offset:   3   3;
+              }
+              rel2 {
+                 relative: 1.0 1.0;
+                 offset:   -4  -4;
+              }
+           }
+           description { state: "selected" 0.0;
+              inherit: "default" 0.0;
+              rel1 {
+                 relative: -0.5 -2.0;
+                 offset:   3   3;
+              }
+              rel2 {
+                 relative: 1.5 0.0;
+                 offset:   -4  -4;
+              }
+           }
+        }
+        part { name: "e.text.label";
+           type: TEXT;
+           clip_to: "content_clip";
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              rel1.to: "e.swallow.content";
+              rel2.to: "e.swallow.content";
+              color: 255 255 255 255;
+              text {
+                  font: "Sans"; 
+                 size: 10;
+                 min: 1 1;
+              }
+           }
+           description { state: "selected" 0.0;
+              inherit: "default" 0.0;
+              text {
+                 size: 24;
+              }
+           }
+        }
+         part { name: "over1";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              rel2.relative: 1.0 0.5;
+              image {
+                 normal: "bt_hilightw.png";
+                 border: 7 7 7 0;
+              }
+              fill.smooth: 0;
+           }
+        }
+        part { name: "over2";
+           mouse_events: 1;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              image {
+                 normal: "bt_shine.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit:  "default" 0.0;
+              visible: 0;
+           }
+        }
+      }
+      programs {
+        program { name: "down";
+           signal: "e,state,pressed";
+           source: "e";
+           action: STATE_SET "selected" 0.0;
+           target: "e.swallow.content";
+           target: "e.text.label";
+        }
+        program { name: "up";
+           signal: "e,state,released";
+           source: "e";
+           action: STATE_SET "default" 0.0;
+           transition: DECELERATE 0.25;
+           target: "e.swallow.content";
+           target: "e.text.label";
+        }
+        program { name: "selected";
+           signal: "e,state,selected";
+           source: "e";
+           action: STATE_SET "active" 0.0;
+           target: "button_image";
+           target: "content_clip";
+        }
+        program { name: "sunelected";
+           signal: "e,state,unselected";
+           source: "e";
+           action: STATE_SET "default" 0.0;
+           target: "button_image";
+           target: "content_clip";
+        }
+      }
+   }
+
+   group { name: "e/modules/kbd/zoomkey/default";
+      images {
+        image: "bt_base2.png" COMP;
+         image: "bt_basew.png" COMP;
+         image: "bt_hilightw.png" COMP;
+        image: "bt_shine.png" COMP;
+      }
+      parts {
+        part { name: "button_image";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "e.swallow.content";
+              rel1.offset: -3 -3;
+              rel2.to: "e.swallow.content";
+              rel2.offset: 2 2;
+              image {
+                 normal: "bt_basew.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "active" 0.0;
+              inherit: "default" 0.0;
+              image {
+                 normal: "bt_base2.png";
+                 border: 7 7 7 7;
+              }
+           }
+        }
+        part { name: "content_clip";
+           type: RECT;
+           description { state: "default" 0.0;
+              color: 0 0 0 255;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+           }
+           description { state: "active" 0.0;
+               inherit: "default" 0.0;
+              color: 255 255 255 255;
+           }
+        }
+        part {
+           name: "e.swallow.content";
+           type: SWALLOW;
+           clip_to: "content_clip";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1 {
+                 relative: 0.0 0.0;
+                 offset:   3   3;
+              }
+              rel2 {
+                 relative: 1.0 1.0;
+                 offset:   -4  -4;
+              }
+           }
+           description { state: "selected" 0.0;
+              inherit: "default" 0.0;
+              rel1 {
+                 relative: -0.25 -0.25;
+                 offset:   3   3;
+              }
+              rel2 {
+                 relative: 1.25 1.25;
+                 offset:   -4  -4;
+              }
+           }
+        }
+        part { name: "e.text.label";
+           type: TEXT;
+           clip_to: "content_clip";
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              rel1.to: "e.swallow.content";
+              rel2.to: "e.swallow.content";
+              color: 255 255 255 255;
+              text {
+                  font: "Sans"; 
+                 size: 40;
+                 min: 1 1;
+              }
+           }
+           description { state: "selected" 0.0;
+              inherit: "default" 0.0;
+              text {
+                 size: 60;
+              }
+           }
+        }
+         part { name: "over1";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              rel2.relative: 1.0 0.5;
+              image {
+                 normal: "bt_hilightw.png";
+                 border: 7 7 7 0;
+              }
+              fill.smooth: 0;
+           }
+        }
+        part { name: "over2";
+           mouse_events: 1;
+           description { state: "default" 0.0;
+              rel1.to: "button_image";
+              rel2.to: "button_image";
+              image {
+                 normal: "bt_shine.png";
+                 border: 7 7 7 7;
+              }
+              fill.smooth: 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit:  "default" 0.0;
+              visible: 0;
+           }
+        }
+      }
+      programs {
+        program { name: "down";
+           signal: "e,state,pressed";
+           source: "e";
+           action: STATE_SET "selected" 0.0;
+           target: "e.swallow.content";
+           target: "e.text.label";
+        }
+        program { name: "up";
+           signal: "e,state,released";
+           source: "e";
+           action: STATE_SET "default" 0.0;
+           transition: DECELERATE 0.25;
+           target: "e.swallow.content";
+           target: "e.text.label";
+        }
+        program { name: "selected";
+           signal: "e,state,selected";
+           source: "e";
+           action: STATE_SET "active" 0.0;
+           target: "button_image";
+           target: "content_clip";
+        }
+        program { name: "sunelected";
+           signal: "e,state,unselected";
+           source: "e";
+           action: STATE_SET "default" 0.0;
+           target: "button_image";
+           target: "content_clip";
+        }
+      }
+   }
+
+   group { name: "e/modules/kbd/zoom/default";
+//      data.item: "shaped" "1";
+//      max: 320 320; // hmm size here should be determined some other way
+      images {
+        image: "base_bg.png" COMP;
+        image: "inset_sunk.png" COMP;
+      }
+      parts {
+         part {          name: "base";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "base_bg.png";
+              image.border: 2 2 2 2;
+              fill.smooth: 0;
+           }
+        }
+        part { name: "clip";
+           type: RECT;
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.to: "border";
+              rel2.to: "border";
+              rel1.offset: 1 1;
+              rel2.offset: -2 -2;
+           }
+        }
+        part { name: "e.swallow.content";
+           clip_to: "clip";
+           type: SWALLOW;
+           scale: 1;
+           description { state: "default" 0.0;
+              min: 120 120;
+              max: 120 120;
+              rel1.offset: 4 4;
+              rel2.offset: -5 -5;
+           }
+        }
+        part { name: "border";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              rel1.offset: 3 3;
+              rel2.offset: -4 -4;
+              image {
+                 normal: "inset_sunk.png";
+                 border: 7 7 7 7;
+                 middle: 0;
+              }
+              fill.smooth : 0;
+           }
+        }
+      }
+   }
+
+   group { name: "e/modules/kbd/match/default";
+//      data.item: "shaped" "1";
+      images {
+        image: "base_bg.png" COMP;
+      }
+      parts {
+         part {          name: "base";
+           mouse_events: 0;
+           description { state: "default" 0.0;
+              image.normal: "base_bg.png";
+              image.border: 2 2 2 2;
+              fill.smooth: 0;
+           }
+        }
+        part { name: "e.swallow.content";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              rel1 {
+                 relative: 0.0 0.0;
+                 offset: 4 4;
+              }
+              rel2 {
+                 relative: 1.0 1.0;
+                 offset: -5 -5;
+              }
+           }
+        }
+      }
+   }
+
+}
diff --git a/src/modules/illume-keyboard/e-module-illume-keyboard.edj b/src/modules/illume-keyboard/e-module-illume-keyboard.edj
deleted file mode 100644 (file)
index ada995c..0000000
Binary files a/src/modules/illume-keyboard/e-module-illume-keyboard.edj and /dev/null differ
index b297ec9..452e866 100644 (file)
@@ -25,14 +25,14 @@ _e_kbd_buf_layout_unref(E_Kbd_Buf_Layout *kbl)
    if (kbl->ref > 0) return;
    while (kbl->keys)
      {
-       E_Kbd_Buf_Key *ky;
-       
-       ky = kbl->keys->data;
-       if (ky->key) eina_stringshare_del(ky->key);
-       if (ky->key_shift) eina_stringshare_del(ky->key_shift);
-       if (ky->key_capslock) eina_stringshare_del(ky->key_capslock);
-       free(ky);
-       kbl->keys = eina_list_remove_list(kbl->keys, kbl->keys);
+        E_Kbd_Buf_Key *ky;
+        
+        ky = kbl->keys->data;
+        if (ky->key) eina_stringshare_del(ky->key);
+        if (ky->key_shift) eina_stringshare_del(ky->key_shift);
+        if (ky->key_capslock) eina_stringshare_del(ky->key_capslock);
+        free(ky);
+        kbl->keys = eina_list_remove_list(kbl->keys, kbl->keys);
      }
    free(kbl);
 }
@@ -42,9 +42,9 @@ _e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
 {
    while (kb->string_matches)
      {
-       if (kb->string_matches->data)
-         eina_stringshare_del(kb->string_matches->data);
-       kb->string_matches = eina_list_remove_list(kb->string_matches, kb->string_matches);
+        if (kb->string_matches->data)
+          eina_stringshare_del(kb->string_matches->data);
+        kb->string_matches = eina_list_remove_list(kb->string_matches, kb->string_matches);
      }
 }
 
@@ -62,15 +62,15 @@ _e_kbd_buf_at_coord_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x,
    
    for (l = kbl->keys; l; l = l->next)
      {
-       E_Kbd_Buf_Key *ky;
-       
-       ky = l->data;
-       if (ky->key)
-         {
-            if ((x >= ky->x) && (y >= ky->y) &&
-                (x < (ky->x + ky->w)) && (y < (ky->y + ky->h)))
-              return ky;
-         }
+        E_Kbd_Buf_Key *ky;
+        
+        ky = l->data;
+        if (ky->key)
+          {
+             if ((x >= ky->x) && (y >= ky->y) &&
+                 (x < (ky->x + ky->w)) && (y < (ky->y + ky->h)))
+               return ky;
+          }
      }
    return NULL;
 }
@@ -84,21 +84,21 @@ _e_kbd_buf_closest_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, i
    
    for (l = kbl->keys; l; l = l->next)
      {
-       E_Kbd_Buf_Key *ky;
-       int dist, dx, dy;
-       
-       ky = l->data;
-       if (ky->key)
-         {
-            dx = x - (ky->x + (ky->w / 2));
-            dy = y - (ky->y + (ky->h / 2));
-            dist = (dx * dx) + (dy * dy);
-            if (dist < dist_closest)
-              {
-                 ky_closest = ky;
-                 dist_closest = dist;
-              }
-         }
+        E_Kbd_Buf_Key *ky;
+        int dist, dx, dy;
+        
+        ky = l->data;
+        if (ky->key)
+          {
+             dx = x - (ky->x + (ky->w / 2));
+             dy = y - (ky->y + (ky->h / 2));
+             dist = (dx * dx) + (dy * dy);
+             if (dist < dist_closest)
+               {
+                  ky_closest = ky;
+                  dist_closest = dist;
+               }
+          }
      }
    return ky_closest;
 }
@@ -110,17 +110,17 @@ _e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Keystrok
    
    if ((ky) && (ky->key))
      {
-       if (ks->shift)
-         {
-            if (ky->key_shift) str = ky->key_shift;
-            else str = ky->key;
-         }
-       else if (ks->capslock)
-         {
-            if (ky->key_capslock) str = ky->key_capslock;
-            else str = ky->key;
-         }
-       else str = ky->key;
+        if (ks->shift)
+          {
+             if (ky->key_shift) str = ky->key_shift;
+             else str = ky->key;
+          }
+        else if (ks->capslock)
+          {
+             if (ky->key_capslock) str = ky->key_capslock;
+             else str = ky->key;
+          }
+        else str = ky->key;
      }
    return str;
 }
@@ -133,11 +133,11 @@ _e_kbd_buf_keystroke_string_get(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
    if (ks->key) str = ks->key;
    else
      {
-       E_Kbd_Buf_Key *ky;
-       
-       ky = _e_kbd_buf_at_coord_get(kb, ks->layout, ks->x, ks->y);
-       if (!ky) ky = _e_kbd_buf_closest_get(kb, ks->layout, ks->x, ks->y);
-       str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
+        E_Kbd_Buf_Key *ky;
+        
+        ky = _e_kbd_buf_at_coord_get(kb, ks->layout, ks->x, ks->y);
+        if (!ky) ky = _e_kbd_buf_closest_get(kb, ks->layout, ks->x, ks->y);
+        str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
      }
    return str;
 }
@@ -148,32 +148,27 @@ _e_kbd_buf_actual_string_update(E_Kbd_Buf *kb)
    Eina_List *l;
    char *actual = NULL;
    int actual_len = 0;
-   int actual_size = 0;
+   unsigned int actual_size = 0;
+   E_Kbd_Buf_Keystroke *ks;
    
    _e_kbd_buf_actual_string_clear(kb);
-   for (l = kb->keystrokes; l; l = l->next)
-     {
-       E_Kbd_Buf_Keystroke *ks;
-       const char *str;
-       
-       ks = l->data;
-       str = _e_kbd_buf_keystroke_string_get(kb, ks);
-       if (str)
-         {
-            if ((actual_len + strlen(str) + 1) > actual_size)
-              {
-                 actual_size += 64;
-                 actual = realloc(actual, actual_size);
-              }
-            strcpy(actual + actual_len, str);
-            actual_len += strlen(str);
-         }
-     }
-   if (actual)
+   EINA_LIST_FOREACH(kb->keystrokes, l, ks)
      {
-       kb->actual_string = eina_stringshare_add(actual);
-       if (actual) free(actual);
+        const char *str;
+        
+        str = _e_kbd_buf_keystroke_string_get(kb, ks);
+        if (!str) continue;
+        if (!actual) actual_size += 64, actual = malloc(actual_size);
+        else if ((actual_len + strlen(str) + 1) > actual_size)
+          {
+             actual_size += 64;
+             actual = realloc(actual, actual_size);
+          }
+        strcpy(actual + actual_len, str);
+        actual_len += strlen(str);
      }
+   kb->actual_string = eina_stringshare_add(actual);
+   free(actual);
 }
 
 static const char *
@@ -183,7 +178,7 @@ _e_kbd_buf_matches_find(Eina_List *matches, const char *s)
    
    for (l = matches; l; l = l->next)
      {
-       if (!strcmp(l->data, s)) return s;
+        if (!strcmp(l->data, s)) return s;
      }
    return NULL;
 }
@@ -201,18 +196,18 @@ _e_kbd_buf_matches_update(E_Kbd_Buf *kb)
    dicts[2] = kb->dict.data;
    for (i = 0; i < 3; i++)
      {
-       if (!dicts[i]) continue;
-       e_kbd_dict_matches_lookup(dicts[i]);
-       e_kbd_dict_matches_first(dicts[i]);
-       for (;;)
-         {
-            word = e_kbd_dict_matches_match_get(dicts[i], &pri);
-            if (!word) break;
-            if (!_e_kbd_buf_matches_find(kb->string_matches, word))
-              kb->string_matches = eina_list_append(kb->string_matches,
-                                                    eina_stringshare_add(word));
-            e_kbd_dict_matches_next(dicts[i]);
-         }
+        if (!dicts[i]) continue;
+        e_kbd_dict_matches_lookup(dicts[i]);
+        e_kbd_dict_matches_first(dicts[i]);
+        for (;;)
+          {
+             word = e_kbd_dict_matches_match_get(dicts[i], &pri);
+             if (!word) break;
+             if (!_e_kbd_buf_matches_find(kb->string_matches, word))
+               kb->string_matches = eina_list_append(kb->string_matches,
+                                                     eina_stringshare_add(word));
+             e_kbd_dict_matches_next(dicts[i]);
+          }
      }
 }
 
@@ -258,8 +253,8 @@ e_kbd_buf_new(const char *sysdicts, const char *dict)
    kb->dict.sys = e_kbd_dict_new(buf);
    if (!kb->dict.sys)
      {
-       snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
-       kb->dict.sys = e_kbd_dict_new(buf);
+        snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
+        kb->dict.sys = e_kbd_dict_new(buf);
      }
 
    e_user_dir_concat_static(buf, "dicts-dynamic");
@@ -269,15 +264,15 @@ e_kbd_buf_new(const char *sysdicts, const char *dict)
    kb->dict.personal = e_kbd_dict_new(buf);
    if (!kb->dict.personal)
      {
-       FILE *f;
-       
-       f = fopen(buf, "w");
-       if (f)
-         {
-            fprintf(f, "\n");
-            fclose(f);
-         }
-       kb->dict.personal = e_kbd_dict_new(buf);
+        FILE *f;
+        
+        f = fopen(buf, "w");
+        if (f)
+          {
+             fprintf(f, "\n");
+             fclose(f);
+          }
+        kb->dict.personal = e_kbd_dict_new(buf);
      }
    e_user_dir_concat_static(buf, "dicts-dynamic/data.dic");
    kb->dict.data = e_kbd_dict_new(buf);
@@ -317,8 +312,8 @@ e_kbd_buf_dict_set(E_Kbd_Buf *kb, const char *dict)
    kb->dict.sys = e_kbd_dict_new(buf);
    if (!kb->dict.sys)
      {
-       snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
-       kb->dict.sys = e_kbd_dict_new(buf);
+        snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
+        kb->dict.sys = e_kbd_dict_new(buf);
      }
 }
 
@@ -328,13 +323,13 @@ e_kbd_buf_clear(E_Kbd_Buf *kb)
    e_kbd_buf_lookup_cancel(kb);
    while (kb->keystrokes)
      {
-       E_Kbd_Buf_Keystroke *ks;
-       
-       ks = kb->keystrokes->data;
-       if (ks->key) eina_stringshare_del(ks->key);
-       _e_kbd_buf_layout_unref(ks->layout);
-       free(ks);
-       kb->keystrokes = eina_list_remove_list(kb->keystrokes, kb->keystrokes);
+        E_Kbd_Buf_Keystroke *ks;
+        
+        ks = kb->keystrokes->data;
+        if (ks->key) eina_stringshare_del(ks->key);
+        _e_kbd_buf_layout_unref(ks->layout);
+        free(ks);
+        kb->keystrokes = eina_list_remove_list(kb->keystrokes, kb->keystrokes);
      }
    _e_kbd_buf_string_matches_clear(kb);
    if (kb->dict.sys) e_kbd_dict_word_letter_clear(kb->dict.sys);
@@ -348,8 +343,8 @@ e_kbd_buf_layout_clear(E_Kbd_Buf *kb)
 {
    if (kb->layout)
      {
-       _e_kbd_buf_layout_unref(kb->layout);
-       kb->layout = NULL;
+        _e_kbd_buf_layout_unref(kb->layout);
+        kb->layout = NULL;
      }
 }
 
@@ -398,9 +393,9 @@ _e_kbd_buf_keystroke_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
    str = _e_kbd_buf_keystroke_string_get(kb, ks);
    if (str)
      {
-       if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, 0);
-       if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, 0);
-       if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, 0);
+        if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, 0);
+        if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, 0);
+        if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, 0);
      }
 }
 
@@ -438,26 +433,26 @@ _e_kbd_buf_keystroke_point_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
    
    for (l = ks->layout->keys; l; l = l->next)
      {
-       E_Kbd_Buf_Key *ky;
-       const char *str;
-       int px, py, dx, dy, d;
-
-       ky = l->data;
-       px = ky->x + (ky->w / 2);
-       py = ky->y + (ky->h / 2);
-       dx = ks->x - px;
-       dy = ks->y - py;
-       d = sqrt((dx * dx) + (dy * dy));
-       if (d <= ks->layout->fuzz)
-         {
-            str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
-            if (str)
-              {
-                 if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, d);
-                 if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, d);
-                 if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, d);
-              }
-         }
+        E_Kbd_Buf_Key *ky;
+        const char *str;
+        int px, py, dx, dy, d;
+
+        ky = l->data;
+        px = ky->x + (ky->w / 2);
+        py = ky->y + (ky->h / 2);
+        dx = ks->x - px;
+        dy = ks->y - py;
+        d = sqrt((dx * dx) + (dy * dy));
+        if (d <= ks->layout->fuzz)
+          {
+             str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
+             if (str)
+               {
+                  if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, d);
+                  if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, d);
+                  if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, d);
+               }
+          }
      }
 }
 
@@ -509,18 +504,18 @@ e_kbd_buf_backspace(E_Kbd_Buf *kb)
    l = eina_list_last(kb->keystrokes);
    if (l)
      {
-       E_Kbd_Buf_Keystroke *ks;
-       
-       ks = l->data;
-       if (ks->key) eina_stringshare_del(ks->key);
-       _e_kbd_buf_layout_unref(ks->layout);
-       free(ks);
-       kb->keystrokes = eina_list_remove_list(kb->keystrokes, l);
-       if (kb->dict.sys) e_kbd_dict_word_letter_delete(kb->dict.sys);
-       if (kb->dict.personal) e_kbd_dict_word_letter_delete(kb->dict.personal);
-       if (kb->dict.data) e_kbd_dict_word_letter_delete(kb->dict.data);
-       _e_kbd_buf_actual_string_update(kb);
-       _e_kbd_buf_matches_update(kb);
+        E_Kbd_Buf_Keystroke *ks;
+        
+        ks = l->data;
+        if (ks->key) eina_stringshare_del(ks->key);
+        _e_kbd_buf_layout_unref(ks->layout);
+        free(ks);
+        kb->keystrokes = eina_list_remove_list(kb->keystrokes, l);
+        if (kb->dict.sys) e_kbd_dict_word_letter_delete(kb->dict.sys);
+        if (kb->dict.personal) e_kbd_dict_word_letter_delete(kb->dict.personal);
+        if (kb->dict.data) e_kbd_dict_word_letter_delete(kb->dict.data);
+        _e_kbd_buf_actual_string_update(kb);
+        _e_kbd_buf_matches_update(kb);
      }
 }
 
index 575acb6..5a4218a 100644 (file)
@@ -15,69 +15,69 @@ _e_kbd_normalise_init(void)
    int i;
    const char *table[][2] =
      {
-         {"À", "a"},
-         {"Á", "a"},
-         {"Â", "a"},
-         {"Ã", "a"},
-         {"Ä", "a"},
-         {"Å", "a"},
-         {"Æ", "a"},
-         {"Ç", "c"},
-         {"È", "e"},
-         {"É", "e"},
-         {"Ê", "e"},
-         {"Ë", "e"},
-         {"Ì", "i"},
-         {"Í", "i"},
-         {"Î", "i"},
-         {"Ï", "i"},
-         {"Ð", "d"},
-         {"Ñ", "n"},
-         {"Ò", "o"},
-         {"Ó", "o"},
-         {"Ô", "o"},
-         {"Õ", "o"},
-         {"Ö", "o"},
-         {"×", "x"},
-         {"Ø", "o"},
-         {"Ù", "u"},
-         {"Ú", "u"},
-         {"Û", "u"},
-         {"Ü", "u"},
-         {"Ý", "y"},
-         {"Þ", "p"},
-         {"ß", "s"},
-         {"à", "a"},
-         {"á", "a"},
-         {"â", "a"},
-         {"ã", "a"},
-         {"ä", "a"},
-         {"å", "a"},
-         {"æ", "a"},
-         {"ç", "c"},
-         {"è", "e"},
-         {"é", "e"},
-         {"ê", "e"},
-         {"ë", "e"},
-         {"ì", "i"},
-         {"í", "i"},
-         {"î", "i"},
-         {"ï", "i"},
-         {"ð", "o"},
-         {"ñ", "n"},
-         {"ò", "o"},
-         {"ó", "o"},
-         {"ô", "o"},
-         {"õ", "o"},
-         {"ö", "o"},
-         {"ø", "o"},
-         {"ù", "u"},
-         {"ú", "u"},
-         {"û", "u"},
-         {"ü", "u"},
-         {"ý", "y"},
-         {"þ", "p"},
-         {"ÿ", "y"}
+          {"À", "a"},
+          {"Á", "a"},
+          {"Â", "a"},
+          {"Ã", "a"},
+          {"Ä", "a"},
+          {"Å", "a"},
+          {"Æ", "a"},
+          {"Ç", "c"},
+          {"È", "e"},
+          {"É", "e"},
+          {"Ê", "e"},
+          {"Ë", "e"},
+          {"Ì", "i"},
+          {"Í", "i"},
+          {"Î", "i"},
+          {"Ï", "i"},
+          {"Ð", "d"},
+          {"Ñ", "n"},
+          {"Ò", "o"},
+          {"Ó", "o"},
+          {"Ô", "o"},
+          {"Õ", "o"},
+          {"Ö", "o"},
+          {"×", "x"},
+          {"Ø", "o"},
+          {"Ù", "u"},
+          {"Ú", "u"},
+          {"Û", "u"},
+          {"Ü", "u"},
+          {"Ý", "y"},
+          {"Þ", "p"},
+          {"ß", "s"},
+          {"à", "a"},
+          {"á", "a"},
+          {"â", "a"},
+          {"ã", "a"},
+          {"ä", "a"},
+          {"å", "a"},
+          {"æ", "a"},
+          {"ç", "c"},
+          {"è", "e"},
+          {"é", "e"},
+          {"ê", "e"},
+          {"ë", "e"},
+          {"ì", "i"},
+          {"í", "i"},
+          {"î", "i"},
+          {"ï", "i"},
+          {"ð", "o"},
+          {"ñ", "n"},
+          {"ò", "o"},
+          {"ó", "o"},
+          {"ô", "o"},
+          {"õ", "o"},
+          {"ö", "o"},
+          {"ø", "o"},
+          {"ù", "u"},
+          {"ú", "u"},
+          {"û", "u"},
+          {"ü", "u"},
+          {"ý", "y"},
+          {"þ", "p"},
+          {"ÿ", "y"}
      }; // 63 items
 
    if (_e_kbd_normalise_ready) return;
@@ -86,17 +86,17 @@ _e_kbd_normalise_init(void)
      _e_kbd_normalise_base[i] = tolower(i);
    for (;i < MAXLATIN; i++)
      {
-       int glyph, j;
-
-       for (j = 0; j < 63; j++)
-         {
-            evas_string_char_next_get(table[j][0], 0, &glyph);
-            if (glyph == i)
-              {
-                 _e_kbd_normalise_base[i] = *table[j][1];
-                 break;
-              }
-         }
+        int glyph, j;
+
+        for (j = 0; j < 63; j++)
+          {
+             evas_string_char_next_get(table[j][0], 0, &glyph);
+             if (glyph == i)
+               {
+                  _e_kbd_normalise_base[i] = *table[j][1];
+                  break;
+               }
+          }
      }
 }
 
@@ -181,8 +181,8 @@ _e_kbd_dict_line_parse(E_Kbd_Dict *kd __UNUSED__, const char *p, int *usage)
    if (*ps == '\n') *usage = 0;
    else
      {
-       ps++;
-       *usage = atoi(ps);
+        ps++;
+        *usage = atoi(ps);
      }
    return wd;
 }
@@ -212,38 +212,38 @@ _e_kbd_dict_lookup_build(E_Kbd_Dict *kd)
    pglyphs[0] = pglyphs[1] = 0;
    while (p < e)
      {
-       eol = strchr(p, '\n');
-       if (!eol) break;
-       if (eol > p)
-         {
-            glyphs[0] = glyphs[1] = 0;
-            _e_kbd_dict_lookup_build_line(kd, p, eol, glyphs);
-            if ((glyphs[1] != pglyphs[1]) || (glyphs[0] != pglyphs[0]))
-              {
-                 int v1, v2;
-
-                 if (isspace(glyphs[0]))
-                   {
-                      glyphs[0] = 0;
-                      glyphs[1] = 0;
-                   }
-                 else if (isspace(glyphs[1]))
-                   glyphs[1] = 0;
-                 if (glyphs[0] == 0)
-                   {
-                      pglyphs[0] = pglyphs[1] = 0;
-                      p = eol + 1;
-                      continue;
-                   }
-                 v1 = _e_kbd_dict_letter_normalise(glyphs[0]);
-                 v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
-                 if (!kd->lookup.tuples[v1][v2])
-                   kd->lookup.tuples[v1][v2] = p;
-                 pglyphs[0] = v1;
-                 pglyphs[1] = v2;
-              }
-         }
-       p = eol + 1;
+        eol = strchr(p, '\n');
+        if (!eol) break;
+        if (eol > p)
+          {
+             glyphs[0] = glyphs[1] = 0;
+             _e_kbd_dict_lookup_build_line(kd, p, eol, glyphs);
+             if ((glyphs[1] != pglyphs[1]) || (glyphs[0] != pglyphs[0]))
+               {
+                  int v1, v2;
+
+                  if (isspace(glyphs[0]))
+                    {
+                       glyphs[0] = 0;
+                       glyphs[1] = 0;
+                    }
+                  else if (isspace(glyphs[1]))
+                    glyphs[1] = 0;
+                  if (glyphs[0] == 0)
+                    {
+                       pglyphs[0] = pglyphs[1] = 0;
+                       p = eol + 1;
+                       continue;
+                    }
+                  v1 = _e_kbd_dict_letter_normalise(glyphs[0]);
+                  v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
+                  if (!kd->lookup.tuples[v1][v2])
+                    kd->lookup.tuples[v1][v2] = p;
+                  pglyphs[0] = v1;
+                  pglyphs[1] = v2;
+               }
+          }
+        p = eol + 1;
      }
 }
 
@@ -256,16 +256,19 @@ _e_kbd_dict_open(E_Kbd_Dict *kd)
    if (kd->file.fd < 0) return 0;
    if (fstat(kd->file.fd, &st) < 0)
      {
-       close(kd->file.fd);
-       return 0;
+        close(kd->file.fd);
+        return 0;
      }
    kd->file.size = st.st_size;
+   
+   eina_mmap_safety_enabled_set(EINA_TRUE);
+   
    kd->file.dict = mmap(NULL, kd->file.size, PROT_READ, MAP_SHARED,
-                       kd->file.fd, 0);
+                        kd->file.fd, 0);
    if ((kd->file.dict== MAP_FAILED) || (!kd->file.dict))
      {
-       close(kd->file.fd);
-       return 0;
+        close(kd->file.fd);
+        return 0;
      }
    return 1;
 }
@@ -294,15 +297,15 @@ e_kbd_dict_new(const char *file)
    kd->file.file = eina_stringshare_add(file);
    if (!kd->file.file)
      {
-       free(kd);
-       return NULL;
+        free(kd);
+        return NULL;
      }
    kd->file.fd = -1;
    if (!_e_kbd_dict_open(kd))
      {
-       eina_stringshare_del(kd->file.file);
-       free(kd);
-       return NULL;
+        eina_stringshare_del(kd->file.file);
+        free(kd);
+        return NULL;
      }
    _e_kbd_dict_lookup_build(kd);
    return kd;
@@ -325,10 +328,10 @@ _e_kbd_dict_changed_write_find(E_Kbd_Dict *kd, const char *word)
 
    for (l = kd->changed.writes; l; l = l->next)
      {
-       E_Kbd_Dict_Word *kw;
+        E_Kbd_Dict_Word *kw;
 
-       kw = l->data;
-       if (!strcmp(kw->word, word)) return kw;
+        kw = l->data;
+        if (!strcmp(kw->word, word)) return kw;
      }
    return NULL;
 }
@@ -343,91 +346,91 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
    if (!kd->changed.writes) return;
    if (kd->changed.flush_timer)
      {
-       ecore_timer_del(kd->changed.flush_timer);
-       kd->changed.flush_timer = NULL;
+        ecore_timer_del(kd->changed.flush_timer);
+        kd->changed.flush_timer = NULL;
      }
    ecore_file_unlink(kd->file.file);
    f = fopen(kd->file.file, "w");
    kd->changed.writes = eina_list_sort(kd->changed.writes,
-                                      eina_list_count(kd->changed.writes),
-                                      _e_kbd_dict_writes_cb_sort);
+                                       eina_list_count(kd->changed.writes),
+                                       _e_kbd_dict_writes_cb_sort);
    if (f)
      {
-       const char *p, *pn;
+        const char *p, *pn;
 
-       p = kd->file.dict;
-       while (p)
-         {
-            char *wd;
-            int usage = 0;
+        p = kd->file.dict;
+        while (p)
+          {
+             char *wd;
+             int usage = 0;
 
-            pn = _e_kbd_dict_line_next(kd, p);
-            if (!pn)
+             pn = _e_kbd_dict_line_next(kd, p);
+             if (!pn)
                {
                   fclose(f);
                   return;
                }
-            wd = _e_kbd_dict_line_parse(kd, p, &usage);
-            if ((wd) && (strlen(wd) > 0))
-              {
-                 if (kd->changed.writes)
-                   {
-                      int writeline = 0;
-
-                      while (kd->changed.writes)
-                        {
-                           E_Kbd_Dict_Word *kw;
-                           int cmp;
-
-                           kw = kd->changed.writes->data;
-                           cmp = _e_kbd_dict_normalized_strcmp(kw->word, wd);
-                           if (cmp < 0)
-                             {
-                                fprintf(f, "%s %i\n", kw->word, kw->usage);
-                                writeline = 1;
-                                eina_stringshare_del(kw->word);
-                                free(kw);
-                                kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
-                             }
-                           else if (cmp == 0)
-                             {
-                                fprintf(f, "%s %i\n", wd, kw->usage);
-                                if (!strcmp(kw->word, wd))
-                                  writeline = 0;
-                                else
-                                  writeline = 1;
-                                eina_stringshare_del(kw->word);
-                                free(kw);
-                                kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
-                                break;
-                             }
-                           else if (cmp > 0)
-                             {
-                                writeline = 1;
-                                break;
-                             }
-                        }
-                      if (writeline)
-                        fprintf(f, "%s %i\n", wd, usage);
-                   }
-                 else
-                   fprintf(f, "%s %i\n", wd, usage);
-              }
-            if (wd) free(wd);
-            p = pn;
-            if (p >= (kd->file.dict + kd->file.size)) break;
-         }
-       while (kd->changed.writes)
-         {
-            E_Kbd_Dict_Word *kw;
-
-            kw = kd->changed.writes->data;
-            fprintf(f, "%s %i\n", kw->word, kw->usage);
-            eina_stringshare_del(kw->word);
-            free(kw);
-            kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
-         }
-       fclose(f);
+             wd = _e_kbd_dict_line_parse(kd, p, &usage);
+             if ((wd) && (strlen(wd) > 0))
+               {
+                  if (kd->changed.writes)
+                    {
+                       int writeline = 0;
+
+                       while (kd->changed.writes)
+                         {
+                            E_Kbd_Dict_Word *kw;
+                            int cmp;
+
+                            kw = kd->changed.writes->data;
+                            cmp = _e_kbd_dict_normalized_strcmp(kw->word, wd);
+                            if (cmp < 0)
+                              {
+                                 fprintf(f, "%s %i\n", kw->word, kw->usage);
+                                 writeline = 1;
+                                 eina_stringshare_del(kw->word);
+                                 free(kw);
+                                 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+                              }
+                            else if (cmp == 0)
+                              {
+                                 fprintf(f, "%s %i\n", wd, kw->usage);
+                                 if (!strcmp(kw->word, wd))
+                                   writeline = 0;
+                                 else
+                                   writeline = 1;
+                                 eina_stringshare_del(kw->word);
+                                 free(kw);
+                                 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+                                 break;
+                              }
+                            else if (cmp > 0)
+                              {
+                                 writeline = 1;
+                                 break;
+                              }
+                         }
+                       if (writeline)
+                         fprintf(f, "%s %i\n", wd, usage);
+                    }
+                  else
+                    fprintf(f, "%s %i\n", wd, usage);
+               }
+             if (wd) free(wd);
+             p = pn;
+             if (p >= (kd->file.dict + kd->file.size)) break;
+          }
+        while (kd->changed.writes)
+          {
+             E_Kbd_Dict_Word *kw;
+
+             kw = kd->changed.writes->data;
+             fprintf(f, "%s %i\n", kw->word, kw->usage);
+             eina_stringshare_del(kw->word);
+             free(kw);
+             kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+          }
+        fclose(f);
      }
    _e_kbd_dict_close(kd);
    if (_e_kbd_dict_open(kd)) _e_kbd_dict_lookup_build(kd);
@@ -460,9 +463,9 @@ _e_kbd_dict_changed_write_add(E_Kbd_Dict *kd, const char *word, int usage)
      e_kbd_dict_save(kd);
    else
      {
-       if (kd->changed.flush_timer)
-         ecore_timer_del(kd->changed.flush_timer);
-       kd->changed.flush_timer = 
+        if (kd->changed.flush_timer)
+          ecore_timer_del(kd->changed.flush_timer);
+        kd->changed.flush_timer = 
           ecore_timer_add(5.0, _e_kbd_dict_cb_save_flush, kd);
      }
 }
@@ -477,17 +480,17 @@ _e_kbd_dict_find_pointer(E_Kbd_Dict *kd, const char *p, int baselen, const char
    len = strlen(word);
    while (p)
      {
-       pn = _e_kbd_dict_line_next(kd, p);
-       if (!pn) return NULL;
-       if ((pn - p) > len)
-         {
-            if (!_e_kbd_dict_normalized_strncmp(p, word, len))
-              return p;
-         }
-       if (_e_kbd_dict_normalized_strncmp(p, word, baselen))
-         return NULL;
-       p = pn;
-       if (p >= (kd->file.dict + kd->file.size)) break;
+        pn = _e_kbd_dict_line_next(kd, p);
+        if (!pn) return NULL;
+        if ((pn - p) > len)
+          {
+             if (!_e_kbd_dict_normalized_strncmp(p, word, len))
+               return p;
+          }
+        if (_e_kbd_dict_normalized_strncmp(p, word, baselen))
+          return NULL;
+        p = pn;
+        if (p >= (kd->file.dict + kd->file.size)) break;
      }
    return NULL;
 }
@@ -513,12 +516,12 @@ _e_kbd_dict_find(E_Kbd_Dict *kd, const char *word)
    p2 = strlen(tword);
    while (tword[0])
      {
-       p2 = evas_string_char_prev_get(tword, p2, &i);
-       if (p2 < 0) break;
-       tword[p2] = 0;
-       p = eina_hash_find(kd->matches.leads, tword);
-       if (p)
-         return _e_kbd_dict_find_pointer(kd, p, p2, word);
+        p2 = evas_string_char_prev_get(tword, p2, &i);
+        if (p2 < 0) break;
+        tword[p2] = 0;
+        p = eina_hash_find(kd->matches.leads, tword);
+        if (p)
+          return _e_kbd_dict_find_pointer(kd, p, p2, word);
      }
    /* looking at leads going back letters didn't work */
    p = kd->file.dict;
@@ -530,16 +533,16 @@ _e_kbd_dict_find(E_Kbd_Dict *kd, const char *word)
    v1 = _e_kbd_dict_letter_normalise(glyphs[0]);
    if (glyphs[1] != 0)
      {
-       v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
-       p = kd->lookup.tuples[v1][v2];
+        v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
+        p = kd->lookup.tuples[v1][v2];
      }
    else
      {
-       for (i = 0; i < 128; i++)
-         {
-            p = kd->lookup.tuples[v1][i];
-            if (p) break;
-         }
+        for (i = 0; i < 128; i++)
+          {
+             p = kd->lookup.tuples[v1][i];
+             if (p) break;
+          }
      }
    return _e_kbd_dict_find_pointer(kd, p, p2, word);
 }
@@ -566,27 +569,27 @@ e_kbd_dict_word_usage_adjust(E_Kbd_Dict *kd, const char *word, int adjust)
    kw = _e_kbd_dict_changed_write_find(kd, word);
    if (kw)
      {
-       kw->usage += adjust;
-       if (kd->changed.flush_timer)
-         ecore_timer_del(kd->changed.flush_timer);
-       kd->changed.flush_timer = ecore_timer_add(5.0, _e_kbd_dict_cb_save_flush, kd);
+        kw->usage += adjust;
+        if (kd->changed.flush_timer)
+          ecore_timer_del(kd->changed.flush_timer);
+        kd->changed.flush_timer = ecore_timer_add(5.0, _e_kbd_dict_cb_save_flush, kd);
      }
    else
      {
-       const char *line;
-       int usage = 0;
-
-       line = _e_kbd_dict_find_full(kd, word);
-       if (line)
-         {
-            char *wd;
-
-            // FIXME: we need to find an EXACT line match - case and all
-            wd = _e_kbd_dict_line_parse(kd, line, &usage);
-            if (wd) free(wd);
-         }
-       usage += adjust;
-       _e_kbd_dict_changed_write_add(kd, word, usage);
+        const char *line;
+        int usage = 0;
+
+        line = _e_kbd_dict_find_full(kd, word);
+        if (line)
+          {
+             char *wd;
+
+             // FIXME: we need to find an EXACT line match - case and all
+             wd = _e_kbd_dict_line_parse(kd, line, &usage);
+             if (wd) free(wd);
+          }
+        usage += adjust;
+        _e_kbd_dict_changed_write_add(kd, word, usage);
      }
 }
 
@@ -601,8 +604,8 @@ e_kbd_dict_word_delete(E_Kbd_Dict *kd, const char *word)
      kw->usage = -1;
    else
      {
-       if (_e_kbd_dict_find_full(kd, word))
-         _e_kbd_dict_changed_write_add(kd, word, -1);
+        if (_e_kbd_dict_find_full(kd, word))
+          _e_kbd_dict_changed_write_add(kd, word, -1);
      }
 }
 
@@ -614,22 +617,22 @@ e_kbd_dict_word_letter_clear(E_Kbd_Dict *kd)
      e_kbd_dict_word_letter_delete(kd);
    if (kd->matches.deadends)
      {
-       eina_hash_free(kd->matches.deadends);
-       kd->matches.deadends = NULL;
+        eina_hash_free(kd->matches.deadends);
+        kd->matches.deadends = NULL;
      }
    if (kd->matches.leads)
      {
-       eina_hash_free(kd->matches.leads);
-       kd->matches.leads = NULL;
+        eina_hash_free(kd->matches.leads);
+        kd->matches.leads = NULL;
      }
    while (kd->matches.list)
      {
-       E_Kbd_Dict_Word *kw;
+        E_Kbd_Dict_Word *kw;
 
-       kw = kd->matches.list->data;
-       eina_stringshare_del(kw->word);
-       free(kw);
-       kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
+        kw = kd->matches.list->data;
+        eina_stringshare_del(kw->word);
+        free(kw);
+        kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
     }
 }
 
@@ -670,19 +673,19 @@ e_kbd_dict_word_letter_delete(E_Kbd_Dict *kd)
    list = l->data;
    while (list)
      {
-       E_Kbd_Dict_Letter *kl;
+        E_Kbd_Dict_Letter *kl;
 
-       kl = list->data;
-       eina_stringshare_del(kl->letter);
-       free(kl);
-       list = eina_list_remove_list(list, list);
+        kl = list->data;
+        eina_stringshare_del(kl->letter);
+        free(kl);
+        list = eina_list_remove_list(list, list);
      }
    kd->word.letters = eina_list_remove_list(kd->word.letters, l);
 }
 
 static void
 _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
-                               Eina_List *more)
+                                Eina_List *more)
 {
    Eina_List *l, *list;
    const char *p;
@@ -694,10 +697,10 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
    level++;
    for (l = word; l; l = l->next)
      {
-       kl = l->data;
-       len += strlen(kl->letter);
-       dist += kl->dist;
-       if (kl->dist > maxdist) maxdist = kl->dist;
+        kl = l->data;
+        len += strlen(kl->letter);
+        dist += kl->dist;
+        if (kl->dist > maxdist) maxdist = kl->dist;
      }
    if (maxdist < 1) maxdist = 1;
    buf = alloca(len + 20); // 20 - just padding enough for 1 more utf8 char
@@ -705,8 +708,8 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
    base[0] = 0;
    for (l = word; l; l = l->next)
      {
-       kl = l->data;
-       strcat(base, kl->letter);
+        kl = l->data;
+        strcat(base, kl->letter);
      }
    baselen = strlen(base);
    strcpy(buf, base);
@@ -714,97 +717,97 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
    list = more->data;
    for (l = list; l; l = l->next)
      {
-       kl = l->data;
-       if (kl->dist > maxdist) maxdist = kl->dist;
+        kl = l->data;
+        if (kl->dist > maxdist) maxdist = kl->dist;
      }
    for (l = list; l; l = l->next)
      {
-       kl = l->data;
-       strcpy(bufapp, kl->letter);
-       if ((kd->matches.deadends) && eina_hash_find(kd->matches.deadends, buf))
-         continue;
-       p = eina_hash_find(kd->matches.leads, buf);
-       if (p) p = _e_kbd_dict_find_pointer(kd, p, baselen, buf);
-       else p = _e_kbd_dict_find(kd, buf);
-       if (!p)
-         {
-            if (!kd->matches.deadends)
-              kd->matches.deadends = eina_hash_string_superfast_new(NULL);
-            eina_hash_add(kd->matches.deadends, buf, kd);
-            continue;
-         }
-       else
-         {
-            if (!kd->matches.leads)
-              kd->matches.leads = eina_hash_string_superfast_new(NULL);
-            eina_hash_add(kd->matches.leads, buf, p);
-         }
-       if ((!more->next) || (!more->next->data))
-         {
-            d = dist + kl->dist;
-            md = maxdist;
-            for (;;)
-              {
-                 E_Kbd_Dict_Word *kw;
-                 int usage = 0;
-
-                 wd = _e_kbd_dict_line_parse(kd, p, &usage);
-                 if (!wd) break;
-                 if (_e_kbd_dict_normalized_strcmp(wd, buf))
-                   {
-                      free(wd);
-                      break;
-                   }
-                 kw = E_NEW(E_Kbd_Dict_Word, 1);
-                 if (kw)
-                   {
-                      int accuracy;
-                      int w, b, w2, b2, wc, bc;
-
-                      // match any capitalisation
-                      for (w = 0, b = 0; wd[w] && buf[b];)
-                        {
-                           b2 = evas_string_char_next_get(buf, b, &bc);
-                           w2 = evas_string_char_next_get(wd, w, &wc);
-                           if (isupper(bc)) wd[w] = toupper(wc);
-                           w = w2;
-                           b = b2;
-                        }
-                      kw->word = eina_stringshare_add(wd);
-                      // FIXME: magic combination of distance metric and
-                      // frequency of usage. this is simple now, but could
-                      // be tweaked
-                      wc = eina_list_count(word);
-                      if (md < 1) md = 1;
-
-                      // basically a metric to see how far away the keys that
-                      // were actually pressed are away from the letters of
-                      // this word in a physical on-screen sense
-                      accuracy = md - (d / (wc + 1));
-                      // usage is the frequency of usage in the dictionary.
-                      // it its < 1 time, it's assumed to be 1.
-                      if (usage < 1) usage = 1;
-                      // multiply usage by a factor of 100 for better detailed
-                      // sorting. 10 == 1/10th factor
-                      usage = 100 + ((usage - 1) * 10);
-                      // and well just multiply and lets see. maybe this can
-                      // do with multiplication factors etc. but simple for
-                      // now.
-                      kw->usage = (usage * accuracy) / md;
-                      kd->matches.list = eina_list_append(kd->matches.list, kw);
-                   }
-                 free(wd);
-                 p = _e_kbd_dict_line_next(kd, p);
-                 if (p >= (kd->file.dict + kd->file.size)) break;
-                 if (!p) break;
-              }
-         }
-       else
-         {
-            word = eina_list_append(word, kl);
-            _e_kbd_dict_matches_lookup_iter(kd, word, more->next);
-            word = eina_list_remove_list(word, eina_list_last(word));
-         }
+        kl = l->data;
+        strcpy(bufapp, kl->letter);
+        if ((kd->matches.deadends) && eina_hash_find(kd->matches.deadends, buf))
+          continue;
+        p = eina_hash_find(kd->matches.leads, buf);
+        if (p) p = _e_kbd_dict_find_pointer(kd, p, baselen, buf);
+        else p = _e_kbd_dict_find(kd, buf);
+        if (!p)
+          {
+             if (!kd->matches.deadends)
+               kd->matches.deadends = eina_hash_string_superfast_new(NULL);
+             eina_hash_add(kd->matches.deadends, buf, kd);
+             continue;
+          }
+        else
+          {
+             if (!kd->matches.leads)
+               kd->matches.leads = eina_hash_string_superfast_new(NULL);
+             eina_hash_add(kd->matches.leads, buf, p);
+          }
+        if ((!more->next) || (!more->next->data))
+          {
+             d = dist + kl->dist;
+             md = maxdist;
+             for (;;)
+               {
+                  E_Kbd_Dict_Word *kw;
+                  int usage = 0;
+
+                  wd = _e_kbd_dict_line_parse(kd, p, &usage);
+                  if (!wd) break;
+                  if (_e_kbd_dict_normalized_strcmp(wd, buf))
+                    {
+                       free(wd);
+                       break;
+                    }
+                  kw = E_NEW(E_Kbd_Dict_Word, 1);
+                  if (kw)
+                    {
+                       int accuracy;
+                       int w, b, w2, b2, wc, bc;
+
+                       // match any capitalisation
+                       for (w = 0, b = 0; wd[w] && buf[b];)
+                         {
+                            b2 = evas_string_char_next_get(buf, b, &bc);
+                            w2 = evas_string_char_next_get(wd, w, &wc);
+                            if (isupper(bc)) wd[w] = toupper(wc);
+                            w = w2;
+                            b = b2;
+                         }
+                       kw->word = eina_stringshare_add(wd);
+                       // FIXME: magic combination of distance metric and
+                       // frequency of usage. this is simple now, but could
+                       // be tweaked
+                       wc = eina_list_count(word);
+                       if (md < 1) md = 1;
+
+                       // basically a metric to see how far away the keys that
+                       // were actually pressed are away from the letters of
+                       // this word in a physical on-screen sense
+                       accuracy = md - (d / (wc + 1));
+                       // usage is the frequency of usage in the dictionary.
+                       // it its < 1 time, it's assumed to be 1.
+                       if (usage < 1) usage = 1;
+                       // multiply usage by a factor of 100 for better detailed
+                       // sorting. 10 == 1/10th factor
+                       usage = 100 + ((usage - 1) * 10);
+                       // and well just multiply and lets see. maybe this can
+                       // do with multiplication factors etc. but simple for
+                       // now.
+                       kw->usage = (usage * accuracy) / md;
+                       kd->matches.list = eina_list_append(kd->matches.list, kw);
+                    }
+                  free(wd);
+                  p = _e_kbd_dict_line_next(kd, p);
+                  if (p >= (kd->file.dict + kd->file.size)) break;
+                  if (!p) break;
+               }
+          }
+        else
+          {
+             word = eina_list_append(word, kl);
+             _e_kbd_dict_matches_lookup_iter(kd, word, more->next);
+             word = eina_list_remove_list(word, eina_list_last(word));
+          }
      }
    level--;
 }
@@ -815,18 +818,18 @@ e_kbd_dict_matches_lookup(E_Kbd_Dict *kd)
    // find all matches and sort them
    while (kd->matches.list)
      {
-       E_Kbd_Dict_Word *kw;
+        E_Kbd_Dict_Word *kw;
 
-       kw = kd->matches.list->data;
-       eina_stringshare_del(kw->word);
-       free(kw);
-       kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
+        kw = kd->matches.list->data;
+        eina_stringshare_del(kw->word);
+        free(kw);
+        kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
     }
    if (kd->word.letters)
      _e_kbd_dict_matches_lookup_iter(kd, NULL, kd->word.letters);
    kd->matches.list = eina_list_sort(kd->matches.list,
-                                    eina_list_count(kd->matches.list),
-                                    _e_kbd_dict_matches_lookup_cb_sort);
+                                     eina_list_count(kd->matches.list),
+                                     _e_kbd_dict_matches_lookup_cb_sort);
 }
 
 EAPI void
@@ -849,14 +852,14 @@ e_kbd_dict_matches_match_get(E_Kbd_Dict *kd, int *pri_ret)
    // return the word (string utf-8) for the current match
    if (kd->matches.list_ptr)
      {
-       E_Kbd_Dict_Word *kw;
-
-       kw = kd->matches.list_ptr->data;
-       if (kw)
-         {
-            *pri_ret = kw->usage;
-            return kw->word;
-         }
+        E_Kbd_Dict_Word *kw;
+
+        kw = kd->matches.list_ptr->data;
+        if (kw)
+          {
+             *pri_ret = kw->usage;
+             return kw->word;
+          }
      }
    return NULL;
 }
index 6796e39..b35f843 100644 (file)
@@ -23,17 +23,6 @@ static void _e_kbd_int_dictlist_down(E_Kbd_Int *ki);
 static void _e_kbd_int_matchlist_down(E_Kbd_Int *ki);
 static Eina_Bool _e_kbd_int_cb_border_move(void *data, int type, void *event);
 
-static void
-_e_kbd_int_cb_resize(E_Win *win)
-{
-   E_Kbd_Int *ki;
-   
-   ki = win->data;
-   evas_object_resize(ki->base_obj, ki->win->w, ki->win->h);
-   _e_kbd_int_zoomkey_down(ki);
-   _e_kbd_int_dictlist_down(ki);
-   _e_kbd_int_matchlist_down(ki);
-}
 
 static const char *
 _e_kbd_int_str_unquote(const char *str)
@@ -62,16 +51,16 @@ _e_kbd_int_at_coord_get(E_Kbd_Int *ki, Evas_Coord x, Evas_Coord y)
    dist = 0x7fffffff;
    EINA_LIST_FOREACH(ki->layout.keys, l, ky)
      {
-       Evas_Coord dx, dy;
-
-       dx = x - (ky->x + (ky->w / 2));
-       dy = y - (ky->y + (ky->h / 2));
-       dx = (dx * dx) + (dy * dy);
-       if (dx < dist)
-         {
-            dist = dx;
-            closest_ky = ky;
-         }
+        Evas_Coord dx, dy;
+
+        dx = x - (ky->x + (ky->w / 2));
+        dy = y - (ky->y + (ky->h / 2));
+        dx = (dx * dx) + (dy * dy);
+        if (dx < dist)
+          {
+             dist = dx;
+             closest_ky = ky;
+          }
      }
    return closest_ky;
 }
@@ -85,8 +74,8 @@ _e_kbd_int_key_state_get(E_Kbd_Int *ki, E_Kbd_Int_Key *ky)
 
    EINA_LIST_FOREACH(ky->states, l, st)
      {
-       if (st->state & ki->layout.state) return st;
-       if (!found && st->state == NORMAL) found = st;
+        if (st->state & ki->layout.state) return st;
+        if (!found && st->state == NORMAL) found = st;
      }
    return found;
 }
@@ -102,43 +91,43 @@ _e_kbd_int_layout_buf_update(E_Kbd_Int *ki)
    e_kbd_buf_layout_fuzz_set(ki->kbuf, ki->layout.fuzz);
    EINA_LIST_FOREACH(ki->layout.keys, l, ky)
      {
-       E_Kbd_Int_Key_State *st;
-       const char *out, *out_shift, *out_capslock, *out_altgr;
-
-       out = NULL;
-       out_shift = NULL;
-       out_capslock = NULL;
-       out_altgr = NULL;
-
-       EINA_LIST_FOREACH(ky->states, l2, st)
-         {
-            if (st->state == NORMAL)
-              out = st->out;
-            else if (st->state == SHIFT)
-              out_shift = st->out;
-            else if (st->state == CAPSLOCK)
-              out_capslock = st->out;
-            else if (st->state == ALTGR)
-              out_altgr = st->out;
-         }
-       if (out)
-         {
-            char *s1 = NULL, *s2 = NULL, *s3 = NULL;
-
-            if ((out) && (out[0] == '"')) 
-              s1 = strdup(_e_kbd_int_str_unquote(out));
-            if ((out_shift) && (out_shift[0] == '"')) 
-              s2 = strdup(_e_kbd_int_str_unquote(out_shift));
-            if ((out_altgr) && (out_altgr[0] == '"')) 
-              s2 = strdup(_e_kbd_int_str_unquote(out_altgr));
-            if ((out_capslock) && (out_capslock[0] == '"')) 
-              s3 = strdup(_e_kbd_int_str_unquote(out_capslock));
-            e_kbd_buf_layout_key_add(ki->kbuf, s1, s2, s3, 
-                                     ky->x, ky->y, ky->w, ky->h);
-            if (s1) free(s1);
-            if (s2) free(s2);
-            if (s3) free(s3);
-         }
+        E_Kbd_Int_Key_State *st;
+        const char *out, *out_shift, *out_capslock, *out_altgr;
+
+        out = NULL;
+        out_shift = NULL;
+        out_capslock = NULL;
+        out_altgr = NULL;
+
+        EINA_LIST_FOREACH(ky->states, l2, st)
+          {
+             if (st->state == NORMAL)
+               out = st->out;
+             else if (st->state == SHIFT)
+               out_shift = st->out;
+             else if (st->state == CAPSLOCK)
+               out_capslock = st->out;
+             else if (st->state == ALTGR)
+               out_altgr = st->out;
+          }
+        if (out)
+          {
+             char *s1 = NULL, *s2 = NULL, *s3 = NULL;
+
+             if ((out) && (out[0] == '"')) 
+               s1 = strdup(_e_kbd_int_str_unquote(out));
+             if ((out_shift) && (out_shift[0] == '"')) 
+               s2 = strdup(_e_kbd_int_str_unquote(out_shift));
+             if ((out_altgr) && (out_altgr[0] == '"')) 
+               s2 = strdup(_e_kbd_int_str_unquote(out_altgr));
+             if ((out_capslock) && (out_capslock[0] == '"')) 
+               s3 = strdup(_e_kbd_int_str_unquote(out_capslock));
+             e_kbd_buf_layout_key_add(ki->kbuf, s1, s2, s3, 
+                                      ky->x, ky->y, ky->w, ky->h);
+             if (s1) free(s1);
+             if (s2) free(s2);
+             if (s3) free(s3);
+          }
      }
 }
 
@@ -150,55 +139,55 @@ _e_kbd_int_layout_state_update(E_Kbd_Int *ki)
 
    EINA_LIST_FOREACH(ki->layout.keys, l, ky)
      {
-       E_Kbd_Int_Key_State *st;
-       int selected;
-
-       st = _e_kbd_int_key_state_get(ki, ky);
-       if (st)
-         {
-            if (st->label)
-              edje_object_part_text_set(ky->obj, "e.text.label", st->label);
-            else
-              edje_object_part_text_set(ky->obj, "e.text.label", "");
-            if (st->icon)
-              {
-                 char buf[PATH_MAX];
-                 char *p;
-
-                 snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, st->icon);
-                 p = strrchr(st->icon, '.');
-                 if (!strcmp(p, ".edj"))
-                   e_icon_file_edje_set(ky->icon_obj, buf, "icon");
-                 else
-                   e_icon_file_set(ky->icon_obj, buf);
-              }
-            else
-              e_icon_file_set(ky->icon_obj, NULL);
-         }
-       selected = 0;
-       if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
-       if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
-       if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
-       if ((ki->layout.state & ALTGR) && (ky->is_altgr)) selected = 1;
-       if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
-       if ((ki->layout.state & (SHIFT | CAPSLOCK)) && (ky->is_multi_shift)) 
+        E_Kbd_Int_Key_State *st;
+        int selected;
+
+        st = _e_kbd_int_key_state_get(ki, ky);
+        if (st)
+          {
+             if (st->label)
+               edje_object_part_text_set(ky->obj, "e.text.label", st->label);
+             else
+               edje_object_part_text_set(ky->obj, "e.text.label", "");
+             if (st->icon)
+               {
+                  char buf[PATH_MAX];
+                  char *p;
+
+                  snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, st->icon);
+                  p = strrchr(st->icon, '.');
+                  if (!strcmp(p, ".edj"))
+                    e_icon_file_edje_set(ky->icon_obj, buf, "icon");
+                  else
+                    e_icon_file_set(ky->icon_obj, buf);
+               }
+             else
+               e_icon_file_set(ky->icon_obj, NULL);
+          }
+        selected = 0;
+        if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
+        if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
+        if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
+        if ((ki->layout.state & ALTGR) && (ky->is_altgr)) selected = 1;
+        if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
+        if ((ki->layout.state & (SHIFT | CAPSLOCK)) && (ky->is_multi_shift)) 
           selected = 1;
-       if (selected)
-         {
-            if (!ky->selected)
-              {
-                 edje_object_signal_emit(ky->obj, "e,state,selected", "e");
-                 ky->selected = 1;
-              }
-         }
-       if (!selected)
-         {
-            if (ky->selected)
-              {
-                 edje_object_signal_emit(ky->obj, "e,state,unselected", "e");
-                 ky->selected = 0;
-              }
-         }
+        if (selected)
+          {
+             if (!ky->selected)
+               {
+                  edje_object_signal_emit(ky->obj, "e,state,selected", "e");
+                  ky->selected = 1;
+               }
+          }
+        if (!selected)
+          {
+             if (ky->selected)
+               {
+                  edje_object_signal_emit(ky->obj, "e,state,unselected", "e");
+                  ky->selected = 0;
+               }
+          }
      }
 }
 
@@ -211,14 +200,14 @@ _e_kbd_int_string_send(E_Kbd_Int *ki, const char *str)
    e_kbd_buf_word_use(ki->kbuf, str);
    for (;;)
      {
-       char buf[16];
-
-       newpos = evas_string_char_next_get(str, pos, &glyph);
-       if (glyph <= 0) return;
-       strncpy(buf, str + pos, newpos - pos);
-       buf[newpos - pos] = 0;
-       e_kbd_send_string_press(buf, 0);
-       pos = newpos;
+        char buf[16];
+
+        newpos = evas_string_char_next_get(str, pos, &glyph);
+        if (glyph <= 0) return;
+        strncpy(buf, str + pos, newpos - pos);
+        buf[newpos - pos] = 0;
+        e_kbd_send_string_press(buf, 0);
+        pos = newpos;
      }
 }
 
@@ -245,8 +234,8 @@ _e_kbd_int_cb_match_select(void *data, Evas_Object *obj __UNUSED__, const char *
    e_kbd_send_keysym_press("space", 0);
    if (km->ki->layout.state & (SHIFT | CTRL | ALT | ALTGR))
      {
-       km->ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
-       _e_kbd_int_layout_state_update(km->ki);
+        km->ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
+        _e_kbd_int_layout_state_update(km->ki);
      }
    _e_kbd_int_matches_update(km->ki);
 }
@@ -261,7 +250,7 @@ _e_kbd_int_matches_add(E_Kbd_Int *ki, const char *str, int num)
    km = E_NEW(E_Kbd_Int_Match, 1);
    if (!km) return;
    o = _theme_obj_new(ki->win->evas, ki->themedir,
-                     "e/modules/kbd/match/word");
+                      "e/modules/kbd/match/word");
    km->ki = ki;
    km->str = eina_stringshare_add(str);
    km->obj = o;
@@ -275,7 +264,7 @@ _e_kbd_int_matches_add(E_Kbd_Int *ki, const char *str, int num)
    if (num == 0)
      edje_object_signal_emit(o, "e,state,selected", "e");
    edje_object_signal_callback_add(o, "e,action,do,select", "",
-                                  _e_kbd_int_cb_match_select, km);
+                                   _e_kbd_int_cb_match_select, km);
    evas_object_show(o);
 }
 
@@ -286,9 +275,9 @@ _e_kbd_int_matches_free(E_Kbd_Int *ki)
 
    EINA_LIST_FREE(ki->matches, km)
      {
-       if (km->str) eina_stringshare_del(km->str);
-       evas_object_del(km->obj);
-       free(km);
+        if (km->str) eina_stringshare_del(km->str);
+        evas_object_del(km->obj);
+        free(km);
      }
 }
 
@@ -307,34 +296,34 @@ _e_kbd_int_matches_update(void *data)
    matches = e_kbd_buf_string_matches_get(ki->kbuf);
    if (!matches)
      {
-       actual = e_kbd_buf_actual_string_get(ki->kbuf);
-       if (actual) _e_kbd_int_matches_add(ki, actual, 0);
+        actual = e_kbd_buf_actual_string_get(ki->kbuf);
+        if (actual) _e_kbd_int_matches_add(ki, actual, 0);
      }
    else
      {
-       int i = 0;
-
-       for (i = 0, l = matches; l; l = l->next, i++)
-         {
-            _e_kbd_int_matches_add(ki, l->data, i);
-            e_box_size_min_get(ki->box_obj, &mw, &mh);
-            edje_object_part_geometry_get(ki->base_obj, "e.swallow.label", 
-                                          NULL, NULL, &vw, &vh);
-            if (mw > vw) break;
-         }
-
-       if (!l)
-         {
-            actual = e_kbd_buf_actual_string_get(ki->kbuf);
-            if (actual)
-              {
-                 const char *str;
-
-                 EINA_LIST_FOREACH(matches, l, str)
-                   if (!strcmp(str, actual)) break;
-                 if (!l) _e_kbd_int_matches_add(ki, actual, i);
-              }
-         }
+        int i = 0;
+
+        for (i = 0, l = matches; l; l = l->next, i++)
+          {
+             _e_kbd_int_matches_add(ki, l->data, i);
+             e_box_size_min_get(ki->box_obj, &mw, &mh);
+             edje_object_part_geometry_get(ki->base_obj, "e.swallow.label", 
+                                           NULL, NULL, &vw, &vh);
+             if (mw > vw) break;
+          }
+
+        if (!l)
+          {
+             actual = e_kbd_buf_actual_string_get(ki->kbuf);
+             if (actual)
+               {
+                  const char *str;
+
+                  EINA_LIST_FOREACH(matches, l, str)
+                    if (!strcmp(str, actual)) break;
+                  if (!l) _e_kbd_int_matches_add(ki, actual, i);
+               }
+          }
      }
    e_box_thaw(ki->box_obj);
    e_box_size_min_get(ki->box_obj, &mw, &mh);
@@ -355,111 +344,111 @@ _e_kbd_int_key_press_handle(E_Kbd_Int *ki, E_Kbd_Int_Key *ky)
 
    if (ky->is_shift)
      {
-       if (ki->layout.state & SHIFT) ki->layout.state &= (~(SHIFT));
-       else ki->layout.state |= SHIFT;
-       _e_kbd_int_layout_state_update(ki);
-       return;
+        if (ki->layout.state & SHIFT) ki->layout.state &= (~(SHIFT));
+        else ki->layout.state |= SHIFT;
+        _e_kbd_int_layout_state_update(ki);
+        return;
      }
    if (ky->is_multi_shift)
      {
-       if (ki->layout.state & SHIFT)
+        if (ki->layout.state & SHIFT)
           {
              ki->layout.state &= (~(SHIFT));
              ki->layout.state |= CAPSLOCK;
           }
-       else if (ki->layout.state & CAPSLOCK)
+        else if (ki->layout.state & CAPSLOCK)
           ki->layout.state &= (~(CAPSLOCK));
         else
           ki->layout.state |= SHIFT;
-       _e_kbd_int_layout_state_update(ki);
-       return;
+        _e_kbd_int_layout_state_update(ki);
+        return;
      }
    if (ky->is_ctrl)
      {
-       if (ki->layout.state & CTRL) ki->layout.state &= (~(CTRL));
-       else ki->layout.state |= CTRL;
-       if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
-       e_kbd_buf_clear(ki->kbuf);
-       _e_kbd_int_layout_state_update(ki);
-       _e_kbd_int_matches_update(ki);
-       return;
+        if (ki->layout.state & CTRL) ki->layout.state &= (~(CTRL));
+        else ki->layout.state |= CTRL;
+        if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+        e_kbd_buf_clear(ki->kbuf);
+        _e_kbd_int_layout_state_update(ki);
+        _e_kbd_int_matches_update(ki);
+        return;
      }
    if (ky->is_alt)
      {
-       if (ki->layout.state & ALT) ki->layout.state &= (~(ALT));
-       else ki->layout.state |= ALT;
-       if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
-       e_kbd_buf_clear(ki->kbuf);
-       _e_kbd_int_layout_state_update(ki);
-       _e_kbd_int_matches_update(ki);
-       return;
+        if (ki->layout.state & ALT) ki->layout.state &= (~(ALT));
+        else ki->layout.state |= ALT;
+        if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+        e_kbd_buf_clear(ki->kbuf);
+        _e_kbd_int_layout_state_update(ki);
+        _e_kbd_int_matches_update(ki);
+        return;
      }
    if (ky->is_altgr)
      {
-       if (ki->layout.state & ALTGR) ki->layout.state &= (~(ALTGR));
-       else ki->layout.state |= ALTGR;
-       _e_kbd_int_layout_state_update(ki);
-       return;
+        if (ki->layout.state & ALTGR) ki->layout.state &= (~(ALTGR));
+        else ki->layout.state |= ALTGR;
+        _e_kbd_int_layout_state_update(ki);
+        return;
      }
    if (ky->is_capslock)
      {
-       if (ki->layout.state & CAPSLOCK) ki->layout.state &= (~CAPSLOCK);
-       else ki->layout.state |= CAPSLOCK;
-       _e_kbd_int_layout_state_update(ki);
-       return;
+        if (ki->layout.state & CAPSLOCK) ki->layout.state &= (~CAPSLOCK);
+        else ki->layout.state |= CAPSLOCK;
+        _e_kbd_int_layout_state_update(ki);
+        return;
      }
    st = _e_kbd_int_key_state_get(ki, ky);
    if (st) out = st->out;
    if (ki->layout.state & (CTRL | ALT))
      {
-       if (out)
-         {
-            Kbd_Mod mods = 0;
+        if (out)
+          {
+             Kbd_Mod mods = 0;
 
-            if (ki->layout.state & CTRL) mods |= KBD_MOD_CTRL;
-            if (ki->layout.state & ALT) mods |= KBD_MOD_ALT;
-            if (out[0] == '"')
+             if (ki->layout.state & CTRL) mods |= KBD_MOD_CTRL;
+             if (ki->layout.state & ALT) mods |= KBD_MOD_ALT;
+             if (out[0] == '"')
                e_kbd_send_string_press(_e_kbd_int_str_unquote(out), mods);
-            else
-              e_kbd_send_keysym_press(out, mods);
-         }
-       ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
-       _e_kbd_int_layout_state_update(ki);
-       e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
-       return;
+             else
+               e_kbd_send_keysym_press(out, mods);
+          }
+        ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
+        _e_kbd_int_layout_state_update(ki);
+        e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+        return;
      }
    if (out)
      {
-       if (out[0] == '"')
-         {
-            if (ki->down.zoom)
-              e_kbd_buf_pressed_key_add(ki->kbuf,
-                                        _e_kbd_int_str_unquote(out), 
-                                        ki->layout.state & SHIFT, 
-                                        ki->layout.state & CAPSLOCK);
-            else
-              e_kbd_buf_pressed_point_add(ki->kbuf,
+        if (out[0] == '"')
+          {
+             if (ki->down.zoom)
+               e_kbd_buf_pressed_key_add(ki->kbuf,
+                                         _e_kbd_int_str_unquote(out), 
+                                         ki->layout.state & SHIFT, 
+                                         ki->layout.state & CAPSLOCK);
+             else
+               e_kbd_buf_pressed_point_add(ki->kbuf,
                                            ky->x + (ky->w / 2),
                                            ky->y + (ky->h / 2),
-                                          ki->layout.state & SHIFT, 
-                                          ki->layout.state & CAPSLOCK);
-            e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
-         }
-       else
-         {
-            if (e_kbd_buf_actual_string_get(ki->kbuf)) 
+                                           ki->layout.state & SHIFT, 
+                                           ki->layout.state & CAPSLOCK);
+             e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+          }
+        else
+          {
+             if (e_kbd_buf_actual_string_get(ki->kbuf)) 
                _e_kbd_int_buf_send(ki);
-            e_kbd_buf_clear(ki->kbuf);
-            e_kbd_send_keysym_press(out, 0);
-            _e_kbd_int_matches_update(ki);
-         }
+             e_kbd_buf_clear(ki->kbuf);
+             e_kbd_send_keysym_press(out, 0);
+             _e_kbd_int_matches_update(ki);
+          }
      }
    if (ki->layout.state & (SHIFT | CTRL | ALT | ALTGR))
      {
-       printf("CLEARING STATE\n");
-       if (!ky->is_multi_shift) 
+        printf("CLEARING STATE\n");
+        if (!ky->is_multi_shift) 
           ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
-       _e_kbd_int_layout_state_update(ki);
+        _e_kbd_int_layout_state_update(ki);
      }
 }
     
@@ -472,7 +461,7 @@ _e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir)
      {
         if (dir == 3)
           dir = 1;
-       else if (dir == 1)
+        else if (dir == 1)
           dir = 3;
      }
 
@@ -480,32 +469,32 @@ _e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir)
      _e_kbd_int_layout_next(ki);
    else if (dir == 3) // left
      {
-       if (e_kbd_buf_actual_string_get(ki->kbuf))
-         {
-            e_kbd_buf_backspace(ki->kbuf);
-            e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
-         }
-       else
-         e_kbd_send_keysym_press("BackSpace", 0);
+        if (e_kbd_buf_actual_string_get(ki->kbuf))
+          {
+             e_kbd_buf_backspace(ki->kbuf);
+             e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+          }
+        else
+          e_kbd_send_keysym_press("BackSpace", 0);
      }
    else if (dir == 2) // down
      {
-       if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
-       e_kbd_buf_clear(ki->kbuf);
-       e_kbd_send_keysym_press("Return", 0);
-       _e_kbd_int_matches_update(ki);
+        if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+        e_kbd_buf_clear(ki->kbuf);
+        e_kbd_send_keysym_press("Return", 0);
+        _e_kbd_int_matches_update(ki);
      }
    else if (dir == 1) // right
      {
-       if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
-       e_kbd_buf_clear(ki->kbuf);
-       e_kbd_send_keysym_press("space", 0);
-       _e_kbd_int_matches_update(ki);
+        if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+        e_kbd_buf_clear(ki->kbuf);
+        e_kbd_send_keysym_press("space", 0);
+        _e_kbd_int_matches_update(ki);
      }
    if (ki->layout.state)
      {
-       ki->layout.state = 0;
-       _e_kbd_int_layout_state_update(ki);
+        ki->layout.state = 0;
+        _e_kbd_int_layout_state_update(ki);
      }
 }
     
@@ -523,9 +512,9 @@ _e_kbd_int_zoomkey_down(E_Kbd_Int *ki)
      {
         E_Kbd_Int_Key *ky;
 
-       ky = l->data;
-       ky->zoom_obj = NULL;
-       ky->zoom_icon_obj = NULL;
+        ky = l->data;
+        ky->zoom_obj = NULL;
+        ky->zoom_icon_obj = NULL;
      }
 }
 
@@ -542,7 +531,7 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
    e_popup_layer_set(ki->zoomkey.popup, 190);
 
    o = _theme_obj_new(ki->zoomkey.popup->evas, ki->themedir,
-                     "e/modules/kbd/zoom/default");
+                      "e/modules/kbd/zoom/default");
    ki->zoomkey.base_obj = o;
 
    o = e_layout_add(ki->zoomkey.popup->evas);
@@ -557,68 +546,69 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
    e_layout_virtual_size_set(o, vw, vh);
    e_layout_pack(ki->zoomkey.layout_obj, o);
    e_layout_child_move(o, 0, 0);
-   // FIXME dimension * 4 is a magic number - make config
-   e_layout_child_resize(o, vw * 4, vh * 4);
+   e_layout_child_resize(o,
+                         vw * il_kbd_cfg->zoom_level,
+                         vh * il_kbd_cfg->zoom_level);
    evas_object_show(o);
    ki->zoomkey.sublayout_obj = o;
 
    for (l = ki->layout.keys; l; l = l->next)
      {
-       E_Kbd_Int_Key *ky;
-       E_Kbd_Int_Key_State *st;
-       const char *label, *icon;
-       int selected;
-
-       ky = l->data;
-       o = _theme_obj_new(ki->zoomkey.popup->evas, ki->themedir,
-                          "e/modules/kbd/zoomkey/default");
-       label = "";
-       icon = NULL;
-       st = _e_kbd_int_key_state_get(ki, ky);
-       if (st)
-         {
-            label = st->label;
-            icon = st->icon;
-         }
-
-       edje_object_part_text_set(o, "e.text.label", label);
-
-       o2 = e_icon_add(ki->zoomkey.popup->evas);
-       e_icon_fill_inside_set(o2, 1);
-//     e_icon_scale_up_set(o2, 0);
-       edje_object_part_swallow(o, "e.swallow.content", o2);
-       evas_object_show(o2);
-
-       if (icon)
-         {
-            char buf[PATH_MAX];
-            char *p;
-
-            snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
-            p = strrchr(icon, '.');
-            if (!strcmp(p, ".edj"))
-              e_icon_file_edje_set(o2, buf, "icon");
-            else
-              e_icon_file_set(o2, buf);
-         }
-       selected = 0;
-       if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
-       if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
-       if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
-       if ((ki->layout.state & ALTGR) && (ky->is_altgr)) selected = 1;
-       if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
-       if ((ki->layout.state & (SHIFT|CAPSLOCK)) && (ky->is_multi_shift)) 
+        E_Kbd_Int_Key *ky;
+        E_Kbd_Int_Key_State *st;
+        const char *label, *icon;
+        int selected;
+
+        ky = l->data;
+        o = _theme_obj_new(ki->zoomkey.popup->evas, ki->themedir,
+                           "e/modules/kbd/zoomkey/default");
+        label = "";
+        icon = NULL;
+        st = _e_kbd_int_key_state_get(ki, ky);
+        if (st)
+          {
+             label = st->label;
+             icon = st->icon;
+          }
+
+        edje_object_part_text_set(o, "e.text.label", label);
+
+        o2 = e_icon_add(ki->zoomkey.popup->evas);
+        e_icon_fill_inside_set(o2, 1);
+//        e_icon_scale_up_set(o2, 0);
+        edje_object_part_swallow(o, "e.swallow.content", o2);
+        evas_object_show(o2);
+
+        if (icon)
+          {
+             char buf[PATH_MAX];
+             char *p;
+
+             snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
+             p = strrchr(icon, '.');
+             if (!strcmp(p, ".edj"))
+               e_icon_file_edje_set(o2, buf, "icon");
+             else
+               e_icon_file_set(o2, buf);
+          }
+        selected = 0;
+        if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
+        if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
+        if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
+        if ((ki->layout.state & ALTGR) && (ky->is_altgr)) selected = 1;
+        if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
+        if ((ki->layout.state & (SHIFT|CAPSLOCK)) && (ky->is_multi_shift)) 
           selected = 1;
-       if (selected)
-         edje_object_signal_emit(o, "e,state,selected", "e");
-       if (!selected)
-         edje_object_signal_emit(o, "e,state,unselected", "e");
-       e_layout_pack(ki->zoomkey.sublayout_obj, o);
-       e_layout_child_move(o, ky->x, ky->y);
-       e_layout_child_resize(o, ky->w, ky->h);
-       evas_object_show(o);
-       ky->zoom_obj = o;
-       ky->zoom_icon_obj = o2;
+        if (selected)
+          edje_object_signal_emit(o, "e,state,selected", "e");
+        if (!selected)
+          edje_object_signal_emit(o, "e,state,unselected", "e");
+        e_layout_pack(ki->zoomkey.sublayout_obj, o);
+        e_layout_child_move(o, ky->x, ky->y);
+        e_layout_child_resize(o, ky->w, ky->h);
+        evas_object_show(o);
+        ky->zoom_obj = o;
+        ky->zoom_icon_obj = o2;
      }
 
    edje_object_size_min_calc(ki->zoomkey.base_obj, &vw, &vh);
@@ -630,9 +620,9 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
    if ((vh > 0) && (mh > vh)) mh = vh;
 
    e_popup_move_resize(ki->zoomkey.popup, 
-                      sx + ((sw - mw) / 2), sy + ((sh - mh) / 2), mw, mh);
+                       sx + ((sw - mw) / 2), sy + ((sh - mh) / 2), mw, mh);
    evas_object_resize(ki->zoomkey.base_obj,
-                     ki->zoomkey.popup->w, ki->zoomkey.popup->h);
+                      ki->zoomkey.popup->w, ki->zoomkey.popup->h);
    evas_object_show(ki->zoomkey.base_obj);
    e_popup_edje_bg_object_set(ki->zoomkey.popup, ki->zoomkey.base_obj);
    e_popup_show(ki->zoomkey.popup);
@@ -648,34 +638,35 @@ _e_kbd_int_zoomkey_update(E_Kbd_Int *ki)
    evas_object_geometry_get(ki->zoomkey.layout_obj, NULL, NULL, &w, &h);
    evas_object_geometry_get(ki->layout_obj, NULL, NULL, &ww, &hh);
    e_layout_virtual_size_set(ki->zoomkey.layout_obj, w, h);
-   // FIXME dimension * 4 is a magic number - make config
-   e_layout_child_resize(ki->zoomkey.sublayout_obj, ww * 4, hh * 4);
+   e_layout_child_resize(ki->zoomkey.sublayout_obj,
+                         ww * il_kbd_cfg->zoom_level,
+                         hh * il_kbd_cfg->zoom_level);
    e_layout_child_move(ki->zoomkey.sublayout_obj, 
-                      (w / 2) - (ki->down.cx * 4), 
-                      (h / 2) - (ki->down.cy * 4));
+                       (w / 2) - (ki->down.cx * il_kbd_cfg->zoom_level),
+                       (h / 2) - (ki->down.cy * il_kbd_cfg->zoom_level));
    ky = _e_kbd_int_at_coord_get(ki, ki->down.clx, ki->down.cly);
    if (ky != ki->zoomkey.pressed)
      {
-       if (ki->zoomkey.pressed)
-         {
-            ki->zoomkey.pressed->pressed = 0;
-            edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
-                                    "e,state,released", "e");
-            edje_object_signal_emit(ki->zoomkey.pressed->obj,
-                                    "e,state,released", "e");
-         }
-       ki->zoomkey.pressed = ky;
-       if (ki->zoomkey.pressed)
-         {
-            ki->zoomkey.pressed->pressed = 1;
-            e_layout_child_raise(ki->zoomkey.pressed->zoom_obj);
-            edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
-                                    "e,state,pressed", "e");
-            e_layout_child_raise(ki->zoomkey.pressed->obj);
-            e_layout_child_raise(ki->event_obj);
-            edje_object_signal_emit(ki->zoomkey.pressed->obj,
-                                    "e,state,pressed", "e");
-         }
+        if (ki->zoomkey.pressed)
+          {
+             ki->zoomkey.pressed->pressed = 0;
+             edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
+                                     "e,state,released", "e");
+             edje_object_signal_emit(ki->zoomkey.pressed->obj,
+                                     "e,state,released", "e");
+          }
+        ki->zoomkey.pressed = ky;
+        if (ki->zoomkey.pressed)
+          {
+             ki->zoomkey.pressed->pressed = 1;
+             e_layout_child_raise(ki->zoomkey.pressed->zoom_obj);
+             edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
+                                     "e,state,pressed", "e");
+             e_layout_child_raise(ki->zoomkey.pressed->obj);
+             e_layout_child_raise(ki->event_obj);
+             edje_object_signal_emit(ki->zoomkey.pressed->obj,
+                                     "e,state,pressed", "e");
+          }
      }
 }
 
@@ -689,10 +680,10 @@ _e_kbd_int_cb_hold_timeout(void *data)
    ki->down.zoom = 1;
    if (ki->layout.pressed)
      {
-       ki->layout.pressed->pressed = 0;
-       edje_object_signal_emit(ki->layout.pressed->obj,
-                               "e,state,released", "e");
-       ki->layout.pressed = NULL;
+        ki->layout.pressed->pressed = 0;
+        edje_object_signal_emit(ki->layout.pressed->obj,
+                                "e,state,released", "e");
+        ki->layout.pressed = NULL;
      }
    _e_kbd_int_zoomkey_up(ki);
    _e_kbd_int_zoomkey_update(ki);
@@ -729,17 +720,17 @@ _e_kbd_int_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U
    ki->down.cly = y;
 
    if (ki->down.hold_timer) ecore_timer_del(ki->down.hold_timer);
-   // FIXME 0.25 - magic value. make config.
-   ki->down.hold_timer = ecore_timer_add(0.25, _e_kbd_int_cb_hold_timeout, ki);
+   ki->down.hold_timer = ecore_timer_add(il_kbd_cfg->hold_timer,
+                                         _e_kbd_int_cb_hold_timeout, ki);
 
    ky = _e_kbd_int_at_coord_get(ki, x, y);
    ki->layout.pressed = ky;
    if (ky)
      {
-       ky->pressed = 1;
-       e_layout_child_raise(ky->obj);
-       e_layout_child_raise(ki->event_obj);
-       edje_object_signal_emit(ky->obj, "e,state,pressed", "e");
+        ky->pressed = 1;
+        e_layout_child_raise(ky->obj);
+        e_layout_child_raise(ki->event_obj);
+        edje_object_signal_emit(ky->obj, "e,state,pressed", "e");
      }
 }
 
@@ -755,17 +746,17 @@ _e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U
 
    if (ki->down.zoom)
      {
-       evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
-       x = ev->cur.canvas.x - x;
-       y = ev->cur.canvas.y - y;
-       ki->down.cx = x;
-       ki->down.cy = y;
-       x = (x * ki->layout.w) / w;
-       y = (y * ki->layout.h) / h;
-       ki->down.clx = x;
-       ki->down.cly = y;
-       _e_kbd_int_zoomkey_update(ki);
-       return;
+        evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
+        x = ev->cur.canvas.x - x;
+        y = ev->cur.canvas.y - y;
+        ki->down.cx = x;
+        ki->down.cy = y;
+        x = (x * ki->layout.w) / w;
+        y = (y * ki->layout.h) / h;
+        ki->down.clx = x;
+        ki->down.cly = y;
+        _e_kbd_int_zoomkey_update(ki);
+        return;
      }
    if (ki->down.stroke) return;
 
@@ -774,15 +765,18 @@ _e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U
    evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
    dx = (dx * ki->layout.w) / w;
    dy = (dy * ki->layout.h) / h;
-   // FIXME: slide 1/4 of dimension is a magic number - make config
-   if ((dx > 0) && (dx > (ki->layout.w / 4))) ki->down.stroke = 1;
-   else if ((dx < 0) && (-dx > (ki->layout.w / 4))) ki->down.stroke = 1;
-   if ((dy > 0) && (dy > (ki->layout.h / 4))) ki->down.stroke = 1;
-   else if ((dy < 0) && (-dy > (ki->layout.w / 4))) ki->down.stroke = 1;
+   if ((dx > 0) && (dx > (ki->layout.w / il_kbd_cfg->slide_dim)))
+     ki->down.stroke = 1;
+   else if ((dx < 0) && (-dx > (ki->layout.w / il_kbd_cfg->slide_dim)))
+     ki->down.stroke = 1;
+   if ((dy > 0) && (dy > (ki->layout.h / il_kbd_cfg->slide_dim)))
+     ki->down.stroke = 1;
+   else if ((dy < 0) && (-dy > (ki->layout.w / il_kbd_cfg->slide_dim)))
+     ki->down.stroke = 1;
    if ((ki->down.stroke) && (ki->down.hold_timer))
      {
-       ecore_timer_del(ki->down.hold_timer);
-       ki->down.hold_timer = NULL;
+        ecore_timer_del(ki->down.hold_timer);
+        ki->down.hold_timer = NULL;
      }
 }
 
@@ -801,9 +795,9 @@ _e_kbd_int_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNU
    if (ki->down.zoom)
      {
         ky = _e_kbd_int_at_coord_get(ki, ki->down.clx, ki->down.cly);
-       _e_kbd_int_key_press_handle(ki, ky);
-       _e_kbd_int_zoomkey_down(ki);
-       ki->down.zoom = 0;
+        _e_kbd_int_key_press_handle(ki, ky);
+        _e_kbd_int_zoomkey_down(ki);
+        ki->down.zoom = 0;
      }
    else if (!ki->down.down)
      {
@@ -829,59 +823,59 @@ _e_kbd_int_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNU
      }
    else
      {
-       Evas_Coord dx, dy;
-
-       dx = ev->canvas.x - ki->down.x;
-       dy = ev->canvas.y - ki->down.y;
-       if (dx > 0)
-         {
-            if (dy > 0)
-              {
-                 if (dx > dy) dir = 1; // right
-                 else dir = 2; // down
-              }
-            else
-              {
-                 if (dx > -dy) dir = 1; // right
-                 else dir = 4; // up
-              }
-         }
-       else
-         {
-            if (dy > 0)
-              {
-                 if (-dx > dy) dir = 3; // left
-                 else dir = 2; // down
-              }
-            else
-              {
-                 if (-dx > -dy) dir = 3; // left
-                 else dir = 4; // up
-              }
-         }
+        Evas_Coord dx, dy;
+
+        dx = ev->canvas.x - ki->down.x;
+        dy = ev->canvas.y - ki->down.y;
+        if (dx > 0)
+          {
+             if (dy > 0)
+               {
+                  if (dx > dy) dir = 1; // right
+                  else dir = 2; // down
+               }
+             else
+               {
+                  if (dx > -dy) dir = 1; // right
+                  else dir = 4; // up
+               }
+          }
+        else
+          {
+             if (dy > 0)
+               {
+                  if (-dx > dy) dir = 3; // left
+                  else dir = 2; // down
+               }
+             else
+               {
+                  if (-dx > -dy) dir = 3; // left
+                  else dir = 4; // up
+               }
+          }
      }
 
    ky = ki->layout.pressed;
    if (ky)
      {
-       ky->pressed = 0;
-       edje_object_signal_emit(ky->obj, "e,state,released", "e");
-       ki->layout.pressed = NULL;
+        ky->pressed = 0;
+        edje_object_signal_emit(ky->obj, "e,state,released", "e");
+        ki->layout.pressed = NULL;
      }
    ky = ki->zoomkey.pressed;
    if (ky)
      {
-       ky->pressed = 0;
-       edje_object_signal_emit(ky->obj, "e,state,released", "e");
-       ki->zoomkey.pressed = NULL;
+        ky->pressed = 0;
+        edje_object_signal_emit(ky->obj, "e,state,released", "e");
+        ki->zoomkey.pressed = NULL;
      }
 
    ki->down.down = 0;
    ki->down.stroke = 0;
    if (ki->down.hold_timer)
      {
-       ecore_timer_del(ki->down.hold_timer);
-       ki->down.hold_timer = NULL;
+        ecore_timer_del(ki->down.hold_timer);
+        ki->down.hold_timer = NULL;
      }
 
    if (dir > 0) _e_kbd_int_stroke_handle(ki, dir);
@@ -894,6 +888,10 @@ _e_kbd_int_layouts_list_default_get(E_Kbd_Int *ki)
    Eina_List *l;
 
    EINA_LIST_FOREACH(ki->layouts, l, kil)
+     if (kil->type == il_kbd_cfg->layout)
+       return kil;
+
+   EINA_LIST_FOREACH(ki->layouts, l, kil)
      if ((!strcmp(ecore_file_file_get(kil->path), "Default.kbd")))
        return kil;
    return NULL;
@@ -923,16 +921,16 @@ _e_kbd_int_layout_free(E_Kbd_Int *ki)
      {
         E_Kbd_Int_Key_State *st;
 
-       EINA_LIST_FREE(ky->states, st)
-         {
-            if (st->label) eina_stringshare_del(st->label);
-            if (st->icon) eina_stringshare_del(st->icon);
-            if (st->out) eina_stringshare_del(st->out);
-            free(st);
-         }
-       if (ky->obj) evas_object_del(ky->obj);
-       if (ky->icon_obj) evas_object_del(ky->icon_obj);
-       free(ky);
+        EINA_LIST_FREE(ky->states, st)
+          {
+             if (st->label) eina_stringshare_del(st->label);
+             if (st->icon) eina_stringshare_del(st->icon);
+             if (st->out) eina_stringshare_del(st->out);
+             free(st);
+          }
+        if (ky->obj) evas_object_del(ky->obj);
+        if (ky->icon_obj) evas_object_del(ky->icon_obj);
+        free(ky);
      }
    if (ki->event_obj) evas_object_del(ki->event_obj);
    ki->event_obj = NULL;
@@ -957,87 +955,87 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
 
    while (fgets(buf, sizeof(buf), f))
      {
-       int len;
-       char str[PATH_MAX];
-
-       if (!isok)
-         {
-            if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
-         }
-       if (!isok) break;
-       if (buf[0] == '#') continue;
-       len = strlen(buf);
-       if (len > 0)
-         {
-            if (buf[len - 1] == '\n') buf[len - 1] = 0;
-         }
-       if (sscanf(buf, "%4000s", str) != 1) continue;
-       if (!strcmp(str, "kbd"))
-         {
-            if (sscanf(buf, "%*s %i %i\n", &(ki->layout.w), &(ki->layout.h)) != 2)
-              continue;
-         }
-       if (!strcmp(str, "fuzz"))
-         {
-            sscanf(buf, "%*s %i\n", &(ki->layout.fuzz));
-            continue;
-         }
-       if (!strcmp(str, "direction"))
-         {
-            char direction[4];
-
-            sscanf(buf, "%*s %3s\n", direction);
-
-            /* If rtl mark as rtl, otherwise make it ltr */
-            if (!strcmp(direction, "rtl"))
+        int len;
+        char str[PATH_MAX];
+
+        if (!isok)
+          {
+             if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
+          }
+        if (!isok) break;
+        if (buf[0] == '#') continue;
+        len = strlen(buf);
+        if (len > 0)
+          {
+             if (buf[len - 1] == '\n') buf[len - 1] = 0;
+          }
+        if (sscanf(buf, "%4000s", str) != 1) continue;
+        if (!strcmp(str, "kbd"))
+          {
+             if (sscanf(buf, "%*s %i %i\n", &(ki->layout.w), &(ki->layout.orig_h)) != 2)
+               continue;
+          }
+        if (!strcmp(str, "fuzz"))
+          {
+             sscanf(buf, "%*s %i\n", &(ki->layout.fuzz));
+             continue;
+          }
+        if (!strcmp(str, "direction"))
+          {
+             char direction[4];
+
+             sscanf(buf, "%*s %3s\n", direction);
+
+             /* If rtl mark as rtl, otherwise make it ltr */
+             if (!strcmp(direction, "rtl"))
                ki->layout.direction = E_KBD_INT_DIRECTION_RTL;
-            else
+             else
                ki->layout.direction = E_KBD_INT_DIRECTION_LTR;
-            continue;
-         }
-       if (!strcmp(str, "key"))
-         {
-            ky = calloc(1, sizeof(E_Kbd_Int_Key));
-            if (!ky) continue;
-            if (sscanf(buf, "%*s %i %i %i %i\n", &(ky->x), &(ky->y), &(ky->w), &(ky->h)) != 4)
-              {
-                 free(ky);
-                 ky = NULL;
-                 continue;
-              }
-            ki->layout.keys = eina_list_append(ki->layout.keys, ky);
-         }
-       if (!ky) continue;
-       if ((!strcmp(str, "normal")) || (!strcmp(str, "shift")) ||
-           (!strcmp(str, "capslock")) || (!strcmp(str, "altgr")))
-         {
-            char *p;
-            char label[PATH_MAX];
-
-            if (sscanf(buf, "%*s %4000s", label) != 1) continue;
-            st = calloc(1, sizeof(E_Kbd_Int_Key_State));
-            if (!st) continue;
-            ky->states = eina_list_append(ky->states, st);
-            if (!strcmp(str, "normal")) st->state = NORMAL;
-            if (!strcmp(str, "shift")) st->state = SHIFT;
-            if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
-            if (!strcmp(str, "altgr")) st->state = ALTGR;
-            p = strrchr(label, '.');
-            if ((p) && (!strcmp(p, ".png")))
-              st->icon = eina_stringshare_add(label);
-            else if ((p) && (!strcmp(p, ".edj")))
-              st->icon = eina_stringshare_add(label);
-            else
-              st->label = eina_stringshare_add(label);
-            if (sscanf(buf, "%*s %*s %4000s", str) != 1) continue;
-            st->out = eina_stringshare_add(str);
-         }
-       if (!strcmp(str, "is_shift")) ky->is_shift = 1;
-       if (!strcmp(str, "is_multi_shift")) ky->is_multi_shift = 1;
-       if (!strcmp(str, "is_ctrl")) ky->is_ctrl = 1;
-       if (!strcmp(str, "is_alt")) ky->is_alt = 1;
-       if (!strcmp(str, "is_altgr")) ky->is_altgr = 1;
-       if (!strcmp(str, "is_capslock")) ky->is_capslock = 1;
+             continue;
+          }
+        if (!strcmp(str, "key"))
+          {
+             ky = calloc(1, sizeof(E_Kbd_Int_Key));
+             if (!ky) continue;
+             if (sscanf(buf, "%*s %i %i %i %i\n", &(ky->x), &(ky->orig_y), &(ky->w), &(ky->orig_h)) != 4)
+               {
+                  free(ky);
+                  ky = NULL;
+                  continue;
+               }
+             ki->layout.keys = eina_list_append(ki->layout.keys, ky);
+          }
+        if (!ky) continue;
+        if ((!strcmp(str, "normal")) || (!strcmp(str, "shift")) ||
+            (!strcmp(str, "capslock")) || (!strcmp(str, "altgr")))
+          {
+             char *p;
+             char label[PATH_MAX];
+
+             if (sscanf(buf, "%*s %4000s", label) != 1) continue;
+             st = calloc(1, sizeof(E_Kbd_Int_Key_State));
+             if (!st) continue;
+             ky->states = eina_list_append(ky->states, st);
+             if (!strcmp(str, "normal")) st->state = NORMAL;
+             if (!strcmp(str, "shift")) st->state = SHIFT;
+             if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
+             if (!strcmp(str, "altgr")) st->state = ALTGR;
+             p = strrchr(label, '.');
+             if ((p) && (!strcmp(p, ".png")))
+               st->icon = eina_stringshare_add(label);
+             else if ((p) && (!strcmp(p, ".edj")))
+               st->icon = eina_stringshare_add(label);
+             else
+               st->label = eina_stringshare_add(label);
+             if (sscanf(buf, "%*s %*s %4000s", str) != 1) continue;
+             st->out = eina_stringshare_add(str);
+          }
+        if (!strcmp(str, "is_shift")) ky->is_shift = 1;
+        if (!strcmp(str, "is_multi_shift")) ky->is_multi_shift = 1;
+        if (!strcmp(str, "is_ctrl")) ky->is_ctrl = 1;
+        if (!strcmp(str, "is_alt")) ky->is_alt = 1;
+        if (!strcmp(str, "is_altgr")) ky->is_altgr = 1;
+        if (!strcmp(str, "is_capslock")) ky->is_capslock = 1;
      }
    fclose(f);
 }
@@ -1050,6 +1048,8 @@ _e_kbd_int_layout_build(E_Kbd_Int *ki)
    Evas_Coord lw, lh;
    Eina_List *l;
 
+   ki->layout.h = ki->layout.orig_h * il_kbd_cfg->scale_height;
+
    evas_event_freeze(ki->win->evas);
    e_layout_virtual_size_set(ki->layout_obj, ki->layout.w, ki->layout.h);
    edje_extern_object_aspect_set(ki->layout_obj, EDJE_ASPECT_CONTROL_BOTH, 
@@ -1059,52 +1059,56 @@ _e_kbd_int_layout_build(E_Kbd_Int *ki)
    edje_object_part_geometry_get(ki->base_obj, "e.swallow.content", 
                                  NULL, NULL, &lw, &lh);
    lh = (ki->layout.h * lw) / ki->layout.w;
+   if (lw > ki->win->w) lw = ki->win->w;
+   if (lh > ki->win->h) lh = ki->win->h;
    edje_extern_object_min_size_set(ki->layout_obj, lw, lh);
    edje_extern_object_max_size_set(ki->layout_obj, ki->win->w, ki->win->h);
-   edje_object_part_swallow(ki->base_obj, "e.swallow.content", ki->layout_obj);
 
    EINA_LIST_FOREACH(ki->layout.keys, l, ky)
      {
-       E_Kbd_Int_Key_State *st;
-       const char *label, *icon;
-
-       o = _theme_obj_new(ki->win->evas, ki->themedir,
-                          "e/modules/kbd/key/default");
-       ky->obj = o;
-       label = "";
-       icon = NULL;
-       st = _e_kbd_int_key_state_get(ki, ky);
-       if (st)
-         {
-            label = st->label;
-            icon = st->icon;
-         }
+        E_Kbd_Int_Key_State *st;
+        const char *label, *icon;
+
+        ky->y = ky->orig_y * il_kbd_cfg->scale_height;
+        ky->h = ky->orig_h * il_kbd_cfg->scale_height;
+
+        o = _theme_obj_new(ki->win->evas, ki->themedir,
+                           "e/modules/kbd/key/default");
+        ky->obj = o;
+        label = "";
+        icon = NULL;
+        st = _e_kbd_int_key_state_get(ki, ky);
+        if (st)
+          {
+             label = st->label;
+             icon = st->icon;
+          }
 
         edje_object_part_text_set(o, "e.text.label", label);
 
-       o2 = e_icon_add(ki->win->evas);
-       e_icon_fill_inside_set(o2, 1);
-       e_icon_scale_up_set(o2, 0);
-       ky->icon_obj = o2;
-       edje_object_part_swallow(o, "e.swallow.content", o2);
-       evas_object_show(o2);
-
-       if (icon)
-         {
-            char buf[PATH_MAX];
-            char *p;
-
-            snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
-            p = strrchr(icon, '.');
-            if (!strcmp(p, ".edj"))
-              e_icon_file_edje_set(o2, buf, "icon");
-            else
-              e_icon_file_set(o2, buf);
-         }
-       e_layout_pack(ki->layout_obj, o);
-       e_layout_child_move(o, ky->x, ky->y);
-       e_layout_child_resize(o, ky->w, ky->h);
-       evas_object_show(o);
+        o2 = e_icon_add(ki->win->evas);
+        e_icon_fill_inside_set(o2, 1);
+        e_icon_scale_up_set(o2, 0);
+        ky->icon_obj = o2;
+        edje_object_part_swallow(o, "e.swallow.content", o2);
+        evas_object_show(o2);
+
+        if (icon)
+          {
+             char buf[PATH_MAX];
+             char *p;
+
+             snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
+             p = strrchr(icon, '.');
+             if (!strcmp(p, ".edj"))
+               e_icon_file_edje_set(o2, buf, "icon");
+             else
+               e_icon_file_set(o2, buf);
+          }
+        e_layout_pack(ki->layout_obj, o);
+        e_layout_child_move(o, ky->x, ky->y);
+        e_layout_child_resize(o, ky->w, ky->h);
+        evas_object_show(o);
      }
 
    o = evas_object_rectangle_add(ki->win->evas);
@@ -1131,11 +1135,11 @@ _e_kbd_int_layouts_free(E_Kbd_Int *ki)
 
    EINA_LIST_FREE(ki->layouts, kil)
      {
-       eina_stringshare_del(kil->path);
-       eina_stringshare_del(kil->dir);
-       eina_stringshare_del(kil->icon);
-       eina_stringshare_del(kil->name);
-       free(kil);
+        eina_stringshare_del(kil->path);
+        eina_stringshare_del(kil->dir);
+        eina_stringshare_del(kil->icon);
+        eina_stringshare_del(kil->name);
+        free(kil);
      }
 }
 
@@ -1160,14 +1164,14 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 
    EINA_LIST_FREE(files, file)
      {
-       p = strrchr(file, '.');
-       if ((p) && (!strcmp(p, ".kbd")))
-         {
-            if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
-              continue;
-            kbs = eina_list_append(kbs, eina_stringshare_add(buf));
-         }
-       free(file);
+        p = strrchr(file, '.');
+        if ((p) && (!strcmp(p, ".kbd")))
+          {
+             if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+               continue;
+             kbs = eina_list_append(kbs, eina_stringshare_add(buf));
+          }
+        free(file);
      }
 
    len = snprintf(buf, sizeof(buf), "%s/keyboards", ki->syskbds);
@@ -1180,26 +1184,26 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 
    EINA_LIST_FREE(files, file)
      {
-       p = strrchr(file, '.');
-       if ((p) && (!strcmp(p, ".kbd")))
-         {
-            ok = 1;
-            EINA_LIST_FOREACH(kbs, l, fl)
-              {
-                 if (!strcmp(file, fl))
-                   {
-                      ok = 0;
-                      break;
-                   }
-              }
-            if (ok)
-              {
-                 if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
-                   continue;
-                 kbs = eina_list_append(kbs, eina_stringshare_add(buf));
-              }
-         }
-       free(file);
+        p = strrchr(file, '.');
+        if ((p) && (!strcmp(p, ".kbd")))
+          {
+             ok = 1;
+             EINA_LIST_FOREACH(kbs, l, fl)
+               {
+                  if (!strcmp(file, fl))
+                    {
+                       ok = 0;
+                       break;
+                    }
+               }
+             if (ok)
+               {
+                  if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+                    continue;
+                  kbs = eina_list_append(kbs, eina_stringshare_add(buf));
+               }
+          }
+        free(file);
      }
    /* Previous loop could break before destroying all items. */
    EINA_LIST_FREE(files, file)
@@ -1207,94 +1211,94 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 
    EINA_LIST_FREE(kbs, path)
      {
-       E_Kbd_Int_Layout *kil;
-
-       kil = E_NEW(E_Kbd_Int_Layout, 1);
-       if (kil)
-         {
-            char *s, *p;
-            FILE *f;
-
-            kil->path = path;
-            s = strdup(ecore_file_file_get(kil->path));
-            if (s)
-              {
-                 p = strrchr(s, '.');
-                 if (p) *p = 0;
-                 kil->name = eina_stringshare_add(s);
-                 free(s);
-              }
-            s = ecore_file_dir_get(kil->path);
-            if (s)
-              {
-                 kil->dir = eina_stringshare_add(s);
-                 free(s);
-              }
-            f = fopen(kil->path, "r");
-            if (f)
-              {
-                 int isok = 0;
-
-                 while (fgets(buf, sizeof(buf), f))
-                   {
-                      int len;
-                      char str[4096];
-
-                      if (!isok)
-                        {
-                           if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
-                        }
-                      if (!isok) break;
-                      if (buf[0] == '#') continue;
-                      len = strlen(buf);
-                      if (len > 0)
-                        {
-                           if (buf[len - 1] == '\n') buf[len - 1] = 0;
-                        }
-                      if (sscanf(buf, "%4000s", str) != 1) continue;
-                      if (!strcmp(str, "type"))
-                        {
-                           sscanf(buf, "%*s %4000s\n", str);
-                           if (!strcmp(str, "ALPHA"))
-                             kil->type = E_KBD_INT_TYPE_ALPHA;
-                           else if (!strcmp(str, "NUMERIC"))
-                             kil->type = E_KBD_INT_TYPE_NUMERIC;
-                           else if (!strcmp(str, "PIN"))
-                             kil->type = E_KBD_INT_TYPE_PIN;
-                           else if (!strcmp(str, "PHONE_NUMBER"))
-                             kil->type = E_KBD_INT_TYPE_PHONE_NUMBER;
-                           else if (!strcmp(str, "HEX"))
-                             kil->type = E_KBD_INT_TYPE_HEX;
-                           else if (!strcmp(str, "TERMINAL"))
-                             kil->type = E_KBD_INT_TYPE_TERMINAL;
-                           else if (!strcmp(str, "PASSWORD"))
-                             kil->type = E_KBD_INT_TYPE_PASSWORD;
-                           else if (!strcmp(str, "IP"))
-                             kil->type = E_KBD_INT_TYPE_IP;
-                           else if (!strcmp(str, "HOST"))
-                             kil->type = E_KBD_INT_TYPE_HOST;
-                           else if (!strcmp(str, "FILE"))
-                             kil->type = E_KBD_INT_TYPE_FILE;
-                           else if (!strcmp(str, "URL"))
-                             kil->type = E_KBD_INT_TYPE_URL;
-                           else if (!strcmp(str, "KEYPAD"))
-                             kil->type = E_KBD_INT_TYPE_KEYPAD;
-                           else if (!strcmp(str, "J2ME"))
-                             kil->type = E_KBD_INT_TYPE_J2ME;
-                           continue;
-                        }
-                      if (!strcmp(str, "icon"))
-                        {
-                           sscanf(buf, "%*s %4000s\n", str);
-                           snprintf(buf, sizeof(buf), "%s/%s", kil->dir, str);
-                           kil->icon = eina_stringshare_add(buf);
-                           continue;
-                        }
-                   }
-                 fclose(f);
-              }
-            layouts = eina_list_append(layouts, kil);
-         }
+        E_Kbd_Int_Layout *kil;
+
+        kil = E_NEW(E_Kbd_Int_Layout, 1);
+        if (kil)
+          {
+             char *s, *p;
+             FILE *f;
+
+             kil->path = path;
+             s = strdup(ecore_file_file_get(kil->path));
+             if (s)
+               {
+                  p = strrchr(s, '.');
+                  if (p) *p = 0;
+                  kil->name = eina_stringshare_add(s);
+                  free(s);
+               }
+             s = ecore_file_dir_get(kil->path);
+             if (s)
+               {
+                  kil->dir = eina_stringshare_add(s);
+                  free(s);
+               }
+             f = fopen(kil->path, "r");
+             if (f)
+               {
+                  int isok = 0;
+
+                  while (fgets(buf, sizeof(buf), f))
+                    {
+                       int len;
+                       char str[4096];
+
+                       if (!isok)
+                         {
+                            if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
+                         }
+                       if (!isok) break;
+                       if (buf[0] == '#') continue;
+                       len = strlen(buf);
+                       if (len > 0)
+                         {
+                            if (buf[len - 1] == '\n') buf[len - 1] = 0;
+                         }
+                       if (sscanf(buf, "%4000s", str) != 1) continue;
+                       if (!strcmp(str, "type"))
+                         {
+                            sscanf(buf, "%*s %4000s\n", str);
+                            if (!strcmp(str, "ALPHA"))
+                              kil->type = E_KBD_INT_TYPE_ALPHA;
+                            else if (!strcmp(str, "NUMERIC"))
+                              kil->type = E_KBD_INT_TYPE_NUMERIC;
+                            else if (!strcmp(str, "PIN"))
+                              kil->type = E_KBD_INT_TYPE_PIN;
+                            else if (!strcmp(str, "PHONE_NUMBER"))
+                              kil->type = E_KBD_INT_TYPE_PHONE_NUMBER;
+                            else if (!strcmp(str, "HEX"))
+                              kil->type = E_KBD_INT_TYPE_HEX;
+                            else if (!strcmp(str, "TERMINAL"))
+                              kil->type = E_KBD_INT_TYPE_TERMINAL;
+                            else if (!strcmp(str, "PASSWORD"))
+                              kil->type = E_KBD_INT_TYPE_PASSWORD;
+                            else if (!strcmp(str, "IP"))
+                              kil->type = E_KBD_INT_TYPE_IP;
+                            else if (!strcmp(str, "HOST"))
+                              kil->type = E_KBD_INT_TYPE_HOST;
+                            else if (!strcmp(str, "FILE"))
+                              kil->type = E_KBD_INT_TYPE_FILE;
+                            else if (!strcmp(str, "URL"))
+                              kil->type = E_KBD_INT_TYPE_URL;
+                            else if (!strcmp(str, "KEYPAD"))
+                              kil->type = E_KBD_INT_TYPE_KEYPAD;
+                            else if (!strcmp(str, "J2ME"))
+                              kil->type = E_KBD_INT_TYPE_J2ME;
+                            continue;
+                         }
+                       if (!strcmp(str, "icon"))
+                         {
+                            sscanf(buf, "%*s %4000s\n", str);
+                            snprintf(buf, sizeof(buf), "%s/%s", kil->dir, str);
+                            kil->icon = eina_stringshare_add(buf);
+                            continue;
+                         }
+                    }
+                  fclose(f);
+               }
+             layouts = eina_list_append(layouts, kil);
+          }
      }
    _e_kbd_int_layouts_free(ki);
    ki->layouts = layouts;
@@ -1313,18 +1317,18 @@ _e_kbd_int_layout_select(E_Kbd_Int *ki, E_Kbd_Int_Layout *kil)
      e_icon_file_set(ki->icon_obj, kil->icon);
    else
      {
-       const char *p;
-
-       p = strrchr(kil->icon, '.');
-       if (!p)
-         e_icon_file_set(ki->icon_obj, kil->icon);
-       else
-         {
-            if (!strcmp(p, ".edj"))
-              e_icon_file_edje_set(ki->icon_obj, kil->icon, "icon");
-            else
-              e_icon_file_set(ki->icon_obj, kil->icon);
-         }
+        const char *p;
+
+        p = strrchr(kil->icon, '.');
+        if (!p)
+          e_icon_file_set(ki->icon_obj, kil->icon);
+        else
+          {
+             if (!strcmp(p, ".edj"))
+               e_icon_file_edje_set(ki->icon_obj, kil->icon, "icon");
+             else
+               e_icon_file_set(ki->icon_obj, kil->icon);
+          }
      }
 }
 
@@ -1357,43 +1361,43 @@ _e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event)
    if ((ev->win == ki->win->evas_win) && 
        (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE)) 
      {
-       E_Kbd_Int_Layout *kil = NULL;
-
-       if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF)
-         {
-            _e_kbd_int_zoomkey_down(ki);
-            _e_kbd_int_dictlist_down(ki);
-            _e_kbd_int_matchlist_down(ki);
-         }
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
-         {
-            // do nothing - leave kbd as-is
-         }
-       else if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ALPHA)
+        E_Kbd_Int_Layout *kil = NULL;
+
+        if ((unsigned int)ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF)
+          {
+             _e_kbd_int_zoomkey_down(ki);
+             _e_kbd_int_dictlist_down(ki);
+             _e_kbd_int_matchlist_down(ki);
+          }
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
+          {
+             // do nothing - leave kbd as-is
+          }
+        else if ((unsigned int)ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ALPHA)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_ALPHA);
-       else if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_NUMERIC)
+        else if ((unsigned int)ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_NUMERIC)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_NUMERIC);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PIN);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PHONE_NUMBER);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_HEX);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_TERMINAL);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PASSWORD);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_IP)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_IP)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_IP);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_HOST)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_HOST)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_HOST);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_FILE)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_FILE)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_FILE);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_URL)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_URL)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_URL);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_KEYPAD)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_KEYPAD)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_KEYPAD);
-       else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_J2ME)
+        else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_J2ME)
           kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_J2ME);
 
         if (kil) _e_kbd_int_layout_select(ki, kil);
@@ -1426,8 +1430,8 @@ _e_kbd_int_cb_dictlist_item_sel(void *data)
    e_kbd_buf_clear(ki->kbuf);
    if (ki->layout.state & (SHIFT | CTRL | ALT | ALTGR))
      {
-       ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
-       _e_kbd_int_layout_state_update(ki);
+        ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
+        _e_kbd_int_layout_state_update(ki);
      }
 
    eina_stringshare_replace(&il_kbd_cfg->dict, str);
@@ -1453,7 +1457,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
    e_popup_layer_set(ki->dictlist.popup, 190);
 
    o = _theme_obj_new(ki->dictlist.popup->evas, ki->themedir,
-                     "e/modules/kbd/match/default");
+                      "e/modules/kbd/match/default");
    ki->dictlist.base_obj = o;
 
    o = e_widget_ilist_add(ki->dictlist.popup->evas, 
@@ -1473,13 +1477,13 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
              const char *match;
 
              used = 0;
-            EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
-              if (!strcmp(match, file)) used = 1;
+             EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
+               if (!strcmp(match, file)) used = 1;
 
-            if (used) goto next1;
+             if (used) goto next1;
 
              p = strdup(file);
-            if (!p) goto next1;
+             if (!p) goto next1;
 
              for (pp = p; *pp; pp++)
                {
@@ -1495,7 +1499,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
           }
 
         next1:
-       free(file);
+        free(file);
      }
 
    snprintf(buf, sizeof(buf), "%s/dicts", ki->sysdicts);
@@ -1505,16 +1509,16 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
         p = strrchr(file, '.');
         if ((p) && (!strcmp(p, ".dic")))
           {
-            const char *match;
+             const char *match;
 
              used = 0;
-            EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
-              if (!strcmp(match, file)) used = 1;
+             EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
+               if (!strcmp(match, file)) used = 1;
 
-            if (used) goto next2;
+             if (used) goto next2;
 
              p = strdup(file);
-            if (!p) goto next2;
+             if (!p) goto next2;
 
              for (pp = p; *pp; pp++)
                {
@@ -1529,7 +1533,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
              free(p);
           }
         next2:
-       free(file);
+        free(file);
      }
    e_widget_ilist_thaw(o);
    e_widget_ilist_go(o);
@@ -1548,7 +1552,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
    e_popup_move_resize(ki->dictlist.popup, 0, ki->win->y - mh, mw, mh);
 
    evas_object_resize(ki->dictlist.base_obj, 
-                     ki->dictlist.popup->w, ki->dictlist.popup->h);
+                      ki->dictlist.popup->w, ki->dictlist.popup->h);
    evas_object_show(ki->dictlist.base_obj);
    e_popup_edje_bg_object_set(ki->dictlist.popup, ki->dictlist.base_obj);
    e_popup_show(ki->dictlist.popup);
@@ -1580,8 +1584,8 @@ _e_kbd_int_cb_matchlist_item_sel(void *data)
    e_kbd_send_keysym_press("space", 0);
    if (ki->layout.state & (SHIFT | CTRL | ALT | ALTGR))
      {
-       ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
-       _e_kbd_int_layout_state_update(ki);
+        ki->layout.state &= (~(SHIFT | CTRL | ALT | ALTGR));
+        _e_kbd_int_layout_state_update(ki);
      }
    _e_kbd_int_matches_update(ki);
    _e_kbd_int_matchlist_down(ki);
@@ -1600,7 +1604,7 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
    e_popup_layer_set(ki->matchlist.popup, 190);
 
    o = _theme_obj_new(ki->matchlist.popup->evas, ki->themedir,
-                     "e/modules/kbd/match/default");
+                      "e/modules/kbd/match/default");
    ki->matchlist.base_obj = o;
 
    o = e_widget_ilist_add(ki->matchlist.popup->evas, 
@@ -1612,25 +1616,25 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
 
    for (l = e_kbd_buf_string_matches_get(ki->kbuf); l; l = l->next)
      {
-       const char *str;
-
-       if (!l->prev)
-         {
-            str = e_kbd_buf_actual_string_get(ki->kbuf);
-            if (str)
-              {
-                 str = eina_stringshare_add(str);
-                 ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
-                 e_widget_ilist_append(o, NULL, str, 
+        const char *str;
+
+        if (!l->prev)
+          {
+             str = e_kbd_buf_actual_string_get(ki->kbuf);
+             if (str)
+               {
+                  str = eina_stringshare_add(str);
+                  ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
+                  e_widget_ilist_append(o, NULL, str, 
                                         _e_kbd_int_cb_matchlist_item_sel,
-                                       ki, NULL);
-              }
-         }
-       str = l->data;
-       str = eina_stringshare_add(str);
-       ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
-       e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
-                             ki, NULL);
+                                        ki, NULL);
+               }
+          }
+        str = l->data;
+        str = eina_stringshare_add(str);
+        ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
+        e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
+                              ki, NULL);
      }
    e_widget_ilist_thaw(o);
    e_widget_ilist_go(o);
@@ -1640,19 +1644,19 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
 
    edje_extern_object_min_size_set(ki->matchlist.ilist_obj, mw, mh);
    edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
-                           ki->matchlist.ilist_obj);
+                               ki->matchlist.ilist_obj);
    edje_object_size_min_calc(ki->matchlist.base_obj, &mw, &mh);
 
    edje_extern_object_min_size_set(ki->matchlist.ilist_obj, 0, 0);
    edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
-                           ki->matchlist.ilist_obj);
+                               ki->matchlist.ilist_obj);
    e_zone_useful_geometry_get(ki->win->border->zone, NULL, NULL, NULL, &sh);
    mw = ki->win->w;
    if (mh > (sh - ki->win->h)) mh = (sh - ki->win->h);
    e_popup_move_resize(ki->matchlist.popup,
-                      ki->win->x, ki->win->y - mh, mw, mh);
+                       ki->win->x, ki->win->y - mh, mw, mh);
    evas_object_resize(ki->matchlist.base_obj, 
-                     ki->matchlist.popup->w, ki->matchlist.popup->h);
+                      ki->matchlist.popup->w, ki->matchlist.popup->h);
    evas_object_show(ki->matchlist.base_obj);
    e_popup_edje_bg_object_set(ki->matchlist.popup, ki->matchlist.base_obj);
    e_popup_show(ki->matchlist.popup);
@@ -1670,10 +1674,10 @@ _e_kbd_int_cb_matches(void *data, Evas_Object *obj __UNUSED__, const char *emiss
    else if (ki->matchlist.popup) _e_kbd_int_matchlist_down(ki);
    else
      {
-       if (!e_kbd_buf_actual_string_get(ki->kbuf))
-         _e_kbd_int_dictlist_up(ki);
-       else
-         _e_kbd_int_matchlist_up(ki);
+        if (!e_kbd_buf_actual_string_get(ki->kbuf))
+          _e_kbd_int_dictlist_up(ki);
+        else
+          _e_kbd_int_matchlist_up(ki);
      }
 }
 
@@ -1696,6 +1700,27 @@ _e_kbd_int_cb_layouts(void *data, Evas_Object *obj __UNUSED__, const char *emiss
    _e_kbd_int_layout_next(ki);
 }
 
+static void
+_e_kbd_int_cb_resize(E_Win *win)
+{
+   E_Kbd_Int *ki;
+   E_Kbd_Int_Key *ky;
+   Eina_List *l;
+   
+   ki = win->data;
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     {
+           if (ky->obj) evas_object_del(ky->obj);
+           if (ky->icon_obj) evas_object_del(ky->icon_obj);
+     }
+   if (ki->event_obj) evas_object_del(ki->event_obj);
+   ki->event_obj = NULL;
+   
+   _e_kbd_int_layout_build(ki);
+   _e_kbd_int_layout_buf_update(ki);
+   _e_kbd_int_layout_state_update(ki);
+}
+
 EAPI E_Kbd_Int *
 e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
 {
@@ -1719,10 +1744,13 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
    ecore_x_icccm_hints_set(ki->win->evas_win, 0, 0, 0, 0, 0, 0, 0);
    e_win_no_remember_set(ki->win, 1);
 
-   if (zone->w > zone->h)
-     e_win_resize(ki->win, zone->w, (zone->h / 2));
+   mw = zone->w;
+   mh = zone->h;
+
+   if (mw > mh)
+     e_win_resize(ki->win, mw, (mh / 2));
    else
-     e_win_resize(ki->win, zone->w, zone->h);
+     e_win_resize(ki->win, mw, mh);
 
    e_win_resize_callback_set(ki->win, _e_kbd_int_cb_resize);
    e_win_borderless_set(ki->win, 1);
@@ -1731,13 +1759,13 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
    e_win_title_set(ki->win, "Virtual Keyboard");
 
    ki->base_obj = _theme_obj_new(ki->win->evas, ki->themedir,
-                                "e/modules/kbd/base/default");
+                                 "e/modules/kbd/base/default");
    edje_object_signal_callback_add(ki->base_obj, "e,action,do,matches", "",
-                                  _e_kbd_int_cb_matches, ki);
+                                   _e_kbd_int_cb_matches, ki);
    edje_object_signal_callback_add(ki->base_obj, "e,action,do,layouts", "",
-                                  _e_kbd_int_cb_layouts, ki);
+                                   _e_kbd_int_cb_layouts, ki);
    edje_object_signal_callback_add(ki->base_obj, "e,action,do,dicts", "",
-                                  _e_kbd_int_cb_dicts, ki);
+                                   _e_kbd_int_cb_dicts, ki);
 
    o = e_layout_add(ki->win->evas);
    edje_object_part_swallow(ki->base_obj, "e.swallow.content", o);
@@ -1776,10 +1804,10 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
    if (mw < 48) mw = 48;
    if (mh < 48) mh = 48;
    evas_object_move(ki->base_obj, 0, 0);
-   evas_object_resize(ki->base_obj, mw, mh);
+   evas_object_resize(ki->base_obj, zone->w, mh);
    evas_object_show(ki->base_obj);
-
-   e_win_size_min_set(ki->win, zone->w, mh);
+   
+   e_win_size_min_set(ki->win, mw, mh);
    ecore_x_e_virtual_keyboard_set(ki->win->evas_win, 1);
 
    ki->client_message_handler = 
@@ -1791,6 +1819,8 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
 
    e_win_show(ki->win);
    ki->win->border->user_skip_winlist = 1;
+   ki->win->border->lock_focus_in = 1;
+   ki->win->border->lock_focus_out = 1;
 
    return ki;
 }
@@ -1822,14 +1852,14 @@ _theme_obj_new(Evas *e, const char *custom_dir, const char *group)
    o = edje_object_add(e);
    if (!e_theme_edje_object_set(o, "base/theme/modules/illume", group))
      {
-       if (custom_dir)
-         {
-            char buf[PATH_MAX];
+        if (custom_dir)
+          {
+             char buf[PATH_MAX];
 
-            snprintf(buf, sizeof(buf), "%s/e-module-illume-keyboard.edj", 
+             snprintf(buf, sizeof(buf), "%s/e-module-illume-keyboard.edj", 
                       custom_dir);
-            edje_object_file_set(o, buf, group);
-         }
+             edje_object_file_set(o, buf, group);
+          }
      }
    return o;
 }
index 1998e45..033a891 100644 (file)
@@ -46,7 +46,7 @@ struct _E_Kbd_Int
    struct {
       char             *directory;
       const char       *file;
-      int               w, h;
+      int               w, h, orig_h;
       int               fuzz;
       int              direction;
       E_Kbd_Int_Type    type;
@@ -87,7 +87,7 @@ struct _E_Kbd_Int
 
 struct _E_Kbd_Int_Key
 {
-   int x, y, w, h;
+   int x, y, w, h, orig_y, orig_h;
    
    Eina_List *states;
    Evas_Object *obj, *zoom_obj, *icon_obj, *zoom_icon_obj;
index e3e69ee..2bfa17d 100644 (file)
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_mod_main.h"
 #include "e_mod_config.h"
+#include "e_kbd_int.h"
 
 /* local function prototypes */
 static void *_il_kbd_config_create(E_Config_Dialog *cfd);
@@ -29,7 +30,11 @@ il_kbd_config_init(E_Module *m)
    E_CONFIG_VAL(D, T, use_internal, INT);
    E_CONFIG_VAL(D, T, run_keyboard, STR);
    E_CONFIG_VAL(D, T, dict, STR);
-
+   E_CONFIG_VAL(D, T, zoom_level, INT);
+   E_CONFIG_VAL(D, T, hold_timer, DOUBLE);
+   E_CONFIG_VAL(D, T, slide_dim, INT);
+   E_CONFIG_VAL(D, T, scale_height, DOUBLE);
+   E_CONFIG_VAL(D, T, layout, INT);
    il_kbd_cfg = e_config_domain_load("module.illume-keyboard", conf_edd);
    if ((il_kbd_cfg) && 
        ((il_kbd_cfg->version >> 16) < IL_CONFIG_MAJ)) 
@@ -44,11 +49,26 @@ il_kbd_config_init(E_Module *m)
         il_kbd_cfg->use_internal = 1;
         il_kbd_cfg->run_keyboard = NULL;
         il_kbd_cfg->dict = eina_stringshare_add("English_(US).dic");
+        il_kbd_cfg->zoom_level = 4;
+        il_kbd_cfg->slide_dim = 4;
+        il_kbd_cfg->hold_timer = 0.25;
      }
    if (il_kbd_cfg) 
      {
         /* Add new config variables here */
         /* if ((il_kbd_cfg->version & 0xffff) < 1) */
+        if ((il_kbd_cfg->version & 0xffff) < 2)
+          {
+             il_kbd_cfg->zoom_level = 4;
+             il_kbd_cfg->slide_dim = 4;
+             il_kbd_cfg->hold_timer = 0.25;
+             il_kbd_cfg->scale_height = 1.0;
+          }
+        if ((il_kbd_cfg->version & 0xffff) < IL_CONFIG_MIN)
+          {
+             il_kbd_cfg->layout = E_KBD_INT_TYPE_ALPHA;
+          }
+
         il_kbd_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
      }
 
@@ -128,7 +148,7 @@ _il_kbd_config_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdat
 static Evas_Object *
 _il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) 
 {
-   Evas_Object *list, *of, *ow;
+   Evas_Object *list, *of, *ow, *sl, *ol;
    E_Radio_Group *rg;
    Eina_List *l;
 
@@ -164,8 +184,8 @@ _il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_D
                     }
                   nn++;
                }
-            EINA_LIST_FREE(kbds, desktop)
-              efreet_desktop_free(desktop);
+             EINA_LIST_FREE(kbds, desktop)
+               efreet_desktop_free(desktop);
           }
      }
 
@@ -189,11 +209,50 @@ _il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_D
              e_widget_framelist_object_append(of, ow);
              evas_object_smart_callback_add(ow, "changed", 
                                             _il_kbd_config_changed, NULL);
-            efreet_desktop_free(desktop);
+             efreet_desktop_free(desktop);
              nn++;
-         }
+          }
      }
+   
+   ol = e_widget_label_add(evas, _("Displacement ratio"));
+   e_widget_framelist_object_append(of, ol);
+   sl = e_widget_slider_add(evas, EINA_TRUE, 0, "1/%.0f", 1.0, 10.0, 1.0, 0,
+                            NULL, &(il_kbd_cfg->slide_dim), 150);
+   e_widget_framelist_object_append(of, sl);
+
+   ol = e_widget_label_add(evas, _("Delay for zoom popup"));
+   e_widget_framelist_object_append(of, ol);
+   sl = e_widget_slider_add(evas, EINA_TRUE, 0, "%.2f second(s)", 0.0, 3.0, 0.01, 0,
+                            &(il_kbd_cfg->hold_timer), NULL, 150);
+   e_widget_framelist_object_append(of, sl);
+
+   ol = e_widget_label_add(evas, _("Zoom level"));
+   e_widget_framelist_object_append(of, ol);
+   sl = e_widget_slider_add(evas, EINA_TRUE, 0, "%.0f", 1.0, 10.0, 1.0, 0,
+                            NULL, &(il_kbd_cfg->zoom_level), 150);
+   e_widget_framelist_object_append(of, sl);
+
+   ol = e_widget_label_add(evas, _("Height"));
+   e_widget_framelist_object_append(of, ol);
+   sl = e_widget_slider_add(evas, EINA_TRUE, 0, "%.2f", 0.2, 2.0, 0.1, 0,
+                            &(il_kbd_cfg->scale_height), NULL, 150);
+   evas_object_smart_callback_add(sl, "changed", 
+                                  _il_kbd_config_changed, NULL);
+        
+   e_widget_framelist_object_append(of, sl);
+
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Layout"), 0);
+   rg = e_widget_radio_group_new(&(il_kbd_cfg->layout));
+   ow = e_widget_radio_add(evas, _("Default"), E_KBD_INT_TYPE_ALPHA, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", _il_kbd_config_changed, NULL);
+   ow = e_widget_radio_add(evas, _("Terminal"), E_KBD_INT_TYPE_TERMINAL, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", _il_kbd_config_changed, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
+   
    return list;
 }
 
@@ -242,8 +301,8 @@ _il_kbd_config_change_timeout(void *data __UNUSED__)
                     }
                   nn++;
                }
-            EINA_LIST_FREE(kbds, desktop)
-              efreet_desktop_free(desktop);
+             EINA_LIST_FREE(kbds, desktop)
+               efreet_desktop_free(desktop);
           }
      }
 
index e50950b..d529a3f 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_H
 
-#define IL_CONFIG_MIN 0
-#define IL_CONFIG_MAJ 0
+#define IL_CONFIG_MIN 3
+#define IL_CONFIG_MAJ 1
 
 typedef struct _Il_Kbd_Config Il_Kbd_Config;
 
@@ -15,6 +15,12 @@ struct _Il_Kbd_Config
 
    // Not User Configurable. Placeholders
    const char *mod_dir;
+   int zoom_level;
+   int slide_dim;
+   double hold_timer;
+   double scale_height;
+   int layout;
+
    E_Config_Dialog *cfd;
 };
 
index 91116e9..db7dfc2 100644 (file)
@@ -20,6 +20,7 @@ e_modapi_init(E_Module *m)
 {
    if (!il_kbd_config_init(m)) return NULL;
    _il_kbd_start();
+   e_module_delayed_set(m, 1); 
    return m;
 }
 
@@ -71,7 +72,7 @@ _il_kbd_start(void)
         desktop = efreet_util_desktop_file_id_find(il_kbd_cfg->run_keyboard);
         if (!desktop) 
           {
-            Efreet_Desktop *d;
+             Efreet_Desktop *d;
              Eina_List *kbds, *l;
 
              kbds = efreet_util_desktop_category_list("Keyboard");
@@ -85,15 +86,15 @@ _il_kbd_start(void)
                        if (dname) 
                          {
                             if (!strcmp(dname, il_kbd_cfg->run_keyboard))
-                             {
-                                desktop = d;
-                                efreet_desktop_ref(desktop);
-                                break;
-                             }
+                              {
+                                 desktop = d;
+                                 efreet_desktop_ref(desktop);
+                                 break;
+                              }
                          }
                     }
-                 EINA_LIST_FREE(kbds, d)
-                   efreet_desktop_free(d);
+                  EINA_LIST_FREE(kbds, d)
+                    efreet_desktop_free(d);
                }
           }
         if (desktop) 
@@ -109,7 +110,7 @@ _il_kbd_start(void)
                     ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 
                                             _il_kbd_cb_exit, NULL);
                }
-            efreet_desktop_free(desktop);
+             efreet_desktop_free(desktop);
           }
      }
 }
diff --git a/src/modules/illume-keyboard/images/Makefile.am b/src/modules/illume-keyboard/images/Makefile.am
new file mode 100644 (file)
index 0000000..1c3dec3
--- /dev/null
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = \
+base_bg.png \
+big_arrow_up.png \
+bt_base2.png \
+bt_basew.png \
+bt_dis_hilight.png \
+bt_glow.png \
+bt_hilight.png \
+bt_hilightw.png \
+bt_shine.png \
+inset_sunk.png \
+k_grad.png \
+k_tabhl.png \
+k_tabhm.png \
+k_tabhr.png \
+k_tabl.png \
+k_tabr.png \
+k_tpsh.png \
+k_wtgr.png \
+module_icon.png
diff --git a/src/modules/illume-keyboard/images/base_bg.png b/src/modules/illume-keyboard/images/base_bg.png
new file mode 100644 (file)
index 0000000..a47ea16
Binary files /dev/null and b/src/modules/illume-keyboard/images/base_bg.png differ
diff --git a/src/modules/illume-keyboard/images/big_arrow_up.png b/src/modules/illume-keyboard/images/big_arrow_up.png
new file mode 100644 (file)
index 0000000..864f1ce
Binary files /dev/null and b/src/modules/illume-keyboard/images/big_arrow_up.png differ
diff --git a/src/modules/illume-keyboard/images/bt_base2.png b/src/modules/illume-keyboard/images/bt_base2.png
new file mode 100644 (file)
index 0000000..f914418
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_base2.png differ
diff --git a/src/modules/illume-keyboard/images/bt_basew.png b/src/modules/illume-keyboard/images/bt_basew.png
new file mode 100644 (file)
index 0000000..2a241f2
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_basew.png differ
diff --git a/src/modules/illume-keyboard/images/bt_dis_hilight.png b/src/modules/illume-keyboard/images/bt_dis_hilight.png
new file mode 100644 (file)
index 0000000..e03cd3c
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_dis_hilight.png differ
diff --git a/src/modules/illume-keyboard/images/bt_glow.png b/src/modules/illume-keyboard/images/bt_glow.png
new file mode 100644 (file)
index 0000000..735787e
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_glow.png differ
diff --git a/src/modules/illume-keyboard/images/bt_hilight.png b/src/modules/illume-keyboard/images/bt_hilight.png
new file mode 100644 (file)
index 0000000..173ee64
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_hilight.png differ
diff --git a/src/modules/illume-keyboard/images/bt_hilightw.png b/src/modules/illume-keyboard/images/bt_hilightw.png
new file mode 100644 (file)
index 0000000..d5dbd31
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_hilightw.png differ
diff --git a/src/modules/illume-keyboard/images/bt_shine.png b/src/modules/illume-keyboard/images/bt_shine.png
new file mode 100644 (file)
index 0000000..7a43de7
Binary files /dev/null and b/src/modules/illume-keyboard/images/bt_shine.png differ
diff --git a/src/modules/illume-keyboard/images/inset_sunk.png b/src/modules/illume-keyboard/images/inset_sunk.png
new file mode 100644 (file)
index 0000000..4be55c7
Binary files /dev/null and b/src/modules/illume-keyboard/images/inset_sunk.png differ
diff --git a/src/modules/illume-keyboard/images/k_grad.png b/src/modules/illume-keyboard/images/k_grad.png
new file mode 100644 (file)
index 0000000..e96638f
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_grad.png differ
diff --git a/src/modules/illume-keyboard/images/k_tabhl.png b/src/modules/illume-keyboard/images/k_tabhl.png
new file mode 100644 (file)
index 0000000..04d298c
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tabhl.png differ
diff --git a/src/modules/illume-keyboard/images/k_tabhm.png b/src/modules/illume-keyboard/images/k_tabhm.png
new file mode 100644 (file)
index 0000000..a1f1e12
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tabhm.png differ
diff --git a/src/modules/illume-keyboard/images/k_tabhr.png b/src/modules/illume-keyboard/images/k_tabhr.png
new file mode 100644 (file)
index 0000000..6c54fb1
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tabhr.png differ
diff --git a/src/modules/illume-keyboard/images/k_tabl.png b/src/modules/illume-keyboard/images/k_tabl.png
new file mode 100644 (file)
index 0000000..3b37010
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tabl.png differ
diff --git a/src/modules/illume-keyboard/images/k_tabr.png b/src/modules/illume-keyboard/images/k_tabr.png
new file mode 100644 (file)
index 0000000..524914b
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tabr.png differ
diff --git a/src/modules/illume-keyboard/images/k_tpsh.png b/src/modules/illume-keyboard/images/k_tpsh.png
new file mode 100644 (file)
index 0000000..f2b4097
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_tpsh.png differ
diff --git a/src/modules/illume-keyboard/images/k_wtgr.png b/src/modules/illume-keyboard/images/k_wtgr.png
new file mode 100644 (file)
index 0000000..099a223
Binary files /dev/null and b/src/modules/illume-keyboard/images/k_wtgr.png differ
diff --git a/src/modules/illume-keyboard/images/module_icon.png b/src/modules/illume-keyboard/images/module_icon.png
new file mode 100644 (file)
index 0000000..2bf6d32
Binary files /dev/null and b/src/modules/illume-keyboard/images/module_icon.png differ
index e8f2344..2e65bbe 100644 (file)
@@ -14,7 +14,7 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static void _cb_action_mode_single(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
@@ -71,18 +71,18 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    inst = E_NEW(Instance, 1);
    inst->o_toggle = edje_object_add(gc->evas);
    e_theme_edje_object_set(inst->o_toggle, 
-                          "base/theme/modules/illume_mode_toggle",
-                          "e/modules/illume_mode_toggle/main");
+                           "base/theme/modules/illume_mode_toggle",
+                           "e/modules/illume_mode_toggle/main");
 
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_toggle);
    inst->gcc->data = inst;
 
    edje_object_signal_callback_add(inst->o_toggle, "e,action,mode,single", "",
-                                  _cb_action_mode_single, inst);
+                                   _cb_action_mode_single, inst);
    edje_object_signal_callback_add(inst->o_toggle, "e,action,mode,dual,top", "",
-                                  _cb_action_mode_dual_top, inst);
+                                   _cb_action_mode_dual_top, inst);
    edje_object_signal_callback_add(inst->o_toggle, "e,action,mode,dual,left", "",
-                                  _cb_action_mode_dual_left, inst);
+                                   _cb_action_mode_dual_left, inst);
 
    _set_icon(inst);
 
@@ -113,7 +113,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Mode-Toggle");
old mode 100644 (file)
new mode 100755 (executable)
index 73d4f3c..a8eeb06
@@ -89,7 +89,7 @@ collections
                          }
                        rel2 
                          {
-                            relative: 0.60 1.0;
+                            relative: 0.30 1.0;
                             offset: 0 -4;
                             to: "base";
                          }
index 4ac58e0..c651323 100644 (file)
@@ -99,6 +99,9 @@ e_mod_sft_win_new(E_Zone *zone)
    e_border_zone_set(swin->win->border, zone);
    swin->win->border->user_skip_winlist = 1;
 
+   swin->win->border->lock_focus_in = 1;
+   swin->win->border->lock_focus_out = 1;
+
    /* set this window to be a dock window. This needs to be done after show 
     * as E will sometimes reset the window type */
    ecore_x_netwm_window_type_set(swin->win->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
index e8fb3f9..b24b77d 100644 (file)
@@ -299,9 +299,10 @@ e_illume_border_is_splash(E_Border *bd)
    /* check for transient flag */
 //   if (bd->client.icccm.transient_for != 0) return EINA_TRUE;
 
-   /* NB: may or may not need to handle these. Needs Testing */
+   /* NB: may or may not need to handle these. Needs Testing
    if (bd->client.netwm.extra_types) 
      printf("\t\tBorder has extra types: %s\n", bd->client.icccm.class);
+   */
 
    /* return a fallback */
    return EINA_FALSE;
@@ -334,9 +335,10 @@ e_illume_border_is_dialog(E_Border *bd)
     * not a dialog. */
 //   if (bd->client.icccm.client_leader) return EINA_TRUE;
 
-   /* NB: may or may not need to handle these. Needs Testing */
+   /* NB: may or may not need to handle these. Needs Testing
    if (bd->client.netwm.extra_types) 
      printf("\t\tBorder has extra types: %s\n", bd->client.icccm.class);
+   */
 
    /* return a fallback */
    return EINA_FALSE;
@@ -431,6 +433,35 @@ e_illume_border_is_quickpanel(E_Border *bd)
 }
 
 /**
+ * Determine if the border request a fixed size.
+ * 
+ * @param bd The border to get the minium space for.
+ * @return EINA_TRUE if border requested fixed size, EINA_FALSE otherwise.
+ *
+ * @note If @p bd is NULL then this function will return EINA_FALSE.
+ *
+ * @ingroup E_Illume_Main_Group
+ */
+EAPI Eina_Bool 
+e_illume_border_is_fixed_size(E_Border *bd)
+{
+   /* make sure we have a border */
+   if (!bd) return EINA_FALSE;
+
+   if ((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
+       (bd->client.icccm.min_h == bd->client.icccm.max_h))
+     return EINA_TRUE;
+   
+   if ((bd->client.mwm.exists) && 
+       !((bd->client.mwm.func & ECORE_X_MWM_HINT_FUNC_ALL) ||
+         (bd->client.mwm.func & ECORE_X_MWM_HINT_FUNC_MAXIMIZE) ||
+         (bd->client.mwm.func & ECORE_X_MWM_HINT_FUNC_RESIZE)))
+     return EINA_TRUE;
+
+   return EINA_FALSE;
+}
+
+/**
  * Retrieves the minimum space required to display this border.
  * 
  * @param bd The border to get the minium space for.
index 2f5860e..4db00b7 100644 (file)
@@ -247,7 +247,8 @@ struct _E_Illume_Config
         struct 
           {
              int duration;
-             /**< integer specifying the amount of time it takes for an 
+            int resize_before; /* resize app window before hide animation */
+            /**< integer specifying the amount of time it takes for an 
               * animation to complete. */
           } vkbd, quickpanel;
      } animation;
@@ -346,6 +347,7 @@ EAPI Eina_Bool e_illume_border_is_qt_frame(E_Border *bd);
 EAPI Eina_Bool e_illume_border_is_fullscreen(E_Border *bd);
 EAPI Eina_Bool e_illume_border_is_conformant(E_Border *bd);
 EAPI Eina_Bool e_illume_border_is_quickpanel(E_Border *bd);
+EAPI Eina_Bool e_illume_border_is_fixed_size(E_Border *bd);
 
 EAPI void e_illume_border_min_get(E_Border *bd, int *w, int *h);
 EAPI E_Border *e_illume_border_at_xy_get(E_Zone *zone, int x, int y);
index 94a9591..d68f06f 100644 (file)
@@ -36,6 +36,7 @@ e_mod_illume_config_init(void)
 #define D _il_conf_edd
    E_CONFIG_VAL(D, T, version, INT);
    E_CONFIG_VAL(D, T, animation.vkbd.duration, INT);
+   E_CONFIG_VAL(D, T, animation.vkbd.resize_before, INT);
    E_CONFIG_VAL(D, T, animation.quickpanel.duration, INT);
    E_CONFIG_VAL(D, T, policy.name, STR);
    E_CONFIG_VAL(D, T, policy.vkbd.class, STR);
@@ -197,6 +198,7 @@ _e_mod_illume_config_new(void)
    _e_illume_cfg = E_NEW(E_Illume_Config, 1);
    _e_illume_cfg->version = 0;
    _e_illume_cfg->animation.vkbd.duration = 1000;
+   _e_illume_cfg->animation.vkbd.resize_before = 1;
    _e_illume_cfg->animation.quickpanel.duration = 1000;
    _e_illume_cfg->policy.name = eina_stringshare_add("illume");
 
index f27d0db..95c0be7 100644 (file)
@@ -17,7 +17,7 @@ e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_illume_animation_settings")) return;
+   if (e_config_dialog_find("E", "illume/animation")) return;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
@@ -30,7 +30,7 @@ e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED
    v->scroll = 1;
 
    cfd = e_config_dialog_new(con, _("Animation Settings"), "E", 
-                             "_config_illume_animation_settings", 
+                             "illume/animation", 
                              "enlightenment/animation_settings", 0, v, NULL);
    if (!cfd) return;
 
@@ -81,6 +81,11 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
                                   _e_mod_illume_config_animation_change, NULL);
+   ow = e_widget_check_add(evas, _("Resize Window before Animation"),
+                           &_e_illume_cfg->animation.vkbd.resize_before); 
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _e_mod_illume_config_animation_change, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    of = e_widget_framelist_add(evas, _("Quickpanel"), 0);
@@ -105,6 +110,12 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
                                   _e_mod_illume_config_animation_change, NULL);
+
+   /* ow = e_widget_check_add(evas, _("Resize Window before Animation"),
+    *                            &_e_illume_cfg->animation.quickpanel.resize_before); 
+    * e_widget_framelist_object_append(of, ow);
+    * evas_object_smart_callback_add(ow, "changed", 
+    *                                _e_mod_illume_config_animation_change, NULL); */
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    return list;
index f68ccd8..53b611c 100644 (file)
@@ -20,7 +20,7 @@ e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_illume_policy")) return;
+   if (e_config_dialog_find("E", "illume/policy")) return;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
@@ -31,7 +31,7 @@ e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__)
    v->basic_only = 1;
    v->normal_win = 1;
    v->scroll = 1;
-   cfd = e_config_dialog_new(con, _("Policy"), "E", "_config_illume_policy", 
+   cfd = e_config_dialog_new(con, _("Policy"), "E", "illume/policy", 
                              "enlightenment/policy", 0, v, NULL);
    if (!cfd) return;
    e_dialog_resizable_set(cfd->dia, 1);
index 650ccc2..1d266bc 100644 (file)
@@ -24,7 +24,7 @@ e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_illume_windows_settings")) return;
+   if (e_config_dialog_find("E", "illume/windows")) return;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
@@ -36,7 +36,7 @@ e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__
    v->normal_win = 1;
    v->scroll = 1;
    cfd = e_config_dialog_new(con, _("Window Settings"), "E", 
-                             "_config_illume_windows_settings", 
+                             "illume/windows", 
                              "preferences-system-windows", 0, v, NULL);
    if (!cfd) return;
    e_dialog_resizable_set(cfd->dia, 1);
index cd0df35..a01b574 100644 (file)
@@ -95,7 +95,7 @@ e_mod_kbd_new(void)
    if (!kbd) return NULL;
 
    /* set default layout on new keyboard */
-   kbd->layout = E_ILLUME_KEYBOARD_LAYOUT_ALPHA;
+   kbd->layout = E_ILLUME_KEYBOARD_LAYOUT_DEFAULT;
    kbd->visible = 0;
 
    return kbd;
@@ -188,6 +188,10 @@ e_mod_kbd_hide(void)
 //   if (!_e_illume_kbd->visible) return;
 
    /* create new hide timer if it doesn't exist */
+   if (_e_illume_kbd->disabled) return;
+   
+   _e_illume_kbd->visible = 0;
+
    if (!_e_illume_kbd->timer) 
      _e_illume_kbd->timer = ecore_timer_add(0.2, _e_mod_kbd_cb_delay_hide, NULL);
 }
@@ -293,8 +297,6 @@ _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *
    ev = event;
    if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
 
-//   printf("Kbd Focus in: %s\n", ev->border->client.icccm.name);
-
    /* set focused border for kbd */
    _focused_border = ev->border;
    _focused_state = ev->border->client.vkbd.state;
@@ -315,8 +317,6 @@ _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void
    ev = event;
    if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
 
-//   printf("Kbd Focus Out: %s\n", ev->border->client.icccm.name);
-
    _prev_focused_border = _focused_border;
 
    /* hide the keyboard */
@@ -466,14 +466,15 @@ _e_mod_kbd_hide(void)
                                 _e_illume_kbd->border->h);
              e_border_hide(_e_illume_kbd->border, 2);
           }
-        _e_illume_kbd->visible = 0;
+     }
+   else  
+     _e_mod_kbd_slide(0, (double)_e_illume_cfg->animation.vkbd.duration / 1000.0);
 
+   if (_e_illume_cfg->animation.vkbd.resize_before)
+     {
         _e_mod_kbd_geometry_send();
-
         _e_mod_kbd_changes_send();
      }
-   else  
-     _e_mod_kbd_slide(0, (double)_e_illume_cfg->animation.vkbd.duration / 1000.0);
 }
 
 static void 
@@ -528,7 +529,6 @@ _e_mod_kbd_cb_animate(void *data __UNUSED__)
           _e_illume_kbd->visible = 1;
 
         _e_mod_kbd_geometry_send();
-
         _e_mod_kbd_changes_send();
 
         return ECORE_CALLBACK_CANCEL;
@@ -622,17 +622,26 @@ _e_mod_kbd_geometry_send(void)
    /* make sure we have a keyboard border */
    if (!_e_illume_kbd->border) return;
 
+   /* no need. we send geometry only when kbd is visible or invisible */
    /* adjust Y for keyboard visibility */
-   if (_e_illume_kbd->border->fx.y <= 0) 
-     y = _e_illume_kbd->border->y;
+   //if (_e_illume_kbd->border->fx.y <= 0) 
+   y = _e_illume_kbd->border->y;
 
    if (_focused_border) zone = _focused_border->zone;
    else zone = _e_illume_kbd->border->zone;
 
-   ecore_x_e_illume_keyboard_geometry_set(zone->black_win, 
-                                          _e_illume_kbd->border->x, y, 
-                                          _e_illume_kbd->border->w, 
-                                          _e_illume_kbd->border->h);
+   if (_e_illume_kbd->visible)
+     ecore_x_e_illume_keyboard_geometry_set(zone->black_win, 
+                                            _e_illume_kbd->border->x,
+                                            y, 
+                                            _e_illume_kbd->border->w, 
+                                            _e_illume_kbd->border->h);
+   else
+     ecore_x_e_illume_keyboard_geometry_set(zone->black_win, 
+                                            _e_illume_kbd->border->x,
+                                            _e_illume_kbd->border->h + y, 
+                                            _e_illume_kbd->border->w, 
+                                            _e_illume_kbd->border->h);     
 }
 
 static void 
index 6094ee4..c3c5692 100644 (file)
@@ -39,7 +39,7 @@ e_mod_kbd_device_init(void)
 #ifdef HAVE_EEZE
    eeze_init();
    watch = eeze_udev_watch_add(EEZE_UDEV_TYPE_KEYBOARD, EEZE_UDEV_EVENT_NONE,
-                           _e_mod_kbd_device_udev_event, NULL);
+                            _e_mod_kbd_device_udev_event, NULL);
 #else
    e_dbus_init();
    e_hal_init();
@@ -122,24 +122,24 @@ _e_mod_kbd_device_ignore_load_file(const char *file)
    /* parse out the info in the ignore file */
    while (fgets(buff, sizeof(buff), f))
      {
-       char *p;
-       int len;
+        char *p;
+        int len;
 
-       if (buff[0] == '#') continue;
+        if (buff[0] == '#') continue;
         len = strlen(buff);
-       if (len > 0)
-         {
-            if (buff[len - 1] == '\n') buff[len - 1] = 0;
-         }
-       p = buff;
-       while (isspace(*p)) p++;
+        if (len > 0)
+          {
+             if (buff[len - 1] == '\n') buff[len - 1] = 0;
+          }
+        p = buff;
+        while (isspace(*p)) p++;
 
         /* append this kbd to the ignore list */
-       if (*p) 
-         {
-            _ignore_kbds = 
-              eina_list_append(_ignore_kbds, eina_stringshare_add(p));
-         }
+        if (*p) 
+          {
+             _ignore_kbds = 
+               eina_list_append(_ignore_kbds, eina_stringshare_add(p));
+          }
      }
    fclose(f);
 }
index ae40460..ffcd29c 100644 (file)
@@ -539,7 +539,6 @@ _e_mod_policy_cb_hook_layout(void *data __UNUSED__, void *data2 __UNUSED__)
                zl = eina_list_append(zl, bd->zone);
           }
      }
-   l = eina_list_free(l);
 
    /* loop the zones that need updating and call the policy update function */
    EINA_LIST_FREE(zl, zone) 
@@ -547,5 +546,4 @@ _e_mod_policy_cb_hook_layout(void *data __UNUSED__, void *data2 __UNUSED__)
         if ((_policy) && (_policy->funcs.zone_layout))
           _policy->funcs.zone_layout(zone);
      }
-   zl = eina_list_free(zl);
 }
index f1a7176..395f20f 100644 (file)
@@ -128,26 +128,26 @@ e_mod_quickpanel_show(E_Illume_Quickpanel *qp)
         E_Border *bd;
         int ny = 0;
 
-       ny = qp->vert.isize;
-       if (qp->vert.dir == 1) ny = 0;
+        ny = qp->vert.isize;
+        if (qp->vert.dir == 1) ny = 0;
 
         /* if we are not animating, just show the borders */
         EINA_LIST_FOREACH(qp->borders, l, bd) 
           {
              if (!bd->visible) e_illume_border_show(bd);
              if (qp->vert.dir == 0) 
-              {
-                 e_border_fx_offset(bd, 0, ny);
-                 ny += bd->h;
-              }
-            else 
-              {
-                 ny -= bd->h;
-                 e_border_fx_offset(bd, 0, ny);
-              }
+               {
+                  e_border_fx_offset(bd, 0, ny);
+                  ny += bd->h;
+               }
+             else 
+               {
+                  ny -= bd->h;
+                  e_border_fx_offset(bd, 0, ny);
+               }
           }
         qp->visible = 1;
-       _e_mod_quickpanel_clickwin_show(qp);
+        _e_mod_quickpanel_clickwin_show(qp);
      }
    else 
      _e_mod_quickpanel_slide(qp, 1, (double)duration / 1000.0);
@@ -196,9 +196,9 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__,
              if ((qp = e_illume_quickpanel_by_zone_get(zone))) 
                {
                   if (qp->visible) 
-                   _e_mod_quickpanel_hide(qp);
+                    _e_mod_quickpanel_hide(qp);
                   else 
-                   e_mod_quickpanel_show(qp);
+                    e_mod_quickpanel_show(qp);
                }
           }
      }
@@ -419,11 +419,11 @@ _e_mod_quickpanel_slide(E_Illume_Quickpanel *qp, int visible, double len)
    qp->vert.adjust_end = 0;
    if (qp->vert.dir == 0) 
      {
-       if (visible) qp->vert.adjust_end = qp->vert.size;
+        if (visible) qp->vert.adjust_end = qp->vert.size;
      }
    else 
      {
-       if (visible) qp->vert.adjust_end = -qp->vert.size;
+        if (visible) qp->vert.adjust_end = -qp->vert.size;
      }
 
    if (!qp->animator) 
@@ -462,7 +462,7 @@ _e_mod_quickpanel_hide(E_Illume_Quickpanel *qp)
              if (bd->visible) e_illume_border_hide(bd);
           }
         qp->visible = 0;
-       _e_mod_quickpanel_clickwin_hide(qp);
+        _e_mod_quickpanel_clickwin_hide(qp);
      }
    else
      _e_mod_quickpanel_slide(qp, 0, (double)duration / 1000.0);
@@ -497,15 +497,15 @@ _e_mod_quickpanel_cb_animate(void *data)
      {
         qp->animator = NULL;
         if (qp->visible) 
-         {
-            qp->visible = 0;
-            _e_mod_quickpanel_clickwin_hide(qp);
-         }
+          {
+             qp->visible = 0;
+             _e_mod_quickpanel_clickwin_hide(qp);
+          }
         else 
-         {
-            qp->visible = 1;
-            _e_mod_quickpanel_clickwin_show(qp);
-         }
+          {
+             qp->visible = 1;
+             _e_mod_quickpanel_clickwin_show(qp);
+          }
         return ECORE_CALLBACK_CANCEL;
      }
 
@@ -543,9 +543,9 @@ _e_mod_quickpanel_animate_down(E_Illume_Quickpanel *qp)
      {
         /* don't adjust borders that are being deleted */
         if (e_object_is_del(E_OBJECT(bd))) continue;
-       if (bd->fx.y != (qp->vert.adjust + pbh)) 
-         e_border_fx_offset(bd, 0, (qp->vert.adjust + pbh));
-       pbh += bd->h;
+        if (bd->fx.y != (qp->vert.adjust + pbh)) 
+          e_border_fx_offset(bd, 0, (qp->vert.adjust + pbh));
+        pbh += bd->h;
 
         if (!qp->visible) 
           {
@@ -577,9 +577,9 @@ _e_mod_quickpanel_animate_up(E_Illume_Quickpanel *qp)
      {
         /* don't adjust borders that are being deleted */
         if (e_object_is_del(E_OBJECT(bd))) continue;
-       pbh -= bd->h;
-       if (bd->fx.y != (qp->vert.adjust + pbh)) 
-         e_border_fx_offset(bd, 0, (qp->vert.adjust + pbh));
+        pbh -= bd->h;
+        if (bd->fx.y != (qp->vert.adjust + pbh)) 
+          e_border_fx_offset(bd, 0, (qp->vert.adjust + pbh));
 
         if (!qp->visible) 
           {
@@ -609,15 +609,15 @@ _e_mod_quickpanel_clickwin_show(E_Illume_Quickpanel *qp)
    if (qp->clickwin) ecore_x_window_free(qp->clickwin);
    qp->clickwin = 0;
    qp->clickwin = ecore_x_window_input_new(qp->zone->container->win, 
-                                          qp->zone->x, qp->zone->y, 
-                                          qp->zone->w, qp->zone->h);
+                                           qp->zone->x, qp->zone->y, 
+                                           qp->zone->w, qp->zone->h);
 
    ecore_x_window_configure(qp->clickwin, 
-                           ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING | 
-                           ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE, 
-                           qp->zone->x, qp->zone->y, 
-                           qp->zone->w, qp->zone->h, 0, 
-                           ind->win, ECORE_X_WINDOW_STACK_BELOW);
+                            ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING | 
+                            ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE, 
+                            qp->zone->x, qp->zone->y, 
+                            qp->zone->w, qp->zone->h, 0, 
+                            ind->win, ECORE_X_WINDOW_STACK_BELOW);
 
    ecore_x_window_show(qp->clickwin);
 }
index 9958953..b06bf22 100644 (file)
@@ -114,24 +114,24 @@ _e_mod_illume_config_select_window_list_changed(void *data)
    switch (stype) 
      {
       case E_ILLUME_SELECT_WINDOW_TYPE_HOME:
-       eina_stringshare_replace(&_e_illume_cfg->policy.home.title, title);
-       eina_stringshare_replace(&_e_illume_cfg->policy.home.class, class);
-       eina_stringshare_replace(&_e_illume_cfg->policy.home.name, name);
+        eina_stringshare_replace(&_e_illume_cfg->policy.home.title, title);
+        eina_stringshare_replace(&_e_illume_cfg->policy.home.class, class);
+        eina_stringshare_replace(&_e_illume_cfg->policy.home.name, name);
         break;
       case E_ILLUME_SELECT_WINDOW_TYPE_VKBD:
-       eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.title, title);
-       eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.class, class);
-       eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.name, name);
+        eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.title, title);
+        eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.class, class);
+        eina_stringshare_replace(&_e_illume_cfg->policy.vkbd.name, name);
         break;
       case E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY:
-       eina_stringshare_replace(&_e_illume_cfg->policy.softkey.title, title);
-       eina_stringshare_replace(&_e_illume_cfg->policy.softkey.class, class);
-       eina_stringshare_replace(&_e_illume_cfg->policy.softkey.name, name);
+        eina_stringshare_replace(&_e_illume_cfg->policy.softkey.title, title);
+        eina_stringshare_replace(&_e_illume_cfg->policy.softkey.class, class);
+        eina_stringshare_replace(&_e_illume_cfg->policy.softkey.name, name);
         break;
       case E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR:
-       eina_stringshare_replace(&_e_illume_cfg->policy.indicator.title, title);
-       eina_stringshare_replace(&_e_illume_cfg->policy.indicator.class, class);
-       eina_stringshare_replace(&_e_illume_cfg->policy.indicator.name, name);
+        eina_stringshare_replace(&_e_illume_cfg->policy.indicator.title, title);
+        eina_stringshare_replace(&_e_illume_cfg->policy.indicator.class, class);
+        eina_stringshare_replace(&_e_illume_cfg->policy.indicator.name, name);
         break;
      }
 
index e433fce..2867433 100644 (file)
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = illume
+SUBDIRS = illume tablet
index 06bff4f..5872894 100644 (file)
@@ -468,7 +468,7 @@ _policy_zone_layout_home_single(E_Border *bd, E_Illume_Config_Zone *cz)
    /* no point in adjusting size or position if it's not visible */
    if (!bd->visible) return;
 
-   printf("\tLayout Home Single: %s\n", bd->client.icccm.class);
+//   printf("\tLayout Home Single: %s\n", bd->client.icccm.class);
 
    indsz = cz->indicator.size;
    sftsz = cz->softkey.size;
@@ -621,7 +621,7 @@ _policy_zone_layout_fullscreen(E_Border *bd)
 {
    int kh;
 
-   printf("\tLayout Fullscreen: %s\n", bd->client.icccm.name);
+//   printf("\tLayout Fullscreen: %s\n", bd->client.icccm.name);
 
    if (!bd) return;
 
@@ -1098,7 +1098,7 @@ _policy_border_add(E_Border *bd)
 void 
 _policy_border_del(E_Border *bd) 
 {
-//   printf("Border deleted: %s\n", bd->client.icccm.class);
+//   printf("Policy Border deleted: %s\n", bd->client.icccm.class);
 
    if (!bd) return;
 
@@ -1148,7 +1148,7 @@ _policy_border_del(E_Border *bd)
 }
 
 void 
-_policy_border_focus_in(E_Border *bd __UNUSED__
+_policy_border_focus_in(E_Border *bd) 
 {
    E_Border *ind;
 
@@ -1563,8 +1563,6 @@ _policy_zone_close(E_Zone *zone)
 {
    E_Border *bd;
 
-//   printf("Zone close\n");
-
    if (!zone) return;
 
    /* make sure we have a focused border */
diff --git a/src/modules/illume2/policies/tablet/Makefile.am b/src/modules/illume2/policies/tablet/Makefile.am
new file mode 100644 (file)
index 0000000..a7cd5c1
--- /dev/null
@@ -0,0 +1,27 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume2
+POLICY = tablet
+
+# the module .so file
+INCLUDES = -I.. \
+           -I$(top_srcdir) \
+           -I$(top_srcdir)/src/modules/$(MODULE) \
+           -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
+           -I$(top_srcdir)/src/bin \
+           -I$(top_builddir)/src/bin \
+           -I$(top_srcdir)/src/modules \
+           @e_cflags@
+
+plugindir = $(libdir)/enlightenment/modules/$(MODULE)/policies
+
+tabletdir = $(plugindir)
+tablet_LTLIBRARIES = tablet.la
+tablet_la_SOURCES = \
+                  policy.h \
+                  policy.c \
+                 tablet.h \
+                  tablet.c
+
+tablet_la_LIBADD = @e_libs@
+tablet_la_LDFLAGS = -module -avoid-version
+tablet_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/illume2/policies/tablet/policy.c b/src/modules/illume2/policies/tablet/policy.c
new file mode 100644 (file)
index 0000000..bfd65d3
--- /dev/null
@@ -0,0 +1,1534 @@
+#include "e_illume.h"
+#include "policy.h"
+#include "e.h"
+
+/* local function prototypes */
+static void _policy_border_set_focus(E_Border *bd);
+static void _policy_border_move(E_Border *bd, int x, int y);
+static void _policy_border_resize(E_Border *bd, int w, int h);
+static void _policy_border_hide_below(E_Border *bd);
+static void _policy_border_show_below(E_Border *bd);
+static void _policy_zone_layout_update(E_Zone *zone);
+static void _policy_zone_layout_indicator(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_quickpanel(E_Border *bd);
+static void _policy_zone_layout_softkey(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_keyboard(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_home_single(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_fullscreen(E_Border *bd);
+static void _policy_zone_layout_app_single(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_app_dual_top(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_app_dual_custom(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_app_dual_left(E_Border *bd, E_Illume_Config_Zone *cz, Eina_Bool force);
+static void _policy_zone_layout_dialog(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_splash(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_conformant_single(E_Border *bd, E_Illume_Config_Zone *cz);
+#if 0
+static void _policy_zone_layout_conformant_dual_top(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_conformant_dual_custom(E_Border *bd, E_Illume_Config_Zone *cz);
+static void _policy_zone_layout_conformant_dual_left(E_Border *bd, E_Illume_Config_Zone *cz);
+#endif
+
+static Eina_List *_pol_focus_stack;
+
+/* local functions */
+static void
+_policy_border_set_focus(E_Border *bd)
+{
+   if (!bd) return;
+   /* printf("_policy_border_set_focus %s\n", e_border_name_get(bd)); */
+
+   /* if focus is locked out then get out */
+   if (bd->lock_focus_out) return;
+
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus))
+     {
+       /* check E's focus settings */
+       if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
+           ((bd->parent) &&
+            ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
+             ((bd->parent->focused) &&
+              (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))))
+         {
+            /* if the border was hidden due to layout, we need to unhide */
+            if (!bd->visible) e_illume_border_show(bd);
+
+            if ((bd->iconic) && (!bd->lock_user_iconify))
+              e_border_uniconify(bd);
+
+            if (!bd->lock_user_stacking) e_border_raise(bd);
+
+            /* focus the border */
+            e_border_focus_set(bd, 1, 1);
+            /* e_border_raise(bd); */
+            /* hide the border below this one */
+            _policy_border_hide_below(bd);
+
+            /* NB: since we skip needless border evals when container layout
+             * is called (to save cpu cycles), we need to
+             * signal this border that it's focused so that the edj gets
+             * updated.
+             *
+             * This is potentially useless as THIS policy
+             * makes all windows borderless anyway, but it's in here for
+             * completeness
+             e_border_focus_latest_set(bd);
+             if (bd->bg_object)
+             edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+             if (bd->icon_object)
+             edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+             e_focus_event_focus_in(bd);
+            */
+         }
+     }
+}
+
+static void
+_policy_border_move(E_Border *bd, int x, int y)
+{
+   if (!bd) return;
+
+   bd->x = x;
+   bd->y = y;
+   bd->changes.pos = 1;
+   bd->changed = 1;
+}
+
+static void
+_policy_border_resize(E_Border *bd, int w, int h)
+{
+   if (!bd) return;
+
+   bd->w = w;
+   bd->h = h;
+   bd->client.w = (bd->w - (bd->client_inset.l + bd->client_inset.r));
+   bd->client.h = (bd->h - (bd->client_inset.t + bd->client_inset.b));
+   bd->changes.size = 1;
+   bd->changed = 1;
+}
+
+static void
+_policy_border_hide_below(E_Border *bd)
+{
+   int pos = 0, i;
+
+   return;
+
+   //  printf("Hide Borders Below: %s %d %d\n",
+   //         bd->client.icccm.name, bd->x, bd->y);
+
+   if (!bd) return;
+   /* printf("_policy_border_hide_below %s\n", e_border_name_get(bd)); */
+   /* determine layering position */
+   if (bd->layer <= 0) pos = 0;
+   else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1;
+   else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2;
+   else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3;
+   else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
+   else pos = 5;
+
+   /* Find the windows below this one */
+   for (i = pos; i >= 2; i--)
+     {
+       Eina_List *l;
+       E_Border *b;
+
+       EINA_LIST_FOREACH(bd->zone->container->layers[i].clients, l, b)
+         {
+            /* skip if it's the same border */
+            if (b == bd) continue;
+
+            /* skip if it's not on this zone */
+            if (b->zone != bd->zone) continue;
+
+            /* skip special borders */
+            if (e_illume_border_is_indicator(b)) continue;
+            if (e_illume_border_is_softkey(b)) continue;
+            if (e_illume_border_is_keyboard(b)) continue;
+            if (e_illume_border_is_quickpanel(b)) continue;
+            if (e_illume_border_is_home(b)) continue;
+
+            if ((bd->fullscreen) || (bd->need_fullscreen))
+              {
+                 if (b->visible) e_illume_border_hide(b);
+              }
+            else
+              {
+                 /* we need to check x/y position */
+                 if (E_CONTAINS(bd->x, bd->y, bd->w, bd->h,
+                                b->x, b->y, b->w, b->h))
+                   {
+                      if (b->visible) e_illume_border_hide(b);
+                   }
+              }
+         }
+     }
+}
+
+static void
+_policy_border_show_below(E_Border *bd)
+{
+   Eina_List *l;
+   E_Border *prev;
+   int pos = 0, i;
+
+   //  printf("Show Borders Below: %s %d %d\n",
+   //         bd->client.icccm.class, bd->x, bd->y);
+
+   if (!bd) return;
+   /* printf("_policy_border_show_below %s\n", e_border_name_get(bd)); */
+   if (bd->client.icccm.transient_for)
+     {
+       if ((prev = e_border_find_by_client_window(bd->client.icccm.transient_for)))
+         {
+            _policy_border_set_focus(prev);
+            return;
+         }
+     }
+
+   /* determine layering position */
+   if (bd->layer <= 0) pos = 0;
+   else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1;
+   else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2;
+   else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3;
+   else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
+   else pos = 5;
+
+   /* Find the windows below this one */
+   for (i = pos; i >= 2; i--)
+     {
+       E_Border *b;
+
+       EINA_LIST_REVERSE_FOREACH(bd->zone->container->layers[i].clients, l, b)
+         {
+            /* skip if it's the same border */
+            if (b == bd) continue;
+
+            /* skip if it's not on this zone */
+            if (b->zone != bd->zone) continue;
+
+            /* skip special borders */
+            if (e_illume_border_is_indicator(b)) continue;
+            if (e_illume_border_is_softkey(b)) continue;
+            if (e_illume_border_is_keyboard(b)) continue;
+            if (e_illume_border_is_quickpanel(b)) continue;
+            if (e_illume_border_is_home(b)) continue;
+
+            if ((bd->fullscreen) || (bd->need_fullscreen))
+              {
+                 _policy_border_set_focus(b);
+                 return;
+              }
+            else
+              {
+                 /* need to check x/y position */
+                 if (E_CONTAINS(bd->x, bd->y, bd->w, bd->h,
+                                b->x, b->y, b->w, b->h))
+                   {
+                      _policy_border_set_focus(b);
+                      return;
+                   }
+              }
+         }
+     }
+
+   /* if we reach here, then there is a problem with showing a window below
+    * this one, so show previous window in stack */
+   EINA_LIST_REVERSE_FOREACH(_pol_focus_stack, l, prev)
+     {
+       if (prev->zone != bd->zone) continue;
+       _policy_border_set_focus(prev);
+       return;
+     }
+
+   /* Fallback to focusing home if all above fails */
+   _policy_focus_home(bd->zone);
+}
+
+static void
+_policy_zone_layout_update(E_Zone *zone)
+{
+   Eina_List *l;
+   E_Border *bd;
+
+   if (!zone) return;
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+       /* skip borders not on this zone */
+       if (bd->zone != zone) continue;
+
+       /* skip special windows */
+       if (e_illume_border_is_keyboard(bd)) continue;
+       if (e_illume_border_is_quickpanel(bd)) continue;
+
+       /* signal a changed pos here so layout gets updated */
+       bd->changes.pos = 1;
+       bd->changed = 1;
+     }
+}
+
+static void
+_policy_zone_layout_indicator(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   if ((!bd) || (!cz)) return;
+
+   /* grab minimum indicator size */
+   e_illume_border_min_get(bd, NULL, &cz->indicator.size);
+
+   /* no point in doing anything here if indicator is hidden */
+   if ((!bd->new_client) && (!bd->visible))
+     {
+       ecore_x_e_illume_indicator_geometry_set(bd->zone->black_win,
+                                               0, 0, 0, 0);
+       return;
+     }
+
+   /* if we are dragging, then skip it for now */
+   if (bd->client.illume.drag.drag)
+     {
+       /* when dragging indicator, we need to trigger a layout update */
+       ecore_x_e_illume_indicator_geometry_set(bd->zone->black_win,
+                                               0, 0, 0, 0);
+       _policy_zone_layout_update(bd->zone);
+       return;
+     }
+
+   //  printf("\tLayout Indicator: %d\n", bd->zone->id);
+
+   /* lock indicator window from dragging if we need to */
+   if ((cz->mode.dual == 1) && (cz->mode.side == 0))
+     ecore_x_e_illume_drag_locked_set(bd->client.win, 0);
+   else
+     ecore_x_e_illume_drag_locked_set(bd->client.win, 1);
+
+   if ((bd->w != bd->zone->w) || (bd->h != cz->indicator.size))
+     _policy_border_resize(bd, bd->zone->w, cz->indicator.size);
+
+   if (!cz->mode.dual)
+     {
+       /* move to 0, 0 (relative to zone) if needed */
+       if ((bd->x != bd->zone->x) || (bd->y != bd->zone->y))
+         {
+            _policy_border_move(bd, bd->zone->x, bd->zone->y);
+            ecore_x_e_illume_quickpanel_position_update_send(bd->client.win);
+         }
+     }
+   else
+     {
+       if (cz->mode.side == 0)
+         {
+            /* top mode...indicator is draggable so just set X.
+             * in this case, the indicator itself should be responsible for
+             * sending the quickpanel position update message when it is
+             * finished dragging */
+            if (bd->x != bd->zone->x)
+              _policy_border_move(bd, bd->zone->x, bd->y);
+         }
+       else
+         {
+            /* move to 0, 0 (relative to zone) if needed */
+            if ((bd->x != bd->zone->x) || (bd->y != bd->zone->y))
+              {
+                 _policy_border_move(bd, bd->zone->x, bd->zone->y);
+                 ecore_x_e_illume_quickpanel_position_update_send(bd->client.win);
+              }
+         }
+     }
+   ecore_x_e_illume_indicator_geometry_set(bd->zone->black_win,
+                                          bd->x, bd->y,
+                                          bd->w, bd->h);
+
+   if (bd->layer != POL_INDICATOR_LAYER)
+     e_border_layer_set(bd, POL_INDICATOR_LAYER);
+}
+
+#define ZONE_GEOMETRY                                  \
+  int x, y, w, h;                                      \
+  e_zone_useful_geometry_get(bd->zone, &x, &y, &w, &h); \
+  x += bd->zone->x;                                    \
+  y += bd->zone->y;                                    \
+
+static void
+_border_geometry_set(E_Border *bd, int x, int y, int w, int h, int layer)
+{
+   if ((bd->w != w) || (bd->h != h))
+     _policy_border_resize(bd, w, h);
+
+   if ((bd->x != x) || (bd->y != y))
+     _policy_border_move(bd, x, y);
+
+   if ((int)bd->layer != layer) e_border_layer_set(bd, layer);
+}
+
+static void
+_policy_zone_layout_quickpanel(E_Border *bd)
+{
+   int mh;
+
+   if (!bd) return;
+
+   e_illume_border_min_get(bd, NULL, &mh);
+
+   if ((bd->w != bd->zone->w) || (bd->h != mh))
+     _policy_border_resize(bd, bd->zone->w, mh);
+
+   if (bd->layer != POL_QUICKPANEL_LAYER)
+     e_border_layer_set(bd, POL_QUICKPANEL_LAYER);
+}
+
+static void
+_policy_zone_layout_softkey(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   int ny;
+
+   if ((!bd) || (!cz)) return;
+   if (!bd->visible)
+     {
+       ecore_x_e_illume_softkey_geometry_set(bd->zone->black_win, 0, 0, 0, 0);
+       return;
+     }
+
+   ZONE_GEOMETRY;
+
+   e_illume_border_min_get(bd, NULL, &cz->softkey.size);
+
+   /* if we are dragging, then skip it for now */
+   /* NB: Disabled currently until we confirm that softkey should be draggable */
+   //  if (bd->client.illume.drag.drag) return;
+
+   if ((bd->w != w) || (bd->h != cz->softkey.size))
+     _policy_border_resize(bd, w, cz->softkey.size);
+
+   ny = ((bd->zone->y + bd->zone->h) - cz->softkey.size);
+
+   /* NB: not sure why yet, but on startup the border->y is reporting
+    * that it is already in this position...but it's actually not.
+    * So for now, just disable the ny check until this gets sorted out */
+
+   if ((bd->x != x) || (bd->y != ny))
+     _policy_border_move(bd, x, ny);
+
+   /* _border_geometry_set(bd, x, ny, nw, nh, bd, POL_CONFORMANT_LAYER); */
+
+   ecore_x_e_illume_softkey_geometry_set(bd->zone->black_win,
+                                        bd->x, bd->y,
+                                        bd->w, bd->h);
+
+   if (bd->layer != POL_SOFTKEY_LAYER) e_border_layer_set(bd, POL_SOFTKEY_LAYER);
+}
+
+
+
+#define MIN_HEIGHT 100
+
+static Eina_Bool
+_policy_layout_app_check(E_Border *bd)
+{
+   if (!bd)
+     return EINA_FALSE;
+
+   if (!bd->visible)
+     return EINA_FALSE;
+
+   if ((bd->desk != e_desk_current_get(bd->zone)) && (!bd->sticky))
+     return EINA_FALSE;
+
+   return EINA_TRUE;
+}
+
+
+static void
+_policy_keyboard_restrict(E_Border *bd, int *h)
+{
+   int kh;
+
+   if (bd->client.vkbd.state > ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+     {
+       e_illume_keyboard_safe_app_region_get(bd->zone, NULL, NULL, NULL, &kh);
+       kh -= bd->zone->h - *h;
+       if ((kh < *h) && (kh > MIN_HEIGHT))
+         *h = kh;
+     }
+}
+
+static void
+_policy_indicator_restrict(E_Illume_Config_Zone *cz, int *y, int *h)
+{
+   if ((cz->indicator.size) && (*y < cz->indicator.size))
+     {
+       *h -= cz->indicator.size;
+       *y = cz->indicator.size;
+     }
+}
+
+static void
+_policy_softkey_restrict(E_Illume_Config_Zone *cz, int *y, int *h)
+{
+   if ((cz->softkey.size) && ((*y + *h) > cz->softkey.size))
+     *h -= (*y + *h) - cz->softkey.size;
+}
+
+static void
+_policy_zone_layout_keyboard(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   int ny, layer;
+
+   if ((!bd) || (!cz) || (!bd->visible)) return;
+
+   ZONE_GEOMETRY;
+
+   e_illume_border_min_get(bd, NULL, &cz->vkbd.size);
+
+   ny = ((bd->zone->y + bd->zone->h) - cz->vkbd.size);
+
+   /* if ((bd->fullscreen) || (bd->need_fullscreen))
+    *   layer = POL_FULLSCREEN_LAYER;
+    * else */
+   layer = POL_KEYBOARD_LAYER;
+   
+   _border_geometry_set(bd, x, ny, w, cz->vkbd.size, layer);
+}
+
+static void
+_policy_zone_layout_home_single(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   if ((!bd) || (!cz) || (!bd->visible)) return;
+
+   ZONE_GEOMETRY;
+   _policy_indicator_restrict(cz, &y, &h);
+   _border_geometry_set(bd, x, y, w, h, POL_HOME_LAYER);
+}
+
+static void
+_policy_zone_layout_fullscreen(E_Border *bd)
+{
+   if (!_policy_layout_app_check(bd)) return;
+
+   ZONE_GEOMETRY;
+
+   _policy_keyboard_restrict(bd, &h);
+
+   _border_geometry_set(bd, x, y, w, h, POL_FULLSCREEN_LAYER);
+}
+
+static void
+_policy_zone_layout_app_single(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   if (!_policy_layout_app_check(bd)) return;
+
+   ZONE_GEOMETRY;
+
+   _policy_keyboard_restrict(bd, &h);
+   _policy_indicator_restrict(cz, &y, &h);
+   _policy_softkey_restrict(cz, &y, &h);
+
+   _border_geometry_set(bd, x, y, w, h, POL_APP_LAYER);
+}
+
+static void
+_policy_zone_layout_app_dual_top(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   E_Border *bd2;
+
+   if (!_policy_layout_app_check(bd)) return;
+
+   ZONE_GEOMETRY;
+
+   _policy_keyboard_restrict(bd, &h);
+   _policy_indicator_restrict(cz, &y, &h);
+   _policy_softkey_restrict(cz, &y, &h);
+
+   bd2 = e_illume_border_at_xy_get(bd->zone, x, y);
+   if ((bd2) && (bd2 != bd))
+     {
+       if ((bd->focused) && (bd->client.vkbd.state > ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF))
+         _border_geometry_set(bd2, x, h/2 + y, w, h/2, POL_APP_LAYER);
+       else
+         y += h/2;
+     }
+
+   _border_geometry_set(bd, x, y, w, h/2, POL_APP_LAYER);
+}
+
+static void
+_policy_zone_layout_app_dual_custom(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   E_Border *app;
+   int iy, ny, nh;
+
+   if (!_policy_layout_app_check(bd)) return;
+
+   ZONE_GEOMETRY;
+
+   e_illume_border_indicator_pos_get(bd->zone, NULL, &iy);
+
+   ny = bd->zone->y;
+   nh = iy;
+
+   app = e_illume_border_at_xy_get(bd->zone, bd->zone->x, bd->zone->y);
+   if ((app) && (bd != app))
+     {
+       ny = (iy + cz->indicator.size);
+       nh = ((bd->zone->y + bd->zone->h) - ny - cz->softkey.size);
+     }
+
+   _border_geometry_set(bd, x, ny, w, nh, POL_APP_LAYER);
+}
+
+static void
+_policy_zone_layout_app_dual_left(E_Border *bd, E_Illume_Config_Zone *cz, Eina_Bool force)
+{
+   E_Border *bd2;
+   int ky, kh, nx, nw;
+
+   if (!_policy_layout_app_check(bd)) return;
+
+   ZONE_GEOMETRY;
+
+   e_illume_keyboard_safe_app_region_get(bd->zone, NULL, &ky, NULL, &kh);
+
+   if (kh >= bd->zone->h)
+     kh = (kh - cz->indicator.size - cz->softkey.size);
+   else
+     kh = (kh - cz->indicator.size);
+
+   nx = x;
+   nw = w / 2;
+
+   if (!force)
+     {
+       /* see if there is a border already there. if so, place at right */
+       bd2 = e_illume_border_at_xy_get(bd->zone, nx, y);
+       if ((bd2) && (bd != bd2)) nx = x + nw;
+     }
+
+   _border_geometry_set(bd, nx, y, nw, kh, POL_APP_LAYER);
+}
+
+static void
+_policy_zone_layout_dialog(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   E_Border *parent;
+   int mw, mh, nx, ny;
+
+   /* if (!_policy_layout_app_check(bd)) return; */
+   if ((!bd) || (!cz)) return;
+   printf("place dialog %d - %dx%d\n", bd->placed, bd->w, bd->h);
+
+   if (bd->placed)
+     return;
+
+   ZONE_GEOMETRY;
+
+   mw = bd->w;
+   mh = bd->h;
+
+   if (e_illume_border_is_fixed_size(bd))
+     {
+       if (mw > w) mw = w;
+       if (mh > h) mh = h;
+     }
+   else
+     {
+       if (w * 2/3 > bd->w)
+         mw = w * 2/3;
+
+       if (h * 2/3 > bd->h)
+         mh = h * 2/3;
+     }
+
+   parent = e_illume_border_parent_get(bd);
+
+   if ((!parent) || (cz->mode.dual == 1))
+     {
+       nx = (x + ((w - mw) / 2));
+       ny = (y + ((h - mh) / 2));
+     }
+   else
+     {
+       if (mw > parent->w) mw = parent->w;
+       if (mh > parent->h) mh = parent->h;
+
+       nx = (parent->x + ((parent->w - mw) / 2));
+       ny = (parent->y + ((parent->h - mh) / 2));
+     }
+
+   bd->placed = 1;
+   
+   _border_geometry_set(bd, nx, ny, mw, mh, POL_DIALOG_LAYER);
+   printf("set geom %d %d\n", mw, mh);
+}
+
+static void
+_policy_zone_layout_splash(E_Border *bd, E_Illume_Config_Zone *cz)
+{
+   _policy_zone_layout_dialog(bd, cz);
+
+   if (bd->layer != POL_SPLASH_LAYER) e_border_layer_set(bd, POL_SPLASH_LAYER);
+}
+
+static void
+_policy_zone_layout_conformant_single(E_Border *bd, E_Illume_Config_Zone *cz __UNUSED__)
+{
+   if (!_policy_layout_app_check(bd)) return;
+
+   _border_geometry_set(bd, bd->zone->x, bd->zone->y,
+                       bd->zone->w, bd->zone->h,
+                       POL_CONFORMANT_LAYER);
+}
+
+#if 0
+typedef struct _App_Desk App_Desk;
+
+struct _App_Desk
+{
+  E_Desk *desk;
+  const char *class;
+  Eina_List *borders;
+};
+
+static Eina_List *desks = NULL;
+
+#define EINA_LIST_FIND(_list, _item, _match)   \
+  {                                            \
+     Eina_List *_l;                            \
+     EINA_LIST_FOREACH(_list, _l, _item)       \
+       if (_match) break;                      \
+  }
+#endif
+
+
+/* policy functions */
+void
+_policy_border_add(E_Border *bd)
+{
+   //  printf("Border added: %s\n", bd->client.icccm.class);
+
+   if (!bd) return;
+
+   /* NB: this call sets an atom on the window that specifices the zone.
+    * the logic here is that any new windows created can access the zone
+    * window by a 'get' call. This is useful for elementary apps as they
+    * normally would not have access to the zone window. Typical use case
+    * is for indicator & softkey windows so that they can send messages
+    * that apply to their respective zone only. Example: softkey sends close
+    * messages (or back messages to cycle focus) that should pertain just
+    * to it's current zone */
+   ecore_x_e_illume_zone_set(bd->client.win, bd->zone->black_win);
+
+   if (e_illume_border_is_keyboard(bd))
+     {
+       bd->sticky = 1;
+       e_hints_window_sticky_set(bd, 1);
+     }
+   
+   if (e_illume_border_is_home(bd))
+     {
+       bd->sticky = 1;
+       e_hints_window_sticky_set(bd, 1);
+     }
+
+   if (e_illume_border_is_indicator(bd))
+     {
+       bd->sticky = 1;
+       e_hints_window_sticky_set(bd, 1);
+     }
+
+   if (e_illume_border_is_softkey(bd))
+     {
+       bd->sticky = 1;
+       e_hints_window_sticky_set(bd, 1);
+     }
+
+   /* ignore stolen borders. These are typically quickpanel or keyboards */
+   if (bd->stolen) return;
+
+   /* if this is a fullscreen window, than we need to hide indicator window */
+   /* NB: we could use the e_illume_border_is_fullscreen function here
+    * but we save ourselves a function call this way */
+   if ((bd->fullscreen) || (bd->need_fullscreen))
+     {
+       E_Border *ind, *sft;
+
+       if ((ind = e_illume_border_indicator_get(bd->zone)))
+         {
+            if (ind->visible) e_illume_border_hide(ind);
+         }
+       if ((sft = e_illume_border_softkey_get(bd->zone)))
+         {
+            if (e_illume_border_is_conformant(bd))
+              {
+                 if (sft->visible)
+                   e_illume_border_hide(sft);
+                 else if (!sft->visible)
+                   e_illume_border_show(sft);
+              }
+         }
+     }
+
+
+#if 0
+   if (bd->client.icccm.class)
+     {
+       Eina_List *l;
+       App_Desk *d;
+
+       EINA_LIST_FIND(desks, d, (d->class == bd->client.icccm.class));
+
+       if (!d)
+         {
+            d = E_NEW(App_Desk, 1);
+            d->desk
+         }
+
+       d->borders = eina_list_append(d->borders, bd);
+       e_border_desk_set(bd, d->desk);
+     }
+#endif
+
+   /* Add this border to our focus stack if it can accept or take focus */
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus))
+     _pol_focus_stack = eina_list_append(_pol_focus_stack, bd);
+
+   if ((e_illume_border_is_softkey(bd)) || (e_illume_border_is_indicator(bd)))
+     _policy_zone_layout_update(bd->zone);
+   else
+     {
+       /* set focus on new border if we can */
+       _policy_border_set_focus(bd);
+     }
+}
+
+void
+_policy_border_del(E_Border *bd)
+{
+   //  printf("Policy Border deleted: %s\n", bd->client.icccm.class);
+
+   if (!bd) return;
+
+   /* if this is a fullscreen window, than we need to show indicator window */
+   /* NB: we could use the e_illume_border_is_fullscreen function here
+    * but we save ourselves a function call this way */
+   if ((bd->fullscreen) || (bd->need_fullscreen))
+     {
+       E_Border *ind;
+
+       /* try to get the Indicator on this zone */
+       if ((ind = e_illume_border_indicator_get(bd->zone)))
+         {
+            if (!ind->visible) e_illume_border_show(ind);
+         }
+       _policy_zone_layout_update(bd->zone);
+     }
+
+   /* remove from focus stack */
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus))
+     _pol_focus_stack = eina_list_remove(_pol_focus_stack, bd);
+
+   if (e_illume_border_is_softkey(bd))
+     {
+       E_Illume_Config_Zone *cz;
+
+       cz = e_illume_zone_config_get(bd->zone->id);
+       cz->softkey.size = 0;
+       _policy_zone_layout_update(bd->zone);
+     }
+   else if (e_illume_border_is_indicator(bd))
+     {
+       E_Illume_Config_Zone *cz;
+
+       cz = e_illume_zone_config_get(bd->zone->id);
+       cz->indicator.size = 0;
+       _policy_zone_layout_update(bd->zone);
+     }
+   /* else
+    *   {
+    *  _policy_border_show_below(bd);
+    *   } */
+}
+
+void
+_policy_border_focus_in(E_Border *bd __UNUSED__)
+{
+   E_Border *ind;
+
+   //  printf("Border focus in: %s\n", bd->client.icccm.name);
+   if ((bd->fullscreen) || (bd->need_fullscreen))
+     {
+       /* try to get the Indicator on this zone */
+       if ((ind = e_illume_border_indicator_get(bd->zone)))
+         {
+            /* we have the indicator, show it if needed */
+            if (ind->visible) e_illume_border_hide(ind);
+         }
+     }
+   else
+     {
+       /* try to get the Indicator on this zone */
+       if ((ind = e_illume_border_indicator_get(bd->zone)))
+         {
+            /* we have the indicator, show it if needed */
+            if (!ind->visible) e_illume_border_show(ind);
+         }
+     }
+   _policy_zone_layout_update(bd->zone);
+}
+
+void
+_policy_border_focus_out(E_Border *bd)
+{
+   //  printf("Border focus out: %s\n", bd->client.icccm.name);
+
+   if (!bd) return;
+
+   /* NB: if we got this focus_out event on a deleted border, we check if
+    * it is a transient (child) of another window. If it is, then we
+    * transfer focus back to the parent window */
+   if (e_object_is_del(E_OBJECT(bd)))
+     {
+       if (e_illume_border_is_dialog(bd))
+         {
+            E_Border *parent;
+
+            if ((parent = e_illume_border_parent_get(bd)))
+              _policy_border_set_focus(parent);
+         }
+     }
+}
+
+void
+_policy_border_activate(E_Border *bd)
+{
+   E_Border *sft;
+
+   //  printf("Border Activate: %s\n", bd->client.icccm.name);
+
+   if (!bd) return;
+
+   /* NB: stolen borders may or may not need focus call...have to test */
+   if (bd->stolen) return;
+
+   /* conformant windows hide the softkey */
+   if ((sft = e_illume_border_softkey_get(bd->zone)))
+     {
+       if (e_illume_border_is_conformant(bd))
+         {
+            if (sft->visible) e_illume_border_hide(sft);
+         }
+       else
+         {
+            if (!sft->visible) e_illume_border_show(sft);
+         }
+     }
+
+   /* NB: We cannot use our set_focus function here because it does,
+    * occasionally fall through wrt E's focus policy, so cherry pick the good
+    * parts and use here :) */
+   if (bd->desk != e_desk_current_get(bd->zone))
+     e_desk_show(bd->desk);
+
+   /* if the border is iconified then uniconify if allowed */
+   if ((bd->iconic) && (!bd->lock_user_iconify))
+     e_border_uniconify(bd);
+
+   /* set very high layer for this window as it needs attention and thus
+    * should show above everything */
+   e_border_layer_set(bd, POL_ACTIVATE_LAYER);
+
+   /* if we can raise the border do it */
+   if (!bd->lock_user_stacking) e_border_raise(bd);
+
+   /* focus the border */
+   e_border_focus_set(bd, 1, 1);
+
+   /* NB: since we skip needless border evals when container layout
+    * is called (to save cpu cycles), we need to
+    * signal this border that it's focused so that the edj gets
+    * updated.
+    *
+    * This is potentially useless as THIS policy
+    * makes all windows borderless anyway, but it's in here for
+    * completeness
+    e_border_focus_latest_set(bd);
+    if (bd->bg_object)
+    edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+    if (bd->icon_object)
+    edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+    e_focus_event_focus_in(bd);
+   */
+}
+static Eina_Bool
+_policy_border_is_dialog(E_Border *bd)
+{
+   if (e_illume_border_is_dialog(bd))
+     return EINA_TRUE;
+
+   if (bd->client.e.state.centered)
+     return EINA_TRUE;
+
+   if (bd->internal)
+     {
+       if (bd->client.icccm.class)
+         {
+            if (!strncmp(bd->client.icccm.class, "Illume", 6))
+              return EINA_FALSE;
+            if (!strncmp(bd->client.icccm.class, "e_fwin", 6))
+              return EINA_FALSE;
+            if (!strncmp(bd->client.icccm.class, "every", 5))
+              return EINA_FALSE;
+
+         }
+       return EINA_TRUE;
+     }
+
+   return EINA_FALSE;
+}
+
+void
+_policy_border_post_fetch(E_Border *bd)
+{
+   if (!bd) return;
+
+   /* NB: for this policy we disable all remembers set on a border */
+   if (bd->remember) e_remember_del(bd->remember);
+   bd->remember = NULL;
+
+   if (_policy_border_is_dialog(bd))
+     {
+       return;
+     }
+   else if (e_illume_border_is_fixed_size(bd))
+     {
+       return;
+     }
+   else if (!bd->borderless)
+     {
+       bd->borderless = 1;
+       bd->client.border.changed = 1;
+     }
+}
+
+void
+_policy_border_post_assign(E_Border *bd)
+{
+   if (!bd) return;
+
+   bd->internal_no_remember = 1;
+
+   if (_policy_border_is_dialog(bd) ||
+       e_illume_border_is_fixed_size(bd))
+     return;
+
+   /* do not allow client to change these properties */
+   bd->lock_client_size = 1;
+   bd->lock_client_shade = 1;
+   bd->lock_client_maximize = 1;
+   bd->lock_client_location = 1;
+   bd->lock_client_stacking = 1;
+
+   /* do not allow the user to change these properties */
+   /* bd->lock_user_location = 1;
+    * bd->lock_user_size = 1;
+    * bd->lock_user_shade = 1; */
+
+   /* clear any centered states */
+   /* NB: this is mainly needed for E's main config dialog */
+   bd->client.e.state.centered = 0;
+
+   /* lock the border type so user/client cannot change */
+   bd->lock_border = 1;
+
+   /* disable e's placement (and honoring of icccm.request_pos) */
+   bd->placed = 1;
+}
+
+void
+_policy_border_show(E_Border *bd)
+{
+   if (!bd) return;
+
+   /* printf("_policy_border_show %s\n", e_border_name_get(bd)); */
+
+   if (!bd->client.icccm.name) return;
+
+   //  printf("Border Show: %s\n", bd->client.icccm.class);
+
+   /* trap for special windows so we can ignore hides below them */
+   if (e_illume_border_is_indicator(bd)) return;
+   if (e_illume_border_is_softkey(bd)) return;
+   if (e_illume_border_is_quickpanel(bd)) return;
+   if (e_illume_border_is_keyboard(bd)) return;
+
+   _policy_border_hide_below(bd);
+}
+
+/* called on E_BORDER_HOOK_CONTAINER_LAYOUT (after e_border/eval0) */
+void
+_policy_zone_layout(E_Zone *zone)
+{
+   E_Illume_Config_Zone *cz;
+   Eina_List *l;
+   E_Border *bd;
+
+   if (!zone) return;
+
+   cz = e_illume_zone_config_get(zone->id);
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+       if (e_object_is_del(E_OBJECT(bd))) continue;
+
+       if (bd->zone != zone) continue;
+
+       if ((!bd->new_client) && (!bd->changes.pos) && (!bd->changes.size) &&
+           (!bd->changes.visible) && (!bd->pending_move_resize) &&
+           (!bd->need_shape_export) && (!bd->need_shape_merge)) continue;
+
+       if (e_illume_border_is_indicator(bd))
+         _policy_zone_layout_indicator(bd, cz);
+
+       else if (e_illume_border_is_quickpanel(bd))
+         _policy_zone_layout_quickpanel(bd);
+
+       else if (e_illume_border_is_softkey(bd))
+         _policy_zone_layout_softkey(bd, cz);
+
+       else if (e_illume_border_is_keyboard(bd))
+         _policy_zone_layout_keyboard(bd, cz);
+
+       else if (e_illume_border_is_home(bd))
+         _policy_zone_layout_home_single(bd, cz);
+
+       else if ((bd->fullscreen) || (bd->need_fullscreen))
+         _policy_zone_layout_fullscreen(bd);
+
+       else if (e_illume_border_is_splash(bd))
+         _policy_zone_layout_splash(bd, cz);
+
+       else if (_policy_border_is_dialog(bd))
+         _policy_zone_layout_dialog(bd, cz);
+
+       else if (e_illume_border_is_conformant(bd))
+         _policy_zone_layout_conformant_single(bd, cz);
+
+       else if (e_illume_border_is_fixed_size(bd))
+         _policy_zone_layout_dialog(bd, cz);
+
+       else if (bd->internal && bd->client.icccm.class &&
+                (!strcmp(bd->client.icccm.class, "everything-window")))
+         {
+            if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
+              _policy_zone_layout_app_single(bd, cz);
+            /* else
+             *   _policy_zone_layout_app_dual_left(bd, cz, EINA_TRUE); */
+            if (bd->layer != POL_ACTIVATE_LAYER)
+              e_border_layer_set(bd, POL_ACTIVATE_LAYER);
+            
+            /* if (bd->layer != POL_SPLASH_LAYER)
+             *   e_border_layer_set(bd, POL_SPLASH_LAYER); */
+         }
+       else if (bd->client.e.state.centered)
+         _policy_zone_layout_dialog(bd, cz);
+       else if (!cz->mode.dual)
+         _policy_zone_layout_app_single(bd, cz);
+       else
+         {
+            if (cz->mode.side == 0)
+              {
+                 int ty;
+
+                 /* grab the indicator position so we can tell if it
+                  * is in a custom position or not (user dragged it) */
+                 e_illume_border_indicator_pos_get(bd->zone, NULL, &ty);
+                 if (ty <= bd->zone->y)
+                   _policy_zone_layout_app_dual_top(bd, cz);
+                 else
+                   _policy_zone_layout_app_dual_custom(bd, cz);
+              }
+            else
+              _policy_zone_layout_app_dual_left(bd, cz, EINA_FALSE);
+         }
+     }
+}
+
+void
+_policy_zone_move_resize(E_Zone *zone)
+{
+   Eina_List *l;
+   E_Border *bd;
+
+   if (!zone) return;
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+       if (bd->zone != zone) continue;
+
+       bd->changes.pos = 1;
+       bd->changed = 1;
+     }
+}
+
+void
+_policy_zone_mode_change(E_Zone *zone, Ecore_X_Atom mode)
+{
+   E_Illume_Config_Zone *cz;
+   /* Eina_List *homes = NULL; */
+   E_Border *bd;
+   /* int count; */
+
+   if (!zone) return;
+
+   cz = e_illume_zone_config_get(zone->id);
+
+   if (mode == ECORE_X_ATOM_E_ILLUME_MODE_SINGLE)
+     cz->mode.dual = 0;
+   else
+     {
+       cz->mode.dual = 1;
+       if (mode == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP)
+         cz->mode.side = 0;
+       else if (mode == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT)
+         cz->mode.side = 1;
+     }
+   e_config_save_queue();
+
+   /* lock indicator window from dragging if we need to */
+   bd = e_illume_border_indicator_get(zone);
+   if (bd)
+     {
+       /* only dual-top mode can drag */
+       if ((cz->mode.dual == 1) && (cz->mode.side == 0))
+         {
+            /* only set locked if we need to */
+            if (bd->client.illume.drag.locked != 0)
+              ecore_x_e_illume_drag_locked_set(bd->client.win, 0);
+         }
+       else
+         {
+            /* only set locked if we need to */
+            if (bd->client.illume.drag.locked != 1)
+              ecore_x_e_illume_drag_locked_set(bd->client.win, 1);
+         }
+     }
+#if 0 /* split home window? wtf?! go home! */
+   if (!(homes = e_illume_border_home_borders_get(zone))) return;
+
+   count = eina_list_count(homes);
+
+   /* create a new home window (if needed) for dual mode */
+   if (cz->mode.dual == 1)
+     {
+       if (count < 2)
+         ecore_x_e_illume_home_new_send(zone->black_win);
+     }
+   else if (cz->mode.dual == 0)
+     {
+       /* if we went to single mode, delete any extra home windows */
+       if (count >= 2)
+         {
+            E_Border *home;
+
+            /* try to get a home window on this zone and remove it */
+            if ((home = e_illume_border_home_get(zone)))
+              ecore_x_e_illume_home_del_send(home->client.win);
+         }
+     }
+#endif
+
+   _policy_zone_layout_update(zone);
+}
+
+void
+_policy_zone_close(E_Zone *zone)
+{
+   E_Border *bd;
+
+   if (!zone) return;
+
+   if (!(bd = e_border_focused_get())) return;
+
+   if (bd->zone != zone) return;
+
+   /* close this border */
+   e_border_act_close_begin(bd);
+}
+
+void
+_policy_drag_start(E_Border *bd)
+{
+   if (!bd) return;
+
+   if (bd->stolen) return;
+
+   ecore_x_e_illume_drag_set(bd->client.win, 1);
+   ecore_x_e_illume_drag_set(bd->zone->black_win, 1);
+}
+
+void
+_policy_drag_end(E_Border *bd)
+{
+   //  printf("Drag end\n");
+
+   if (!bd) return;
+
+   if (bd->stolen) return;
+
+   /* set property on this border to say we are done dragging */
+   ecore_x_e_illume_drag_set(bd->client.win, 0);
+
+   /* set property on zone window that a drag is finished */
+   ecore_x_e_illume_drag_set(bd->zone->black_win, 0);
+}
+
+void
+_policy_focus_back(E_Zone *zone)
+{
+   Eina_List *l, *fl = NULL;
+   E_Border *bd, *fbd;
+
+   if (!zone) return;
+   if (eina_list_count(_pol_focus_stack) < 1) return;
+
+   //  printf("Focus back\n");
+
+   EINA_LIST_REVERSE_FOREACH(_pol_focus_stack, l, bd)
+     {
+       if (bd->zone != zone) continue;
+       fl = eina_list_append(fl, bd);
+     }
+
+   if (!(fbd = e_border_focused_get())) return;
+   if (fbd->parent) return;
+
+   EINA_LIST_REVERSE_FOREACH(fl, l, bd)
+     {
+       if ((fbd) && (bd == fbd))
+         {
+            E_Border *b;
+
+            if ((l->next) && (b = l->next->data))
+              {
+                 _policy_border_set_focus(b);
+                 break;
+              }
+            else
+              {
+                 /* we've reached the end of the list. Set focus to first */
+                 if ((b = eina_list_nth(fl, 0)))
+                   {
+                      _policy_border_set_focus(b);
+                      break;
+                   }
+              }
+         }
+     }
+   eina_list_free(fl);
+}
+
+void
+_policy_focus_forward(E_Zone *zone)
+{
+   Eina_List *l, *fl = NULL;
+   E_Border *bd, *fbd;
+
+   if (!zone) return;
+   if (eina_list_count(_pol_focus_stack) < 1) return;
+
+   //  printf("Focus forward\n");
+
+   EINA_LIST_FOREACH(_pol_focus_stack, l, bd)
+     {
+       if (bd->zone != zone) continue;
+       fl = eina_list_append(fl, bd);
+     }
+
+   if (!(fbd = e_border_focused_get())) return;
+   if (fbd->parent) return;
+
+   EINA_LIST_FOREACH(fl, l, bd)
+     {
+       if ((fbd) && (bd == fbd))
+         {
+            E_Border *b;
+
+            if ((l->next) && (b = l->next->data))
+              {
+                 _policy_border_set_focus(b);
+                 break;
+              }
+            else
+              {
+                 /* we've reached the end of the list. Set focus to first */
+                 if ((b = eina_list_nth(fl, 0)))
+                   {
+                      _policy_border_set_focus(b);
+                      break;
+                   }
+              }
+         }
+     }
+   eina_list_free(fl);
+}
+
+void
+_policy_focus_home(E_Zone *zone)
+{
+   E_Border *bd;
+
+   if (!zone) return;
+   if (!(bd = e_illume_border_home_get(zone))) return;
+   _policy_border_set_focus(bd);
+}
+
+void
+_policy_property_change(Ecore_X_Event_Window_Property *event)
+{
+   if (event->atom == ECORE_X_ATOM_NET_WM_STATE)
+     {
+       E_Border *bd, *ind;
+
+       if (!(bd = e_border_find_by_client_window(event->win))) return;
+
+       /* not interested in stolen or invisible borders */
+       if ((bd->stolen) || (!bd->visible)) return;
+
+       /* make sure the border has a name or class */
+       /* NB: this check is here because some E borders get State Changes
+        * but do not have a name/class associated with them. Not entirely sure
+        * which ones they are, but I would guess Managers, Containers, or Zones.
+        * At any rate, we're not interested in those types of borders */
+       if ((!bd->client.icccm.name) || (!bd->client.icccm.class)) return;
+
+       /* NB: If we have reached this point, then it should be a fullscreen
+        * border that has toggled fullscreen on/off */
+
+       /* try to get the Indicator on this zone */
+       if (!(ind = e_illume_border_indicator_get(bd->zone))) return;
+
+       /* if we are fullscreen, hide the indicator...else we show it */
+       /* NB: we could use the e_illume_border_is_fullscreen function here
+        * but we save ourselves a function call this way */
+       if ((bd->fullscreen) || (bd->need_fullscreen))
+         {
+            if (ind->visible)
+              {
+                 e_illume_border_hide(ind);
+                 _policy_zone_layout_update(bd->zone);
+              }
+         }
+       else
+         {
+            if (!ind->visible)
+              {
+                 e_illume_border_show(ind);
+                 _policy_zone_layout_update(bd->zone);
+              }
+         }
+     }
+   else if (event->atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY)
+     {
+       Eina_List *l;
+       E_Zone *zone;
+       E_Border *bd;
+       int x, y, w, h;
+
+       if (!(zone = e_util_zone_window_find(event->win))) return;
+
+       if (!(bd = e_illume_border_indicator_get(zone))) return;
+       x = bd->x;
+       y = bd->y;
+       w = bd->w;
+       h = bd->h;
+
+       EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+         {
+            if (bd->zone != zone) continue;
+            if (!e_illume_border_is_conformant(bd)) continue;
+            /* set indicator geometry on conformant window */
+            /* NB: This is needed so that conformant apps get told about
+             * the indicator size/position...else they have no way of
+             * knowing that the geometry has been updated */
+            ecore_x_e_illume_indicator_geometry_set(bd->client.win, x, y, w, h);
+         }
+     }
+   else if (event->atom == ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY)
+     {
+       Eina_List *l;
+       E_Zone *zone;
+       E_Border *bd;
+       int x, y, w, h;
+
+       if (!(zone = e_util_zone_window_find(event->win))) return;
+
+       if (!(bd = e_illume_border_softkey_get(zone))) return;
+       x = bd->x;
+       y = bd->y;
+       w = bd->w;
+       h = bd->h;
+
+       EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+         {
+            if (bd->zone != zone) continue;
+            if (!e_illume_border_is_conformant(bd)) continue;
+            /* set softkey geometry on conformant window */
+            /* NB: This is needed so that conformant apps get told about
+             * the softkey size/position...else they have no way of
+             * knowing that the geometry has been updated */
+            ecore_x_e_illume_softkey_geometry_set(bd->client.win, x, y, w, h);
+         }
+     }
+   else if (event->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY)
+     {
+       Eina_List *l;
+       E_Zone *zone;
+       E_Illume_Keyboard *kbd;
+       E_Border *bd;
+       int x, y, w, h;
+
+       if (!(zone = e_util_zone_window_find(event->win))) return;
+
+       if (!(kbd = e_illume_keyboard_get())) return;
+       if (!kbd->border) return;
+
+       x = kbd->border->x;
+       w = kbd->border->w;
+       h = kbd->border->h;
+
+       /* adjust Y for keyboard visibility because keyboard uses fx_offset */
+       y = 0;
+       if (kbd->border->fx.y <= 0) y = kbd->border->y;
+
+       /* look for conformant borders */
+       EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+         {
+            if (bd->zone != zone) continue;
+            if (!e_illume_border_is_conformant(bd)) continue;
+            /* set keyboard geometry on conformant window */
+            /* NB: This is needed so that conformant apps get told about
+             * the keyboard size/position...else they have no way of
+             * knowing that the geometry has been updated */
+            ecore_x_e_illume_keyboard_geometry_set(bd->client.win, x, y, w, h);
+         }
+     }
+   else if (event->atom == ATM_ENLIGHTENMENT_SCALE)
+     {
+       Eina_List *ml;
+       E_Manager *man;
+
+       EINA_LIST_FOREACH(e_manager_list(), ml, man)
+         {
+            Eina_List *cl;
+            E_Container *con;
+
+            if (event->win != man->root) continue;
+            EINA_LIST_FOREACH(man->containers, cl, con)
+              {
+                 Eina_List *zl;
+                 E_Zone *zone;
+
+                 EINA_LIST_FOREACH(con->zones, zl, zone)
+                   _policy_zone_layout_update(zone);
+              }
+         }
+     }
+}
diff --git a/src/modules/illume2/policies/tablet/policy.h b/src/modules/illume2/policies/tablet/policy.h
new file mode 100644 (file)
index 0000000..39af6af
--- /dev/null
@@ -0,0 +1,37 @@
+#ifndef _POLICY_H
+# define _POLICY_H
+
+/* define layer values here so we don't have to grep through code to change */
+# define POL_INDICATOR_LAYER 200
+# define POL_QUICKPANEL_LAYER 160
+# define POL_KEYBOARD_LAYER 150
+# define POL_ACTIVATE_LAYER 145
+# define POL_FULLSCREEN_LAYER 140
+# define POL_DIALOG_LAYER 120
+# define POL_SPLASH_LAYER 120
+# define POL_SOFTKEY_LAYER 110
+# define POL_CONFORMANT_LAYER 100
+# define POL_APP_LAYER 100
+# define POL_HOME_LAYER 90
+
+void _policy_border_add(E_Border *bd);
+void _policy_border_del(E_Border *bd);
+void _policy_border_focus_in(E_Border *bd);
+void _policy_border_focus_out(E_Border *bd);
+void _policy_border_activate(E_Border *bd);
+void _policy_border_post_fetch(E_Border *bd);
+void _policy_border_post_assign(E_Border *bd);
+void _policy_border_show(E_Border *bd);
+void _policy_border_hide(E_Border *bd);
+void _policy_zone_layout(E_Zone *zone);
+void _policy_zone_move_resize(E_Zone *zone);
+void _policy_zone_mode_change(E_Zone *zone, Ecore_X_Atom mode);
+void _policy_zone_close(E_Zone *zone);
+void _policy_drag_start(E_Border *bd);
+void _policy_drag_end(E_Border *bd);
+void _policy_focus_back(E_Zone *zone);
+void _policy_focus_forward(E_Zone *zone);
+void _policy_focus_home(E_Zone *zone);
+void _policy_property_change(Ecore_X_Event_Window_Property *event);
+
+#endif
diff --git a/src/modules/illume2/policies/tablet/tablet.c b/src/modules/illume2/policies/tablet/tablet.c
new file mode 100644 (file)
index 0000000..ab3b1f7
--- /dev/null
@@ -0,0 +1,60 @@
+#include "e_illume.h"
+#include "tablet.h"
+#include "policy.h"
+
+EAPI E_Illume_Policy_Api e_illume_policy_api = 
+{
+   /* version, name, label */
+   E_ILLUME_POLICY_API_VERSION, "tablet", "Tablet"
+};
+
+EAPI int 
+e_illume_policy_init(E_Illume_Policy *p) 
+{
+   /* tell the policy what functions we support */
+   p->funcs.border_add = _policy_border_add;
+   p->funcs.border_del = _policy_border_del;
+   p->funcs.border_focus_in = _policy_border_focus_in;
+   p->funcs.border_focus_out = _policy_border_focus_out;
+   p->funcs.border_activate = _policy_border_activate;
+   p->funcs.border_post_fetch = _policy_border_post_fetch;
+   p->funcs.border_post_assign = _policy_border_post_assign;
+   p->funcs.border_show = _policy_border_show;
+   p->funcs.zone_layout = _policy_zone_layout;
+   p->funcs.zone_move_resize = _policy_zone_move_resize;
+   p->funcs.zone_mode_change = _policy_zone_mode_change;
+   p->funcs.zone_close = _policy_zone_close;
+   p->funcs.drag_start = _policy_drag_start;
+   p->funcs.drag_end = _policy_drag_end;
+   p->funcs.focus_back = _policy_focus_back;
+   p->funcs.focus_forward = _policy_focus_forward;
+   p->funcs.focus_home = _policy_focus_home;
+   p->funcs.property_change = _policy_property_change;
+
+   return 1;
+}
+
+EAPI int 
+e_illume_policy_shutdown(E_Illume_Policy *p) 
+{
+   p->funcs.border_add = NULL;
+   p->funcs.border_del = NULL;
+   p->funcs.border_focus_in = NULL;
+   p->funcs.border_focus_out = NULL;
+   p->funcs.border_activate = NULL;
+   p->funcs.border_post_fetch = NULL;
+   p->funcs.border_post_assign = NULL;
+   p->funcs.border_show = NULL;
+   p->funcs.zone_layout = NULL;
+   p->funcs.zone_move_resize = NULL;
+   p->funcs.zone_mode_change = NULL;
+   p->funcs.zone_close = NULL;
+   p->funcs.drag_start = NULL;
+   p->funcs.drag_end = NULL;
+   p->funcs.focus_back = NULL;
+   p->funcs.focus_forward = NULL;
+   p->funcs.focus_home = NULL;
+   p->funcs.property_change = NULL;
+
+   return 1;
+}
diff --git a/src/modules/illume2/policies/tablet/tablet.h b/src/modules/illume2/policies/tablet/tablet.h
new file mode 100644 (file)
index 0000000..d7d975b
--- /dev/null
@@ -0,0 +1,9 @@
+#ifndef _ILLUME_H
+# define _ILLUME_H
+
+EAPI extern E_Illume_Policy_Api e_illume_policy_api;
+
+EAPI int e_illume_policy_init(E_Illume_Policy *p);
+EAPI int e_illume_policy_shutdown(E_Illume_Policy *p);
+
+#endif
diff --git a/src/modules/layout/.cvsignore b/src/modules/layout/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/mixer/.cvsignore b/src/modules/mixer/.cvsignore
deleted file mode 100644 (file)
index 91e5195..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-e_mod_main.lo
-module.la
-*.lo
-*.la
-module.desktop
index 4ea2b91..98dfb2b 100644 (file)
@@ -15,15 +15,27 @@ INCLUDES          = -I. \
                     -I$(top_builddir)/src/bin \
                     -I$(top_srcdir)/src/modules \
                     @e_cflags@ @SOUND_CFLAGS@
+if HAVE_ENOTIFY
+INCLUDES          += @ENOTIFY_CFLAGS@
+endif
+
 pkgdir            = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES   = module.la
 
 module_la_SOURCES = e_mod_main.h \
+                   Pulse.h \
+                   pa.h \
                    e_mod_main.c \
                     e_mod_system.h \
                     conf_gadget.c \
                     conf_module.c \
-                   app_mixer.c
+                    sys_pulse.c \
+                    app_mixer.c \
+                    msg.c \
+                    pa.c \
+                    serial.c \
+                    sink.c \
+                    tag.c
 
 if HAVE_ALSA
 module_la_SOURCES += sys_alsa.c
@@ -32,6 +44,10 @@ module_la_SOURCES += sys_dummy.c
 endif
 
 module_la_LIBADD       = @SOUND_LIBS@ @e_libs@ @dlopen_libs@
+if HAVE_ENOTIFY
+module_la_LIBADD       += @ENOTIFY_LIBS@
+endif
+
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
diff --git a/src/modules/mixer/Pulse.h b/src/modules/mixer/Pulse.h
new file mode 100644 (file)
index 0000000..44d0d62
--- /dev/null
@@ -0,0 +1,68 @@
+#ifndef PULSE_H
+#define PULSE_H
+
+#include <Eina.h>
+#include <inttypes.h>
+
+#define PULSE_SUCCESS (void*)1
+
+extern int PULSE_EVENT_CONNECTED;
+extern int PULSE_EVENT_DISCONNECTED;
+extern int PULSE_EVENT_CHANGE;
+typedef struct Pulse Pulse;
+typedef uint32_t Pulse_Tag_Id;
+typedef struct Pulse_Sink Pulse_Sink;
+typedef struct Pulse_Sink Pulse_Source;
+typedef void (*Pulse_Cb)(Pulse *, Pulse_Tag_Id, void *);
+
+typedef struct Pulse_Sink_Port_Info {
+    const char *name;                   /**< Name of this port */
+    const char *description;            /**< Description of this port */
+    uint32_t priority;                  /**< The higher this value is the more useful this port is as a default */
+} Pulse_Sink_Port_Info;
+
+int pulse_init(void);
+void pulse_shutdown(void);
+
+Pulse *pulse_new(void);
+Eina_Bool pulse_connect(Pulse *conn);
+void pulse_free(Pulse *conn);
+void pulse_cb_set(Pulse *conn, uint32_t tagnum, Pulse_Cb cb);
+
+uint32_t pulse_cards_get(Pulse *conn);
+#define pulse_sinks_get(conn) pulse_types_get((conn), EINA_FALSE)
+#define pulse_sources_get(conn) pulse_types_get((conn), EINA_TRUE)
+uint32_t pulse_types_get(Pulse *conn, Eina_Bool source);
+#define pulse_sink_get(conn, idx) pulse_type_get((conn), (idx), EINA_FALSE)
+#define pulse_source_get(conn, idx) pulse_type_get((conn), (idx), EINA_FALSE)
+uint32_t pulse_type_get(Pulse *conn, uint32_t idx, Eina_Bool source);
+#define pulse_sink_mute_set(conn, idx, mute) pulse_type_mute_set((conn), (idx), (mute), EINA_FALSE)
+#define pulse_source_mute_set(conn, idx, mute) pulse_type_mute_set((conn), (idx), (mute), EINA_TRUE)
+uint32_t pulse_type_mute_set(Pulse *conn, uint32_t idx, Eina_Bool mute, Eina_Bool source);
+#define pulse_sink_volume_set(conn, idx, channels, vol) pulse_type_volume_set((conn), (idx), (channels), (vol), EINA_FALSE)
+#define pulse_source_volume_set(conn, idx, channels, vol) pulse_type_volume_set((conn), (idx), (channels), (vol), EINA_TRUE)
+uint32_t pulse_type_volume_set(Pulse *conn, uint32_t sink_num, uint8_t channels, double vol, Eina_Bool source);
+
+void pulse_sink_free(Pulse_Sink *sink);
+const char *pulse_sink_name_get(Pulse_Sink *sink);
+const char *pulse_sink_desc_get(Pulse_Sink *sink);
+uint32_t pulse_sink_idx_get(Pulse_Sink *sink);
+Eina_Bool pulse_sink_muted_get(Pulse_Sink *sink);
+double pulse_sink_avg_get_pct(Pulse_Sink *sink);
+float pulse_sink_balance_get(Pulse_Sink *sink);
+uint8_t pulse_sink_channels_count(Pulse_Sink *sink);
+Eina_List *pulse_sink_channel_names_get(Pulse_Sink *sink);
+Eina_Bool pulse_sinks_watch(Pulse *conn);
+
+const Eina_List *pulse_sink_ports_get(Pulse_Sink *sink);
+const char *pulse_sink_port_active_get(Pulse_Sink *sink);
+#define pulse_source_channel_volume_set pulse_sink_channel_volume_set
+uint32_t pulse_sink_channel_volume_set(Pulse *conn, Pulse_Sink *sink, uint32_t id, double vol);
+uint32_t pulse_sink_port_set(Pulse *conn, Pulse_Sink *sink, const char *port);
+double pulse_sink_channel_volume_get(Pulse_Sink *sink, unsigned int id);
+float pulse_sink_channel_balance_get(Pulse_Sink *sink, unsigned int id);
+float pulse_sink_channel_depth_get(Pulse_Sink *sink, unsigned int id);
+unsigned int pulse_sink_channel_name_get_id(Pulse_Sink *sink, const char *name);
+const char *pulse_sink_channel_id_get_name(Pulse_Sink *sink, unsigned int id);
+
+#endif
index 7b49ad2..76a15fe 100644 (file)
@@ -73,7 +73,7 @@ _cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
                                      state->right);
      }
 
-   e_mixer_system_set_volume(app->sys, app->channel_info->id,
+   e_mod_mixer_volume_set(app->sys, app->channel_info->id,
                              state->left, state->right);
 }
 
@@ -91,7 +91,7 @@ _cb_changed_right(void *data, Evas_Object *obj __UNUSED__)
                                      state->left);
      }
 
-   e_mixer_system_set_volume(app->sys, app->channel_info->id,
+   e_mod_mixer_volume_set(app->sys, app->channel_info->id,
                              state->left, state->right);
 }
 
@@ -100,7 +100,7 @@ _cb_changed_mute(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Mixer_App_Dialog_Data *app = data;
 
-   e_mixer_system_set_mute(app->sys, app->channel_info->id, app->state.mute);
+   e_mod_mixer_mute_set(app->sys, app->channel_info->id, app->state.mute);
 }
 
 static void
@@ -120,7 +120,7 @@ _cb_changed_lock_sliders(void *data, Evas_Object *obj __UNUSED__)
 
    e_widget_slider_value_int_set(app->ui.channel_editor.left, state->left);
    e_widget_slider_value_int_set(app->ui.channel_editor.right, state->right);
-   e_mixer_system_set_volume(app->sys, app->channel_info->id,
+   e_mod_mixer_volume_set(app->sys, app->channel_info->id,
                              state->left, state->right);
 }
 
@@ -132,7 +132,7 @@ _update_channel_editor_state(E_Mixer_App_Dialog_Data *app, const E_Mixer_Channel
    e_widget_slider_value_int_set(ui->left, state.left);
    e_widget_slider_value_int_set(ui->right, state.right);
 
-   if (e_mixer_system_can_mute(app->sys, app->channel_info->id))
+   if (e_mod_mixer_mutable_get(app->sys, app->channel_info->id))
      {
        e_widget_disabled_set(ui->mute, 0);
        e_widget_check_checked_set(ui->mute, state.mute);
@@ -151,18 +151,18 @@ _populate_channel_editor(E_Mixer_App_Dialog_Data *app)
    E_Mixer_Channel_State state;
    const char *card_name;
 
-   card_name = e_mixer_system_get_card_name(app->card);
+   card_name = e_mod_mixer_card_name_get(app->card);
    e_widget_entry_text_set(ui->card, card_name);
    eina_stringshare_del(card_name);
 
    e_widget_entry_text_set(ui->channel, app->channel_name);
 
-   if (e_mixer_system_has_capture(app->sys, app->channel_info->id))
+   if (e_mod_mixer_capture_get(app->sys, app->channel_info->id))
      e_widget_entry_text_set(ui->type, _("Capture"));
    else
      e_widget_entry_text_set(ui->type, _("Playback"));
 
-   e_mixer_system_get_state(app->sys, app->channel_info->id, &state);
+   e_mod_mixer_state_get(app->sys, app->channel_info->id, &state);
    _update_channel_editor_state(app, state);
 
    app->lock_sliders = (state.left == state.right);
@@ -198,7 +198,7 @@ _channels_info_new(E_Mixer_System *sys)
 {
    Eina_List *channels, *channels_infos, *l;
 
-   channels = e_mixer_system_get_channels(sys);
+   channels = e_mod_mixer_channels_get(sys);
    channels_infos = NULL;
    for (l = channels; l; l = l->next)
      {
@@ -206,12 +206,12 @@ _channels_info_new(E_Mixer_System *sys)
 
        info = malloc(sizeof(*info));
        info->id = l->data;
-       info->name = e_mixer_system_get_channel_name(sys, info->id);
-       info->has_capture = e_mixer_system_has_capture(sys, info->id);
+       info->name = e_mod_mixer_channel_name_get(sys, info->id);
+       info->has_capture = e_mod_mixer_capture_get(sys, info->id);
 
        channels_infos = eina_list_append(channels_infos, info);
      }
-   e_mixer_system_free_channels(channels);
+   e_mod_mixer_channels_free(channels);
 
    return eina_list_sort(channels_infos, -1, _channel_info_cmp);
 }
@@ -237,13 +237,12 @@ _cb_system_update(void *data, E_Mixer_System *sys __UNUSED__)
    if ((!app->sys) || (!app->channel_info))
      return 1;
 
-   e_mixer_system_get_state(app->sys, app->channel_info->id, &state);
+   e_mod_mixer_state_get(app->sys, app->channel_info->id, &state);
    _update_channel_editor_state(app, state);
 
    return 1;
 }
 
-
 static void
 _populate_channels(E_Mixer_App_Dialog_Data *app)
 {
@@ -258,54 +257,55 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
    e_widget_ilist_clear(ilist);
 
    if (app->sys)
-     e_mixer_system_del(app->sys);
-   app->sys = e_mixer_system_new(app->card);
-   e_mixer_system_callback_set(app->sys, _cb_system_update, app);
+     e_mod_mixer_del(app->sys);
+   app->sys = e_mod_mixer_new(app->card);
+   if (_mixer_using_default)
+     e_mixer_system_callback_set(app->sys, _cb_system_update, app);
 
    eina_stringshare_del(app->channel_name);
-   app->channel_name = e_mixer_system_get_default_channel_name(app->sys);
-
+   app->channel_name = e_mod_mixer_channel_default_name_get(app->sys);
+   
    if (app->channels_infos)
      _channels_info_free(app->channels_infos);
    app->channels_infos = _channels_info_new(app->sys);
 
    if (app->channels_infos)
      {
-       struct channel_info *info = app->channels_infos->data;
-       if (info->has_capture)
-         {
-            e_widget_ilist_header_append(ilist, NULL, _("Input"));
-            header_input = 1;
-            i = 1;
-         }
-       else
-         {
-            e_widget_ilist_header_append(ilist, NULL, _("Output"));
-            header_input = 0;
-            i = 1;
-         }
+        struct channel_info *info = app->channels_infos->data;
+        if (info->has_capture)
+          {
+             e_widget_ilist_header_append(ilist, NULL, _("Input"));
+             header_input = 1;
+             i = 1;
+          }
+        else
+          {
+             e_widget_ilist_header_append(ilist, NULL, _("Output"));
+             header_input = 0;
+             i = 1;
+          }
      }
 
    for (l = app->channels_infos; l; l = l->next, i++)
      {
-       struct channel_info *info = l->data;
-
-       if ((!header_input) && info->has_capture)
-         {
-            e_widget_ilist_header_append(ilist, NULL, _("Input"));
-            header_input = 1;
-            i++;
-         }
-
-       info->app = app;
-       e_widget_ilist_append(ilist, NULL, info->name, _cb_channel_selected,
-                             info, info->name);
-       if (app->channel_name && info->name &&
-            (strcmp(app->channel_name, info->name) == 0))
-         {
-            e_widget_ilist_selected_set(ilist, i);
-            app->channel_info = info;
-         }
+        struct channel_info *info = l->data;
+
+        if ((!header_input) && info->has_capture)
+          {
+             e_widget_ilist_header_append(ilist, NULL, _("Input"));
+             header_input = 1;
+             i++;
+          }
+
+        info->app = app;
+        e_widget_ilist_append(ilist, NULL, info->name, _cb_channel_selected,
+                info, info->name);
+        if (app->channel_name && info->name &&
+                   (strcmp(app->channel_name, info->name) == 0))
+          {
+             e_widget_ilist_selected_set(ilist, i);
+             app->channel_info = info;
+          }
      }
 
    e_widget_ilist_go(ilist);
@@ -333,8 +333,8 @@ _create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *
    const char *card;
    Eina_List *l;
 
-   app->card = e_mixer_system_get_default_card();
-   app->cards = e_mixer_system_get_cards();
+   app->card = e_mod_mixer_card_default_get();
+   app->cards = e_mod_mixer_cards_get();
    if (eina_list_count(app->cards) < 2)
      return;
 
@@ -345,7 +345,7 @@ _create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *
      {
        const char *card_name;
 
-       card_name = e_mixer_system_get_card_name(card);
+       card_name = e_mod_mixer_card_name_get(card);
 
        e_widget_ilist_append(ui->list, NULL, card_name, _cb_card_selected,
                              app, card);
@@ -459,10 +459,10 @@ _mixer_app_dialog_del(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app)
    eina_stringshare_del(app->card);
    eina_stringshare_del(app->channel_name);
    if (app->cards)
-     e_mixer_system_free_cards(app->cards);
+     e_mod_mixer_cards_free(app->cards);
    if (app->channels_infos)
      _channels_info_free(app->channels_infos);
-   e_mixer_system_del(app->sys);
+   e_mod_mixer_del(app->sys);
 
    e_util_defer_object_del(E_OBJECT(dialog));
    dialog->data = NULL;
index 980f756..5746607 100644 (file)
@@ -50,11 +50,11 @@ _mixer_fill_cards_info(E_Config_Dialog_Data *cfdata)
    int i = 0;
 
    cfdata->card_num = -1;
-   cfdata->cards = e_mixer_system_get_cards();
+   cfdata->cards = e_mod_mixer_cards_get();
    cfdata->cards_names = NULL;
    EINA_LIST_FOREACH(cfdata->cards, l, card)
      {
-       name = e_mixer_system_get_card_name(card);
+       name = e_mod_mixer_card_name_get(card);
        if ((cfdata->card_num < 0) && card && cfdata->card &&
             (strcmp(card, cfdata->card) == 0))
          cfdata->card_num = i;
@@ -76,13 +76,13 @@ _mixer_fill_channels_info(E_Config_Dialog_Data *cfdata)
    Eina_List *l;
    int i = 0;
 
-   sys = e_mixer_system_new(cfdata->card);
+   sys = e_mod_mixer_new(cfdata->card);
    if (!sys)
      return;
 
    cfdata->channel = 0;
    cfdata->channel_name = eina_stringshare_add(cfdata->conf->channel_name);
-   cfdata->channels_names = e_mixer_system_get_channels_names(sys);
+   cfdata->channels_names = e_mod_mixer_channels_names_get(sys);
    EINA_LIST_FOREACH(cfdata->channels_names, l, channel)
      {
        if (channel && cfdata->channel_name &&
@@ -95,7 +95,7 @@ _mixer_fill_channels_info(E_Config_Dialog_Data *cfdata)
 
        i++;
      }
-   e_mixer_system_del(sys);
+   e_mod_mixer_del(sys);
 }
 
 static void *
@@ -136,9 +136,9 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
      eina_stringshare_del(card);
 
    if (cfdata->channels_names)
-     e_mixer_system_free_channels_names(cfdata->channels_names);
+     e_mod_mixer_channels_free(cfdata->channels_names);
    if (cfdata->cards)
-     e_mixer_system_free_cards(cfdata->cards);
+     e_mod_mixer_cards_free(cfdata->cards);
 
    eina_stringshare_del(cfdata->card);
    eina_stringshare_del(cfdata->channel_name);
@@ -292,7 +292,7 @@ _card_change(void *data, Evas_Object *obj, void *event __UNUSED__)
 
    eina_stringshare_del(cfdata->card);
 
-   e_mixer_system_free_channels_names(cfdata->channels_names);
+   e_mod_mixer_channels_free(cfdata->channels_names);
 
    eina_stringshare_del(cfdata->channel_name);
 
@@ -350,6 +350,12 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    return cfdata->ui.table;
 }
 
+void
+e_mixer_config_pulse_toggle(void)
+{
+
+}
+
 E_Config_Dialog *
 e_mixer_config_dialog_new(E_Container *con, E_Mixer_Gadget_Config *conf)
 {
index 88e7613..c667edb 100644 (file)
@@ -72,6 +72,8 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
 
        id = ctxt->default_instance->gcc->cf->id;
        conf->default_gc_id = eina_stringshare_add(id);
+
+        conf->desktop_notification = ctxt->desktop_notification;
      }
 
    return 1;
@@ -82,7 +84,7 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data
 {
    struct mixer_config_ui_general *ui = &cfdata->ui.general;
    E_Mixer_Module_Context *ctxt = dialog->data;
-   Evas_Object *label;
+   Evas_Object *label, *chk;
    Eina_List *l;
    int i;
 
@@ -111,7 +113,14 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data
        e_widget_framelist_object_append(ui->frame, o);
      }
 
+
    e_widget_list_object_append(cfdata->ui.list, ui->frame, 1, 1, 0.5);
+   chk = e_widget_check_add(evas, _("Diplay desktop notifications on volume change"), &ctxt->desktop_notification);
+   e_widget_check_checked_set(chk, ctxt->conf->desktop_notification);
+#ifndef HAVE_ENOTIFY
+   e_widget_disabled_set(chk, EINA_TRUE);
+#endif
+   e_widget_list_object_append(cfdata->ui.list, chk, 1, 1, 0.5);
 }
 
 static void
index 3077f35..b3a53bb 100644 (file)
@@ -1,5 +1,8 @@
 #include "e_mod_main.h"
 #include "e_mod_system.h"
+#ifdef HAVE_ENOTIFY
+#include <E_Notify.h>
+#endif
 
 static void _mixer_popup_timer_new(E_Mixer_Instance *inst);
 static Eina_Bool _mixer_popup_timer_cb(void *data);
@@ -10,6 +13,63 @@ static char tmpbuf[PATH_MAX]; /* general purpose buffer, just use immediately */
 static const char _conf_domain[] = "module.mixer";
 static const char _name[] = "mixer";
 const char _e_mixer_Name[] = "Mixer";
+Eina_Bool _mixer_using_default = EINA_FALSE;
+E_Mixer_Volume_Get_Cb e_mod_mixer_volume_get;
+E_Mixer_Volume_Set_Cb e_mod_mixer_volume_set;
+E_Mixer_Mute_Get_Cb e_mod_mixer_mute_get;
+E_Mixer_Mute_Set_Cb e_mod_mixer_mute_set;
+E_Mixer_Capture_Cb e_mod_mixer_mutable_get;
+E_Mixer_State_Get_Cb e_mod_mixer_state_get;
+E_Mixer_Capture_Cb e_mod_mixer_capture_get;
+E_Mixer_Cb e_mod_mixer_new;
+E_Mixer_Cb e_mod_mixer_del;
+E_Mixer_Cb e_mod_mixer_channel_default_name_get;
+E_Mixer_Cb e_mod_mixer_channel_get_by_name;
+E_Mixer_Cb e_mod_mixer_channel_name_get;
+E_Mixer_Cb e_mod_mixer_channel_del;
+E_Mixer_Cb e_mod_mixer_channel_free;
+E_Mixer_Cb e_mod_mixer_channels_free;
+E_Mixer_Cb e_mod_mixer_channels_get;
+E_Mixer_Cb e_mod_mixer_channels_names_get;
+E_Mixer_Cb e_mod_mixer_card_name_get;
+E_Mixer_Cb e_mod_mixer_cards_get;
+E_Mixer_Cb e_mod_mixer_cards_free;
+E_Mixer_Cb e_mod_mixer_card_default_get;
+
+static void
+_mixer_notify(const float val, E_Mixer_Instance *inst __UNUSED__)
+{
+#ifdef HAVE_ENOTIFY
+   E_Notification *n;
+   E_Mixer_Module_Context *ctxt;
+   char *icon, buf[56];
+   int ret;
+
+   if (val > 100.0 || val < 0.0)
+     return;
+
+   if (!(ctxt = (E_Mixer_Module_Context*)mixer_mod->data) || !ctxt->desktop_notification)
+     return;
+
+   ret = snprintf(buf, (sizeof(buf) - 1), "%s: %d%%", _("New volume"), (int)(val + 0.5));
+   if ((ret < 0) || ((unsigned int)ret > sizeof(buf)))
+     return;
+   //Names are taken from FDO icon naming scheme
+   if (val == 0.0)
+     icon = "audio-volume-muted";
+   else if ((val > 33.3) && (val < 66.6))
+     icon = "audio-volume-medium";
+   else if (val < 33.3)
+     icon = "audio-volume-low";
+   else
+     icon = "audio-volume-high";
+
+   n = e_notification_full_new(_("Mixer"), 0, icon, _("Volume changed"), buf, 2000);
+   e_notification_replaces_id_set(n, EINA_TRUE);
+   e_notification_send(n, NULL, NULL);
+   e_notification_unref(n);
+#endif
+}
 
 const char *
 e_mixer_theme_path(void)
@@ -34,19 +94,19 @@ _mixer_gadget_configuration_defaults(E_Mixer_Gadget_Config *conf)
    E_Mixer_System *sys;
    const char *card, *channel;
 
-   card = e_mixer_system_get_default_card();
+   card = e_mod_mixer_card_default_get();
    if (!card)
       return 0;
 
-   sys = e_mixer_system_new(card);
+   sys = e_mod_mixer_new(card);
    if (!sys)
    {
       eina_stringshare_del(card);
       return 0;
    }
 
-   channel = e_mixer_system_get_default_channel_name(sys);
-   e_mixer_system_del(sys);
+   channel = e_mod_mixer_channel_default_name_get(sys);
+   e_mod_mixer_del(sys);
 
    if (!channel)
    {
@@ -137,8 +197,6 @@ _mixer_module_configuration_new(void)
    if (!conf)
       return NULL;
 
-   conf->version = MOD_CONF_VERSION;
-
    return conf;
 }
 
@@ -178,7 +236,7 @@ _mixer_gadget_update(E_Mixer_Instance *inst)
    if (!inst)
       return;
 
-   e_mixer_system_get_state(inst->sys, inst->channel, &inst->mixer_state);
+   e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
 
    msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
    msg->count = 3;
@@ -199,7 +257,7 @@ _mixer_balance_left(E_Mixer_Instance *inst)
    E_Mixer_Channel_State *state;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
    if (state->left >= 0)
    {
@@ -216,7 +274,7 @@ _mixer_balance_left(E_Mixer_Instance *inst)
          state->right = 100;
    }
 
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
 }
@@ -227,7 +285,7 @@ _mixer_balance_right(E_Mixer_Instance *inst)
    E_Mixer_Channel_State *state;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
    if (state->left >= 0)
    {
@@ -243,18 +301,18 @@ _mixer_balance_right(E_Mixer_Instance *inst)
       else
          state->right = 0;
    }
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
 }
 
 static void
-_mixer_volume_increase(E_Mixer_Instance *inst)
+_mixer_volume_increase(E_Mixer_Instance *inst, Eina_Bool non_ui)
 {
    E_Mixer_Channel_State *state;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
    if (state->left >= 0)
    {
@@ -272,18 +330,20 @@ _mixer_volume_increase(E_Mixer_Instance *inst)
          state->right = 100;
    }
 
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
+   if (non_ui)
+     _mixer_notify(((float)state->left + (float)state->right) / 2.0, inst);
 }
 
 static void
-_mixer_volume_decrease(E_Mixer_Instance *inst)
+_mixer_volume_decrease(E_Mixer_Instance *inst, Eina_Bool non_ui)
 {
    E_Mixer_Channel_State *state;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
    if (state->left >= 0)
    {
@@ -300,24 +360,34 @@ _mixer_volume_decrease(E_Mixer_Instance *inst)
          state->right = 0;
    }
 
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
+   if (non_ui)
+     _mixer_notify(((float)state->left + (float)state->right) / 2.0, inst);
 }
 
 static void
-_mixer_toggle_mute(E_Mixer_Instance *inst)
+_mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui)
 {
    E_Mixer_Channel_State *state;
 
-   if (!e_mixer_system_can_mute(inst->sys, inst->channel))
+   if (!e_mod_mixer_mutable_get(inst->sys, inst->channel))
       return;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_mute(inst->sys, inst->channel, &state->mute);
+   e_mod_mixer_mute_get(inst->sys, inst->channel, &state->mute);
    state->mute = !state->mute;
-   e_mixer_system_set_mute(inst->sys, inst->channel, state->mute);
+   e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute);
+   if (!state->mute) e_mod_mixer_volume_set(inst->sys, inst->channel, state->left, state->right);
    _mixer_gadget_update(inst);
+   if (non_ui)
+     {
+        if (state->mute)
+          _mixer_notify(0.0, inst);
+        else
+          _mixer_notify(((float)state->left + (float)state->right) / 2.0, inst);
+     }
 }
 
 static void
@@ -326,7 +396,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U
    E_Mixer_Instance *inst = data;
    E_Mixer_Channel_State *state = &inst->mixer_state;
 
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
 
    state->left = (int)e_slider_value_get(obj);
@@ -336,7 +406,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U
       e_slider_value_set(inst->ui.right, state->right);
    }
 
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
 }
@@ -347,7 +417,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __
    E_Mixer_Instance *inst = data;
    E_Mixer_Channel_State *state = &inst->mixer_state;
 
-   e_mixer_system_get_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_get(inst->sys, inst->channel,
                              &state->left, &state->right);
 
    state->right = (int)e_slider_value_get(obj);
@@ -357,7 +427,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __
       e_slider_value_set(inst->ui.left, state->left);
    }
 
-   e_mixer_system_set_volume(inst->sys, inst->channel,
+   e_mod_mixer_volume_set(inst->sys, inst->channel,
                              state->left, state->right);
    _mixer_gadget_update(inst);
 }
@@ -369,7 +439,8 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__
    E_Mixer_Channel_State *state = &inst->mixer_state;
 
    state->mute = e_widget_check_checked_get(obj);
-   e_mixer_system_set_mute(inst->sys, inst->channel, state->mute);
+   e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute);
+   if (!state->mute) e_mod_mixer_volume_set(inst->sys, inst->channel, state->left, state->right);
 
    _mixer_gadget_update(inst);
 }
@@ -425,14 +496,54 @@ _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
    if (strcmp(keysym, "Escape") == 0)
       _mixer_popup_del(inst);
    else if (strcmp(keysym, "Up") == 0)
-      _mixer_volume_increase(inst);
+      _mixer_volume_increase(inst, EINA_FALSE);
    else if (strcmp(keysym, "Down") == 0)
-      _mixer_volume_decrease(inst);
+      _mixer_volume_decrease(inst, EINA_FALSE);
    else if ((strcmp(keysym, "Return") == 0) ||
             (strcmp(keysym, "KP_Enter") == 0))
-      _mixer_toggle_mute(inst);
+      _mixer_toggle_mute(inst, EINA_FALSE);
    else
-      _mixer_popup_del(inst); /* XXX really? */
+     {
+        E_Action *act;
+        Eina_List *l;
+        E_Config_Binding_Key *bind;
+        E_Binding_Modifier mod;
+        Eina_Bool handled = EINA_FALSE;
+        
+        for (l = e_config->key_bindings; l; l = l->next)
+          {
+             bind = l->data;
+             
+             if (bind->action && 
+                 (strcmp(bind->action, "volume_increase") &&
+                     strcmp(bind->action, "volume_decrease") &&
+                     strcmp(bind->action, "volume_mute")))
+                continue;
+             
+             mod = 0;
+             
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+                mod |= E_BINDING_MODIFIER_SHIFT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
+                mod |= E_BINDING_MODIFIER_CTRL;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
+                mod |= E_BINDING_MODIFIER_ALT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
+                mod |= E_BINDING_MODIFIER_WIN;
+             
+             if (bind->key && (!strcmp(bind->key, ev->keyname)) &&
+                 ((bind->modifiers == mod) || (bind->any_mod)))
+               {
+                  if (!(act = e_action_find(bind->action))) continue;
+                  if (act->func.go_key)
+                     act->func.go_key(E_OBJECT(inst->gcc->gadcon->zone), bind->params, ev);
+                  else if (act->func.go)
+                     act->func.go(E_OBJECT(inst->gcc->gadcon->zone), bind->params);
+                  handled = EINA_TRUE;
+               }
+          }
+        if (!handled) _mixer_popup_del(inst);
+     }
 
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -440,6 +551,7 @@ _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
 static void
 _mixer_popup_input_window_destroy(E_Mixer_Instance *inst)
 {
+   e_grabinput_release(0, inst->ui.input.win);
    ecore_x_window_free(inst->ui.input.win);
    inst->ui.input.win = 0;
 
@@ -476,6 +588,7 @@ _mixer_popup_input_window_create(E_Mixer_Instance *inst)
                               _mixer_popup_input_window_key_down_cb, inst);
 
    inst->ui.input.win = w;
+   e_grabinput_get(0, 0, inst->ui.input.win);
 }
 
 static void
@@ -540,7 +653,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
       return;
 
    state = &inst->mixer_state;
-   e_mixer_system_get_state(inst->sys, inst->channel, state);
+   e_mod_mixer_state_get(inst->sys, inst->channel, state);
 
    if ((state->right >= 0) &&
          (inst->conf->show_locked || (!inst->conf->lock_sliders)))
@@ -578,7 +691,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
    else
       inst->ui.right = NULL;
 
-   if (e_mixer_system_can_mute(inst->sys, inst->channel))
+   if (e_mod_mixer_mutable_get(inst->sys, inst->channel))
    {
       inst->ui.mute = e_widget_check_add(evas, _("Mute"), &state->mute);
       evas_object_show(inst->ui.mute);
@@ -702,7 +815,7 @@ _mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
          _mixer_popup_del(inst);
    }
    else if (ev->button == 2)
-      _mixer_toggle_mute(inst);
+      _mixer_toggle_mute(inst, EINA_FALSE);
    else if ((ev->button == 3) && (!inst->menu))
       _mixer_menu_new(inst, ev);
 }
@@ -716,11 +829,11 @@ _mixer_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUS
    if (ev->direction == 0)
    {
       if (ev->z > 0)
-         _mixer_volume_decrease(inst);
+         _mixer_volume_decrease(inst, EINA_FALSE);
       else if (ev->z < 0)
-         _mixer_volume_increase(inst);
+         _mixer_volume_increase(inst, EINA_FALSE);
    }
-   else if (ev->direction == 1)
+   else if (_mixer_using_default && (ev->direction == 1)) /* invalid with pulse */
    {
       if (ev->z > 0)
          _mixer_balance_left(inst);
@@ -735,19 +848,19 @@ _mixer_sys_setup(E_Mixer_Instance *inst)
    E_Mixer_Gadget_Config *conf;
 
    conf = inst->conf;
+   if ((!_mixer_using_default) && (!e_mixer_pulse_ready())) return 1;
 
    if (inst->sys)
-      e_mixer_system_del(inst->sys);
+      e_mod_mixer_del(inst->sys);
 
-   inst->sys = e_mixer_system_new(conf->card);
+   inst->sys = e_mod_mixer_new(conf->card);
    if (!inst->sys)
    {
       inst->channel = NULL;
       return 0;
    }
 
-   inst->channel = e_mixer_system_get_channel_by_name(inst->sys,
-                   conf->channel_name);
+   inst->channel = e_mod_mixer_channel_get_by_name(inst->sys, conf->channel_name);
    return !!inst->channel;
 }
 
@@ -755,7 +868,7 @@ static int
 _mixer_system_cb_update(void *data, E_Mixer_System *sys __UNUSED__)
 {
    E_Mixer_Instance *inst = data;
-   e_mixer_system_get_state(inst->sys, inst->channel, &inst->mixer_state);
+   e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
    _mixer_gadget_update(inst);
 
    return 1;
@@ -771,7 +884,7 @@ e_mixer_update(E_Mixer_Instance *inst)
       return 0;
 
    r = _mixer_sys_setup(inst);
-   if (r)
+   if (r && _mixer_using_default)
       e_mixer_system_callback_set(inst->sys, _mixer_system_cb_update, inst);
 
    return r;
@@ -787,11 +900,11 @@ _mixer_sys_setup_default_card(E_Mixer_Instance *inst)
    if (conf->card)
       eina_stringshare_del(conf->card);
 
-   card = e_mixer_system_get_default_card();
+   card = e_mod_mixer_card_default_get();
    if (!card)
       goto error;
 
-   inst->sys = e_mixer_system_new(card);
+   inst->sys = e_mod_mixer_new(card);
    if (!inst->sys)
       goto system_error;
 
@@ -816,11 +929,11 @@ _mixer_sys_setup_default_channel(E_Mixer_Instance *inst)
    if (conf->channel_name)
       eina_stringshare_del(conf->channel_name);
 
-   channel_name = e_mixer_system_get_default_channel_name(inst->sys);
+   channel_name = e_mod_mixer_channel_default_name_get(inst->sys);
    if (!channel_name)
       goto error;
 
-   inst->channel = e_mixer_system_get_channel_by_name(inst->sys, channel_name);
+   inst->channel = e_mod_mixer_channel_get_by_name(inst->sys, channel_name);
    if (!inst->channel)
       goto system_error;
 
@@ -837,12 +950,58 @@ error:
 static int
 _mixer_sys_setup_defaults(E_Mixer_Instance *inst)
 {
+   if ((!_mixer_using_default) && (!e_mixer_pulse_ready())) return 1;
    if ((!inst->sys) && (!_mixer_sys_setup_default_card(inst)))
       return 0;
 
    return _mixer_sys_setup_default_channel(inst);
 }
 
+void
+e_mod_mixer_pulse_ready(Eina_Bool ready)
+{
+   E_Mixer_Instance *inst;
+   E_Mixer_Module_Context *ctxt;
+   Eina_List *l;
+
+   if (!mixer_mod) return;
+
+   if (ready) e_mixer_pulse_setup();
+   else e_mixer_default_setup();
+
+   ctxt = mixer_mod->data;
+   EINA_LIST_FOREACH(ctxt->instances, l, inst)
+     {
+        if ((!_mixer_sys_setup(inst)) && (!_mixer_sys_setup_defaults(inst)))
+           {
+              if (inst->sys)
+                 e_mod_mixer_del(inst->sys);
+              _mixer_gadget_configuration_free(ctxt->conf, inst->conf);
+              E_FREE(inst);
+              return;
+           }
+        e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
+        _mixer_gadget_update(inst);
+     }
+}
+
+void
+e_mod_mixer_pulse_update(void)
+{
+   E_Mixer_Instance *inst;
+   E_Mixer_Module_Context *ctxt;
+   Eina_List *l;
+
+   if (!mixer_mod) return;
+
+   ctxt = mixer_mod->data;
+   EINA_LIST_FOREACH(ctxt->instances, l, inst)
+     {
+        e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
+        _mixer_gadget_update(inst);
+     }
+}
+
 /* Gadcon Api Functions */
 static void _mixer_module_configuration_setup(E_Mixer_Module_Context *ctxt);
 
@@ -878,12 +1037,13 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    if ((!_mixer_sys_setup(inst)) && (!_mixer_sys_setup_defaults(inst)))
    {
       if (inst->sys)
-         e_mixer_system_del(inst->sys);
+         e_mod_mixer_del(inst->sys);
       _mixer_gadget_configuration_free(ctxt->conf, conf);
       E_FREE(inst);
       return NULL;
    }
-   e_mixer_system_callback_set(inst->sys, _mixer_system_cb_update, inst);
+   
+   if (_mixer_using_default) e_mixer_system_callback_set(inst->sys, _mixer_system_cb_update, inst);
 
    inst->ui.gadget = edje_object_add(gc->evas);
    e_theme_edje_object_set(inst->ui.gadget, "base/theme/modules/mixer",
@@ -897,8 +1057,11 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    evas_object_event_callback_add(inst->ui.gadget, EVAS_CALLBACK_MOUSE_WHEEL,
                                   _mixer_cb_mouse_wheel, inst);
 
-   e_mixer_system_get_state(inst->sys, inst->channel, &inst->mixer_state);
-   _mixer_gadget_update(inst);
+   if (inst->sys)
+     {
+        e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
+        _mixer_gadget_update(inst);
+     }
 
    if (!ctxt->conf->default_gc_id)
    {
@@ -937,8 +1100,8 @@ _gc_shutdown(E_Gadcon_Client *gcc)
       e_object_del(E_OBJECT(inst->menu));
    }
    evas_object_del(inst->ui.gadget);
-   e_mixer_system_channel_del(inst->channel);
-   e_mixer_system_del(inst->sys);
+   e_mod_mixer_channel_del(inst->channel);
+   e_mod_mixer_del(inst->sys);
 
    inst->conf->instance = NULL;
    ctxt->instances = eina_list_remove(ctxt->instances, inst);
@@ -956,7 +1119,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return (char*)_(_e_mixer_Name);
@@ -1020,7 +1183,7 @@ _mixer_cb_volume_increase(E_Object *obj __UNUSED__, const char *params __UNUSED_
 
    if (ctxt->default_instance->conf->keybindings_popup)
      _mixer_popup_timer_new(ctxt->default_instance);
-   _mixer_volume_increase(ctxt->default_instance);
+   _mixer_volume_increase(ctxt->default_instance, EINA_TRUE);
 }
 
 static void
@@ -1040,7 +1203,7 @@ _mixer_cb_volume_decrease(E_Object *obj __UNUSED__, const char *params __UNUSED_
 
    if (ctxt->default_instance->conf->keybindings_popup)
      _mixer_popup_timer_new(ctxt->default_instance);
-   _mixer_volume_decrease(ctxt->default_instance);
+   _mixer_volume_decrease(ctxt->default_instance, EINA_TRUE);
 }
 
 static void
@@ -1060,7 +1223,7 @@ _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__)
 
    if (ctxt->default_instance->conf->keybindings_popup)
      _mixer_popup_timer_new(ctxt->default_instance);
-   _mixer_toggle_mute(ctxt->default_instance);
+   _mixer_toggle_mute(ctxt->default_instance, EINA_TRUE);
 }
 
 static E_Config_Dialog *
@@ -1120,6 +1283,7 @@ _mixer_module_configuration_descriptor_new(E_Config_DD *gadget_conf_edd)
    E_CONFIG_VAL(conf_edd, E_Mixer_Module_Config, version, INT);
    E_CONFIG_VAL(conf_edd, E_Mixer_Module_Config, default_gc_id, STR);
    E_CONFIG_HASH(conf_edd, E_Mixer_Module_Config, gadgets, gadget_conf_edd);
+   E_CONFIG_VAL(conf_edd, E_Mixer_Module_Config, desktop_notification, INT);
 
    return conf_edd;
 }
@@ -1163,22 +1327,16 @@ _mixer_module_configuration_load(E_Config_DD *module_conf_edd)
    E_Mixer_Module_Config *conf;
 
    conf = e_config_domain_load(_conf_domain, module_conf_edd);
-   if (!conf)
-      return _mixer_module_configuration_new();
-
-   if (conf->version != MOD_CONF_VERSION)
-   {
-      _mixer_module_configuration_free(conf);
-      conf = _mixer_module_configuration_new();
-      if (!conf)
-         return NULL;
 
-      ecore_timer_add(1.0, _mixer_module_configuration_alert,
-                      _("Mixer Module Settings data changed.<br>"
-                        "Your old configuration has been replaced with "
-                        "new default.<br>Sorry for the inconvenience."));
-      return conf;
-   }
+   if (!conf)
+     return _mixer_module_configuration_new();
+   
+   if (conf && !e_util_module_config_check (_("Mixer Module"), conf->version,
+                                           MOD_CONFIG_FILE_VERSION))
+     {
+       _mixer_module_configuration_free(conf);
+       return _mixer_module_configuration_new();
+     }
 
    return conf;
 }
@@ -1193,6 +1351,16 @@ _mixer_module_configuration_setup(E_Mixer_Module_Context *ctxt)
    ctxt->gadget_conf_edd = gadget_edd;
    ctxt->module_conf_edd = module_edd;
    ctxt->conf = _mixer_module_configuration_load(module_edd);
+
+#define IFMODCFG(v) if ((ctxt->conf->version & 0xffff) < v) {
+#define IFMODCFGEND } 
+
+   IFMODCFG(0x0003);
+   ctxt->conf->desktop_notification = 1;
+   IFMODCFGEND;
+
+   ctxt->conf->version = MOD_CONFIG_FILE_VERSION;
+   ctxt->desktop_notification = ctxt->conf->desktop_notification;
 }
 
 static const char _act_increase[] = "volume_increase";
@@ -1252,6 +1420,58 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt)
    }
 }
 
+void
+e_mixer_default_setup(void)
+{
+   e_mod_mixer_volume_get = (void*)e_mixer_system_get_volume;
+   e_mod_mixer_volume_set = (void*)e_mixer_system_set_volume;
+   e_mod_mixer_mute_get = (void*)e_mixer_system_get_mute;
+   e_mod_mixer_mute_set = (void*)e_mixer_system_set_mute;
+   e_mod_mixer_mutable_get = (void*)e_mixer_system_can_mute;
+   e_mod_mixer_state_get = (void*)e_mixer_system_get_state;
+   e_mod_mixer_capture_get = (void*)e_mixer_system_has_capture;
+   e_mod_mixer_new = (void*)e_mixer_system_new;
+   e_mod_mixer_del = (void*)e_mixer_system_del;
+   e_mod_mixer_channel_default_name_get = (void*)e_mixer_system_get_default_channel_name;
+   e_mod_mixer_channel_get_by_name = (void*)e_mixer_system_get_channel_by_name;
+   e_mod_mixer_channel_name_get = (void*)e_mixer_system_get_channel_name;
+   e_mod_mixer_channel_del = (void*)e_mixer_system_channel_del;
+   e_mod_mixer_channels_free = (void*)e_mixer_system_free_channels;
+   e_mod_mixer_channels_get = (void*)e_mixer_system_get_channels;
+   e_mod_mixer_channels_names_get = (void*)e_mixer_system_get_channels_names;
+   e_mod_mixer_card_name_get = (void*)e_mixer_system_get_card_name;
+   e_mod_mixer_cards_get = (void*)e_mixer_system_get_cards;
+   e_mod_mixer_cards_free = (void*)e_mixer_system_free_cards;
+   e_mod_mixer_card_default_get = (void*)e_mixer_system_get_default_card;
+   _mixer_using_default = EINA_TRUE;
+}
+
+void
+e_mixer_pulse_setup(void)
+{
+   e_mod_mixer_volume_get = (void*)e_mixer_pulse_get_volume;
+   e_mod_mixer_volume_set = (void*)e_mixer_pulse_set_volume;
+   e_mod_mixer_mute_get = (void*)e_mixer_pulse_get_mute;
+   e_mod_mixer_mute_set = (void*)e_mixer_pulse_set_mute;
+   e_mod_mixer_mutable_get = (void*)e_mixer_pulse_can_mute;
+   e_mod_mixer_state_get = (void*)e_mixer_pulse_get_state;
+   e_mod_mixer_capture_get = (void*)e_mixer_pulse_has_capture;
+   e_mod_mixer_new = (void*)e_mixer_pulse_new;
+   e_mod_mixer_del = (void*)e_mixer_pulse_del;
+   e_mod_mixer_channel_default_name_get = (void*)e_mixer_pulse_get_default_channel_name;
+   e_mod_mixer_channel_get_by_name = (void*)e_mixer_pulse_get_channel_by_name;
+   e_mod_mixer_channel_name_get = (void*)e_mixer_pulse_get_channel_name;
+   e_mod_mixer_channel_del = (void*)e_mixer_pulse_channel_del;
+   e_mod_mixer_channels_free = (void*)e_mixer_pulse_free_channels;
+   e_mod_mixer_channels_get = (void*)e_mixer_pulse_get_channels;
+   e_mod_mixer_channels_names_get = (void*)e_mixer_pulse_get_channels_names;
+   e_mod_mixer_card_name_get = (void*)e_mixer_pulse_get_card_name;
+   e_mod_mixer_cards_get = (void*)e_mixer_pulse_get_cards;
+   e_mod_mixer_cards_free = (void*)e_mixer_pulse_free_cards;
+   e_mod_mixer_card_default_get = (void*)e_mixer_pulse_get_default_card;
+   _mixer_using_default = EINA_FALSE;
+}
+
 EAPI void *
 e_modapi_init(E_Module *m)
 {
@@ -1261,9 +1481,16 @@ e_modapi_init(E_Module *m)
    if (!ctxt)
       return NULL;
 
+#ifdef HAVE_ENOTIFY
+   e_notification_init();
+#endif
+
    _mixer_configure_registry_register();
    _mixer_actions_register(ctxt);
    e_gadcon_provider_register(&_gc_class);
+   if (!e_mixer_pulse_init()) e_mixer_default_setup();
+   else e_mixer_pulse_setup();
+
    mixer_mod = m;
    return ctxt;
 }
@@ -1306,6 +1533,10 @@ e_modapi_shutdown(E_Module *m)
       _mixer_module_configuration_descriptor_free(ctxt->module_conf_edd);
    }
 
+#ifdef HAVE_ENOTIFY
+   e_notification_shutdown();
+#endif
+
    E_FREE(ctxt);
    mixer_mod = NULL;
    return 1;
index f390985..d345de9 100644 (file)
@@ -5,7 +5,10 @@
 #include "e_mod_system.h"
 #include <e.h>
 
-#define MOD_CONF_VERSION 3
+#define MOD_CONFIG_FILE_EPOCH 0x0000
+#define MOD_CONFIG_FILE_GENERATION 0x0003
+#define MOD_CONFIG_FILE_VERSION                                 \
+  ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
 
 typedef struct E_Mixer_Gadget_Config
 {
@@ -24,6 +27,7 @@ typedef struct E_Mixer_Module_Config
    int version;
    const char *default_gc_id;
    Eina_Hash *gadgets;
+   int desktop_notification;
 } E_Mixer_Module_Config;
 
 typedef struct E_Mixer_Instance
@@ -71,8 +75,17 @@ typedef struct E_Mixer_Module_Context
       E_Action *decr;
       E_Action *mute;
    } actions;
+   int desktop_notification;
 } E_Mixer_Module_Context;
 
+typedef int (*E_Mixer_Volume_Set_Cb)(E_Mixer_System *, E_Mixer_Channel *, int, int);
+typedef int (*E_Mixer_Volume_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *, int *);
+typedef int (*E_Mixer_Mute_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *);
+typedef int (*E_Mixer_Mute_Set_Cb)(E_Mixer_System *, E_Mixer_Channel *, int);
+typedef int (*E_Mixer_State_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, E_Mixer_Channel_State *);
+typedef int (*E_Mixer_Capture_Cb)(E_Mixer_System *, E_Mixer_Channel *);
+typedef void *(*E_Mixer_Cb)();
+
 EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init(E_Module *m);
 EAPI int e_modapi_shutdown(E_Module *m);
@@ -84,6 +97,33 @@ E_Dialog *e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog
 int e_mixer_app_dialog_select(E_Dialog *dialog, const char *card_name, const char *channel_name);
 
 int e_mixer_update(E_Mixer_Instance *inst);
+void e_mixer_default_setup(void);
+void e_mixer_pulse_setup(void);
 const char *e_mixer_theme_path(void);
 
+void e_mod_mixer_pulse_ready(Eina_Bool);
+void e_mod_mixer_pulse_update(void);
+
+extern Eina_Bool _mixer_using_default;
+extern E_Mixer_Volume_Get_Cb e_mod_mixer_volume_get;
+extern E_Mixer_Volume_Set_Cb e_mod_mixer_volume_set;
+extern E_Mixer_Mute_Get_Cb e_mod_mixer_mute_get;
+extern E_Mixer_Mute_Set_Cb e_mod_mixer_mute_set;
+extern E_Mixer_Capture_Cb e_mod_mixer_mutable_get;
+extern E_Mixer_State_Get_Cb e_mod_mixer_state_get;
+extern E_Mixer_Capture_Cb e_mod_mixer_capture_get;
+extern E_Mixer_Cb e_mod_mixer_new;
+extern E_Mixer_Cb e_mod_mixer_del;
+extern E_Mixer_Cb e_mod_mixer_channel_default_name_get;
+extern E_Mixer_Cb e_mod_mixer_channel_get_by_name;
+extern E_Mixer_Cb e_mod_mixer_channel_name_get;
+extern E_Mixer_Cb e_mod_mixer_channel_del;
+extern E_Mixer_Cb e_mod_mixer_channel_free;
+extern E_Mixer_Cb e_mod_mixer_channels_free;
+extern E_Mixer_Cb e_mod_mixer_channels_get;
+extern E_Mixer_Cb e_mod_mixer_channels_names_get;
+extern E_Mixer_Cb e_mod_mixer_card_name_get;
+extern E_Mixer_Cb e_mod_mixer_cards_get;
+extern E_Mixer_Cb e_mod_mixer_cards_free;
+extern E_Mixer_Cb e_mod_mixer_card_default_get;
 #endif
index 89bccad..dbbf4ff 100644 (file)
@@ -19,6 +19,7 @@ void e_mixer_system_free_cards(Eina_List *cards);
 const char *e_mixer_system_get_default_card(void);
 const char *e_mixer_system_get_card_name(const char *card);
 
+Eina_Bool e_mixer_pulse_init(void);
 
 E_Mixer_System *e_mixer_system_new(const char *card);
 void e_mixer_system_del(E_Mixer_System *self);
@@ -44,5 +45,31 @@ int e_mixer_system_set_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int
 int e_mixer_system_can_mute(E_Mixer_System *self, E_Mixer_Channel *channel);
 int e_mixer_system_has_capture(E_Mixer_System *self, E_Mixer_Channel *channel);
 
+int pulse_init(void);
+Eina_Bool e_mixer_pulse_ready(void);
+Eina_Bool e_mixer_pulse_init(void);
+void e_mixer_pulse_shutdown(void);
+E_Mixer_System *e_mixer_pulse_new(const char *name);
+void e_mixer_pulse_del(E_Mixer_System *self);
+Eina_List *e_mixer_pulse_get_cards(void);
+void e_mixer_pulse_free_cards(Eina_List *cards);
+const char *e_mixer_pulse_get_default_card(void);
+const char *e_mixer_pulse_get_card_name(const char *card);
+Eina_List *e_mixer_pulse_get_channels(E_Mixer_System *self);
+void e_mixer_pulse_free_channels(Eina_List *channels);
+Eina_List *e_mixer_pulse_get_channels_names(E_Mixer_System *self);
+void e_mixer_pulse_free_channels_names(Eina_List *channels_names);
+const char *e_mixer_pulse_get_default_channel_name(E_Mixer_System *self);
+E_Mixer_Channel *e_mixer_pulse_get_channel_by_name(E_Mixer_System *self, const char *name);
+void e_mixer_pulse_channel_del(E_Mixer_Channel *channel);
+const char *e_mixer_pulse_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel);
+int e_mixer_pulse_get_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int *left, int *right);
+int e_mixer_pulse_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int left, int right);
+int e_mixer_pulse_can_mute(E_Mixer_System *self, E_Mixer_Channel *channel);
+int e_mixer_pulse_get_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int *mute);
+int e_mixer_pulse_set_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int mute);
+int e_mixer_pulse_get_state(E_Mixer_System *self, E_Mixer_Channel *channel, E_Mixer_Channel_State *state);
+int e_mixer_pulse_set_state(E_Mixer_System *self, E_Mixer_Channel *channel, const E_Mixer_Channel_State *state);
+int e_mixer_pulse_has_capture(E_Mixer_System *self, E_Mixer_Channel *channel);
 
 #endif /* E_MOD_SYSTEM_H */
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/src/modules/mixer/msg.c b/src/modules/mixer/msg.c
new file mode 100644 (file)
index 0000000..f9c15d0
--- /dev/null
@@ -0,0 +1,187 @@
+#include "pa.h"
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+void
+msg_recv_creds(Pulse *conn, Pulse_Tag *tag)
+{
+#ifdef __linux__
+   int r;
+   struct msghdr mh;
+   struct iovec iov;
+   union {
+       struct cmsghdr hdr;
+       uint8_t data[CMSG_SPACE(sizeof(struct ucred))];
+   } cmsg;
+
+   memset(&iov, 0, sizeof(iov));
+   iov.iov_base = &tag->header[tag->pos];
+   iov.iov_len = sizeof(tag->header) - tag->pos;
+
+   memset(&cmsg, 0, sizeof(cmsg));
+   memset(&mh, 0, sizeof(mh));
+   mh.msg_iov = &iov;
+   mh.msg_iovlen = 1;
+   mh.msg_control = &cmsg;
+   mh.msg_controllen = sizeof(cmsg);
+
+   r = recvmsg(ecore_main_fd_handler_fd_get(conn->fdh), &mh, 0);
+   if ((!r) || (r == sizeof(tag->header))) tag->auth = EINA_TRUE;
+   else if (r < 0)
+     {
+        if (errno != EAGAIN) ecore_main_fd_handler_del(conn->fdh);
+     }
+   else
+     {
+        DBG("%zu bytes left", sizeof(tag->header) - r);
+        tag->pos += r;
+     }
+#else
+   conn = NULL;
+   tag = NULL;
+#endif   
+}
+
+Eina_Bool
+msg_recv(Pulse *conn, Pulse_Tag *tag)
+{
+#ifdef __linux__
+   long r;
+   struct msghdr mh;
+   struct iovec iov;
+   union {
+       struct cmsghdr hdr;
+       uint8_t data[CMSG_SPACE(sizeof(struct ucred))];
+   } cmsg;
+
+   memset(&iov, 0, sizeof(iov));
+   iov.iov_base = tag->data + tag->pos;
+   iov.iov_len = tag->dsize - tag->pos;
+
+   memset(&cmsg, 0, sizeof(cmsg));
+   memset(&mh, 0, sizeof(mh));
+   mh.msg_iov = &iov;
+   mh.msg_iovlen = 1;
+   mh.msg_control = &cmsg;
+   mh.msg_controllen = sizeof(cmsg);
+
+   r = recvmsg(ecore_main_fd_handler_fd_get(conn->fdh), &mh, 0);
+   DBG("recv %li bytes", r);
+   /* things we don't really care about: credentials */
+   if ((!r) || ((unsigned int)r == tag->dsize))
+     {
+        conn->iq = eina_list_remove(conn->iq, tag);
+        return EINA_TRUE;
+     }
+   else if (r < 0)
+     {
+        if (errno != EAGAIN) ecore_main_fd_handler_del(conn->fdh);
+     }
+   else
+     tag->pos += r;
+#else
+   conn = NULL;
+   tag = NULL;
+#endif   
+   return EINA_FALSE;
+}
+
+void
+msg_sendmsg_creds(Pulse *conn, Pulse_Tag *tag)
+{
+#ifdef __linux__   
+   int r;
+   struct msghdr mh;
+   struct iovec iov;
+   union {
+       struct cmsghdr hdr;
+       uint8_t data[CMSG_SPACE(sizeof(struct ucred))];
+   } cmsg;
+   struct ucred *u;
+
+   memset(&iov, 0, sizeof(iov));
+   iov.iov_base = (void*) &tag->header[tag->pos];
+   iov.iov_len = sizeof(tag->header) - tag->pos;
+
+   memset(&cmsg, 0, sizeof(cmsg));
+   cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
+   cmsg.hdr.cmsg_level = SOL_SOCKET;
+   cmsg.hdr.cmsg_type = SCM_CREDENTIALS;
+
+   u = (struct ucred*) CMSG_DATA(&cmsg.hdr);
+
+   u->pid = getpid();
+   u->uid = getuid();
+   u->gid = getgid();
+
+   memset(&mh, 0, sizeof(mh));
+   mh.msg_iov = &iov;
+   mh.msg_iovlen = 1;
+   mh.msg_control = &cmsg;
+   mh.msg_controllen = sizeof(cmsg);
+
+   r = sendmsg(ecore_main_fd_handler_fd_get(conn->fdh), &mh, MSG_NOSIGNAL);
+   if ((!r) || (r == (int)sizeof(tag->header))) tag->auth = EINA_TRUE;
+   else if (r < 0)
+     {
+        if (errno != EAGAIN) ecore_main_fd_handler_del(conn->fdh);
+     }
+   else
+     tag->pos += r;
+#else
+   conn = NULL;
+   tag = NULL;
+#endif   
+}
+
+void
+msg_send_creds(Pulse *conn, Pulse_Tag *tag)
+{
+#ifdef __linux__   
+   int r;
+
+   INF("trying to send 20 byte auth header");
+   r = send(ecore_main_fd_handler_fd_get(conn->fdh), &tag->header[tag->pos], sizeof(tag->header) - tag->pos, MSG_NOSIGNAL);
+   INF("%i bytes sent!", r);
+   if ((!r) || (r == (int)sizeof(tag->header))) tag->auth = EINA_TRUE;
+   else if (r < 0)
+     {
+        if (errno != EAGAIN) ecore_main_fd_handler_del(conn->fdh);
+     }
+   else
+     tag->pos += r;
+#else
+   conn = NULL;
+   tag = NULL;
+#endif
+}
+
+Eina_Bool
+msg_send(Pulse *conn, Pulse_Tag *tag)
+{
+#ifdef __linux__
+   int r;
+
+   INF("trying to send %zu bytes", tag->dsize - tag->pos);
+   r = send(ecore_main_fd_handler_fd_get(conn->fdh), tag->data + tag->pos, tag->dsize - tag->pos, MSG_NOSIGNAL);
+   INF("%i bytes sent!", r);
+   if ((!r) || ((unsigned int)r == tag->dsize - tag->pos))
+     {
+        DBG("Send complete! Deleting tag...");
+        conn->oq = eina_list_remove(conn->oq, tag);
+        pulse_tag_free(tag);
+        return EINA_TRUE;
+     }
+   if (r < 0)
+     {
+        if (errno != EAGAIN) ecore_main_fd_handler_del(conn->fdh);
+     }
+   else
+     tag->pos += r;
+#else
+   conn = NULL;
+   tag = NULL;
+#endif
+   return EINA_FALSE;
+}
diff --git a/src/modules/mixer/pa.c b/src/modules/mixer/pa.c
new file mode 100644 (file)
index 0000000..6d5f700
--- /dev/null
@@ -0,0 +1,720 @@
+#include <Ecore.h>
+#include <Ecore_Con.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include "pa.h"
+
+static int pulse_init_count = 0;
+int pa_log_dom = -1;
+int PULSE_EVENT_CONNECTED = -1;
+int PULSE_EVENT_DISCONNECTED = -1;
+int PULSE_EVENT_CHANGE = -1;
+Eina_Hash *pulse_sinks = NULL;
+Eina_Hash *pulse_sources = NULL;
+
+void
+pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__)
+{}
+
+static void
+proplist_init(Pulse_Tag *tag)
+{
+   Eina_File *file;
+   size_t size;
+   const char *str;
+   int argc;
+   char **argv;
+   char pid[32];
+   tag->props = eina_hash_string_superfast_new((void*)eina_stringshare_del);
+/*
+    "L\0\0\0\tL\0\0\0\1"
+    "P"
+    "tapplication.process.id\0"
+    "L\0\0\0\5x\0\0\0\0052742\0"
+    "tapplication.process.user\0"
+    "L\0\0\0\5x\0\0\0\5root\0"
+    "tapplication.process.host\0"
+    "L\0\0\0\fx\0\0\0\fdarc.ath.cx\0"
+    "tapplication.process.binary\0"
+    "L\0\0\0\6x\0\0\0\6pactl\0"
+    "tapplication.name\0"
+    "L\0\0\0\6x\0\0\0\6pactl\0"
+    "tapplication.language\0"
+    "L\0\0\0\vx\0\0\0\ven_US.utf8\0"
+    "twindow.x11.display\0"
+    "L\0\0\0\5x\0\0\0\5:0.0\0"
+    "tapplication.process.machine_id\0"
+    "L\0\0\0!x\0\0\0!16ebb73850fbfdfff2b0079400000030\0"
+    "N"
+*/
+   tag->dsize += PA_TAG_SIZE_PROPLIST;
+   snprintf(pid, sizeof(pid), "%"PRIu32, getpid());
+   eina_hash_add(tag->props, "application.process.id", eina_stringshare_add(pid));
+   tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.id") + strlen(pid) + 2 + PA_TAG_SIZE_U32;
+   
+   str = getenv("USER");
+   eina_hash_add(tag->props, "application.process.user", eina_stringshare_add(str));
+   tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.user") + strlen(str) + 2 + PA_TAG_SIZE_U32;
+   
+   file = eina_file_open("/etc/hostname", EINA_FALSE);
+   if (file)
+     {
+        size = eina_file_size_get(file);
+        str = (const char*)eina_file_map_all(file, EINA_FILE_POPULATE);
+        eina_hash_add(tag->props, "application.process.host", eina_stringshare_add_length(str, size - 1));
+        tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.host") + size + 1 + PA_TAG_SIZE_U32;
+        eina_file_map_free(file, (void*)str);
+        eina_file_close(file);
+     }
+   else
+     {
+        eina_hash_add(tag->props, "application.process.host", eina_stringshare_add(""));
+        tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.host") + 2 + PA_TAG_SIZE_U32;
+     }
+   
+   ecore_app_args_get(&argc, &argv);
+   str = strrchr(argv[0], '/');
+   str = (str) ? str + 1 : argv[0];
+   eina_hash_add(tag->props, "application.process.binary", eina_stringshare_add(str));
+   tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.binary") + strlen(str) + 2 + PA_TAG_SIZE_U32;
+   eina_hash_add(tag->props, "application.name", eina_stringshare_add(str));
+   tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.name") + strlen(str) + 2 + PA_TAG_SIZE_U32;
+   
+   str = getenv("LANG");
+   if (str)
+     {
+        eina_hash_add(tag->props, "application.language", eina_stringshare_add(str));
+        tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.language") + strlen(str) + 2 + PA_TAG_SIZE_U32;
+     }
+   
+   str = getenv("DISPLAY");
+   if (str)
+     {
+        eina_hash_add(tag->props, "window.x11.display", eina_stringshare_add(str));
+        tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("window.x11.display") + strlen(str) + 2 + PA_TAG_SIZE_U32;
+     }
+
+   file = eina_file_open(PA_MACHINE_ID, EINA_FALSE);
+   if (file)
+     {
+        size = eina_file_size_get(file);
+        str = (const char*)eina_file_map_all(file, EINA_FILE_POPULATE);
+        eina_hash_add(tag->props, "application.process.machine_id", eina_stringshare_add_length(str, size - 1));
+        tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.machine_id") + size + 1 + PA_TAG_SIZE_U32;
+        eina_file_map_free(file, (void*)str);
+        eina_file_close(file);
+        return;
+     }
+   {
+      char buf[256];
+
+      errno = 0;
+      gethostname(buf, sizeof(buf));
+      if (!errno)
+        {
+           eina_hash_add(tag->props, "application.process.machine_id", eina_stringshare_add(buf));
+           tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.machine_id") + strlen(buf) + 2 + PA_TAG_SIZE_U32;
+           return;
+        }
+      snprintf(buf, sizeof(buf), "%08lx", (unsigned long)gethostid());
+      eina_hash_add(tag->props, "application.process.machine_id", eina_stringshare_add(buf));
+      tag->dsize += PA_TAG_SIZE_ARBITRARY + sizeof("application.process.machine_id") + strlen(buf) + 2 + PA_TAG_SIZE_U32;
+   }
+}
+
+static void
+cookie_file(uint8_t *cookie)
+{
+   char buf[4096];
+   Eina_File *file;
+   size_t size;
+   void *cookie_data;
+
+   snprintf(buf, sizeof(buf), "%s/.pulse-cookie", getenv("HOME"));   
+   file = eina_file_open(buf, EINA_FALSE);
+   size = eina_file_size_get(file);
+   cookie_data = eina_file_map_all(file, EINA_FILE_WILLNEED);
+   memcpy(cookie, cookie_data, size);
+   eina_file_map_free(file, cookie_data);
+   eina_file_close(file);
+}
+
+static Pulse_Tag *
+login_setup(Pulse *conn)
+{
+   Pulse_Tag *tag;
+   uint32_t x;
+   uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
+   
+   tag = calloc(1, sizeof(Pulse_Tag));
+   tag->dsize = 4 * PA_TAG_SIZE_U32 + sizeof(cookie);
+   tag->data = malloc(tag->dsize);
+   tag_simple_init(conn, tag, PA_COMMAND_AUTH, PA_TAG_U32);
+   DBG("%zu bytes", tag->dsize);
+   
+   if (!getuid())
+     x = PA_PROTOCOL_VERSION;
+   else
+     x = PA_PROTOCOL_VERSION | 0x80000000U;
+   tag_uint32(tag, x);
+   DBG("%zu bytes", tag->dsize);
+   
+   cookie_file(cookie);
+   tag_arbitrary(tag, cookie, sizeof(cookie));
+   DBG("%zu bytes", tag->dsize);
+
+   tag_finish(tag);
+   
+   return tag;
+}
+
+static Pulse_Tag *
+pulse_recv(Pulse *conn, Ecore_Fd_Handler *fdh)
+{
+   Pulse_Tag *tag;
+   uint32_t x;
+
+   tag = eina_list_data_get(conn->iq);
+   if (!tag)
+     {
+        tag = calloc(1, sizeof(Pulse_Tag));
+        conn->iq = eina_list_append(conn->iq, tag);
+     }
+   if (!tag->auth)
+     {
+        msg_recv_creds(conn, tag);
+        if (!tag->auth) return NULL;
+     }
+   if (!tag->data)
+     {
+        tag->dsize = ntohl(tag->header[PA_PSTREAM_DESCRIPTOR_LENGTH]);
+        if (!tag->dsize)
+          {
+             ERR("Kicked!");
+             conn->state = PA_STATE_INIT;
+             ecore_main_fd_handler_del(conn->fdh);
+             close(conn->fd);
+             ecore_event_add(PULSE_EVENT_DISCONNECTED, conn, pulse_fake_free, NULL);
+             return NULL;
+          }
+        tag->data = malloc(tag->dsize);
+     }
+   if (tag->pos < tag->dsize)
+     {
+        if (!msg_recv(conn, tag))
+          return NULL;
+     }
+   untag_uint32(tag, &x);
+   EINA_SAFETY_ON_TRUE_GOTO((x != PA_COMMAND_REPLY) && (x != PA_COMMAND_SUBSCRIBE_EVENT), error);
+   tag->command = x;
+   if (x == PA_COMMAND_REPLY)
+     untag_uint32(tag, &tag->tag_count);
+   else
+     tag->size += PA_TAG_SIZE_U32;
+   if (conn->state != PA_STATE_CONNECTED)
+     {
+        ecore_main_fd_handler_active_set(fdh, ECORE_FD_WRITE);
+        pulse_tag_free(tag);
+     }
+   return tag;
+error:
+   CRI("Received error command %"PRIu32"!", x);
+   pulse_tag_free(tag);
+   return NULL;
+}
+
+static void
+login_finish(Pulse *conn, Ecore_Fd_Handler *fdh)
+{
+   Pulse_Tag *tag;
+
+   tag = calloc(1, sizeof(Pulse_Tag));
+   tag->dsize = 2 * PA_TAG_SIZE_U32; /* tag_simple_init */
+   proplist_init(tag);
+   DBG("prep %zu bytes", tag->dsize);
+   tag->data = malloc(tag->dsize);
+   tag_simple_init(conn, tag, PA_COMMAND_SET_CLIENT_NAME, PA_TAG_U32);
+   tag_proplist(tag);
+   tag_finish(tag);
+   msg_send_creds(conn, tag);
+   conn->state++;
+   if (msg_send(conn, tag))
+     ecore_main_fd_handler_active_set(fdh, ECORE_FD_READ);
+   else
+     conn->oq = eina_list_append(conn->oq, tag);
+}
+
+static Eina_Bool
+fdh_func(Pulse *conn, Ecore_Fd_Handler *fdh)
+{
+   Pulse_Tag *rprev, *wprev;
+   int read, write;
+
+   if (conn->watching) read = ECORE_FD_READ;
+   else
+     read = !!ecore_main_fd_handler_active_get(fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   write = !!ecore_main_fd_handler_active_get(fdh, ECORE_FD_WRITE) * ECORE_FD_WRITE;
+   rprev = eina_list_data_get(conn->iq);
+   wprev = eina_list_data_get(conn->oq);
+   
+   switch (conn->state)
+     {
+      case PA_STATE_INIT:
+        if (!wprev)
+          {
+             wprev = login_setup(conn);
+             conn->oq = eina_list_append(conn->oq, wprev);
+          }
+
+        if (!wprev->auth)
+          msg_sendmsg_creds(conn, wprev);
+
+        if (wprev->auth && msg_send(conn, wprev))
+          {
+             conn->state++;
+             ecore_main_fd_handler_active_set(fdh, ECORE_FD_READ);
+          }
+        break;
+      case PA_STATE_AUTH:
+        if (pulse_recv(conn, fdh))
+          login_finish(conn, fdh);
+        break;
+      case PA_STATE_MOREAUTH:
+        if (write)
+          {
+             if (msg_send(conn, wprev))
+               ecore_main_fd_handler_active_set(fdh, ECORE_FD_READ);
+             break;
+          }
+        if (pulse_recv(conn, fdh))
+          {
+             conn->state++;
+             INF("Login complete!");
+             ecore_main_fd_handler_active_set(fdh, 0);
+             ecore_event_add(PULSE_EVENT_CONNECTED, conn, pulse_fake_free, NULL);
+          }
+        break;
+      case PA_STATE_CONNECTED:
+        if (write)
+          {
+             if (wprev)
+               {
+                  DBG("write");
+                  if (!wprev->auth)
+                    msg_send_creds(conn, wprev);
+                  if (wprev->auth)
+                    {
+                       if (msg_send(conn, wprev))
+                         ecore_main_fd_handler_active_set(conn->fdh, ECORE_FD_READ | (!!conn->oq * ECORE_FD_WRITE));
+                    }
+               }
+             else
+               ecore_main_fd_handler_active_set(conn->fdh, ECORE_FD_READ);
+          }
+        if (read)
+          {
+             DBG("read");
+             if ((!rprev) || (!rprev->auth) || (rprev->pos < rprev->dsize))
+               {
+                  Pulse_Tag *tag;
+                  PA_Commands command;
+                  tag = pulse_recv(conn, fdh);
+                  if (!tag) break;
+                       
+                  command = (uintptr_t)eina_hash_find(conn->tag_handlers, &tag->tag_count);
+                  eina_hash_del_by_key(conn->tag_handlers, &tag->tag_count);
+                  deserialize_tag(conn, command, tag);
+                  if (!eina_list_count(conn->oq))
+                    ecore_main_fd_handler_active_set(conn->fdh, write | conn->watching * ECORE_FD_READ);
+                  pulse_tag_free(tag);
+               }
+          }
+      default:
+        break;
+     }
+
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+con(Pulse *conn, int type __UNUSED__, Ecore_Con_Event_Server_Add *ev)
+{
+   int on = 1;
+
+   if (conn != ecore_con_server_data_get(ev->server)) return ECORE_CALLBACK_PASS_ON;
+   INF("connected to %s", ecore_con_server_name_get(ev->server));
+
+   conn->fd = dup(ecore_con_server_fd_get(ev->server));
+#ifdef SO_PASSCRED
+   setsockopt(conn->fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+#endif
+   setsockopt(conn->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+   fcntl(conn->fd, F_SETFL, O_NONBLOCK | FD_CLOEXEC);
+   conn->fdh = ecore_main_fd_handler_add(conn->fd, ECORE_FD_WRITE, (Ecore_Fd_Cb)fdh_func, conn, NULL, NULL);
+   ecore_con_server_del(conn->svr);
+   conn->svr = NULL;
+   return ECORE_CALLBACK_RENEW;
+}
+
+uint32_t
+pulse_cards_get(Pulse *conn)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type = PA_COMMAND_GET_CARD_INFO_LIST;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   tag->dsize = 2 * PA_TAG_SIZE_U32;
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+void
+pulse_cb_set(Pulse *conn, uint32_t tagnum, Pulse_Cb cb)
+{
+   EINA_SAFETY_ON_NULL_RETURN(conn);
+
+   if (cb) eina_hash_set(conn->tag_cbs, &tagnum, cb);
+   else eina_hash_del_by_key(conn->tag_cbs, &tagnum);
+}
+
+uint32_t
+pulse_type_get(Pulse *conn, uint32_t idx, Eina_Bool source)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type = source ? PA_COMMAND_GET_SOURCE_INFO : PA_COMMAND_GET_SINK_INFO;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   tag->dsize = 3 * PA_TAG_SIZE_U32 + PA_TAG_SIZE_STRING_NULL;
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, idx);
+   tag_string(tag, NULL);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+uint32_t
+pulse_types_get(Pulse *conn, Eina_Bool source)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type = source ? PA_COMMAND_GET_SOURCE_INFO_LIST : PA_COMMAND_GET_SINK_INFO_LIST;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   tag->dsize = 2 * PA_TAG_SIZE_U32;
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+uint32_t
+pulse_type_mute_set(Pulse *conn, uint32_t sink_num, Eina_Bool mute, Eina_Bool source)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type = source ? PA_COMMAND_SET_SOURCE_MUTE : PA_COMMAND_SET_SINK_MUTE;
+   Eina_Hash *h;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   tag->dsize = 3 * PA_TAG_SIZE_U32 + PA_TAG_SIZE_STRING_NULL + PA_TAG_SIZE_BOOLEAN;
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, sink_num);
+   tag_string(tag, NULL);
+   tag_bool(tag, !!mute);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   h = (source) ? pulse_sources : pulse_sinks;
+   if (h)
+     {
+        Pulse_Sink *sink;
+
+        sink = eina_hash_find(h, &sink_num);
+        if (sink) sink->mute = !!mute;
+     }
+   return tag->tag_count;
+}
+
+uint32_t
+pulse_type_volume_set(Pulse *conn, uint32_t sink_num, uint8_t channels, double vol, Eina_Bool source)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type = source ? PA_COMMAND_SET_SOURCE_MUTE : PA_COMMAND_SET_SINK_VOLUME;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   tag->dsize = 3 * PA_TAG_SIZE_U32 + PA_TAG_SIZE_STRING_NULL + PA_TAG_SIZE_CVOLUME + channels * sizeof(uint32_t);
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, sink_num);
+   tag_string(tag, NULL);
+   tag_volume(tag, channels, vol);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+uint32_t
+pulse_sink_channel_volume_set(Pulse *conn, Pulse_Sink *sink, uint32_t id, double vol)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(id >= sink->channel_map.channels, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   type = sink->source ? PA_COMMAND_SET_SOURCE_VOLUME : PA_COMMAND_SET_SINK_VOLUME;
+   tag->dsize = 3 * PA_TAG_SIZE_U32 + PA_TAG_SIZE_STRING_NULL + PA_TAG_SIZE_CVOLUME + sink->channel_map.channels * sizeof(uint32_t);
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   if (vol <= 0.0) sink->volume.values[id] = PA_VOLUME_MUTED;
+   else sink->volume.values[id] = ((vol * PA_VOLUME_NORM) - (PA_VOLUME_NORM / 2)) / 100;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, sink->index);
+   tag_string(tag, NULL);
+   tag_cvol(tag, &sink->volume);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+uint32_t
+pulse_sink_port_set(Pulse *conn, Pulse_Sink *sink, const char *port)
+{
+   Pulse_Tag *tag;
+   int read;
+   uint32_t type;
+   Eina_List *l;
+   const char *p;
+   Eina_Bool match = EINA_FALSE;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(port, 0);
+   EINA_LIST_FOREACH(sink->ports, l, p)
+     {
+        match = !strcmp(p, port);
+        if (match) break;
+     }
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(!match, 0);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, 0);
+   type = sink->source ? PA_COMMAND_SET_SOURCE_PORT : PA_COMMAND_SET_SINK_PORT;
+   tag->dsize = PA_TAG_SIZE_U32 + 2 * PA_TAG_SIZE_STRING + strlen(sink->name) + strlen(port);
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, sink->index);
+   tag_string(tag, sink->name);
+   tag_string(tag, port);
+   tag_finish(tag);
+   read = !!ecore_main_fd_handler_active_get(conn->fdh, ECORE_FD_READ) * ECORE_FD_READ;
+   ecore_main_fd_handler_active_set(conn->fdh, read | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return tag->tag_count;
+}
+
+Eina_Bool
+pulse_sinks_watch(Pulse *conn)
+{
+   Pulse_Tag *tag;
+   uint32_t type = PA_COMMAND_SUBSCRIBE;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
+   tag = calloc(1, sizeof(Pulse_Tag));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tag, EINA_FALSE);
+   tag->dsize = 3 * PA_TAG_SIZE_U32;
+   tag->data = malloc(tag->dsize);
+   tag->tag_count = conn->tag_count;
+   tag_simple_init(conn, tag, type, PA_TAG_U32);
+   tag_uint32(tag, PA_SUBSCRIPTION_MASK_ALL);
+   tag_finish(tag);
+   ecore_main_fd_handler_active_set(conn->fdh, ECORE_FD_READ | ECORE_FD_WRITE);
+   conn->oq = eina_list_append(conn->oq, tag);
+   eina_hash_add(conn->tag_handlers, &tag->tag_count, (uintptr_t*)((uintptr_t)type));
+   return EINA_TRUE;
+}
+
+int
+pulse_init(void)
+{
+   if (pulse_init_count++) return pulse_init_count;
+   
+   eina_init();
+   ecore_init();
+   ecore_con_init();
+   pa_log_dom = eina_log_domain_register("pulse", EINA_COLOR_HIGH EINA_COLOR_BLUE);
+
+   PULSE_EVENT_CONNECTED = ecore_event_type_new();
+   PULSE_EVENT_DISCONNECTED = ecore_event_type_new();
+   PULSE_EVENT_CHANGE = ecore_event_type_new();
+
+   return pulse_init_count;
+}
+
+void
+pulse_shutdown(void)
+{
+   if ((!pulse_init_count) || (!--pulse_init_count)) return;
+
+   if (pulse_sinks) eina_hash_free(pulse_sinks);
+   if (pulse_sources) eina_hash_free(pulse_sources);
+   pulse_sinks = pulse_sources = NULL;
+   eina_log_domain_unregister(pa_log_dom);
+   ecore_con_shutdown();
+   ecore_shutdown();
+   eina_shutdown();
+}
+
+Pulse *
+pulse_new(void)
+{
+   Pulse *conn;
+   Eina_Iterator *it;
+   const char *prev = NULL, *buf = NULL;;
+   time_t time = 0;
+   char *home, h[4096];
+   const Eina_File_Direct_Info *info;
+
+   conn = calloc(1, sizeof(Pulse));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
+   home = getenv("PULSE_RUNTIME_PATH");
+
+   if (!home)
+     {
+        home = getenv("HOME");
+        snprintf(h, sizeof(h), "%s/.pulse", home);
+        home = h;
+     }
+
+   it = eina_file_direct_ls(home);
+   EINA_ITERATOR_FOREACH(it, info)
+     {
+        const char *rt = NULL;
+
+        rt = strrchr(info->path + info->name_start, '-');
+        if (rt)
+          {
+             if (!strcmp(rt + 1, "runtime"))
+               {
+                  struct stat st;
+                  buf = eina_stringshare_printf("%s/native", info->path);
+                  if (stat(buf, &st))
+                    {
+                       eina_stringshare_del(buf);
+                       buf = NULL;
+                       continue;
+                    }
+                  if (!time)
+                    {
+                       time = st.st_atime;
+                       prev = buf;
+                       buf = NULL;
+                       continue;
+                    }
+                  if (time > st.st_atime)
+                    {
+                       eina_stringshare_del(buf);
+                       buf = NULL;
+                       continue;
+                    }
+                  eina_stringshare_del(prev);
+                  prev = buf;
+                  time = st.st_atime;
+                  buf = NULL;
+               }
+          }
+     }
+   eina_iterator_free(it);
+   if (!prev)
+     {
+        struct stat st;
+        buf = eina_stringshare_add(STATEDIR "/run/pulse/native");
+        if (stat(buf, &st))
+          {
+             CRI("could not locate local socket '%s'!", buf);
+             free(conn);
+             return NULL;
+          }
+        conn->socket = buf;
+     }
+   else conn->socket = prev;
+   conn->con = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)con, conn);
+   conn->tag_handlers = eina_hash_int32_new(NULL);
+   conn->tag_cbs = eina_hash_int32_new(NULL);
+   return conn;
+}
+
+void
+pulse_free(Pulse *conn)
+{
+   Pulse_Tag *tag;
+   if (!conn) return;
+   if (conn->fdh) ecore_main_fd_handler_del(conn->fdh);
+   else if (conn->svr) ecore_con_server_del(conn->svr);
+   ecore_event_handler_del(conn->con);
+   eina_stringshare_del(conn->socket);
+   EINA_LIST_FREE(conn->oq, tag)
+     pulse_tag_free(tag);
+   EINA_LIST_FREE(conn->iq, tag)
+     pulse_tag_free(tag);
+   eina_hash_free(conn->tag_handlers);
+   eina_hash_free(conn->tag_cbs);
+   free(conn);
+}
+
+Eina_Bool
+pulse_connect(Pulse *conn)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
+   conn->svr = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, conn->socket, -1, conn);
+   return !!conn->svr;
+}
diff --git a/src/modules/mixer/pa.h b/src/modules/mixer/pa.h
new file mode 100644 (file)
index 0000000..c656b0a
--- /dev/null
@@ -0,0 +1,540 @@
+#ifndef PA_HACKS_H
+#define PA_HACKS_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <Ecore.h>
+#include <Ecore_Con.h>
+#include <inttypes.h>
+#include "Pulse.h"
+#include <math.h>
+
+#ifndef STATEDIR
+# define STATEDIR "/var"
+#endif
+
+#ifndef __UNUSED__
+# define __UNUSED__ __attribute__((unused))
+#endif
+
+#define PA_PROTOCOL_VERSION 16
+#define PA_NATIVE_COOKIE_LENGTH 256
+#ifndef PA_MACHINE_ID
+# define PA_MACHINE_ID "/var/lib/dbus/machine-id"
+#endif
+
+#ifndef _
+# define _(X) (X)
+#endif
+
+#define DBG(...)            EINA_LOG_DOM_DBG(pa_log_dom, __VA_ARGS__)
+#define INF(...)            EINA_LOG_DOM_INFO(pa_log_dom, __VA_ARGS__)
+#define WRN(...)            EINA_LOG_DOM_WARN(pa_log_dom, __VA_ARGS__)
+#define ERR(...)            EINA_LOG_DOM_ERR(pa_log_dom, __VA_ARGS__)
+#define CRI(...)            EINA_LOG_DOM_CRIT(pa_log_dom, __VA_ARGS__)
+
+
+typedef enum
+{
+    PA_COMMAND_ERROR,
+    PA_COMMAND_TIMEOUT, /* pseudo command */
+    PA_COMMAND_REPLY,
+    PA_COMMAND_CREATE_PLAYBACK_STREAM,        /* Payload changed in v9, v12 (0.9.0, 0.9.8) */
+    PA_COMMAND_DELETE_PLAYBACK_STREAM,
+    PA_COMMAND_CREATE_RECORD_STREAM,          /* Payload changed in v9, v12 (0.9.0, 0.9.8) */
+    PA_COMMAND_DELETE_RECORD_STREAM,
+    PA_COMMAND_EXIT,
+    PA_COMMAND_AUTH,
+    PA_COMMAND_SET_CLIENT_NAME,
+    PA_COMMAND_LOOKUP_SINK,
+    PA_COMMAND_LOOKUP_SOURCE,
+    PA_COMMAND_DRAIN_PLAYBACK_STREAM,
+    PA_COMMAND_STAT,
+    PA_COMMAND_GET_PLAYBACK_LATENCY,
+    PA_COMMAND_CREATE_UPLOAD_STREAM,
+    PA_COMMAND_DELETE_UPLOAD_STREAM,
+    PA_COMMAND_FINISH_UPLOAD_STREAM,
+    PA_COMMAND_PLAY_SAMPLE,
+    PA_COMMAND_REMOVE_SAMPLE,
+    PA_COMMAND_GET_SERVER_INFO,
+    PA_COMMAND_GET_SINK_INFO,
+    PA_COMMAND_GET_SINK_INFO_LIST,
+    PA_COMMAND_GET_SOURCE_INFO,
+    PA_COMMAND_GET_SOURCE_INFO_LIST,
+    PA_COMMAND_GET_MODULE_INFO,
+    PA_COMMAND_GET_MODULE_INFO_LIST,
+    PA_COMMAND_GET_CLIENT_INFO,
+    PA_COMMAND_GET_CLIENT_INFO_LIST,
+    PA_COMMAND_GET_SINK_INPUT_INFO,          /* Payload changed in v11 (0.9.7) */
+    PA_COMMAND_GET_SINK_INPUT_INFO_LIST,     /* Payload changed in v11 (0.9.7) */
+    PA_COMMAND_GET_SOURCE_OUTPUT_INFO,
+    PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST,
+    PA_COMMAND_GET_SAMPLE_INFO,
+    PA_COMMAND_GET_SAMPLE_INFO_LIST,
+    PA_COMMAND_SUBSCRIBE,
+    PA_COMMAND_SET_SINK_VOLUME,
+    PA_COMMAND_SET_SINK_INPUT_VOLUME,
+    PA_COMMAND_SET_SOURCE_VOLUME,
+    PA_COMMAND_SET_SINK_MUTE,
+    PA_COMMAND_SET_SOURCE_MUTE,
+    PA_COMMAND_CORK_PLAYBACK_STREAM,
+    PA_COMMAND_FLUSH_PLAYBACK_STREAM,
+    PA_COMMAND_TRIGGER_PLAYBACK_STREAM,
+    PA_COMMAND_SET_DEFAULT_SINK,
+    PA_COMMAND_SET_DEFAULT_SOURCE,
+    PA_COMMAND_SET_PLAYBACK_STREAM_NAME,
+    PA_COMMAND_SET_RECORD_STREAM_NAME,
+    PA_COMMAND_KILL_CLIENT,
+    PA_COMMAND_KILL_SINK_INPUT,
+    PA_COMMAND_KILL_SOURCE_OUTPUT,
+    PA_COMMAND_LOAD_MODULE,
+    PA_COMMAND_UNLOAD_MODULE,
+    PA_COMMAND_ADD_AUTOLOAD___OBSOLETE,
+    PA_COMMAND_REMOVE_AUTOLOAD___OBSOLETE,
+    PA_COMMAND_GET_AUTOLOAD_INFO___OBSOLETE,
+    PA_COMMAND_GET_AUTOLOAD_INFO_LIST___OBSOLETE,
+    PA_COMMAND_GET_RECORD_LATENCY,
+    PA_COMMAND_CORK_RECORD_STREAM,
+    PA_COMMAND_FLUSH_RECORD_STREAM,
+    PA_COMMAND_PREBUF_PLAYBACK_STREAM,
+    PA_COMMAND_REQUEST,
+    PA_COMMAND_OVERFLOW,
+    PA_COMMAND_UNDERFLOW,
+    PA_COMMAND_PLAYBACK_STREAM_KILLED,
+    PA_COMMAND_RECORD_STREAM_KILLED,
+    PA_COMMAND_SUBSCRIBE_EVENT,
+    PA_COMMAND_MOVE_SINK_INPUT,
+    PA_COMMAND_MOVE_SOURCE_OUTPUT,
+    PA_COMMAND_SET_SINK_INPUT_MUTE,
+    PA_COMMAND_SUSPEND_SINK,
+    PA_COMMAND_SUSPEND_SOURCE,
+    PA_COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR,
+    PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR,
+    PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE,
+    PA_COMMAND_UPDATE_RECORD_STREAM_SAMPLE_RATE,
+    PA_COMMAND_PLAYBACK_STREAM_SUSPENDED,
+    PA_COMMAND_RECORD_STREAM_SUSPENDED,
+    PA_COMMAND_PLAYBACK_STREAM_MOVED,
+    PA_COMMAND_RECORD_STREAM_MOVED,
+    PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST,
+    PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST,
+    PA_COMMAND_UPDATE_CLIENT_PROPLIST,
+    PA_COMMAND_REMOVE_RECORD_STREAM_PROPLIST,
+    PA_COMMAND_REMOVE_PLAYBACK_STREAM_PROPLIST,
+    PA_COMMAND_REMOVE_CLIENT_PROPLIST,
+    PA_COMMAND_STARTED,
+    PA_COMMAND_EXTENSION,
+    PA_COMMAND_GET_CARD_INFO,
+    PA_COMMAND_GET_CARD_INFO_LIST,
+    PA_COMMAND_SET_CARD_PROFILE,
+    PA_COMMAND_CLIENT_EVENT,
+    PA_COMMAND_PLAYBACK_STREAM_EVENT,
+    PA_COMMAND_RECORD_STREAM_EVENT,
+    PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED,
+    PA_COMMAND_RECORD_BUFFER_ATTR_CHANGED,
+    PA_COMMAND_SET_SINK_PORT,
+    PA_COMMAND_SET_SOURCE_PORT,
+    PA_COMMAND_MAX
+} PA_Commands;
+
+typedef enum pa_subscription_event_type {
+    PA_SUBSCRIPTION_EVENT_SINK = 0x0000U,
+    PA_SUBSCRIPTION_EVENT_SOURCE = 0x0001U,
+    PA_SUBSCRIPTION_EVENT_SINK_INPUT = 0x0002U,
+    PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT = 0x0003U,
+    PA_SUBSCRIPTION_EVENT_MODULE = 0x0004U,
+    PA_SUBSCRIPTION_EVENT_CLIENT = 0x0005U,
+    PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE = 0x0006U,
+    PA_SUBSCRIPTION_EVENT_SERVER = 0x0007U,
+    PA_SUBSCRIPTION_EVENT_AUTOLOAD = 0x0008U,
+    PA_SUBSCRIPTION_EVENT_CARD = 0x0009U,
+    PA_SUBSCRIPTION_EVENT_FACILITY_MASK = 0x000FU,
+    PA_SUBSCRIPTION_EVENT_NEW = 0x0000U,
+    PA_SUBSCRIPTION_EVENT_CHANGE = 0x0010U,
+    PA_SUBSCRIPTION_EVENT_REMOVE = 0x0020U,
+    PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U
+} pa_subscription_event_type_t;
+
+/** Subscription event mask, as used by pa_context_subscribe() */
+typedef enum pa_subscription_mask {
+    PA_SUBSCRIPTION_MASK_NULL = 0x0000U,
+    PA_SUBSCRIPTION_MASK_SINK = 0x0001U,
+    PA_SUBSCRIPTION_MASK_SOURCE = 0x0002U,
+    PA_SUBSCRIPTION_MASK_SINK_INPUT = 0x0004U,
+    PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT = 0x0008U,
+    PA_SUBSCRIPTION_MASK_MODULE = 0x0010U,
+    PA_SUBSCRIPTION_MASK_CLIENT = 0x0020U,
+    PA_SUBSCRIPTION_MASK_SAMPLE_CACHE = 0x0040U,
+    PA_SUBSCRIPTION_MASK_SERVER = 0x0080U,
+    PA_SUBSCRIPTION_MASK_AUTOLOAD = 0x0100U,
+    PA_SUBSCRIPTION_MASK_CARD = 0x0200U,
+    PA_SUBSCRIPTION_MASK_ALL = 0x02ffU
+} pa_subscription_mask_t;
+
+/* The sequence descriptor header consists of 5 32bit integers: */
+typedef enum {
+    PA_PSTREAM_DESCRIPTOR_LENGTH,
+    PA_PSTREAM_DESCRIPTOR_CHANNEL,
+    PA_PSTREAM_DESCRIPTOR_OFFSET_HI,
+    PA_PSTREAM_DESCRIPTOR_OFFSET_LO,
+    PA_PSTREAM_DESCRIPTOR_FLAGS,
+    PA_PSTREAM_DESCRIPTOR_MAX
+} PA_Header;
+
+/* Due to a stupid design flaw, proplists may only be at the END of a
+ * packet or not before a STRING! Don't forget that! We can't really
+ * fix this without breaking compat. */
+
+typedef enum {
+    PA_TAG_INVALID = 0,
+    PA_TAG_STRING = 't',
+    PA_TAG_STRING_NULL = 'N',
+    PA_TAG_U32 = 'L',
+    PA_TAG_U8 = 'B',
+    PA_TAG_U64 = 'R',
+    PA_TAG_S64 = 'r',
+    PA_TAG_SAMPLE_SPEC = 'a',
+    PA_TAG_ARBITRARY = 'x',
+    PA_TAG_BOOLEAN_TRUE = '1',
+    PA_TAG_BOOLEAN_FALSE = '0',
+    PA_TAG_BOOLEAN = PA_TAG_BOOLEAN_TRUE,
+    PA_TAG_TIMEVAL = 'T',
+    PA_TAG_USEC = 'U'  /* 64bit unsigned */,
+    PA_TAG_CHANNEL_MAP = 'm',
+    PA_TAG_CVOLUME = 'v',
+    PA_TAG_PROPLIST = 'P',
+    PA_TAG_VOLUME = 'V'
+} PA_Tag;
+
+typedef enum
+{
+    PA_TAG_SIZE_INVALID = 0,
+    PA_TAG_SIZE_STRING = 2,
+    PA_TAG_SIZE_STRING_NULL = 1,
+    PA_TAG_SIZE_U32 = 5,
+    PA_TAG_SIZE_U8 = 'B',
+    PA_TAG_SIZE_U64 = 'R',
+    PA_TAG_SIZE_S64 = 'r',
+    PA_TAG_SIZE_SAMPLE_SPEC = 7,
+    PA_TAG_SIZE_ARBITRARY = PA_TAG_SIZE_U32,
+    PA_TAG_SIZE_BOOLEAN = 1,
+    PA_TAG_SIZE_TIMEVAL = 'T',
+    PA_TAG_SIZE_USEC = 9  /* 64bit unsigned */,
+    PA_TAG_SIZE_CHANNEL_MAP = 2,
+    PA_TAG_SIZE_CVOLUME = 2,
+    PA_TAG_SIZE_PROPLIST = 1 + PA_TAG_SIZE_STRING_NULL,
+    PA_TAG_SIZE_VOLUME = 2
+} PA_Tag_Size;   
+
+/** Volume specification:
+ *  PA_VOLUME_MUTED: silence;
+ * < PA_VOLUME_NORM: decreased volume;
+ *   PA_VOLUME_NORM: normal volume;
+ * > PA_VOLUME_NORM: increased volume */
+typedef uint32_t pa_volume_t;
+
+/** Normal volume (100%, 0 dB) */
+#define PA_VOLUME_NORM ((pa_volume_t) 0x10000U)
+
+/** Muted (minimal valid) volume (0%, -inf dB) */
+#define PA_VOLUME_MUTED ((pa_volume_t) 0U)
+
+/** Maximum valid volume we can store. \since 0.9.15 */
+#define PA_VOLUME_MAX ((pa_volume_t) UINT32_MAX-1)
+
+/** Special 'invalid' volume. \since 0.9.16 */
+#define PA_VOLUME_INVALID ((pa_volume_t) UINT32_MAX)
+#define PA_CHANNELS_MAX 32U
+
+
+/** Maximum allowed sample rate */
+#define PA_RATE_MAX (48000U*4U)
+
+/** Sample format */
+typedef enum pa_sample_format {
+    PA_SAMPLE_U8,
+    /**< Unsigned 8 Bit PCM */
+
+    PA_SAMPLE_ALAW,
+    /**< 8 Bit a-Law */
+
+    PA_SAMPLE_ULAW,
+    /**< 8 Bit mu-Law */
+
+    PA_SAMPLE_S16LE,
+    /**< Signed 16 Bit PCM, little endian (PC) */
+
+    PA_SAMPLE_S16BE,
+    /**< Signed 16 Bit PCM, big endian */
+
+    PA_SAMPLE_FLOAT32LE,
+    /**< 32 Bit IEEE floating point, little endian (PC), range -1.0 to 1.0 */
+
+    PA_SAMPLE_FLOAT32BE,
+    /**< 32 Bit IEEE floating point, big endian, range -1.0 to 1.0 */
+
+    PA_SAMPLE_S32LE,
+    /**< Signed 32 Bit PCM, little endian (PC) */
+
+    PA_SAMPLE_S32BE,
+    /**< Signed 32 Bit PCM, big endian */
+
+    PA_SAMPLE_S24LE,
+    /**< Signed 24 Bit PCM packed, little endian (PC). \since 0.9.15 */
+
+    PA_SAMPLE_S24BE,
+    /**< Signed 24 Bit PCM packed, big endian. \since 0.9.15 */
+
+    PA_SAMPLE_S24_32LE,
+    /**< Signed 24 Bit PCM in LSB of 32 Bit words, little endian (PC). \since 0.9.15 */
+
+    PA_SAMPLE_S24_32BE,
+    /**< Signed 24 Bit PCM in LSB of 32 Bit words, big endian. \since 0.9.15 */
+
+    PA_SAMPLE_MAX,
+    /**< Upper limit of valid sample types */
+
+    PA_SAMPLE_INVALID = -1
+    /**< An invalid value */
+} pa_sample_format_t;
+
+/** A list of channel labels */
+typedef enum pa_channel_position {
+    PA_CHANNEL_POSITION_INVALID = -1,
+    PA_CHANNEL_POSITION_MONO = 0,
+
+    PA_CHANNEL_POSITION_FRONT_LEFT,               /* Apple, Dolby call this 'Left' */
+    PA_CHANNEL_POSITION_FRONT_RIGHT,              /* Apple, Dolby call this 'Right' */
+    PA_CHANNEL_POSITION_FRONT_CENTER,             /* Apple, Dolby call this 'Center' */
+
+/** \cond fulldocs */
+    PA_CHANNEL_POSITION_LEFT = PA_CHANNEL_POSITION_FRONT_LEFT,
+    PA_CHANNEL_POSITION_RIGHT = PA_CHANNEL_POSITION_FRONT_RIGHT,
+    PA_CHANNEL_POSITION_CENTER = PA_CHANNEL_POSITION_FRONT_CENTER,
+/** \endcond */
+
+    PA_CHANNEL_POSITION_REAR_CENTER,              /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround', Dolby calls this 'Surround Rear Center' */
+    PA_CHANNEL_POSITION_REAR_LEFT,                /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' (!), Dolby calls this 'Surround Rear Left'  */
+    PA_CHANNEL_POSITION_REAR_RIGHT,               /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' (!), Dolby calls this 'Surround Rear Right'  */
+
+    PA_CHANNEL_POSITION_LFE,                      /* Microsoft calls this 'Low Frequency', Apple calls this 'LFEScreen' */
+/** \cond fulldocs */
+    PA_CHANNEL_POSITION_SUBWOOFER = PA_CHANNEL_POSITION_LFE,
+/** \endcond */
+
+    PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,     /* Apple, Dolby call this 'Left Center' */
+    PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,    /* Apple, Dolby call this 'Right Center */
+
+    PA_CHANNEL_POSITION_SIDE_LEFT,                /* Apple calls this 'Left Surround Direct', Dolby calls this 'Surround Left' (!) */
+    PA_CHANNEL_POSITION_SIDE_RIGHT,               /* Apple calls this 'Right Surround Direct', Dolby calls this 'Surround Right' (!) */
+
+    PA_CHANNEL_POSITION_AUX0,
+    PA_CHANNEL_POSITION_AUX1,
+    PA_CHANNEL_POSITION_AUX2,
+    PA_CHANNEL_POSITION_AUX3,
+    PA_CHANNEL_POSITION_AUX4,
+    PA_CHANNEL_POSITION_AUX5,
+    PA_CHANNEL_POSITION_AUX6,
+    PA_CHANNEL_POSITION_AUX7,
+    PA_CHANNEL_POSITION_AUX8,
+    PA_CHANNEL_POSITION_AUX9,
+    PA_CHANNEL_POSITION_AUX10,
+    PA_CHANNEL_POSITION_AUX11,
+    PA_CHANNEL_POSITION_AUX12,
+    PA_CHANNEL_POSITION_AUX13,
+    PA_CHANNEL_POSITION_AUX14,
+    PA_CHANNEL_POSITION_AUX15,
+    PA_CHANNEL_POSITION_AUX16,
+    PA_CHANNEL_POSITION_AUX17,
+    PA_CHANNEL_POSITION_AUX18,
+    PA_CHANNEL_POSITION_AUX19,
+    PA_CHANNEL_POSITION_AUX20,
+    PA_CHANNEL_POSITION_AUX21,
+    PA_CHANNEL_POSITION_AUX22,
+    PA_CHANNEL_POSITION_AUX23,
+    PA_CHANNEL_POSITION_AUX24,
+    PA_CHANNEL_POSITION_AUX25,
+    PA_CHANNEL_POSITION_AUX26,
+    PA_CHANNEL_POSITION_AUX27,
+    PA_CHANNEL_POSITION_AUX28,
+    PA_CHANNEL_POSITION_AUX29,
+    PA_CHANNEL_POSITION_AUX30,
+    PA_CHANNEL_POSITION_AUX31,
+
+    PA_CHANNEL_POSITION_TOP_CENTER,               /* Apple calls this 'Top Center Surround' */
+
+    PA_CHANNEL_POSITION_TOP_FRONT_LEFT,           /* Apple calls this 'Vertical Height Left' */
+    PA_CHANNEL_POSITION_TOP_FRONT_RIGHT,          /* Apple calls this 'Vertical Height Right' */
+    PA_CHANNEL_POSITION_TOP_FRONT_CENTER,         /* Apple calls this 'Vertical Height Center' */
+
+    PA_CHANNEL_POSITION_TOP_REAR_LEFT,            /* Microsoft and Apple call this 'Top Back Left' */
+    PA_CHANNEL_POSITION_TOP_REAR_RIGHT,           /* Microsoft and Apple call this 'Top Back Right' */
+    PA_CHANNEL_POSITION_TOP_REAR_CENTER,          /* Microsoft and Apple call this 'Top Back Center' */
+
+    PA_CHANNEL_POSITION_MAX
+} pa_channel_position_t;
+
+/** A mask of channel positions. \since 0.9.16 */
+typedef uint64_t pa_channel_position_mask_t;
+
+/** Makes a bit mask from a channel position. \since 0.9.16 */
+#define PA_CHANNEL_POSITION_MASK(f) ((pa_channel_position_mask_t) (1ULL << (f)))
+
+/** A list of channel mapping definitions for pa_channel_map_init_auto() */
+typedef enum pa_channel_map_def {
+    PA_CHANNEL_MAP_AIFF,
+    /**< The mapping from RFC3551, which is based on AIFF-C */
+
+/** \cond fulldocs */
+    PA_CHANNEL_MAP_ALSA,
+    /**< The default mapping used by ALSA. This mapping is probably
+     * not too useful since ALSA's default channel mapping depends on
+     * the device string used. */
+/** \endcond */
+
+    PA_CHANNEL_MAP_AUX,
+    /**< Only aux channels */
+
+    PA_CHANNEL_MAP_WAVEEX,
+    /**< Microsoft's WAVEFORMATEXTENSIBLE mapping. This mapping works
+     * as if all LSBs of dwChannelMask are set.  */
+
+/** \cond fulldocs */
+    PA_CHANNEL_MAP_OSS,
+    /**< The default channel mapping used by OSS as defined in the OSS
+     * 4.0 API specs. This mapping is probably not too useful since
+     * the OSS API has changed in this respect and no longer knows a
+     * default channel mapping based on the number of channels. */
+/** \endcond */
+
+    /**< Upper limit of valid channel mapping definitions */
+    PA_CHANNEL_MAP_DEF_MAX,
+
+    PA_CHANNEL_MAP_DEFAULT = PA_CHANNEL_MAP_AIFF
+    /**< The default channel map */
+} pa_channel_map_def_t;
+
+typedef struct pa_sample_spec {
+    pa_sample_format_t format;
+    /**< The sample format */
+
+    uint32_t rate;
+    /**< The sample rate. (e.g. 44100) */
+
+    uint8_t channels;
+    /**< Audio channels. (1 for mono, 2 for stereo, ...) */
+} pa_sample_spec;
+/** A structure encapsulating a per-channel volume */
+typedef struct pa_cvolume {
+    uint8_t channels;                     /**< Number of channels */
+    pa_volume_t values[PA_CHANNELS_MAX];  /**< Per-channel volume  */
+} pa_cvolume;
+
+typedef struct pa_channel_map {
+    uint8_t channels;
+    /**< Number of channels */
+
+    pa_channel_position_t map[PA_CHANNELS_MAX];
+    /**< Channel labels */
+} pa_channel_map;
+
+/** Type for usec specifications (unsigned). Always 64 bit. */
+typedef uint64_t pa_usec_t;
+
+/** Stores information about sinks. Please note that this structure
+ * can be extended as part of evolutionary API updates at any time in
+ * any new release. */
+struct Pulse_Sink {
+    const char *name;                  /**< Name of the sink */
+    uint32_t index;                    /**< Index of the sink */
+    const char *description;           /**< Description of this sink */
+//    pa_sample_spec sample_spec;        /**< Sample spec of this sink */
+    pa_channel_map channel_map;        /**< Channel map */
+//    uint32_t owner_module;             /**< Index of the owning module of this sink, or PA_INVALID_INDEX */
+    pa_cvolume volume;                 /**< Volume of the sink */
+    Eina_List *ports;                  /**< output ports */
+    const char *active_port;           /**< currently active port */
+    Eina_Bool mute : 1;                          /**< Mute switch of the sink */
+    Eina_Bool update : 1;
+    Eina_Bool source : 1; /**< sink is actually a source */
+    Eina_Bool deleted : 1; /**< sink has been deleted */
+};
+
+typedef uint32_t pa_pstream_descriptor[PA_PSTREAM_DESCRIPTOR_MAX];
+
+typedef struct
+{
+   pa_pstream_descriptor header;
+   uint8_t *data;
+
+   size_t dsize;
+   size_t size;
+   size_t pos;
+   PA_Commands command;
+   uint32_t tag_count;
+   Eina_Bool auth : 1;
+   Eina_Hash *props;
+} Pulse_Tag;
+
+typedef enum
+{
+   PA_STATE_INIT,
+   PA_STATE_AUTH,
+   PA_STATE_MOREAUTH,
+   PA_STATE_CONNECTED,
+} PA_State;
+
+struct Pulse
+{
+   PA_State state;
+   int fd;
+   Ecore_Fd_Handler *fdh;
+   Ecore_Con_Server *svr;
+   Ecore_Event_Handler *con;
+   const char *socket;
+   Eina_List *oq;
+   Eina_List *iq;
+   Eina_Hash *tag_handlers;
+   Eina_Hash *tag_cbs;
+   uint32_t tag_count;
+   Eina_Bool watching : 1;
+};
+
+extern int pa_log_dom;
+
+uint8_t *tag_bool(Pulse_Tag *tag, Eina_Bool val);
+uint8_t *untag_bool(Pulse_Tag *tag, Eina_Bool *val);
+uint8_t *tag_uint32(Pulse_Tag *tag, uint32_t val);
+uint8_t *untag_uint32(Pulse_Tag *tag, uint32_t *val);
+uint8_t *tag_string(Pulse_Tag *tag, const char *val);
+uint8_t *untag_string(Pulse_Tag *tag, const char **val);
+uint8_t *tag_arbitrary(Pulse_Tag *tag, const void *val, uint32_t size);
+uint8_t *untag_arbitrary(Pulse_Tag *tag, Eina_Binbuf **val);
+uint8_t *untag_sample(Pulse_Tag *tag, pa_sample_spec *spec);
+uint8_t *untag_channel_map(Pulse_Tag *tag, pa_channel_map *map);
+uint8_t *untag_cvol(Pulse_Tag *tag, pa_cvolume *cvol);
+uint8_t *untag_usec(Pulse_Tag *tag, uint64_t *val);
+uint8_t *untag_proplist(Pulse_Tag *tag, Eina_Hash **props);
+uint8_t *tag_simple_init(Pulse *conn, Pulse_Tag *tag, uint32_t val, PA_Tag type);
+uint8_t *tag_proplist(Pulse_Tag *tag);
+uint8_t *tag_volume(Pulse_Tag *tag, uint8_t channels, double vol);
+uint8_t *tag_cvol(Pulse_Tag *tag, pa_cvolume *c);
+void tag_finish(Pulse_Tag *tag);
+
+Eina_Bool deserialize_tag(Pulse *conn, PA_Commands command, Pulse_Tag *tag);
+
+void pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__);
+void pulse_tag_free(Pulse_Tag *tag);
+
+void msg_recv_creds(Pulse *conn, Pulse_Tag *tag);
+Eina_Bool msg_recv(Pulse *conn, Pulse_Tag *tag);
+void msg_sendmsg_creds(Pulse *conn, Pulse_Tag *tag);
+void msg_send_creds(Pulse *conn, Pulse_Tag *tag);
+Eina_Bool msg_send(Pulse *conn, Pulse_Tag *tag);
+
+extern Eina_Hash *pulse_sinks;
+extern Eina_Hash *pulse_sources;
+
+#endif
diff --git a/src/modules/mixer/serial.c b/src/modules/mixer/serial.c
new file mode 100644 (file)
index 0000000..278e585
--- /dev/null
@@ -0,0 +1,150 @@
+#include "pa.h"
+
+static void
+deserialize_sinks_watcher(Pulse *conn, Pulse_Tag *tag)
+{
+   pa_subscription_event_type_t e;
+   uint32_t idx;
+
+   EINA_SAFETY_ON_FALSE_RETURN(untag_uint32(tag, &e));
+   EINA_SAFETY_ON_FALSE_RETURN(untag_uint32(tag, &idx));
+
+   if (e & PA_SUBSCRIPTION_EVENT_CHANGE)
+     {
+        Pulse_Sink *sink;
+
+        sink = eina_hash_find(pulse_sinks, &idx);
+        if (sink)
+          {
+             if (pulse_sink_get(conn, idx))
+               sink->update = EINA_TRUE;
+          }
+        else
+          {
+             sink = eina_hash_find(pulse_sources, &idx);
+             if (!sink) return;
+             if (pulse_source_get(conn, idx))
+               sink->update = EINA_TRUE;
+          }
+     }
+}
+
+static Pulse_Sink *
+deserialize_sink(Pulse *conn __UNUSED__, Pulse_Tag *tag, Eina_Bool source)
+{
+   Pulse_Sink *sink = NULL;
+   Eina_Bool mute, exist;
+   pa_sample_spec spec;
+   uint32_t owner_module, monitor_source, flags, base_volume, state, n_volume_steps, card, n_ports;
+   uint64_t latency, configured_latency;
+   const char *monitor_source_name, *driver;
+   Eina_Hash *props;
+   unsigned int x;
+
+   monitor_source_name = driver = NULL;
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &x), error);
+   if (source && pulse_sources)
+     sink = eina_hash_find(pulse_sources, &x);
+   else if ((!source) && pulse_sinks)
+     sink = eina_hash_find(pulse_sinks, &x);
+   exist = !!sink;
+   if (!sink) sink = calloc(1, sizeof(Pulse_Sink));
+   sink->index = x;
+   EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &sink->name), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &sink->description), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_sample(tag, &spec), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_channel_map(tag, &sink->channel_map), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &owner_module), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_cvol(tag, &sink->volume), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_bool(tag, &mute), error);
+   sink->mute = !!mute;
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &monitor_source), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &monitor_source_name), error);
+   eina_stringshare_del(monitor_source_name);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_usec(tag, &latency), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &driver), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &flags), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_proplist(tag, &props), error);
+   eina_hash_free(props);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_usec(tag, &configured_latency), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &base_volume), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &state), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &n_volume_steps), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &card), error);
+   EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &n_ports), error);
+
+   for (x = 0; x < n_ports; x++)
+     {
+        Pulse_Sink_Port_Info *pi;
+
+        pi = calloc(1, sizeof(Pulse_Sink_Port_Info));
+        EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &pi->name), error);
+        eina_stringshare_del(pi->name);
+        EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &pi->description), error);
+        eina_stringshare_del(pi->description);
+        EINA_SAFETY_ON_FALSE_GOTO(untag_uint32(tag, &pi->priority), error);
+        sink->ports = eina_list_append(sink->ports, pi);
+     }
+   EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &sink->active_port), error);
+   if (exist)
+     ecore_event_add(PULSE_EVENT_CHANGE, sink, pulse_fake_free, NULL);
+   else
+     {
+        if (source && (!pulse_sources))
+          pulse_sources = eina_hash_int32_new((Eina_Free_Cb)pulse_sink_free);
+        else if ((!source) && (!pulse_sinks))
+          pulse_sinks = eina_hash_int32_new((Eina_Free_Cb)pulse_sink_free);
+        eina_hash_add(source ? pulse_sources : pulse_sinks, (uintptr_t*)&sink->index, sink);
+     }
+   return sink;
+error:
+   pulse_sink_free(sink);
+   return NULL;
+}
+
+Eina_Bool
+deserialize_tag(Pulse *conn, PA_Commands command, Pulse_Tag *tag)
+{
+   Pulse_Cb cb;
+   void *ev = (!command) ? NULL : PULSE_SUCCESS;
+
+   cb = eina_hash_find(conn->tag_cbs, &tag->tag_count);
+   if (command == PA_COMMAND_SUBSCRIBE)
+     conn->watching = EINA_TRUE;
+   switch (command)
+     {
+      case PA_COMMAND_GET_SINK_INFO_LIST:
+      case PA_COMMAND_GET_SOURCE_INFO_LIST:
+        if (!cb) return EINA_TRUE;
+        ev = NULL;
+        while (tag->size < tag->dsize - PA_TAG_SIZE_STRING_NULL)
+          {
+             Pulse_Sink *sink;
+
+             sink = deserialize_sink(conn, tag, (command == PA_COMMAND_GET_SOURCE_INFO_LIST));
+             if (!sink)
+               {
+                  EINA_LIST_FREE(ev, sink)
+                    pulse_sink_free(sink);
+                  break;
+               }
+             ev = eina_list_append(ev, sink);
+          }
+        break;
+      case PA_COMMAND_GET_SINK_INFO:
+      case PA_COMMAND_GET_SOURCE_INFO:
+        if ((!cb) && (!conn->watching)) return EINA_TRUE;
+        ev = deserialize_sink(conn, tag, (command == PA_COMMAND_GET_SOURCE_INFO));
+        break;
+      case 0:
+        deserialize_sinks_watcher(conn, tag);
+        return EINA_TRUE;
+      default:
+        break;
+     }
+   if (!cb) return EINA_TRUE;
+   eina_hash_del_by_key(conn->tag_cbs, &tag->tag_count);
+   cb(conn, tag->tag_count, ev);
+
+   return EINA_TRUE;
+}
diff --git a/src/modules/mixer/sink.c b/src/modules/mixer/sink.c
new file mode 100644 (file)
index 0000000..18cf2cd
--- /dev/null
@@ -0,0 +1,357 @@
+#include "pa.h"
+
+
+/** Makes a bit mask from a channel position. \since 0.9.16 */
+#define PA_CHANNEL_POSITION_MASK(f) ((pa_channel_position_mask_t) (1ULL << (f)))
+
+
+#define PA_CHANNEL_POSITION_MASK_LEFT                                   \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT)           \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_LEFT)          \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER) \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_SIDE_LEFT)          \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_LEFT)     \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_LEFT))     \
+
+#define PA_CHANNEL_POSITION_MASK_RIGHT                                  \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_RIGHT)          \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_RIGHT)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER) \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_SIDE_RIGHT)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_RIGHT)    \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_RIGHT))
+
+#define PA_CHANNEL_POSITION_MASK_CENTER                                 \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_CENTER)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_CENTER)        \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_CENTER)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_CENTER)   \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_CENTER))
+
+#define PA_CHANNEL_POSITION_MASK_FRONT                                  \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT)           \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_RIGHT)        \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_CENTER)       \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER) \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER) \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_LEFT)     \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_RIGHT)    \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_CENTER))
+
+#define PA_CHANNEL_POSITION_MASK_REAR                                   \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_LEFT)            \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_RIGHT)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_CENTER)        \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_LEFT)      \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_RIGHT)     \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_CENTER))
+
+#define PA_CHANNEL_POSITION_MASK_SIDE_OR_TOP_CENTER                     \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_SIDE_LEFT)            \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_SIDE_RIGHT)         \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_CENTER))
+
+#define PA_CHANNEL_POSITION_MASK_TOP                                    \
+    (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_CENTER)           \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_LEFT)     \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_RIGHT)    \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_FRONT_CENTER)   \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_LEFT)      \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_RIGHT)     \
+     | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_TOP_REAR_CENTER))
+
+#define PA_CHANNEL_POSITION_MASK_ALL            \
+    ((pa_channel_position_mask_t) (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_MAX)-1))
+
+const char *const channel_name_table[PA_CHANNEL_POSITION_MAX] = {
+    [PA_CHANNEL_POSITION_MONO] = _("Mono"),
+
+    [PA_CHANNEL_POSITION_FRONT_CENTER] = _("Front Center"),
+    [PA_CHANNEL_POSITION_FRONT_LEFT] = _("Front Left"),
+    [PA_CHANNEL_POSITION_FRONT_RIGHT] = _("Front Right"),
+
+    [PA_CHANNEL_POSITION_REAR_CENTER] = _("Rear Center"),
+    [PA_CHANNEL_POSITION_REAR_LEFT] = _("Rear Left"),
+    [PA_CHANNEL_POSITION_REAR_RIGHT] = _("Rear Right"),
+
+    [PA_CHANNEL_POSITION_LFE] = _("Subwoofer"),
+
+    [PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = _("Front Left-of-center"),
+    [PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = _("Front Right-of-center"),
+
+    [PA_CHANNEL_POSITION_SIDE_LEFT] = _("Side Left"),
+    [PA_CHANNEL_POSITION_SIDE_RIGHT] = _("Side Right"),
+
+    [PA_CHANNEL_POSITION_AUX0] = _("Auxiliary 0"),
+    [PA_CHANNEL_POSITION_AUX1] = _("Auxiliary 1"),
+    [PA_CHANNEL_POSITION_AUX2] = _("Auxiliary 2"),
+    [PA_CHANNEL_POSITION_AUX3] = _("Auxiliary 3"),
+    [PA_CHANNEL_POSITION_AUX4] = _("Auxiliary 4"),
+    [PA_CHANNEL_POSITION_AUX5] = _("Auxiliary 5"),
+    [PA_CHANNEL_POSITION_AUX6] = _("Auxiliary 6"),
+    [PA_CHANNEL_POSITION_AUX7] = _("Auxiliary 7"),
+    [PA_CHANNEL_POSITION_AUX8] = _("Auxiliary 8"),
+    [PA_CHANNEL_POSITION_AUX9] = _("Auxiliary 9"),
+    [PA_CHANNEL_POSITION_AUX10] = _("Auxiliary 10"),
+    [PA_CHANNEL_POSITION_AUX11] = _("Auxiliary 11"),
+    [PA_CHANNEL_POSITION_AUX12] = _("Auxiliary 12"),
+    [PA_CHANNEL_POSITION_AUX13] = _("Auxiliary 13"),
+    [PA_CHANNEL_POSITION_AUX14] = _("Auxiliary 14"),
+    [PA_CHANNEL_POSITION_AUX15] = _("Auxiliary 15"),
+    [PA_CHANNEL_POSITION_AUX16] = _("Auxiliary 16"),
+    [PA_CHANNEL_POSITION_AUX17] = _("Auxiliary 17"),
+    [PA_CHANNEL_POSITION_AUX18] = _("Auxiliary 18"),
+    [PA_CHANNEL_POSITION_AUX19] = _("Auxiliary 19"),
+    [PA_CHANNEL_POSITION_AUX20] = _("Auxiliary 20"),
+    [PA_CHANNEL_POSITION_AUX21] = _("Auxiliary 21"),
+    [PA_CHANNEL_POSITION_AUX22] = _("Auxiliary 22"),
+    [PA_CHANNEL_POSITION_AUX23] = _("Auxiliary 23"),
+    [PA_CHANNEL_POSITION_AUX24] = _("Auxiliary 24"),
+    [PA_CHANNEL_POSITION_AUX25] = _("Auxiliary 25"),
+    [PA_CHANNEL_POSITION_AUX26] = _("Auxiliary 26"),
+    [PA_CHANNEL_POSITION_AUX27] = _("Auxiliary 27"),
+    [PA_CHANNEL_POSITION_AUX28] = _("Auxiliary 28"),
+    [PA_CHANNEL_POSITION_AUX29] = _("Auxiliary 29"),
+    [PA_CHANNEL_POSITION_AUX30] = _("Auxiliary 30"),
+    [PA_CHANNEL_POSITION_AUX31] = _("Auxiliary 31"),
+
+    [PA_CHANNEL_POSITION_TOP_CENTER] = _("Top Center"),
+
+    [PA_CHANNEL_POSITION_TOP_FRONT_CENTER] = _("Top Front Center"),
+    [PA_CHANNEL_POSITION_TOP_FRONT_LEFT] = _("Top Front Left"),
+    [PA_CHANNEL_POSITION_TOP_FRONT_RIGHT] = _("Top Front Right"),
+
+    [PA_CHANNEL_POSITION_TOP_REAR_CENTER] = _("Top Rear Center"),
+    [PA_CHANNEL_POSITION_TOP_REAR_LEFT] = _("Top Rear Left"),
+    [PA_CHANNEL_POSITION_TOP_REAR_RIGHT] = _("Top Rear Right")
+};
+
+static Eina_Bool on_left(pa_channel_position_t p) {
+    return !!(PA_CHANNEL_POSITION_MASK(p) & PA_CHANNEL_POSITION_MASK_LEFT);
+}
+
+static Eina_Bool on_right(pa_channel_position_t p) {
+    return !!(PA_CHANNEL_POSITION_MASK(p) & PA_CHANNEL_POSITION_MASK_RIGHT);
+}
+#if 0
+static Eina_Bool on_center(pa_channel_position_t p) {
+    return !!(PA_CHANNEL_POSITION_MASK(p) & PA_CHANNEL_POSITION_MASK_CENTER);
+}
+
+static Eina_Bool on_lfe(pa_channel_position_t p) {
+    return p == PA_CHANNEL_POSITION_LFE;
+}
+#endif
+static Eina_Bool on_front(pa_channel_position_t p) {
+    return !!(PA_CHANNEL_POSITION_MASK(p) & PA_CHANNEL_POSITION_MASK_FRONT);
+}
+
+static Eina_Bool on_rear(pa_channel_position_t p) {
+    return !!(PA_CHANNEL_POSITION_MASK(p) & PA_CHANNEL_POSITION_MASK_REAR);
+}
+
+static void
+pulse_sink_port_info_free(Pulse_Sink_Port_Info *pi)
+{
+   if (!pi) return;
+   eina_stringshare_del(pi->name);
+   eina_stringshare_del(pi->description);
+   free(pi);
+}
+
+void
+pulse_sink_free(Pulse_Sink *sink)
+{
+   Pulse_Sink_Port_Info *pi;
+   if (!sink) return;
+   if (!sink->deleted)
+     {
+        sink->deleted = EINA_TRUE;
+        if (sink->source)
+          {
+             eina_hash_del_by_key(pulse_sources, (uintptr_t*)&sink->index);
+             return;
+          }
+        else
+          {
+             eina_hash_del_by_key(pulse_sinks, (uintptr_t*)&sink->index);
+             return;
+          }
+     }
+   eina_stringshare_del(sink->name);
+   eina_stringshare_del(sink->description);
+   EINA_LIST_FREE(sink->ports, pi)
+     pulse_sink_port_info_free(pi);
+   eina_stringshare_del(sink->active_port);
+   free(sink);
+}
+
+const Eina_List *
+pulse_sink_ports_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+   return sink->ports;
+}
+
+const char *
+pulse_sink_port_active_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+   return sink->active_port;
+}
+
+const char *
+pulse_sink_name_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+
+   return sink->name;
+}
+
+const char *
+pulse_sink_desc_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+
+   return sink->description;
+}
+
+uint32_t
+pulse_sink_idx_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, 0);
+
+   return sink->index;
+}
+
+Eina_Bool
+pulse_sink_muted_get(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, EINA_FALSE);
+
+   return sink->mute;
+}
+
+uint8_t
+pulse_sink_channels_count(Pulse_Sink *sink)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, 0);
+
+   return sink->volume.channels;
+}
+
+double
+pulse_sink_avg_get_pct(Pulse_Sink *sink)
+{
+   double avg;
+   int x;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, -1.0);
+
+   for (avg = 0, x = 0; x < sink->volume.channels; x++)
+     avg += sink->volume.values[x];
+   avg /= sink->volume.channels;
+
+   if (avg <= PA_VOLUME_MUTED) return 0.0;
+
+   if (avg == PA_VOLUME_NORM) return 100.0;
+
+   return (avg * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
+}
+
+Eina_List *
+pulse_sink_channel_names_get(Pulse_Sink *sink)
+{
+   Eina_List *ret = NULL;
+   unsigned int x;
+   
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+   for (x = 0; x < sink->volume.channels; x++)
+      ret = eina_list_append(ret, pulse_sink_channel_id_get_name(sink, x));
+   return ret;
+}
+
+unsigned int
+pulse_sink_channel_name_get_id(Pulse_Sink *sink, const char *name)
+{
+   unsigned int x;
+   
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, UINT_MAX);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(name, UINT_MAX);
+   for (x = 0; x < sink->channel_map.channels; x++)
+     {
+        if (!strcmp(name, channel_name_table[sink->channel_map.map[x]]))
+           return x;
+     }
+   return UINT_MAX;
+}
+
+const char *
+pulse_sink_channel_id_get_name(Pulse_Sink *sink, unsigned int id)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, NULL);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(id >= sink->channel_map.channels, NULL);
+   return eina_stringshare_add(channel_name_table[sink->channel_map.map[id]]);
+}
+
+double
+pulse_sink_channel_volume_get(Pulse_Sink *sink, unsigned int id)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, -1);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(id >= sink->channel_map.channels, -1);
+   return (sink->volume.values[id] * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
+}
+
+float
+pulse_sink_channel_balance_get(Pulse_Sink *sink, unsigned int id)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, -1.0);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(id >= sink->channel_map.channels, -1.0);
+
+   if (on_left(sink->channel_map.map[id])) return 0.0;
+   if (on_right(sink->channel_map.map[id])) return 1.0;
+   return 0.5;
+}
+
+float
+pulse_sink_channel_depth_get(Pulse_Sink *sink, unsigned int id)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sink, -1.0);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(id >= sink->channel_map.channels, -1.0);
+
+   if (on_rear(sink->channel_map.map[id])) return 0.0;
+   if (on_front(sink->channel_map.map[id])) return 1.0;
+   return 0.5;
+}
+
+float
+pulse_sink_balance_get(Pulse_Sink *sink)
+{
+    int c;
+    float l, r;
+    pa_volume_t left = 0, right = 0;
+    unsigned n_left = 0, n_right = 0;
+
+    for (c = 0; c < sink->channel_map.channels; c++) {
+        if (on_left(sink->channel_map.map[c])) {
+            left += sink->volume.values[c];
+            n_left++;
+        } else if (on_right(sink->channel_map.map[c])) {
+            right += sink->volume.values[c];
+            n_right++;
+        }
+    }
+
+    if (n_left <= 0)
+        l = PA_VOLUME_NORM;
+    else
+        l = left / n_left;
+
+    if (n_right <= 0)
+        r = PA_VOLUME_NORM;
+    else
+        r = right / n_right;
+    l /= (float)PA_VOLUME_NORM;
+    r /= (float)PA_VOLUME_NORM;
+    return r - l;
+}
index db167ce..48e1efb 100644 (file)
@@ -5,17 +5,19 @@
 
 struct e_mixer_callback_desc
 {
-   int (*func)(void *data, E_Mixer_System *self);
-   void *data;
+   int             (*func)(void *data,
+                           E_Mixer_System *self);
+   void           *data;
    E_Mixer_System *self;
-   Ecore_Idler *idler;
-   Eina_List *handlers;
+   Ecore_Idler    *idler;
+   Eina_List      *handlers;
 };
 
-
-static int _mixer_callback_add(E_Mixer_System *self, int (*func)(void *data, E_Mixer_System *self), void *data);
-static int _mixer_callback_del(E_Mixer_System *self, struct e_mixer_callback_desc *desc);
-
+static int _mixer_callback_add(E_Mixer_System *self,
+                               int (*func)(void *data, E_Mixer_System *self),
+                               void *data);
+static int _mixer_callback_del(E_Mixer_System               *self,
+                               struct e_mixer_callback_desc *desc);
 
 static Eina_Bool
 _cb_dispatch(void *data)
@@ -29,13 +31,14 @@ _cb_dispatch(void *data)
    desc->idler = NULL;
 
    if (!r)
-     _mixer_callback_del(desc->self, desc); /* desc is invalid then. */
+     _mixer_callback_del(desc->self, desc);  /* desc is invalid then. */
 
    return ECORE_CALLBACK_CANCEL;
 }
 
 static Eina_Bool
-_cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
+_cb_fd_handler(void             *data,
+               Ecore_Fd_Handler *fd_handler)
 {
    struct e_mixer_callback_desc *desc;
 
@@ -43,20 +46,21 @@ _cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
 
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
      {
-       desc->handlers = eina_list_remove(desc->handlers, fd_handler);
-       if (!desc->handlers)
-         {
-            E_Mixer_System *s;
-            int (*f)(void *, E_Mixer_System *);
-            void *d;
-
-            s = desc->self;
-            f = desc->func;
-            d = desc->data;
-            _mixer_callback_del(s, desc);
-            _mixer_callback_add(s, f, d);
-         }
-       return ECORE_CALLBACK_CANCEL;
+        desc->handlers = eina_list_remove(desc->handlers, fd_handler);
+        if (!desc->handlers)
+          {
+             E_Mixer_System *s;
+             int (*f)(void *,
+                      E_Mixer_System *);
+             void *d;
+
+             s = desc->self;
+             f = desc->func;
+             d = desc->data;
+             _mixer_callback_del(s, desc);
+             _mixer_callback_add(s, f, d);
+          }
+        return ECORE_CALLBACK_CANCEL;
      }
 
    if (!desc->idler)
@@ -65,7 +69,9 @@ _cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
 }
 
 static int
-_mixer_callback_add(E_Mixer_System *self, int (*func)(void *data, E_Mixer_System *self), void *data)
+_mixer_callback_add(E_Mixer_System *self,
+                    int (*func)(void *data, E_Mixer_System *self),
+                    void *data)
 {
    struct e_mixer_callback_desc *desc;
    struct pollfd *pfds;
@@ -89,18 +95,18 @@ _mixer_callback_add(E_Mixer_System *self, int (*func)(void *data, E_Mixer_System
    len = snd_mixer_poll_descriptors(self, pfds, len);
    if (len <= 0)
      {
-       free(desc);
-       return 0;
+        free(desc);
+        return 0;
      }
 
    while (len > 0)
      {
-       Ecore_Fd_Handler *fd_handler;
+        Ecore_Fd_Handler *fd_handler;
 
-       len--;
-       fd_handler = ecore_main_fd_handler_add(
-                                              pfds[len].fd, ECORE_FD_READ, _cb_fd_handler, desc, NULL, NULL);
-       desc->handlers = eina_list_prepend(desc->handlers, fd_handler);
+        len--;
+        fd_handler = ecore_main_fd_handler_add(
+            pfds[len].fd, ECORE_FD_READ, _cb_fd_handler, desc, NULL, NULL);
+        desc->handlers = eina_list_prepend(desc->handlers, fd_handler);
      }
 
    snd_mixer_set_callback_private(self, desc);
@@ -109,7 +115,8 @@ _mixer_callback_add(E_Mixer_System *self, int (*func)(void *data, E_Mixer_System
 }
 
 static int
-_mixer_callback_del(E_Mixer_System *self, struct e_mixer_callback_desc *desc)
+_mixer_callback_del(E_Mixer_System               *self,
+                    struct e_mixer_callback_desc *desc)
 {
    Ecore_Fd_Handler *handler;
 
@@ -124,7 +131,10 @@ _mixer_callback_del(E_Mixer_System *self, struct e_mixer_callback_desc *desc)
 }
 
 static int
-_mixer_callback_replace(E_Mixer_System *self __UNUSED__, struct e_mixer_callback_desc *desc, int (*func)(void *data, E_Mixer_System *self), void *data)
+_mixer_callback_replace(E_Mixer_System *self __UNUSED__,
+                        struct e_mixer_callback_desc *desc,
+                        int (*func)(void *data, E_Mixer_System *self),
+                        void *data)
 {
    desc->func = func;
    desc->data = data;
@@ -159,9 +169,9 @@ e_mixer_system_new(const char *name)
 
    return handle;
 
- error_load:
+error_load:
    snd_mixer_close(handle);
- error_open:
+error_open:
    fprintf(stderr, "MIXER: Cannot get hardware info: %s\n", snd_strerror(err));
    return NULL;
 }
@@ -182,7 +192,9 @@ e_mixer_system_del(E_Mixer_System *self)
 }
 
 int
-e_mixer_system_callback_set(E_Mixer_System *self, int (*func)(void *data, E_Mixer_System *self), void *data)
+e_mixer_system_callback_set(E_Mixer_System *self,
+                            int (*func)(void *data, E_Mixer_System *self),
+                            void *data)
 {
    struct e_mixer_callback_desc *desc;
 
@@ -192,16 +204,16 @@ e_mixer_system_callback_set(E_Mixer_System *self, int (*func)(void *data, E_Mixe
    desc = snd_mixer_get_callback_private(self);
    if (!desc)
      {
-       if (func)
-         return _mixer_callback_add(self, func, data);
-       return 1;
+        if (func)
+          return _mixer_callback_add(self, func, data);
+        return 1;
      }
    else
      {
-       if (func)
-         return _mixer_callback_replace(self, desc, func, data);
-       else
-         return _mixer_callback_del(self, desc);
+        if (func)
+          return _mixer_callback_replace(self, desc, func, data);
+        else
+          return _mixer_callback_del(self, desc);
      }
 }
 
@@ -215,20 +227,20 @@ e_mixer_system_get_cards(void)
    card_num = -1;
    while (((err = snd_card_next(&card_num)) == 0) && (card_num >= 0))
      {
-       snd_ctl_t *control;
-       char buf[256];
+        snd_ctl_t *control;
+        char buf[256];
 
-       snprintf(buf, sizeof(buf), "hw:%d", card_num);
+        snprintf(buf, sizeof(buf), "hw:%d", card_num);
 
-       if (snd_ctl_open(&control, buf, 0) < 0)
-         break;
-       snd_ctl_close(control);
-       cards = eina_list_append(cards, eina_stringshare_add(buf));
+        if (snd_ctl_open(&control, buf, 0) < 0)
+          break;
+        snd_ctl_close(control);
+        cards = eina_list_append(cards, eina_stringshare_add(buf));
      }
 
    if (err < 0)
      fprintf(stderr, "MIXER: Cannot get available card number: %s\n",
-            snd_strerror(err));
+             snd_strerror(err));
 
    return cards;
 }
@@ -274,18 +286,18 @@ e_mixer_system_get_card_name(const char *card)
    err = snd_ctl_card_info(control, hw_info);
    if (err < 0)
      {
-       fprintf(stderr, "MIXER: Cannot get hardware info: %s: %s\n", card,
-               snd_strerror(err));
-       snd_ctl_close(control);
-       return NULL;
+        fprintf(stderr, "MIXER: Cannot get hardware info: %s: %s\n", card,
+                snd_strerror(err));
+        snd_ctl_close(control);
+        return NULL;
      }
 
    snd_ctl_close(control);
    name = snd_ctl_card_info_get_name(hw_info);
    if (!name)
      {
-       fprintf(stderr, "MIXER: Cannot get hardware name: %s\n", card);
-       return NULL;
+        fprintf(stderr, "MIXER: Cannot get hardware name: %s\n", card);
+        return NULL;
      }
 
    return eina_stringshare_add(name);
@@ -305,11 +317,11 @@ e_mixer_system_get_channels(E_Mixer_System *self)
    elem = snd_mixer_first_elem(self);
    for (; elem; elem = snd_mixer_elem_next(elem))
      {
-       if ((!snd_mixer_selem_is_active(elem)) ||
+        if ((!snd_mixer_selem_is_active(elem)) ||
             (!snd_mixer_selem_has_playback_volume(elem)))
-         continue;
+          continue;
 
-       channels = eina_list_append(channels, elem);
+        channels = eina_list_append(channels, elem);
      }
 
    return channels;
@@ -337,15 +349,15 @@ e_mixer_system_get_channels_names(E_Mixer_System *self)
    elem = snd_mixer_first_elem(self);
    for (; elem; elem = snd_mixer_elem_next(elem))
      {
-       const char *name;
-       if ((!snd_mixer_selem_is_active(elem)) ||
+        const char *name;
+        if ((!snd_mixer_selem_is_active(elem)) ||
             (!snd_mixer_selem_has_playback_volume(elem)))
-         continue;
+          continue;
 
-       snd_mixer_selem_get_id(elem, sid);
-       name = snd_mixer_selem_id_get_name(sid);
-       if (name)
-         channels = eina_list_append(channels, eina_stringshare_add(name));
+        snd_mixer_selem_get_id(elem, sid);
+        name = snd_mixer_selem_id_get_name(sid);
+        if (name)
+          channels = eina_list_append(channels, eina_stringshare_add(name));
      }
 
    return channels;
@@ -374,22 +386,23 @@ e_mixer_system_get_default_channel_name(E_Mixer_System *self)
    elem = snd_mixer_first_elem(self);
    for (; elem; elem = snd_mixer_elem_next(elem))
      {
-       const char *name;
-       if ((!snd_mixer_selem_is_active(elem)) ||
+        const char *name;
+        if ((!snd_mixer_selem_is_active(elem)) ||
             (!snd_mixer_selem_has_playback_volume(elem)))
-         continue;
+          continue;
 
-       snd_mixer_selem_get_id(elem, sid);
-       name = snd_mixer_selem_id_get_name(sid);
-       if (name)
-         return eina_stringshare_add(name);
+        snd_mixer_selem_get_id(elem, sid);
+        name = snd_mixer_selem_id_get_name(sid);
+        if (name)
+          return eina_stringshare_add(name);
      }
 
    return NULL;
 }
 
 E_Mixer_Channel *
-e_mixer_system_get_channel_by_name(E_Mixer_System *self, const char *name)
+e_mixer_system_get_channel_by_name(E_Mixer_System *self,
+                                   const char     *name)
 {
    snd_mixer_elem_t *elem;
    snd_mixer_selem_id_t *sid;
@@ -402,15 +415,15 @@ e_mixer_system_get_channel_by_name(E_Mixer_System *self, const char *name)
    elem = snd_mixer_first_elem(self);
    for (; elem; elem = snd_mixer_elem_next(elem))
      {
-       const char *n;
-       if ((!snd_mixer_selem_is_active(elem)) ||
+        const char *n;
+        if ((!snd_mixer_selem_is_active(elem)) ||
             (!snd_mixer_selem_has_playback_volume(elem)))
-         continue;
+          continue;
 
-       snd_mixer_selem_get_id(elem, sid);
-       n = snd_mixer_selem_id_get_name(sid);
-       if (n && (strcmp(n, name) == 0))
-         return elem;
+        snd_mixer_selem_get_id(elem, sid);
+        n = snd_mixer_selem_id_get_name(sid);
+        if (n && (strcmp(n, name) == 0))
+          return elem;
      }
 
    return NULL;
@@ -422,7 +435,8 @@ e_mixer_system_channel_del(E_Mixer_Channel *channel __UNUSED__)
 }
 
 const char *
-e_mixer_system_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel)
+e_mixer_system_get_channel_name(E_Mixer_System  *self,
+                                E_Mixer_Channel *channel)
 {
    snd_mixer_selem_id_t *sid;
    const char *name;
@@ -438,7 +452,10 @@ e_mixer_system_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel)
 }
 
 int
-e_mixer_system_get_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int *left, int *right)
+e_mixer_system_get_volume(E_Mixer_System  *self,
+                          E_Mixer_Channel *channel,
+                          int             *left,
+                          int             *right)
 {
    long lvol, rvol, range, min, max;
 
@@ -472,7 +489,10 @@ e_mixer_system_get_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int *l
 }
 
 int
-e_mixer_system_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int left, int right)
+e_mixer_system_set_volume(E_Mixer_System  *self,
+                          E_Mixer_Channel *channel,
+                          int              left,
+                          int              right)
 {
    long range, min, max, div;
    int mode;
@@ -485,8 +505,8 @@ e_mixer_system_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int le
    div = 100 + min;
    if (div == 0)
      {
-       div = 1; /* no zero-division */
-       min++;
+        div = 1; /* no zero-division */
+        min++;
      }
 
    range = max - min;
@@ -496,14 +516,14 @@ e_mixer_system_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int le
    mode = 0;
    if (left >= 0)
      {
-       left = (((range * left) + (range / 2)) / div) - min;
-       mode |= 1;
+        left = (((range * left) + (range / 2)) / div) - min;
+        mode |= 1;
      }
 
    if (right >= 0)
      {
-       right = (((range * right) + (range / 2)) / div) - min;
-       mode |= 2;
+        right = (((range * right) + (range / 2)) / div) - min;
+        mode |= 2;
      }
 
    if (mode & 1)
@@ -513,26 +533,29 @@ e_mixer_system_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int le
        (!snd_mixer_selem_has_playback_volume_joined(channel)) &&
        (mode & 2))
      {
-       if (snd_mixer_selem_has_playback_channel(channel, 1))
-         snd_mixer_selem_set_playback_volume(channel, 1, right);
+        if (snd_mixer_selem_has_playback_channel(channel, 1))
+          snd_mixer_selem_set_playback_volume(channel, 1, right);
      }
 
    return 1;
 }
 
 int
-e_mixer_system_can_mute(E_Mixer_System *self, E_Mixer_Channel *channel)
+e_mixer_system_can_mute(E_Mixer_System  *self,
+                        E_Mixer_Channel *channel)
 {
    if ((!self) || (!channel))
      return 0;
 
    snd_mixer_handle_events(self);
-   return (snd_mixer_selem_has_playback_switch(channel) ||
-           snd_mixer_selem_has_playback_switch_joined(channel));
+   return snd_mixer_selem_has_playback_switch(channel) ||
+          snd_mixer_selem_has_playback_switch_joined(channel);
 }
 
 int
-e_mixer_system_get_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int *mute)
+e_mixer_system_get_mute(E_Mixer_System  *self,
+                        E_Mixer_Channel *channel,
+                        int             *mute)
 {
    if ((!self) || (!channel) || (!mute))
      return 0;
@@ -541,13 +564,13 @@ e_mixer_system_get_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int *mut
    if (snd_mixer_selem_has_playback_switch(channel) ||
        snd_mixer_selem_has_playback_switch_joined(channel))
      {
-       int m;
+        int m;
 
-       /* XXX: not checking for return, always returns 0 even if it worked.
-        * alsamixer also don't check it. Bug?
-        */
-       snd_mixer_selem_get_playback_switch(channel, 0, &m);
-       *mute = !m;
+        /* XXX: not checking for return, always returns 0 even if it worked.
+         * alsamixer also don't check it. Bug?
+         */
+        snd_mixer_selem_get_playback_switch(channel, 0, &m);
+        *mute = !m;
      }
    else
      *mute = 0;
@@ -556,7 +579,9 @@ e_mixer_system_get_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int *mut
 }
 
 int
-e_mixer_system_set_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int mute)
+e_mixer_system_set_mute(E_Mixer_System  *self,
+                        E_Mixer_Channel *channel,
+                        int              mute)
 {
    if ((!self) || (!channel))
      return 0;
@@ -570,7 +595,9 @@ e_mixer_system_set_mute(E_Mixer_System *self, E_Mixer_Channel *channel, int mute
 }
 
 int
-e_mixer_system_get_state(E_Mixer_System *self, E_Mixer_Channel *channel, E_Mixer_Channel_State *state)
+e_mixer_system_get_state(E_Mixer_System        *self,
+                         E_Mixer_Channel       *channel,
+                         E_Mixer_Channel_State *state)
 {
    int r;
 
@@ -583,7 +610,9 @@ e_mixer_system_get_state(E_Mixer_System *self, E_Mixer_Channel *channel, E_Mixer
 }
 
 int
-e_mixer_system_set_state(E_Mixer_System *self, E_Mixer_Channel *channel, const E_Mixer_Channel_State *state)
+e_mixer_system_set_state(E_Mixer_System              *self,
+                         E_Mixer_Channel             *channel,
+                         const E_Mixer_Channel_State *state)
 {
    int r;
 
@@ -596,10 +625,12 @@ e_mixer_system_set_state(E_Mixer_System *self, E_Mixer_Channel *channel, const E
 }
 
 int
-e_mixer_system_has_capture(E_Mixer_System *self, E_Mixer_Channel *channel)
+e_mixer_system_has_capture(E_Mixer_System  *self,
+                           E_Mixer_Channel *channel)
 {
    if ((!self) || (!channel))
      return 0;
 
    return snd_mixer_selem_has_capture_switch(channel);
 }
+
diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c
new file mode 100644 (file)
index 0000000..661ca8a
--- /dev/null
@@ -0,0 +1,551 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "e_mod_system.h"
+#include "e_mod_main.h"
+#include <Ecore.h>
+#include "Pulse.h"
+
+//#define BAD_CH_MAPPING 1
+
+#define PULSE_BUS "org.PulseAudio.Core1"
+#define PULSE_PATH "/org/pulseaudio/core1"
+#define PULSE_INTERFACE "org.PulseAudio.Core1"
+
+static Pulse *conn = NULL;
+static Ecore_Event_Handler *ph = NULL;
+static Ecore_Event_Handler *pch = NULL;
+static Ecore_Event_Handler *pdh = NULL;
+static Eina_List *sinks = NULL;
+static Eina_List *sources = NULL;
+
+static E_DBus_Connection *dbus = NULL;
+static E_DBus_Signal_Handler *dbus_handler = NULL;
+static double last_disc = 0;
+
+static void
+_dbus_poll(void *data   __UNUSED__,
+           DBusMessage *msg)
+{
+   DBusError err;
+   const char *name, *from, *to;
+
+   dbus_error_init(&err);
+   if (!dbus_message_get_args(msg, &err,
+                              DBUS_TYPE_STRING, &name,
+                              DBUS_TYPE_STRING, &from,
+                              DBUS_TYPE_STRING, &to,
+                              DBUS_TYPE_INVALID))
+     dbus_error_free(&err);
+
+   //printf("name: %s\nfrom: %s\nto: %s\n", name, from, to);
+   if ((name) && !strcmp(name, PULSE_BUS))
+     e_mixer_pulse_init();
+   if (dbus_handler)
+     {
+        e_dbus_signal_handler_del(dbus, dbus_handler);
+        dbus_handler = NULL;
+     }
+   if (dbus)
+     {
+        e_dbus_connection_close(dbus);
+        dbus = NULL;
+        e_dbus_shutdown();
+     }
+}
+
+static void
+_dbus_test(void *data       __UNUSED__,
+           DBusMessage *msg __UNUSED__,
+           DBusError       *error)
+{
+   if ((error) && (dbus_error_is_set(error)))
+     {
+        dbus_error_free(error);
+        if (dbus_handler)
+          {
+             e_dbus_signal_handler_del(dbus, dbus_handler);
+             dbus_handler = NULL;
+          }
+        if (dbus)
+          {
+             e_dbus_connection_close(dbus);
+             dbus = NULL;
+             e_dbus_shutdown();
+          }
+        e_mod_mixer_pulse_ready(EINA_FALSE);
+        return;
+     }
+}
+
+static Eina_Bool
+_pulse_update(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Sink *ev __UNUSED__)
+{
+   e_mod_mixer_pulse_update();
+   return EINA_TRUE;
+}
+
+static void
+_pulse_sinks_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev)
+{
+   Eina_List *l;
+   Pulse_Sink *sink;
+   sinks = ev;
+   EINA_LIST_FOREACH(ev, l, sink)
+     {
+        printf("Sink:\n");
+        printf("\tname: %s\n", pulse_sink_name_get(sink));
+        printf("\tidx: %"PRIu32"\n", pulse_sink_idx_get(sink));
+        printf("\tdesc: %s\n", pulse_sink_desc_get(sink));
+        printf("\tchannels: %u\n", pulse_sink_channels_count(sink));
+        printf("\tmuted: %s\n", pulse_sink_muted_get(sink) ? "yes" : "no");
+        printf("\tavg: %g\n", pulse_sink_avg_get_pct(sink));
+        printf("\tbalance: %f\n", pulse_sink_balance_get(sink));
+     }
+   pulse_sinks_watch(conn);
+   e_mod_mixer_pulse_ready(EINA_TRUE);
+}
+
+static void
+_pulse_sources_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev)
+{
+   Eina_List *l;
+   Pulse_Sink *sink;
+   sources = ev;
+   EINA_LIST_FOREACH(ev, l, sink)
+     {
+        printf("Sources:\n");
+        printf("\tname: %s\n", pulse_sink_name_get(sink));
+        printf("\tidx: %"PRIu32"\n", pulse_sink_idx_get(sink));
+        printf("\tdesc: %s\n", pulse_sink_desc_get(sink));
+        printf("\tchannels: %u\n", pulse_sink_channels_count(sink));
+        printf("\tmuted: %s\n", pulse_sink_muted_get(sink) ? "yes" : "no");
+        printf("\tavg: %g\n", pulse_sink_avg_get_pct(sink));
+        printf("\tbalance: %f\n", pulse_sink_balance_get(sink));
+     }
+}
+
+static Eina_Bool
+_pulse_connected(Pulse *d, int type __UNUSED__, Pulse *ev)
+{
+   Pulse_Tag_Id id;
+   if (d != ev) return ECORE_CALLBACK_PASS_ON;
+   id = pulse_sinks_get(conn);
+   if (!id)
+     {
+        e_mixer_pulse_shutdown();
+        e_mixer_default_setup();
+        return ECORE_CALLBACK_RENEW;
+     }
+   pulse_cb_set(conn, id, (Pulse_Cb)_pulse_sinks_get);
+   id = pulse_sources_get(conn);
+   if (id)
+     pulse_cb_set(conn, id, (Pulse_Cb)_pulse_sources_get);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_pulse_disconnected(Pulse *d, int type __UNUSED__, Pulse *ev)
+{
+   Pulse_Sink *sink;
+
+   if (d != ev) return ECORE_CALLBACK_PASS_ON;
+
+   EINA_LIST_FREE(sinks, sink)
+     pulse_sink_free(sink);
+   EINA_LIST_FREE(sources, sink)
+     pulse_sink_free(sink);
+
+   printf("PULSEAUDIO: disconnected at %g\n", ecore_time_unix_get());
+
+   if (last_disc && (ecore_time_unix_get() - last_disc < 1))
+     {
+        fprintf(stderr, "PULSEAUDIO: disconnecting too quickly, THROTTLED\n");
+        e_mixer_pulse_shutdown();
+        last_disc = 0;
+        e_mod_mixer_pulse_ready(EINA_FALSE);
+     }
+   else
+     {
+        pulse_connect(conn);
+        last_disc = ecore_time_unix_get();
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Pulse_Sink *
+_pulse_sink_find(const char *name)
+{
+   Eina_List *l;
+   Pulse_Sink *sink;
+   EINA_LIST_FOREACH(sinks, l, sink)
+     {
+        const char *sink_name;
+
+        sink_name = pulse_sink_name_get(sink);
+        if ((sink_name == name) || (!strcmp(sink_name, name)))
+          return sink;
+     }
+   EINA_LIST_FOREACH(sources, l, sink)
+     {
+        const char *sink_name;
+
+        sink_name = pulse_sink_name_get(sink);
+        if ((sink_name == name) || (!strcmp(sink_name, name)))
+          return sink;
+     }
+   return NULL;
+}
+
+static void
+_pulse_result_cb(Pulse *p __UNUSED__, Pulse_Tag_Id id, void *ev)
+{
+   if (!ev) fprintf(stderr, "Command %u failed!\n", id);
+}
+
+Eina_Bool
+e_mixer_pulse_ready(void)
+{
+   return !!sinks;
+}
+
+Eina_Bool
+e_mixer_pulse_init(void)
+{
+   pulse_init();
+   conn = pulse_new();
+   if (dbus) goto error;
+   if ((!conn) || (!pulse_connect(conn)))
+     {
+        DBusMessage *msg;
+
+        e_dbus_init();
+        dbus = e_dbus_bus_get(DBUS_BUS_SESSION);
+
+        if (!dbus)
+          {
+             e_dbus_shutdown();
+             return EINA_FALSE;
+          }
+        if (!dbus_handler)
+          dbus_handler = e_dbus_signal_handler_add(dbus,
+                                                   E_DBUS_FDO_BUS, E_DBUS_FDO_PATH,
+                                                   E_DBUS_FDO_INTERFACE,
+                                                   "NameOwnerChanged", (E_DBus_Signal_Cb)_dbus_poll, NULL);
+
+        msg = dbus_message_new_method_call(PULSE_BUS, PULSE_PATH, PULSE_INTERFACE, "suuuuuup");
+        e_dbus_method_call_send(dbus, msg, NULL, (E_DBus_Callback_Func)_dbus_test, NULL, -1, NULL); /* test for not running pulse */
+        dbus_message_unref(msg);
+        pulse_free(conn);
+        conn = NULL;
+        pulse_shutdown();
+        return EINA_TRUE;
+     }
+   ph = ecore_event_handler_add(PULSE_EVENT_CONNECTED, (Ecore_Event_Handler_Cb)_pulse_connected, conn);
+   pch = ecore_event_handler_add(PULSE_EVENT_CHANGE, (Ecore_Event_Handler_Cb)_pulse_update, conn);
+   pdh = ecore_event_handler_add(PULSE_EVENT_DISCONNECTED, (Ecore_Event_Handler_Cb)_pulse_disconnected, conn);
+   return EINA_TRUE;
+error:
+   pulse_free(conn);
+   conn = NULL;
+   pulse_shutdown();
+   return EINA_FALSE;
+}
+
+void
+e_mixer_pulse_shutdown(void)
+{
+   Pulse_Sink *sink;
+   EINA_LIST_FREE(sinks, sink)
+     pulse_sink_free(sink);
+   EINA_LIST_FREE(sources, sink)
+     pulse_sink_free(sink);
+
+   pulse_free(conn);
+   conn = NULL;
+   ecore_event_handler_del(ph);
+   ph = NULL;
+   ecore_event_handler_del(pch);
+   pch = NULL;
+   ecore_event_handler_del(pdh);
+   pdh = NULL;
+   if (dbus_handler)
+     {
+        e_dbus_signal_handler_del(dbus, dbus_handler);
+        dbus_handler = NULL;
+     }
+   if (dbus)
+     {
+        e_dbus_connection_close(dbus);
+        dbus = NULL;
+        e_dbus_shutdown();
+     }
+   pulse_shutdown();
+}
+
+E_Mixer_System *
+e_mixer_pulse_new(const char *name)
+{
+   return (E_Mixer_System*)_pulse_sink_find(name);
+}
+
+void
+e_mixer_pulse_del(E_Mixer_System *self __UNUSED__)
+{
+}
+
+Eina_List *
+e_mixer_pulse_get_cards(void)
+{
+   Eina_List *l, *ret = NULL;
+   Pulse_Sink *sink;
+
+   EINA_LIST_FOREACH(sinks, l, sink)
+     ret = eina_list_append(ret, pulse_sink_name_get(sink));
+   EINA_LIST_FOREACH(sources, l, sink)
+     ret = eina_list_append(ret, pulse_sink_name_get(sink));
+   return ret;
+}
+
+void
+e_mixer_pulse_free_cards(Eina_List *cards)
+{
+   eina_list_free(cards);
+}
+
+const char *
+e_mixer_pulse_get_default_card(void)
+{
+   if (eina_list_data_get(sinks))
+     return eina_stringshare_ref(pulse_sink_name_get(eina_list_last(sinks)->data));
+   return NULL;
+}
+
+const char *
+e_mixer_pulse_get_card_name(const char *card)
+{
+   Pulse_Sink *sink = _pulse_sink_find(card);
+   const char *s = pulse_sink_desc_get(sink);
+   if ((!s) || (!s[0])) s = pulse_sink_name_get(sink);
+   return eina_stringshare_add(s);
+}
+
+Eina_List *
+e_mixer_pulse_get_channels(E_Mixer_System *self)
+{
+   Eina_List *ret = NULL;
+
+#ifdef BAD_CH_MAPPING
+   uintptr_t id;
+   for (id = 0; id < pulse_sink_channels_count((void *)self); id++)
+     ret = eina_list_append(ret, (void *)(id + 1));
+#else
+   (void)self;
+   ret = eina_list_append(ret, (void *)(1));
+#endif
+   return ret;
+}
+
+void
+e_mixer_pulse_free_channels(Eina_List *channels)
+{
+   eina_list_free(channels);
+}
+
+Eina_List *
+e_mixer_pulse_get_channels_names(E_Mixer_System *self)
+{
+#ifdef BAD_CH_MAPPING
+   return pulse_sink_channel_names_get((void *)self);
+#else
+   (void)self;
+   return eina_list_append(NULL, eina_stringshare_add("Output"));
+#endif   
+}
+
+void
+e_mixer_pulse_free_channels_names(Eina_List *channels_names)
+{
+   const char *str;
+   EINA_LIST_FREE(channels_names, str) eina_stringshare_del(str);
+}
+
+const char *
+e_mixer_pulse_get_default_channel_name(E_Mixer_System *self)
+{
+#ifdef BAD_CH_MAPPING
+   return e_mixer_pulse_get_channel_name(self, 0);
+#else
+   (void)self;
+   return eina_stringshare_add("Output");
+#endif   
+}
+
+E_Mixer_Channel *
+e_mixer_pulse_get_channel_by_name(E_Mixer_System *self, const char *name)
+{
+#ifdef BAD_CH_MAPPING
+   unsigned int x;
+   x = pulse_sink_channel_name_get_id((void *)self, name);
+   if (x == UINT_MAX) return NULL;
+   return (E_Mixer_Channel *)((uintptr_t)(x + 1));
+#else
+   (void)self, (void)name;
+   return (E_Mixer_Channel *)1;
+#endif   
+}
+
+void
+e_mixer_pulse_channel_del(E_Mixer_Channel *channel __UNUSED__)
+{
+}
+
+const char *
+e_mixer_pulse_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel)
+{
+   if (!channel) return NULL;
+#ifdef BAD_CH_MAPPING
+   return pulse_sink_channel_id_get_name((void *)self, 
+                                         ((uintptr_t)channel) - 1);
+#else
+   (void)self;
+   return eina_stringshare_add("Output");
+#endif   
+}
+
+int
+e_mixer_pulse_get_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int *left, int *right)
+{
+   double volume;
+   
+#ifdef BAD_CH_MAPPING
+   if (!channel) return 0;
+   volume = pulse_sink_channel_volume_get((void *)self, 
+                                          ((uintptr_t)channel) - 1);
+   if (left) *left = (int)volume;
+   if (right) *right = (int)volume;
+#else
+   int x, n;
+   
+   if (!channel) return 0;
+   n = pulse_sink_channels_count((void *)self);
+   for (x = 0; x < n; x++)
+     {
+        volume = pulse_sink_channel_volume_get((void *)self, 
+                                               ((uintptr_t)channel) - 1);
+        if (x == 0)
+          {
+             if (left) *left = (int)volume;
+          }
+        else if (x == 1)
+          {
+             if (right) *right = (int)volume;
+          }
+     }
+#endif   
+   return 1;
+}
+
+int
+e_mixer_pulse_set_volume(E_Mixer_System *self, E_Mixer_Channel *channel, int left, int right)
+{
+   uint32_t id = 0;
+
+#ifdef BAD_CH_MAPPING
+   if (!channel) return 0;
+   id = pulse_type_channel_volume_set(conn, (void *)self, 
+                                      ((uintptr_t)channel) - 1, 
+                                      (left + right) / 2, source);
+   if (!id) return 0;
+   pulse_cb_set(conn, id, (Pulse_Cb)_pulse_result_cb);
+#else
+   int x, n;
+   
+   if (!channel) return 0;
+   n = pulse_sink_channels_count((void *)self); 
+   for (x = 0; x < n; x++)
+     {
+        if (x == 0)
+          {
+             id |= pulse_sink_channel_volume_set(conn, (void *)self, x, left);
+          }
+        else if (x == 1)
+          {
+             id |= pulse_sink_channel_volume_set(conn, (void *)self, x, right);
+          }
+     }
+#endif   
+   return 1;
+}
+
+int
+e_mixer_pulse_can_mute(E_Mixer_System *self __UNUSED__, E_Mixer_Channel *channel __UNUSED__)
+{
+   return 1;
+}
+
+int
+e_mixer_pulse_get_mute(E_Mixer_System *self, E_Mixer_Channel *channel __UNUSED__, int *mute)
+{
+   if (mute) *mute = pulse_sink_muted_get((void *)self);
+   return 1;
+}
+
+int
+e_mixer_pulse_set_mute(E_Mixer_System *self, E_Mixer_Channel *channel __UNUSED__, int mute)
+{
+   uint32_t id;
+   Eina_Bool source = EINA_FALSE;
+
+   source = !!eina_list_data_find(sources, self);
+   id = pulse_type_mute_set(conn, pulse_sink_idx_get((void *)self), mute, source);
+   if (!id) return 0;
+   pulse_cb_set(conn, id, (Pulse_Cb)_pulse_result_cb);
+   return 1;
+}
+
+int
+e_mixer_pulse_get_state(E_Mixer_System *self, E_Mixer_Channel *channel, E_Mixer_Channel_State *state)
+{
+#ifdef BAD_CH_MAPPING
+   double vol;
+   if (!state) return 0;
+   if (!channel) return 0;
+   vol = pulse_sink_channel_volume_get((void *)self, 
+                                       ((uintptr_t)channel) - 1);
+   state->mute = pulse_sink_muted_get((void *)self);
+   state->left = state->right = (int)vol;
+#else
+   if (!state) return 0;
+   if (!channel) return 0;
+   e_mixer_pulse_get_mute(self, channel, &(state->mute));
+   e_mixer_pulse_get_volume(self, channel, &(state->left), &(state->right));
+#endif   
+   return 1;
+}
+
+int
+e_mixer_pulse_set_state(E_Mixer_System *self, E_Mixer_Channel *channel, const E_Mixer_Channel_State *state)
+{
+#ifdef BAD_CH_MAPPING
+   uint32_t id;
+   Eina_Bool source = EINA_FALSE;
+   if (!channel) return 0;
+   source = !!eina_list_data_find(sources, self);
+   id = pulse_type_channel_volume_set(conn, (void *)self, 
+                                      ((uintptr_t)channel) - 1, 
+                                      (state->left + state->right) / 2, source);
+   if (!id) return 0;
+   pulse_cb_set(conn, id, (Pulse_Cb)_pulse_result_cb);
+#else
+   e_mixer_pulse_set_volume(self, channel, state->left, state->right);
+   e_mixer_pulse_set_mute(self, channel, state->mute);
+#endif   
+   return 1;
+}
+
+int
+e_mixer_pulse_has_capture(E_Mixer_System *self __UNUSED__, E_Mixer_Channel *channel __UNUSED__)
+{
+   return 0;
+}
diff --git a/src/modules/mixer/tag.c b/src/modules/mixer/tag.c
new file mode 100644 (file)
index 0000000..60ab764
--- /dev/null
@@ -0,0 +1,326 @@
+#include "pa.h"
+
+uint8_t *
+tag_uint32(Pulse_Tag *tag, uint32_t val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   *ret = PA_TAG_U32;
+   val = htonl(val);
+   memcpy(ret + 1, &val, sizeof(val));
+   ret += PA_TAG_SIZE_U32;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_uint32(Pulse_Tag *tag, uint32_t *val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   if ((*ret != PA_TAG_U32) && (*ret != PA_TAG_VOLUME)) return 0;
+   memcpy(val, ret + 1, sizeof(uint32_t));
+   *val = ntohl(*val);
+   ret += PA_TAG_SIZE_U32;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+tag_bool(Pulse_Tag *tag, Eina_Bool val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   *ret = (uint8_t)(val ? PA_TAG_BOOLEAN_TRUE : PA_TAG_BOOLEAN_FALSE);
+   ret += PA_TAG_SIZE_BOOLEAN;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_bool(Pulse_Tag *tag, Eina_Bool *val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   if ((*ret != PA_TAG_BOOLEAN_TRUE) && (*ret != PA_TAG_BOOLEAN_FALSE)) return 0;
+   *val = !!(*ret == PA_TAG_BOOLEAN_TRUE) ? EINA_TRUE : EINA_FALSE;
+   ret += PA_TAG_SIZE_BOOLEAN;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+tag_string(Pulse_Tag *tag, const char *val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   if (val)
+     {
+        *ret = PA_TAG_STRING;
+        strcpy((char*)ret + 1, val);
+        ret += PA_TAG_SIZE_STRING + strlen(val);
+        tag->size = ret - tag->data;
+     }
+   else
+     *ret = PA_TAG_STRING_NULL, tag->size++;
+   return ret;
+}
+
+uint8_t *
+untag_string(Pulse_Tag *tag, const char **val)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   switch (*ret)
+     {
+      case PA_TAG_STRING:
+        eina_stringshare_replace(val, (char*)ret + 1);
+        ret += PA_TAG_SIZE_STRING + strlen(*val);
+        break;
+      case PA_TAG_STRING_NULL:
+        *val = NULL;
+        ret += PA_TAG_SIZE_STRING_NULL;
+        break;
+      default:
+        return 0;
+     }
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_sample(Pulse_Tag *tag, pa_sample_spec *spec)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_SAMPLE_SPEC) return 0;
+
+   spec->format = ret[1];
+   spec->channels = ret[2];
+   memcpy(&spec->rate, ret + 3, sizeof(spec->rate));
+   spec->rate = ntohl(spec->rate);
+   ret += PA_TAG_SIZE_SAMPLE_SPEC, tag->size += PA_TAG_SIZE_SAMPLE_SPEC;
+   return ret;
+}
+
+uint8_t *
+untag_channel_map(Pulse_Tag *tag, pa_channel_map *map)
+{
+   uint8_t *ret;
+   unsigned int x;
+
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_CHANNEL_MAP) return 0;
+
+   map->channels = ret[1];
+   if (map->channels > PA_CHANNELS_MAX) return 0;
+   if (map->channels + 2 + tag->size > tag->dsize) return 0;
+
+   for (ret += 2, x = 0; x < map->channels; ret++, x++)
+     map->map[x] = (int8_t)*ret;
+
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_usec(Pulse_Tag *tag, uint64_t *val)
+{
+   uint8_t *ret;
+   uint32_t tmp;
+
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_USEC) return 0;
+
+   memcpy(&tmp, ret + 1, 4);
+   *val = (uint64_t)ntohl(tmp) << 32;
+   memcpy(&tmp, ret + 5, 4);
+   *val |= (uint64_t)ntohl(tmp);
+   ret += PA_TAG_SIZE_USEC;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+tag_arbitrary(Pulse_Tag *tag, const void *val, uint32_t size)
+{
+   uint8_t *ret;
+   uint32_t tmp;
+
+   ret = tag->data + tag->size;
+   *ret = PA_TAG_ARBITRARY;
+   tmp = htonl(size);
+   memcpy(ret + 1, &tmp, sizeof(uint32_t));
+   memcpy(ret + PA_TAG_SIZE_U32, val, size);
+   ret += PA_TAG_SIZE_ARBITRARY + size;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_arbitrary(Pulse_Tag *tag, Eina_Binbuf **val)
+{
+   uint8_t *ret;
+   uint32_t len;
+
+   if (!untag_uint32(tag, &len)) return 0;
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_ARBITRARY) return 0;
+   ret += PA_TAG_SIZE_ARBITRARY;
+   
+   *val = eina_binbuf_new();
+   eina_binbuf_append_length(*val, ret, len);
+   ret += len;
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+tag_simple_init(Pulse *conn, Pulse_Tag *tag, uint32_t val, PA_Tag type)
+{
+   switch (type)
+     {
+      case PA_TAG_U32:
+         tag_uint32(tag, val);
+         return tag_uint32(tag, conn->tag_count++);
+      default:
+        break;
+     }
+   return NULL;
+}
+
+static Eina_Bool
+tag_proplist_foreach(const Eina_Hash *h __UNUSED__, const char *key, const char *val, Pulse_Tag *tag)
+{
+   size_t size;
+
+   tag_string(tag, key);
+   size = strlen(val) + 1;
+   tag_uint32(tag, size);
+   tag_arbitrary(tag, val, size);
+   return EINA_TRUE;
+}
+
+uint8_t *
+tag_proplist(Pulse_Tag *tag)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   *ret = PA_TAG_PROPLIST, tag->size++;
+   
+   eina_hash_foreach(tag->props, (Eina_Hash_Foreach)tag_proplist_foreach, tag);
+   return tag_string(tag, NULL);
+}
+
+uint8_t *
+untag_proplist(Pulse_Tag *tag, Eina_Hash **props)
+{
+   uint8_t *ret;
+
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_PROPLIST) return 0;
+
+   *props = eina_hash_string_superfast_new((Eina_Free_Cb)eina_binbuf_free);
+   for (++tag->size; *ret != PA_TAG_STRING_NULL && tag->size < tag->dsize - 1;)
+     {
+        const char *key = NULL;
+        Eina_Binbuf *val;
+        EINA_SAFETY_ON_FALSE_GOTO(untag_string(tag, &key), error);
+        EINA_SAFETY_ON_FALSE_GOTO(untag_arbitrary(tag, &val), error);
+#if 0
+        {
+           char buf[128];
+           snprintf(buf, sizeof(buf), "key='%%s', val='%%.%zus'", eina_binbuf_length_get(val));
+           DBG(buf, key, eina_binbuf_string_get(val));
+        }
+#endif
+        eina_hash_add(*props, key, val);
+        eina_stringshare_del(key);
+        ret = tag->data + tag->size;
+     }
+   tag->size++;
+   return ++ret;
+error:
+   eina_hash_free(*props);
+   return 0;
+}
+
+uint8_t *
+tag_volume(Pulse_Tag *tag, uint8_t channels, double vol)
+{
+   uint32_t pa_vol;
+   uint8_t *ret, x;
+
+   if (vol <= 0.0) pa_vol = PA_VOLUME_MUTED;
+   else pa_vol = ((vol * PA_VOLUME_NORM) - (PA_VOLUME_NORM / 2)) / 100;
+   pa_vol = htonl(pa_vol);
+   ret = tag->data + tag->size;
+   *ret++ = PA_TAG_CVOLUME;
+   *ret++ = channels;
+   for (x = 0; x < channels; x++, ret += sizeof(pa_vol))
+     memcpy(ret, &pa_vol, sizeof(pa_vol));
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+tag_cvol(Pulse_Tag *tag, pa_cvolume *c)
+{
+   uint8_t *ret, x;
+   uint32_t pa_vol;
+
+   ret = tag->data + tag->size;
+   *ret++ = PA_TAG_CVOLUME;
+   *ret++ = c->channels;
+   for (x = 0; x < c->channels; x++, ret += sizeof(pa_vol))
+     {
+        pa_vol = htonl(c->values[x]);
+        memcpy(ret, &pa_vol, sizeof(pa_vol));
+     }
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+uint8_t *
+untag_cvol(Pulse_Tag *tag, pa_cvolume *cvol)
+{
+   uint32_t pa_vol;
+   uint8_t *ret, x;
+
+   ret = tag->data + tag->size;
+   if (*ret != PA_TAG_CVOLUME) return 0;
+   cvol->channels = ret[1];
+   for (x = 0, ret += 2; x < cvol->channels; x++, ret += sizeof(pa_vol))
+     {
+        memcpy(&pa_vol, ret, sizeof(pa_vol));
+        cvol->values[x] = ntohl(pa_vol);
+     }
+     
+   tag->size = ret - tag->data;
+   return ret;
+}
+
+void
+tag_finish(Pulse_Tag *tag)
+{
+   EINA_SAFETY_ON_NULL_RETURN(tag);
+   tag->header[PA_PSTREAM_DESCRIPTOR_CHANNEL] = htonl((uint32_t) -1);
+   tag->header[PA_PSTREAM_DESCRIPTOR_LENGTH] = htonl(tag->dsize);
+}
+
+void
+pulse_tag_free(Pulse_Tag *tag)
+{
+   if (!tag) return;
+   free(tag->data);
+   if (tag->props) eina_hash_free(tag->props);
+   free(tag);
+}
index eebbd7f..232dfc6 100644 (file)
@@ -90,6 +90,14 @@ cb_desktop_lock(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
 
    return dbus_message_new_method_return(msg);
 }
+static DBusMessage *
+cb_desktop_unlock(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
+{
+   DBG("deskunlock requested");
+   e_desklock_hide();
+
+   return dbus_message_new_method_return(msg);
+}
 
 static DBusMessage*
 cb_desktop_bgadd(E_DBus_Object *obj __UNUSED__, DBusMessage *msg)
@@ -212,6 +220,8 @@ void msgbus_desktop_init(Eina_Array *ifaces)
                                    cb_desktop_show_by_name);
         e_dbus_interface_method_add(iface, "Lock", "", "",
                                     cb_desktop_lock);
+       e_dbus_interface_method_add(iface, "Unlock", "", "",
+                                    cb_desktop_unlock);
        e_msgbus_interface_attach(iface);
        eina_array_push(ifaces, iface);
      }
diff --git a/src/modules/notification/AUTHORS b/src/modules/notification/AUTHORS
new file mode 100755 (executable)
index 0000000..d2e8db4
--- /dev/null
@@ -0,0 +1,3 @@
+Brian Mattern <rephorm@rephorm.com>
+Samuel Mendes <heka.lok@gmail.com>
+Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
diff --git a/src/modules/notification/COPYING b/src/modules/notification/COPYING
new file mode 100755 (executable)
index 0000000..9690c3f
--- /dev/null
@@ -0,0 +1,32 @@
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its Copyright notices. In addition publicly
+documented acknowledgment must be given that this software has been used if no
+source code of this software is made available publicly. Making the source
+available publicly means including the source for this software with the
+distribution, or a method to get this software via some reasonable mechanism
+(electronic transfer via a network or media) as well as making an offer to
+supply the source on request. This Copyright notice serves as an offer to
+supply the source on on request as well. Instead of this, supplying
+acknowledgments of use of this software in either Copyright notices, Manuals,
+Publicity and Marketing documents or any documentation provided with any
+product containing this software. This License does not apply to any software
+that links to the libraries provided by this software (statically or
+dynamically), but only to the software provided.
+
+Please see the COPYING-PLAIN for a plain-english explanation of this notice
+and its intent.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/modules/notification/COPYING-PLAIN b/src/modules/notification/COPYING-PLAIN
new file mode 100755 (executable)
index 0000000..8dc2803
--- /dev/null
@@ -0,0 +1,33 @@
+Plain English Copyright Notice
+
+This file is not intended to be the actual License. The reason this file
+exists is that we here are programmers and engineers. We aren't lawyers. We
+provide licenses that we THINK say the right things, but we have our own
+intentions at heart. This is a plain-english explanation of what those
+intentions are, and if you follow them you will be within the "spirit" of
+the license.
+
+The intent is for us to enjoy writing software that is useful to us (the
+AUTHORS) and allow others to use it freely and also benefit from the work we
+put into making it. We don't want to restrict others using it. They should
+not *HAVE* to make the source code of the applications they write that
+simply link to these libraries (be that statically or dynamically), or for
+them to be limited as to what license they choose to use (be it open, closed
+or anything else). But we would like to know you are using these libraries.
+We simply would like to know that it has been useful to someone. This is why
+we ask for acknowledgement of some sort.
+
+You can do what you want with the source of this software - it doesn't
+matter. We still have it here for ourselves and it is open and free to use
+and download and play with. It can't be taken away. We don't really mind what
+you do with the source to your software. We would simply like to know that
+you are using it - especially if it makes it to a commerical product. If you
+simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
+then make sure you include a paragraph or page in the manual for the product
+with the copyright notice and state that you used this software, we will be
+very happy. If you want to contribute back modifications and fixes you may have
+made we will welcome those too with open arms (generally). If you want help
+with changes needed, ports needed or features to be added, arrangements can
+be easily made with some dialogue.
+
+Samuel Mendes <heka.lok@gmail.com>
diff --git a/src/modules/notification/Makefile.am b/src/modules/notification/Makefile.am
new file mode 100644 (file)
index 0000000..e976d1f
--- /dev/null
@@ -0,0 +1,36 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = notification
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES          = -I. \
+                    -I$(top_srcdir) \
+                    -I$(top_srcdir)/src/modules/$(MODULE) \
+                    -I$(top_srcdir)/src/bin \
+                    -I$(top_builddir)/src/bin \
+                    -I$(top_srcdir)/src/modules \
+                    @e_cflags@ @ENOTIFY_CFLAGS@
+
+pkgdir            = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+
+pkg_LTLIBRARIES   = module.la
+
+module_la_SOURCES = e_mod_main.h \
+                   e_mod_box.c \
+                   e_mod_config_item.c \
+                   e_mod_main.c \
+                   e_mod_popup.c \
+                   e_mod_config.c
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@ @ENOTIFY_LIBS@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/notification/README b/src/modules/notification/README
new file mode 100755 (executable)
index 0000000..91cf8bc
--- /dev/null
@@ -0,0 +1,28 @@
+Notification
+
+This module provide a notification daemon for E.
+It implements the galago specification :
+http://www.galago-project.org/specs/notification/0.9/index.html
+
+You can be notified in two ways, by popups or by icons. Popups are the usual way
+of notifying, you can configure where they should appear and some other options
+in E's configuration panel -> extensions -> notification. Notification box is a
+gadget with the same style as ibox and go into a shelf. If an event occur the
+image associated with the event (or this modules's logo if none) will appear
+inside the box. A click on it will try to focus the source application of the
+event, by matching the "application name" field with any windows class/name.
+Configure a notification box is done by right clicking on it and selecting
+"configuration".
+
+By configuring which level of urgency popups and box should show, you can avoid
+having both showing up everytime.
+
+The icon displayed in the box may be ugly and aliased. It's due to the fact that
+some apps use really small icons. An easy way to fix this is to make sure that
+the application doesn't send a pixbuf but a path to the icon instead. And if this
+icon is too small, replace it by a bigger one.
+
+If you want to fire up a notification and make the module focus an application,
+the easiest way is to use e-notify-send (in e_dbus if built with enotify) like
+in this example:
+e-notify-send -n classname_of_your_app -i "file:///path/to/an/icon" "foo" "bar"
diff --git a/src/modules/notification/e-module-notification.edj b/src/modules/notification/e-module-notification.edj
new file mode 100644 (file)
index 0000000..9796d96
Binary files /dev/null and b/src/modules/notification/e-module-notification.edj differ
diff --git a/src/modules/notification/e_mod_box.c b/src/modules/notification/e_mod_box.c
new file mode 100644 (file)
index 0000000..1417a6a
--- /dev/null
@@ -0,0 +1,748 @@
+#include "e_mod_main.h"
+
+/* Notification box protos */
+static Notification_Box *_notification_box_new(const char *id,
+                                               Evas       *evas);
+static void              _notification_box_free(Notification_Box *b);
+static void              _notification_box_evas_set(Notification_Box *b,
+                                                    Evas             *evas);
+static void              _notification_box_empty(Notification_Box *b);
+static void              _notification_box_resize_handle(Notification_Box *b);
+static void              _notification_box_empty_handle(Notification_Box *b);
+static Eina_List        *_notification_box_find(E_Notification_Urgency urgency);
+
+/* Notification box icons protos */
+static Notification_Box_Icon *_notification_box_icon_new(Notification_Box *b,
+                                                         E_Notification   *n,
+                                                         E_Border         *bd,
+                                                         unsigned int      id);
+static void                   _notification_box_icon_free(Notification_Box_Icon *ic);
+static void                   _notification_box_icon_fill(Notification_Box_Icon *ic,
+                                                          E_Notification        *n);
+static void                   _notification_box_icon_fill_label(Notification_Box_Icon *ic);
+static void                   _notification_box_icon_empty(Notification_Box_Icon *ic);
+static Notification_Box_Icon *_notification_box_icon_find(Notification_Box *b,
+                                                          E_Border         *bd,
+                                                          unsigned int      n_id);
+static void _notification_box_icon_signal_emit(Notification_Box_Icon *ic,
+                                               char                  *sig,
+                                               char                  *src);
+
+/* Utils */
+static E_Border *_notification_find_source_border(E_Notification *n);
+
+/* Notification box callbacks */
+static void _notification_box_cb_menu_post(void   *data,
+                                           E_Menu *m);
+
+void
+notification_box_notify(E_Notification *n,
+                        unsigned int    replaces_id,
+                        unsigned int    id)
+{
+   Eina_List *n_box;
+   E_Border *bd;
+   Notification_Box *b;
+   Notification_Box_Icon *ic = NULL;
+
+   bd = _notification_find_source_border(n);
+
+   n_box = _notification_box_find(e_notification_hint_urgency_get(n));
+   EINA_LIST_FREE(n_box, b)
+     {
+        if (bd || replaces_id)
+          ic = _notification_box_icon_find(b, bd, replaces_id);
+        if (ic)
+          {
+             e_notification_unref(ic->notif);
+             e_notification_ref(n);
+             ic->notif = n;
+             ic->n_id = id;
+             _notification_box_icon_empty(ic);
+             _notification_box_icon_fill(ic, n);
+          }
+        else
+          {
+             ic = _notification_box_icon_new(b, n, bd, id);
+             if (!ic) continue;
+             b->icons = eina_list_append(b->icons, ic);
+             e_box_pack_end(b->o_box, ic->o_holder);
+          }
+        _notification_box_empty_handle(b);
+        _notification_box_resize_handle(b);
+        _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
+     }
+}
+
+void
+notification_box_shutdown(void)
+{
+   Notification_Box *b;
+
+   EINA_LIST_FREE(notification_cfg->n_box, b)
+     {
+        if (b) _notification_box_free(b);
+     }
+}
+
+void
+notification_box_del(const char *id)
+{
+   Eina_List *l;
+   Notification_Box *b;
+
+   /* Find old config */
+   EINA_LIST_FOREACH(notification_cfg->n_box, l, b)
+     {
+        if (b->id == id)
+          {
+             _notification_box_free(b);
+             notification_cfg->n_box = eina_list_remove(notification_cfg->n_box, b);
+             return;
+          }
+     }
+}
+
+void
+notification_box_visible_set(Notification_Box *b, Eina_Bool visible)
+{
+   Eina_List *l;
+   Notification_Box_Icon *ic;
+   Ecore_Cb cb = (Ecore_Cb)(visible ? evas_object_show : evas_object_hide);
+
+   cb(b->o_box);
+   if (b->o_empty) cb(b->o_empty);
+   EINA_LIST_FOREACH(b->icons, l, ic)
+     {
+        if (!ic) continue;
+        cb(ic->o_holder);
+        cb(ic->o_holder2);
+        cb(ic->o_icon);
+        cb(ic->o_icon2);
+     }
+}
+
+Notification_Box *
+notification_box_get(const char *id,
+                     Evas       *evas)
+{
+   Eina_List *l;
+   Notification_Box *b;
+
+   /* Find old config */
+   EINA_LIST_FOREACH(notification_cfg->n_box, l, b)
+     {
+        if (b->id == id)
+          {
+             _notification_box_evas_set(b, evas);
+             notification_box_visible_set(b, EINA_TRUE);
+             return b;
+          }
+     }
+
+   b = _notification_box_new(id, evas);
+   notification_cfg->n_box = eina_list_append(notification_cfg->n_box, b);
+   return b;
+}
+
+Config_Item *
+notification_box_config_item_get(const char *id)
+{
+   Config_Item *ci;
+
+   GADCON_CLIENT_CONFIG_GET(Config_Item, notification_cfg->items, _gc_class, id);
+
+   ci = E_NEW(Config_Item, 1);
+   ci->id = eina_stringshare_ref(id);
+   ci->show_label = 1;
+   ci->show_popup = 1;
+   ci->focus_window = 1;
+   ci->store_low = 1;
+   ci->store_normal = 1;
+   ci->store_critical = 0;
+   notification_cfg->items = eina_list_append(notification_cfg->items, ci);
+
+   return ci;
+}
+
+void
+notification_box_orient_set(Notification_Box *b,
+                            int               horizontal)
+{
+   e_box_orientation_set(b->o_box, horizontal);
+   e_box_align_set(b->o_box, 0.5, 0.5);
+}
+
+void
+notification_box_cb_obj_moveresize(void        *data,
+                                   Evas        *e __UNUSED__,
+                                   Evas_Object *obj __UNUSED__,
+                                   void        *event_info __UNUSED__)
+{
+   Instance *inst;
+
+   inst = data;
+   _notification_box_resize_handle(inst->n_box);
+}
+
+Eina_Bool
+notification_box_cb_border_remove(void *data __UNUSED__,
+                                  int   type __UNUSED__,
+                                  E_Event_Border_Remove *ev)
+{
+   Notification_Box_Icon *ic;
+   Eina_List *l;
+   Instance *inst;
+
+   EINA_LIST_FOREACH(notification_cfg->instances, l, inst)
+     {
+        Notification_Box *b;
+
+        if (!inst) continue;
+        b = inst->n_box;
+
+        ic = _notification_box_icon_find(b, ev->border, 0);
+        if (!ic) continue;
+        b->icons = eina_list_remove(b->icons, ic);
+        _notification_box_icon_free(ic);
+        _notification_box_empty_handle(b);
+        _notification_box_resize_handle(b);
+        _gc_orient(inst->gcc, inst->gcc->gadcon->orient);
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Notification_Box *
+_notification_box_new(const char *id,
+                      Evas       *evas)
+{
+   Notification_Box *b;
+
+   b = E_NEW(Notification_Box, 1);
+   b->id = eina_stringshare_ref(id);
+   b->o_box = e_box_add(evas);
+   e_box_homogenous_set(b->o_box, 1);
+   e_box_orientation_set(b->o_box, 1);
+   e_box_align_set(b->o_box, 0.5, 0.5);
+   _notification_box_empty(b);
+   return b;
+}
+
+static void
+_notification_box_free(Notification_Box *b)
+{
+   _notification_box_empty(b);
+   eina_stringshare_del(b->id);
+   evas_object_del(b->o_box);
+   if (b->o_empty) evas_object_del(b->o_empty);
+   b->o_empty = NULL;
+   free(b);
+}
+
+static void
+_notification_box_evas_set(Notification_Box *b,
+                           Evas             *evas)
+{
+   Eina_List *new_icons = NULL;
+   Notification_Box_Icon *ic, *new_ic;
+
+   evas_object_del(b->o_box);
+   if (b->o_empty) evas_object_del(b->o_empty);
+   b->o_empty = NULL;
+   b->o_box = e_box_add(evas);
+
+   e_box_homogenous_set(b->o_box, 1);
+   e_box_orientation_set(b->o_box, 1);
+   e_box_align_set(b->o_box, 0.5, 0.5);
+
+   EINA_LIST_FREE(b->icons, ic)
+     {
+        if (!ic) continue;
+
+        new_ic = _notification_box_icon_new(b, ic->notif, ic->border, ic->n_id);
+        _notification_box_icon_free(ic);
+        new_icons = eina_list_append(new_icons, new_ic);
+
+        e_box_pack_end(b->o_box, new_ic->o_holder);
+     }
+   b->icons = new_icons;
+   _notification_box_empty_handle(b);
+   _notification_box_resize_handle(b);
+}
+
+static void
+_notification_box_empty(Notification_Box *b)
+{
+   Notification_Box_Icon *ic;
+   EINA_LIST_FREE(b->icons, ic)
+     _notification_box_icon_free(b->icons->data);
+   _notification_box_empty_handle(b);
+}
+
+static void
+_notification_box_resize_handle(Notification_Box *b)
+{
+   Notification_Box_Icon *ic;
+   Evas_Coord w, h;
+
+   evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
+   if (e_box_orientation_get(b->o_box))
+     w = h;
+   else
+     h = w;
+   e_box_freeze(b->o_box);
+   EINA_LIST_FREE(b->icons, ic)
+     e_box_pack_options_set(ic->o_holder, 1, 1, 0, 0, 0.5, 0.5, w, h, w, h);
+   e_box_thaw(b->o_box);
+}
+
+static Eina_List *
+_notification_box_find(E_Notification_Urgency urgency)
+{
+   Eina_List *l, *n_box = NULL;
+   Instance *inst;
+
+   EINA_LIST_FOREACH(notification_cfg->instances, l, inst)
+     {
+        if ((urgency == E_NOTIFICATION_URGENCY_LOW) && (!inst->ci->store_low))
+          continue;
+        if ((urgency == E_NOTIFICATION_URGENCY_NORMAL) && (!inst->ci->store_normal))
+          continue;
+        if ((urgency == E_NOTIFICATION_URGENCY_CRITICAL) && (!inst->ci->store_critical))
+          continue;
+        n_box = eina_list_append(n_box, inst->n_box);
+     }
+   return n_box;
+}
+
+static void
+_notification_box_icon_free(Notification_Box_Icon *ic)
+{
+   if (notification_cfg->menu)
+     {
+        e_menu_post_deactivate_callback_set(notification_cfg->menu, NULL, NULL);
+        e_object_del(E_OBJECT(notification_cfg->menu));
+        notification_cfg->menu = NULL;
+     }
+   _notification_box_icon_empty(ic);
+   evas_object_del(ic->o_holder);
+   evas_object_del(ic->o_holder2);
+   if (ic->border) e_object_unref(E_OBJECT(ic->border));
+   if (ic->notif) e_notification_unref(ic->notif);
+   free(ic);
+}
+
+static void
+_notification_box_icon_fill(Notification_Box_Icon *ic,
+                            E_Notification        *n)
+{
+   void *img;
+   const char *icon_path;
+   Evas_Object *app_icon;
+   Evas_Object *dummy = NULL;
+   int w, h = 0;
+
+   if ((icon_path = e_notification_app_icon_get(n)) && *icon_path)
+     {
+        if (!memcmp(icon_path, "file://", 7)) icon_path += 7;
+        app_icon = evas_object_image_add(evas_object_evas_get(ic->n_box->o_box));
+        evas_object_image_load_scale_down_set(app_icon, 1);
+        evas_object_image_load_size_set(app_icon, 80, 80);
+        evas_object_image_file_set(app_icon, icon_path, NULL);
+        evas_object_image_fill_set(app_icon, 0, 0, 80, 80);
+     }
+   else if ((img = e_notification_hint_icon_data_get(n)))
+     {
+        app_icon = e_notification_image_evas_object_add(evas_object_evas_get(ic->n_box->o_box), img);
+     }
+   else
+     {
+        char buf[PATH_MAX];
+
+        snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", notification_mod->dir);
+        dummy = edje_object_add(evas_object_evas_get(ic->n_box->o_box));
+        if (!e_theme_edje_object_set(dummy, "base/theme/modules/notification",
+                                     "modules/notification/logo"))
+          edje_object_file_set(dummy, buf, "modules/notification/logo");
+        evas_object_resize(dummy, 80, 80);
+        app_icon = (Evas_Object*)edje_object_part_object_get(dummy, "image");
+     }
+   evas_object_image_size_get(app_icon, &w, &h);
+
+   ic->o_icon = e_icon_add(evas_object_evas_get(ic->n_box->o_box));
+   e_icon_alpha_set(ic->o_icon, 1);
+   e_icon_data_set(ic->o_icon, evas_object_image_data_get(app_icon, 0), w, h);
+   edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
+   evas_object_pass_events_set(ic->o_icon, 1);
+   evas_object_show(ic->o_icon);
+
+   ic->o_icon2 = e_icon_add(evas_object_evas_get(ic->n_box->o_box));
+   e_icon_alpha_set(ic->o_icon2, 1);
+   e_icon_data_set(ic->o_icon2, evas_object_image_data_get(app_icon, 0), w, h);
+   edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2);
+   evas_object_pass_events_set(ic->o_icon2, 1);
+   evas_object_show(ic->o_icon2);
+
+   if (dummy) evas_object_del(dummy);
+   evas_object_del(app_icon);
+   _notification_box_icon_fill_label(ic);
+}
+
+static void
+_notification_box_icon_fill_label(Notification_Box_Icon *ic)
+{
+   const char *label = NULL;
+
+   if (ic->border)
+     label = ic->border->client.netwm.name;
+
+   if (!label) label = e_notification_app_name_get(ic->notif);
+   edje_object_part_text_set(ic->o_holder, "e.text.label", label);
+   edje_object_part_text_set(ic->o_holder2, "e.text.label", label);
+}
+
+static void
+_notification_box_icon_empty(Notification_Box_Icon *ic)
+{
+   if (ic->o_icon) evas_object_del(ic->o_icon);
+   if (ic->o_icon2) evas_object_del(ic->o_icon2);
+   ic->o_icon2 = ic->o_icon = NULL;
+}
+
+static Notification_Box_Icon *
+_notification_box_icon_find(Notification_Box *b,
+                            E_Border         *bd,
+                            unsigned int      n_id)
+{
+   Eina_List *l;
+   Notification_Box_Icon *ic;
+
+   EINA_LIST_FOREACH(b->icons, l, ic)
+     {
+        if (!ic) continue;
+        if ((ic->border == bd) || (ic->n_id == n_id))
+          return ic;
+     }
+
+   return NULL;
+}
+
+static void
+_notification_box_icon_signal_emit(Notification_Box_Icon *ic,
+                                   char                  *sig,
+                                   char                  *src)
+{
+   if (ic->o_holder)
+     edje_object_signal_emit(ic->o_holder, sig, src);
+   if (ic->o_icon)
+     edje_object_signal_emit(ic->o_icon, sig, src);
+   if (ic->o_holder2)
+     edje_object_signal_emit(ic->o_holder2, sig, src);
+   if (ic->o_icon2)
+     edje_object_signal_emit(ic->o_icon2, sig, src);
+}
+
+static E_Border *
+_notification_find_source_border(E_Notification *n)
+{
+   const char *app_name;
+   Eina_List *l;
+   E_Border *bd;
+
+   if (!(app_name = e_notification_app_name_get(n))) return NULL;
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+        size_t app, test;
+
+        if ((!bd) || ((!bd->client.icccm.name) && (!bd->client.icccm.class))) continue;
+        /* We can't be sure that the app_name really match the application name.
+         * Some plugin put their name instead. But this search gives some good
+         * results.
+         */
+        app = strlen(app_name);
+        if (bd->client.icccm.name)
+          {
+             test = eina_strlen_bounded(bd->client.icccm.name, app + 1);
+             if (!strncasecmp(bd->client.icccm.name, app_name, (app < test) ? app : test))
+               return bd;
+          }
+        if (bd->client.icccm.class)
+          {
+             test = eina_strlen_bounded(bd->client.icccm.class, app + 1);
+             if (!strncasecmp(bd->client.icccm.class, app_name, (app < test) ? app : test))
+               return bd;
+          }
+     }
+   return NULL;
+}
+
+static void
+_notification_box_cb_menu_post(void   *data __UNUSED__,
+                               E_Menu *m __UNUSED__)
+{
+   if (!notification_cfg->menu) return;
+   e_object_del(E_OBJECT(notification_cfg->menu));
+   notification_cfg->menu = NULL;
+}
+
+static void
+_notification_box_cb_menu_configuration(Notification_Box *b,
+                                        E_Menu      *m __UNUSED__,
+                                        E_Menu_Item *mi __UNUSED__)
+{
+   Eina_List *l;
+   E_Config_Dialog *cfd;
+
+   EINA_LIST_FOREACH(notification_cfg->config_dialog, l, cfd)
+     {
+        if (cfd->data == b->inst->ci) return;
+     }
+   config_notification_box_module(b->inst->ci);
+}
+
+static void
+_notification_box_cb_empty_mouse_down(Notification_Box *b,
+                                      Evas        *e __UNUSED__,
+                                      Evas_Object *obj __UNUSED__,
+                                      Evas_Event_Mouse_Down *ev)
+{
+   E_Menu *m;
+   E_Menu_Item *mi;
+   int cx, cy, cw, ch;
+
+   if (notification_cfg->menu) return;
+   m = e_menu_new();
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Settings"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-system");
+   e_menu_item_callback_set(mi, (E_Menu_Cb)_notification_box_cb_menu_configuration, b);
+
+   notification_cfg->menu = m = e_gadcon_client_util_menu_items_append(b->inst->gcc, m, 0);
+   e_menu_post_deactivate_callback_set(m, _notification_box_cb_menu_post, NULL);
+
+   e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon,
+                                     &cx, &cy, &cw, &ch);
+   e_menu_activate_mouse(m,
+                         e_util_zone_current_get(e_manager_current_get()),
+                         cx + ev->output.x, cy + ev->output.y, 1, 1,
+                         E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+}
+
+static void
+_notification_box_cb_icon_move(Notification_Box_Icon *ic,
+                               Evas        *e __UNUSED__,
+                               Evas_Object *obj __UNUSED__,
+                               void        *event_info __UNUSED__)
+{
+   Evas_Coord x, y;
+
+   evas_object_geometry_get(ic->o_holder, &x, &y, NULL, NULL);
+   evas_object_move(ic->o_holder2, x, y);
+   evas_object_raise(ic->o_holder2);
+}
+
+static void
+_notification_box_cb_icon_resize(Notification_Box_Icon *ic,
+                                 Evas        *e __UNUSED__,
+                                 Evas_Object *obj __UNUSED__,
+                                 void        *event_info __UNUSED__)
+{
+   Evas_Coord w, h;
+
+   evas_object_geometry_get(ic->o_holder, NULL, NULL, &w, &h);
+   evas_object_resize(ic->o_holder2, w, h);
+   evas_object_raise(ic->o_holder2);
+}
+
+
+static Eina_Bool
+_notification_box_cb_icon_mouse_still_in(Notification_Box_Icon *ic)
+{
+   e_notification_timeout_set(ic->notif, 0);
+   e_notification_hint_urgency_set(ic->notif, 4);
+   ic->popup = notification_popup_notify(ic->notif,
+                                         e_notification_id_get(ic->notif),
+                                         e_notification_app_name_get(ic->notif));
+   ecore_timer_del(ic->mouse_in_timer);
+   ic->mouse_in_timer = NULL;
+   return EINA_FALSE;
+}
+
+
+static void
+_notification_box_cb_icon_mouse_in(Notification_Box_Icon *ic,
+                                   Evas        *e __UNUSED__,
+                                   Evas_Object *obj __UNUSED__,
+                                   void        *event_info __UNUSED__)
+{
+   Config_Item *ci;
+
+   if ((!ic) || !ic->n_box || !ic->n_box->inst) return;
+   if (!(ci = ic->n_box->inst->ci)) return;
+
+   _notification_box_icon_signal_emit(ic, "e,state,focused", "e");
+   if (ci->show_label)
+     {
+        _notification_box_icon_fill_label(ic);
+        _notification_box_icon_signal_emit(ic, "e,action,show,label", "e");
+     }
+   if (ci->show_popup && !ic->popup && !ic->mouse_in_timer)
+     ic->mouse_in_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_notification_box_cb_icon_mouse_still_in, ic);
+}
+
+static void
+_notification_box_cb_icon_mouse_out(Notification_Box_Icon *ic,
+                                    Evas        *e __UNUSED__,
+                                    Evas_Object *obj __UNUSED__,
+                                    void        *event_info __UNUSED__)
+{
+   _notification_box_icon_signal_emit(ic, "e,state,unfocused", "e");
+   if (ic->n_box->inst->ci->show_label)
+     _notification_box_icon_signal_emit(ic, "e,action,hide,label", "e");
+
+   if (ic->mouse_in_timer)
+     {
+        ecore_timer_del(ic->mouse_in_timer);
+        ic->mouse_in_timer = NULL;
+     }
+   if (ic->popup)
+     {
+        notification_popup_close(e_notification_id_get(ic->notif));
+        ic->popup = 0;
+     }
+}
+
+static void
+_notification_box_cb_icon_mouse_up(Notification_Box_Icon *ic,
+                                   Evas        *e __UNUSED__,
+                                   Evas_Object *obj __UNUSED__,
+                                   Evas_Event_Mouse_Up *ev)
+{
+   Notification_Box *b;
+
+   b = ic->n_box;
+   if (ev->button != 1) return;
+
+   if (b->inst->ci->focus_window && ic->border)
+     {
+        e_border_uniconify(ic->border);
+        e_desk_show(ic->border->desk);
+        e_border_show(ic->border);
+        e_border_raise(ic->border);
+        e_border_focus_set(ic->border, 1, 1);
+     }
+   b->icons = eina_list_remove(b->icons, ic);
+   _notification_box_icon_free(ic);
+   _notification_box_empty_handle(b);
+   _notification_box_resize_handle(b);
+   _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
+}
+
+static void
+_notification_box_cb_icon_mouse_down(Notification_Box_Icon *ic,
+                                     Evas        *e __UNUSED__,
+                                     Evas_Object *obj __UNUSED__,
+                                     Evas_Event_Mouse_Down *ev)
+{
+   E_Menu *m;
+   E_Menu_Item *mi;
+   int cx, cy, cw, ch;
+
+   if (notification_cfg->menu || (ev->button != 3)) return;
+
+   m = e_menu_new();
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Settings"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-system");
+   e_menu_item_callback_set(mi, (E_Menu_Cb)_notification_box_cb_menu_configuration, ic->n_box);
+
+   m = e_gadcon_client_util_menu_items_append(ic->n_box->inst->gcc, m, 0);
+   e_menu_post_deactivate_callback_set(m, _notification_box_cb_menu_post, NULL);
+   notification_cfg->menu = m;
+
+   e_gadcon_canvas_zone_geometry_get(ic->n_box->inst->gcc->gadcon,
+                                     &cx, &cy, &cw, &ch);
+   e_menu_activate_mouse(m,
+                         e_util_zone_current_get(e_manager_current_get()),
+                         cx + ev->output.x, cy + ev->output.y, 1, 1,
+                         E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+}
+
+static void
+_notification_box_empty_handle(Notification_Box *b)
+{
+   if (!b->icons)
+     {
+        Evas_Coord w, h;
+        if (b->o_empty) return;
+
+        b->o_empty = evas_object_rectangle_add(evas_object_evas_get(b->o_box));
+        evas_object_event_callback_add(b->o_empty, EVAS_CALLBACK_MOUSE_DOWN,
+                                       (Evas_Object_Event_Cb)_notification_box_cb_empty_mouse_down, b);
+        evas_object_color_set(b->o_empty, 0, 0, 0, 0);
+        evas_object_show(b->o_empty);
+        e_box_pack_end(b->o_box, b->o_empty);
+        evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
+        if (e_box_orientation_get(b->o_box))
+          w = h;
+        else
+          h = w;
+        e_box_pack_options_set(b->o_empty,
+                               1, 1, /* fill */
+                               1, 1, /* expand */
+                               0.5, 0.5, /* align */
+                               w, h, /* min */
+                               9999, 9999 /* max */
+                               );
+     }
+   else if (b->o_empty)
+     {
+        evas_object_del(b->o_empty);
+        b->o_empty = NULL;
+     }
+}
+
+static Notification_Box_Icon *
+_notification_box_icon_new(Notification_Box *b,
+                           E_Notification   *n,
+                           E_Border         *bd,
+                           unsigned int      id)
+{
+   Notification_Box_Icon *ic;
+
+   ic = E_NEW(Notification_Box_Icon, 1);
+   if (bd) e_object_ref(E_OBJECT(bd));
+   e_notification_ref(n);
+   ic->label = e_notification_app_name_get(n);
+   ic->n_box = b;
+   ic->n_id = id;
+   ic->border = bd;
+   ic->notif = n;
+   ic->o_holder = edje_object_add(evas_object_evas_get(b->o_box));
+   e_theme_edje_object_set(ic->o_holder, "base/theme/modules/ibox",
+                           "e/modules/ibox/icon");
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_IN,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_mouse_in, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_OUT,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_mouse_out, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_DOWN,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_mouse_down, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_UP,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_mouse_up, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOVE,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_move, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_RESIZE,
+                                  (Evas_Object_Event_Cb)_notification_box_cb_icon_resize, ic);
+   evas_object_show(ic->o_holder);
+
+   ic->o_holder2 = edje_object_add(evas_object_evas_get(b->o_box));
+   e_theme_edje_object_set(ic->o_holder2, "base/theme/modules/ibox",
+                           "e/modules/ibox/icon_overlay");
+   evas_object_layer_set(ic->o_holder2, 9999);
+   evas_object_pass_events_set(ic->o_holder2, 1);
+   evas_object_show(ic->o_holder2);
+
+   _notification_box_icon_fill(ic, n);
+   return ic;
+}
diff --git a/src/modules/notification/e_mod_config.c b/src/modules/notification/e_mod_config.c
new file mode 100644 (file)
index 0000000..3c83cb7
--- /dev/null
@@ -0,0 +1,168 @@
+#include "e_mod_main.h"
+
+struct _E_Config_Dialog_Data
+{
+   int    show_low;
+   int    show_normal;
+   int    show_critical;
+   int    force_timeout;
+   int    ignore_replacement;
+   int    dual_screen;
+   double timeout;
+   int    corner;
+};
+
+/* local function protos */
+static void        *_create_data(E_Config_Dialog *cfd);
+static void         _free_data(E_Config_Dialog      *cfd,
+                               E_Config_Dialog_Data *cfdata);
+static void         _fill_data(E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog      *cfd,
+                                  Evas                 *evas,
+                                  E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog      *cfd,
+                        E_Config_Dialog_Data *cfdata);
+
+E_Config_Dialog *
+e_int_config_notification_module(E_Container *con,
+                                 const char  *params __UNUSED__)
+{
+   E_Config_Dialog *cfd = NULL;
+   E_Config_Dialog_View *v = NULL;
+   char buf[4096];
+
+   if (e_config_dialog_find("Notification", "extensions/notification")) return NULL;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   if (!v) return NULL;
+
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create;
+   v->basic.apply_cfdata = _basic_apply;
+
+   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", notification_mod->dir);
+   cfd = e_config_dialog_new(con, _("Notification Settings"), "Notification",
+                             "extensions/notification", buf, 0, v, NULL);
+   notification_cfg->cfd = cfd;
+   return cfd;
+}
+
+/* local functions */
+static void *
+_create_data(E_Config_Dialog *cfd __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = NULL;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(cfdata);
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog      *cfd __UNUSED__,
+           E_Config_Dialog_Data *cfdata)
+{
+   notification_cfg->cfd = NULL;
+   E_FREE(cfdata);
+}
+
+static void
+_fill_data(E_Config_Dialog_Data *cfdata)
+{
+   cfdata->show_low = notification_cfg->show_low;
+   cfdata->show_normal = notification_cfg->show_normal;
+   cfdata->show_critical = notification_cfg->show_critical;
+   cfdata->timeout = notification_cfg->timeout;
+   cfdata->corner = notification_cfg->corner;
+   cfdata->force_timeout = notification_cfg->force_timeout;
+   cfdata->ignore_replacement = notification_cfg->ignore_replacement;
+   cfdata->dual_screen = notification_cfg->dual_screen;
+}
+
+static Evas_Object *
+_basic_create(E_Config_Dialog      *cfd __UNUSED__,
+              Evas                 *evas,
+              E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o = NULL, *of = NULL, *ow = NULL;
+   E_Radio_Group *rg;
+//   E_Manager *man;
+
+   o = e_widget_list_add(evas, 0, 0);
+   of = e_widget_framelist_add(evas, _("Urgency"), 0);
+   ow = e_widget_label_add(evas, _("Levels of urgency to display:"));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Low"), &(cfdata->show_low));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Normal"), &(cfdata->show_normal));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Critical"), &(cfdata->show_critical));
+   e_widget_framelist_object_append(of, ow);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   of = e_widget_framelist_add(evas, _("Default Timeout"), 0);
+   ow = e_widget_check_add(evas, _("Force timeout for all notifications"), &(cfdata->force_timeout));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.0, 15.0, 0.1, 0,
+                            &(cfdata->timeout), NULL, 200);
+   e_widget_framelist_object_append(of, ow);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   /* man = e_manager_current_get();
+    * of = e_widget_framelist_add(evas, _("Placement"), 0);
+    * ow = e_widget_slider_add(evas, 1, 0, _("%2.0f x"), 0.0, man->w, 1.0, 0,
+    *                          NULL, &(cfdata->placement.x), 200);
+    * e_widget_framelist_object_append(of, ow);
+    * ow = e_widget_slider_add(evas, 1, 0, _("%2.0f y"), 0.0, man->h, 1.0, 0,
+    *                          NULL, &(cfdata->placement.y), 200);
+    * e_widget_framelist_object_append(of, ow);
+    * e_widget_list_object_append(o, of, 1, 1, 0.5); */
+
+   of = e_widget_framelist_add(evas, _("Popup Corner"), 0);
+   rg = e_widget_radio_group_new(&(cfdata->corner));
+   ow = e_widget_radio_add(evas, _("Top left"), CORNER_TL, rg);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_radio_add(evas, _("Top right"), CORNER_TR, rg);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_radio_add(evas, _("Botton left"), CORNER_BL, rg);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_radio_add(evas, _("Bottom right"), CORNER_BR, rg);
+   e_widget_framelist_object_append(of, ow);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   /* of = e_widget_framelist_add(evas, _("Gap"), 0);
+   * ow = e_widget_label_add(evas, _("Size of the gap between two popups : "));
+   * e_widget_framelist_object_append(of, ow);
+   * ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0.0, 50, 1.0, 0,
+   *                          NULL, &(cfdata->gap), 200);
+   * e_widget_framelist_object_append(of, ow);
+   * e_widget_list_object_append(o, of, 1, 1, 0.5); */
+   of = e_widget_framelist_add(evas, _("Miscellaneous"), 0);
+   ow = e_widget_check_add(evas, _("Ignore replace ID"), &(cfdata->ignore_replacement));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Use multiple monitor geometry"), &(cfdata->dual_screen));
+   e_widget_framelist_object_append(of, ow);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+
+   return o;
+}
+
+static int
+_basic_apply(E_Config_Dialog      *cfd __UNUSED__,
+             E_Config_Dialog_Data *cfdata)
+{
+   notification_cfg->show_low = cfdata->show_low;
+   notification_cfg->show_normal = cfdata->show_normal;
+   notification_cfg->show_critical = cfdata->show_critical;
+   notification_cfg->timeout = cfdata->timeout;
+   notification_cfg->corner = cfdata->corner;
+   notification_cfg->force_timeout = cfdata->force_timeout;
+   notification_cfg->ignore_replacement = cfdata->ignore_replacement;
+   notification_cfg->dual_screen = cfdata->dual_screen;
+
+   e_modapi_save(notification_mod);
+   return 1;
+}
+
diff --git a/src/modules/notification/e_mod_config_item.c b/src/modules/notification/e_mod_config_item.c
new file mode 100644 (file)
index 0000000..905bdc6
--- /dev/null
@@ -0,0 +1,129 @@
+#include "e_mod_main.h"
+
+struct _E_Config_Dialog_Data
+{
+   int show_label;
+   int show_popup;
+   int focus_window;
+   int store_low;
+   int store_normal;
+   int store_critical;
+};
+
+static void         _ci_fill_data(Config_Item          *ci,
+                                  E_Config_Dialog_Data *cfdata);
+static void        *_ci_create_data(E_Config_Dialog *cfd);
+static void         _ci_free_data(E_Config_Dialog      *cfd,
+                                  E_Config_Dialog_Data *cfdata);
+static Evas_Object *_ci_basic_create_widgets(E_Config_Dialog      *cfd,
+                                             Evas                 *evas,
+                                             E_Config_Dialog_Data *cfdata);
+static int _ci_basic_apply_data(E_Config_Dialog      *cfd,
+                                E_Config_Dialog_Data *cfdata);
+
+void
+config_notification_box_module(Config_Item *ci)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+   char buf[4096];
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+
+   /* Dialog Methods */
+   v->create_cfdata = _ci_create_data;
+   v->free_cfdata = _ci_free_data;
+   v->basic.apply_cfdata = _ci_basic_apply_data;
+   v->basic.create_widgets = _ci_basic_create_widgets;
+
+   /* Create The Dialog */
+   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", e_module_dir_get(notification_mod));
+   cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
+                             _("Notification Box Configuration"),
+                             "E", "_e_mod_notification_box_config_dialog",
+                             buf, 0, v, ci);
+   notification_cfg->config_dialog = eina_list_append(notification_cfg->config_dialog, cfd);
+}
+
+static void
+_ci_fill_data(Config_Item          *ci,
+              E_Config_Dialog_Data *cfdata)
+{
+   cfdata->show_label = ci->show_label;
+   cfdata->show_popup = ci->show_popup;
+   cfdata->focus_window = ci->focus_window;
+   cfdata->store_low = ci->store_low;
+   cfdata->store_normal = ci->store_normal;
+   cfdata->store_critical = ci->store_critical;
+}
+
+static void *
+_ci_create_data(E_Config_Dialog *cfd)
+{
+   E_Config_Dialog_Data *cfdata;
+   Config_Item *ci;
+
+   ci = cfd->data;
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _ci_fill_data(ci, cfdata);
+   return cfdata;
+}
+
+static void
+_ci_free_data(E_Config_Dialog      *cfd,
+              E_Config_Dialog_Data *cfdata)
+{
+   notification_cfg->config_dialog = eina_list_remove(notification_cfg->config_dialog, cfd);
+   free(cfdata);
+}
+
+static Evas_Object *
+_ci_basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
+                         Evas                 *evas,
+                         E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o, *of, *ob;
+
+   o = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("General Settings"), 0);
+   ob = e_widget_check_add(evas, _("Show Icon Label"), &(cfdata->show_label));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Show the popup on mouse over"), &(cfdata->show_popup));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Focus the source window when clicking"), &(cfdata->focus_window));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   of = e_widget_framelist_add(evas, _("Urgency"), 0);
+   ob = e_widget_label_add(evas, _("Levels of urgency to store:"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Low"), &(cfdata->store_low));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Normal"), &(cfdata->store_normal));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Critical"), &(cfdata->store_critical));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   return o;
+}
+
+static int
+_ci_basic_apply_data(E_Config_Dialog      *cfd,
+                     E_Config_Dialog_Data *cfdata)
+{
+   Config_Item *ci;
+
+   ci = cfd->data;
+   ci->show_label = cfdata->show_label;
+   ci->show_popup = cfdata->show_popup;
+   ci->focus_window = cfdata->focus_window;
+   ci->store_low = cfdata->store_low;
+   ci->store_normal = cfdata->store_normal;
+   ci->store_critical = cfdata->store_critical;
+
+   e_config_save_queue();
+   return 1;
+}
+
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
new file mode 100644 (file)
index 0000000..2cbaa24
--- /dev/null
@@ -0,0 +1,476 @@
+#include "e_mod_main.h"
+
+/* Gadcon function protos */
+static E_Gadcon_Client *_gc_init(E_Gadcon   *gc,
+                                 const char *name,
+                                 const char *id,
+                                 const char *style);
+static void         _gc_shutdown(E_Gadcon_Client *gcc);
+static const char  *_gc_label(E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class,
+                             Evas                  *evas);
+static const char  *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static void         _gc_id_del(E_Gadcon_Client_Class *client_class,
+                               const char            *id);
+
+/* Callback function protos */
+static int  _notification_cb_notify(E_Notification_Daemon *daemon,
+                                    E_Notification        *n);
+static void _notification_cb_close_notification(E_Notification_Daemon *daemon,
+                                                unsigned int           id);
+
+/* Config function protos */
+static Config *_notification_cfg_new(void);
+static void    _notification_cfg_free(Config *cfg);
+
+/* Global variables */
+E_Module *notification_mod = NULL;
+Config *notification_cfg = NULL;
+
+static E_Config_DD *conf_edd = NULL;
+static E_Config_DD *conf_item_edd = NULL;
+
+/* Gadcon Api Functions */
+const E_Gadcon_Client_Class _gc_class =
+{
+   GADCON_CLIENT_CLASS_VERSION, "notification",
+   {
+      _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, _gc_id_del,
+      e_gadcon_site_is_not_toolbar
+   },
+   E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon   *gc,
+         const char *name,
+         const char *id,
+         const char *style)
+{
+   Notification_Box *b;
+   E_Gadcon_Client *gcc;
+   Config_Item *ci;
+   Instance *inst;
+
+   inst = E_NEW(Instance, 1);
+   ci = notification_box_config_item_get(id);
+   b = notification_box_get(ci->id, gc->evas);
+
+   inst->ci = ci;
+   b->inst = inst;
+   inst->n_box = b;
+
+   gcc = e_gadcon_client_new(gc, name, id, style, b->o_box);
+   gcc->data = inst;
+   inst->gcc = gcc;
+
+   evas_object_event_callback_add(b->o_box, EVAS_CALLBACK_MOVE,
+                                  notification_box_cb_obj_moveresize, inst);
+   evas_object_event_callback_add(b->o_box, EVAS_CALLBACK_RESIZE,
+                                  notification_box_cb_obj_moveresize, inst);
+   notification_cfg->instances = eina_list_append(notification_cfg->instances, inst);
+   _gc_orient(gcc, gc->orient);
+   return gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   Instance *inst;
+
+   inst = gcc->data;
+   notification_box_visible_set(inst->n_box, EINA_FALSE);
+   notification_cfg->instances = eina_list_remove(notification_cfg->instances, inst);
+   free(inst);
+}
+
+void
+_gc_orient(E_Gadcon_Client *gcc,
+           E_Gadcon_Orient  orient)
+{
+   Instance *inst;
+
+   inst = gcc->data;
+   switch (orient)
+     {
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+      case E_GADCON_ORIENT_CORNER_BL:
+      case E_GADCON_ORIENT_CORNER_BR:
+        notification_box_orient_set(inst->n_box, 1);
+        e_gadcon_client_aspect_set(gcc, MAX(eina_list_count(inst->n_box->icons), 1) * 16, 16);
+        break;
+
+      case E_GADCON_ORIENT_VERT:
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_LT:
+      case E_GADCON_ORIENT_CORNER_RT:
+      case E_GADCON_ORIENT_CORNER_LB:
+      case E_GADCON_ORIENT_CORNER_RB:
+        notification_box_orient_set(inst->n_box, 0);
+        e_gadcon_client_aspect_set(gcc, 16, MAX(eina_list_count(inst->n_box->icons), 1) * 16);
+        break;
+
+      default:
+        break;
+     }
+   e_gadcon_client_min_size_set(gcc, 16, 16);
+}
+
+static const char *
+_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _("Notification Box");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
+         Evas                  *evas)
+{
+   Evas_Object *o;
+   char buf[4096];
+
+   o = edje_object_add(evas);
+   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
+            e_module_dir_get(notification_mod));
+   if (!e_theme_edje_object_set(o, "base/theme/modules/notification",
+                                "icon"))
+     edje_object_file_set(o, buf, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   Config_Item *ci;
+
+   ci = notification_box_config_item_get(NULL);
+   return ci->id;
+}
+
+static void
+_gc_id_del(E_Gadcon_Client_Class *client_class __UNUSED__,
+           const char            *id)
+{
+   Config_Item *ci;
+
+   notification_box_del(id);
+   ci = notification_box_config_item_get(id);
+   if (!ci) return;
+   eina_stringshare_del(ci->id);
+   notification_cfg->items = eina_list_remove(notification_cfg->items, ci);
+   free(ci);
+}
+
+static unsigned int
+_notification_notify(E_Notification *n)
+{
+   const char *appname = e_notification_app_name_get(n);
+   unsigned int replaces_id = e_notification_replaces_id_get(n);
+   unsigned int new_id;
+   int popuped;
+
+   if (replaces_id) new_id = replaces_id;
+   else new_id = notification_cfg->next_id++;
+
+   e_notification_id_set(n, new_id);
+
+   popuped = notification_popup_notify(n, replaces_id, appname);
+   notification_box_notify(n, replaces_id, new_id);
+
+   if (!popuped)
+     {
+        e_notification_hint_urgency_set(n, 4);
+        notification_popup_notify(n, replaces_id, appname);
+     }
+
+   return new_id;
+}
+
+static void
+_notification_show_common(const char *summary,
+                          const char *body,
+                          int         replaces_id)
+{
+   E_Notification *n = e_notification_full_new
+       ("enlightenment", replaces_id, "enlightenment", summary, body, -1);
+
+   if (!n)
+     return;
+
+   _notification_notify(n);
+   e_notification_unref(n);
+}
+
+static void
+_notification_show_presentation(Eina_Bool enabled)
+{
+   const char *summary, *body;
+
+   if (enabled)
+     {
+        summary = _("Enter Presentation Mode");
+        body = _("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.");
+     }
+   else
+     {
+        summary = _("Exited Presentation Mode");
+        body = _("Presentation mode is over."
+                 "<br>Now screen saver, lock and "
+                 "power saving settings will be restored.");
+     }
+
+   _notification_show_common(summary, body, 0);
+}
+
+static void
+_notification_show_offline(Eina_Bool enabled)
+{
+   const char *summary, *body;
+
+   if (enabled)
+     {
+        summary = _("Enter Offline Mode");
+        body = _("Enlightenment is in <b>offline</b> mode.<br>"
+                 "During offline mode, modules that use network will stop "
+                 "polling remote services.");
+     }
+   else
+     {
+        summary = _("Exited Offline Mode");
+        body = _("Now in <b>online</b> mode.<br>"
+                 "Now modules that use network will "
+                 "resume regular tasks.");
+     }
+
+   _notification_show_common(summary, body, 0);
+}
+
+static Eina_Bool
+_notification_cb_config_mode_changed(Config *m_cfg,
+                                     int   type __UNUSED__,
+                                     void *event __UNUSED__)
+{
+   if (m_cfg->last_config_mode.presentation != e_config->mode.presentation)
+     {
+        m_cfg->last_config_mode.presentation = e_config->mode.presentation;
+        _notification_show_presentation(e_config->mode.presentation);
+     }
+
+   if (m_cfg->last_config_mode.offline != e_config->mode.offline)
+     {
+        m_cfg->last_config_mode.offline = e_config->mode.offline;
+        _notification_show_offline(e_config->mode.offline);
+     }
+
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_notification_cb_initial_mode_timer(Config *m_cfg)
+{
+   if (e_config->mode.presentation)
+     _notification_show_presentation(1);
+   if (e_config->mode.offline)
+     _notification_show_offline(1);
+
+   m_cfg->initial_mode_timer = NULL;
+   return EINA_FALSE;
+}
+
+/* Module Api Functions */
+EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Notification"};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   E_Notification_Daemon *d;
+   char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", m->dir);
+   /* register config panel entry */
+   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
+                                     "preferences-extensions");
+   e_configure_registry_item_add("extensions/notification", 30, 
+                                 _("Notification"), NULL,
+                                 buf, e_int_config_notification_module);
+
+   conf_item_edd = E_CONFIG_DD_NEW("Notification_Config_Item", Config_Item);
+#undef T
+#undef D
+#define T Config_Item
+#define D conf_item_edd
+   E_CONFIG_VAL(D, T, id, STR);
+   E_CONFIG_VAL(D, T, show_label, INT);
+   E_CONFIG_VAL(D, T, show_popup, INT);
+   E_CONFIG_VAL(D, T, focus_window, INT);
+   E_CONFIG_VAL(D, T, store_low, INT);
+   E_CONFIG_VAL(D, T, store_normal, INT);
+   E_CONFIG_VAL(D, T, store_critical, INT);
+
+   conf_edd = E_CONFIG_DD_NEW("Notification_Config", Config);
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, show_low, INT);
+   E_CONFIG_VAL(D, T, show_normal, INT);
+   E_CONFIG_VAL(D, T, show_critical, INT);
+   E_CONFIG_VAL(D, T, corner, INT);
+   E_CONFIG_VAL(D, T, timeout, FLOAT);
+   E_CONFIG_VAL(D, T, force_timeout, INT);
+   E_CONFIG_VAL(D, T, ignore_replacement, INT);
+   E_CONFIG_VAL(D, T, dual_screen, INT);
+   E_CONFIG_LIST(D, T, items, conf_item_edd);
+
+   notification_cfg = e_config_domain_load("module.notification", conf_edd);
+   if (notification_cfg &&
+       !(e_util_module_config_check(_("Notification Module"),
+                                    notification_cfg->version,
+                                    MOD_CFG_FILE_VERSION)))
+     {
+        _notification_cfg_free(notification_cfg);
+     }
+
+   if (!notification_cfg)
+     {
+        notification_cfg = _notification_cfg_new();
+     }
+
+   /* set up the notification daemon */
+   e_notification_daemon_init();
+   d = e_notification_daemon_add("e_notification_module", "Enlightenment");
+   if (!d)
+     {
+        _notification_cfg_free(notification_cfg);
+        notification_cfg = NULL;
+        e_util_dialog_show(_("Error During DBus Init!"),
+                           _("Error during DBus init! Please check if "
+                              "dbus is correctly installed and running."));
+        return NULL;
+     }
+   notification_cfg->daemon = d;
+   e_notification_daemon_data_set(d, notification_cfg);
+   e_notification_daemon_callback_notify_set(d, _notification_cb_notify);
+   e_notification_daemon_callback_close_notification_set(d, _notification_cb_close_notification);
+
+   notification_cfg->last_config_mode.presentation = e_config->mode.presentation;
+   notification_cfg->last_config_mode.offline = e_config->mode.offline;
+   notification_cfg->handlers = eina_list_append
+       (notification_cfg->handlers, ecore_event_handler_add
+         (E_EVENT_CONFIG_MODE_CHANGED, (Ecore_Event_Handler_Cb)_notification_cb_config_mode_changed,
+         notification_cfg));
+   notification_cfg->initial_mode_timer = ecore_timer_add
+       (0.1, (Ecore_Task_Cb)_notification_cb_initial_mode_timer, notification_cfg);
+
+   /* set up the borders events callbacks */
+   notification_cfg->handlers = eina_list_append
+       (notification_cfg->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_REMOVE, (Ecore_Event_Handler_Cb)notification_box_cb_border_remove, NULL));
+
+   notification_mod = m;
+   e_gadcon_provider_register(&_gc_class);
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m __UNUSED__)
+{
+   Ecore_Event_Handler *h;
+   Config_Item *ci;
+
+   e_gadcon_provider_unregister(&_gc_class);
+
+   if (notification_cfg->initial_mode_timer)
+     ecore_timer_del(notification_cfg->initial_mode_timer);
+
+   EINA_LIST_FREE(notification_cfg->handlers, h)
+     ecore_event_handler_del(h);
+
+   if (notification_cfg->cfd) e_object_del(E_OBJECT(notification_cfg->cfd));
+   e_configure_registry_item_del("extensions/notification");
+   e_configure_registry_category_del("extensions");
+
+   if (notification_cfg->menu)
+     {
+        e_menu_post_deactivate_callback_set(notification_cfg->menu, NULL, NULL);
+        e_object_del(E_OBJECT(notification_cfg->menu));
+        notification_cfg->menu = NULL;
+     }
+
+   EINA_LIST_FREE(notification_cfg->items, ci)
+     {
+        eina_stringshare_del(ci->id);
+        free(ci);
+     }
+
+   notification_box_shutdown();
+   notification_popup_shutdown();
+
+   e_notification_daemon_free(notification_cfg->daemon);
+   e_notification_daemon_shutdown();
+   _notification_cfg_free(notification_cfg);
+   E_CONFIG_DD_FREE(conf_item_edd);
+   E_CONFIG_DD_FREE(conf_edd);
+   notification_mod = NULL;
+
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m __UNUSED__)
+{
+   int ret;
+   ret = e_config_domain_save("module.notification", conf_edd, notification_cfg);
+   return ret;
+}
+
+/* Callbacks */
+static int
+_notification_cb_notify(E_Notification_Daemon *daemon __UNUSED__,
+                        E_Notification        *n)
+{
+   return _notification_notify(n);
+}
+
+static void
+_notification_cb_close_notification(E_Notification_Daemon *daemon __UNUSED__,
+                                    unsigned int           id)
+{
+   notification_popup_close(id);
+}
+
+static Config *
+_notification_cfg_new(void)
+{
+   Config *cfg;
+
+   cfg = E_NEW(Config, 1);
+   cfg->cfd = NULL;
+   cfg->version = MOD_CFG_FILE_VERSION;
+   cfg->show_low = 0;
+   cfg->show_normal = 1;
+   cfg->show_critical = 1;
+   cfg->timeout = 5.0;
+   cfg->force_timeout = 0;
+   cfg->ignore_replacement = 0;
+   cfg->dual_screen = 0;
+   cfg->corner = CORNER_TR;
+
+   return cfg;
+}
+
+static void
+_notification_cfg_free(Config *cfg)
+{
+   E_FREE(cfg);
+}
+
diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h
new file mode 100644 (file)
index 0000000..e232c73
--- /dev/null
@@ -0,0 +1,154 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define HAVE_EDBUS 1
+#include <e.h>
+#include <E_Notification_Daemon.h>
+#include "config.h"
+
+#define MOD_CFG_FILE_EPOCH 0x0002
+#define MOD_CFG_FILE_GENERATION 0x0006
+#define MOD_CFG_FILE_VERSION                                   \
+((MOD_CFG_FILE_EPOCH << 16) | MOD_CFG_FILE_GENERATION)
+
+#undef  MAX
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
+
+typedef enum   _Popup_Corner Popup_Corner;
+typedef struct _Config Config;
+typedef struct _Config_Item Config_Item;
+typedef struct _Instance Instance;
+typedef struct _Popup_Data Popup_Data;
+typedef struct _Notification_Box Notification_Box;
+typedef struct _Notification_Box_Icon Notification_Box_Icon;
+
+enum _Popup_Corner
+  {
+    CORNER_TL,
+    CORNER_TR,
+    CORNER_BL,
+    CORNER_BR
+  };
+
+struct _Config 
+{
+  E_Config_Dialog *cfd;
+
+  int version;
+  int show_low;
+  int show_normal;
+  int show_critical;
+  int force_timeout;
+  int ignore_replacement;
+  int dual_screen;
+  float timeout;
+  Popup_Corner corner;
+
+  struct
+  {
+    Eina_Bool presentation;
+    Eina_Bool offline;
+  } last_config_mode;
+  
+  Eina_List  *instances;
+  Eina_List  *n_box;
+  Eina_List  *config_dialog;
+  E_Menu     *menu;
+  Eina_List  *handlers;
+  Eina_List  *items;
+  Eina_List  *popups;
+  int         next_id;
+
+  Ecore_Timer *initial_mode_timer;
+  E_Notification_Daemon *daemon;
+};
+
+struct _Config_Item 
+{
+  const char *id;
+  int show_label;
+  int show_popup;
+  int focus_window;
+  int store_low;
+  int store_normal;
+  int store_critical;
+};
+
+struct _Instance 
+{
+  E_Gadcon_Client  *gcc;
+  Notification_Box *n_box;
+  Config_Item      *ci;
+};
+
+
+struct _Notification_Box
+{
+  const char     *id;
+  Instance       *inst;
+  Evas_Object    *o_box;
+  Evas_Object    *o_empty;
+  Eina_List      *icons;
+};
+
+struct _Notification_Box_Icon
+{
+  Notification_Box *n_box;
+  unsigned int      n_id;
+  const char       *label;
+  Evas_Object      *o_holder;
+  Evas_Object      *o_icon;
+  Evas_Object      *o_holder2;
+  Evas_Object      *o_icon2;
+  E_Border         *border;
+  E_Notification   *notif;
+
+  int             popup;
+  Ecore_Timer    *mouse_in_timer;
+};
+
+struct _Popup_Data
+{
+  E_Notification *notif;
+  E_Popup *win;
+  Evas *e;
+  Evas_Object *theme;
+  const char  *app_name;
+  Evas_Object *app_icon;
+  Ecore_Timer *timer;
+  E_Zone *zone;
+};
+
+
+int  notification_popup_notify(E_Notification *n, unsigned int replaces_id, const char *appname);
+void notification_popup_shutdown(void);
+void notification_popup_close(unsigned int id);
+
+void notification_box_notify(E_Notification *n, unsigned int replaces_id, unsigned int id);
+void notification_box_shutdown(void);
+void notification_box_del(const char *id);
+void notification_box_visible_set(Notification_Box *b, Eina_Bool visible);
+Notification_Box *notification_box_get(const char *id, Evas *evas);
+Config_Item *notification_box_config_item_get(const char *id);
+void notification_box_orient_set(Notification_Box *b, int horizontal);
+void notification_box_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
+Eina_Bool  notification_box_cb_border_remove(void *data, int type, E_Event_Border_Remove *ev);
+
+EAPI extern E_Module_Api e_modapi;
+EAPI void  *e_modapi_init(E_Module *m);
+EAPI int    e_modapi_shutdown(E_Module *m);
+EAPI int    e_modapi_save(E_Module *m);
+
+void _gc_orient    (E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+
+void config_notification_box_module(Config_Item *ci);
+
+E_Config_Dialog *e_int_config_notification_module(E_Container *con, 
+                                                 const char *params __UNUSED__);
+
+extern E_Module *notification_mod;
+extern Config   *notification_cfg;
+extern const E_Gadcon_Client_Class _gc_class;
+
+#endif
diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
new file mode 100644 (file)
index 0000000..180bf08
--- /dev/null
@@ -0,0 +1,584 @@
+#include "e_mod_main.h"
+
+/* Popup function protos */
+static Popup_Data *_notification_popup_new(E_Notification *n);
+static Popup_Data *_notification_popup_find(unsigned int id);
+static Popup_Data *_notification_popup_merge(E_Notification *n);
+
+static int         _notification_popup_place(Popup_Data *popup,
+                                             int         num);
+static void        _notification_popup_refresh(Popup_Data *popup);
+static void        _notification_popup_del(unsigned int                 id,
+                                           E_Notification_Closed_Reason reason);
+static void        _notification_popdown(Popup_Data                  *popup,
+                                         E_Notification_Closed_Reason reason);
+
+#define POPUP_LIMIT 7
+static int popups_displayed = 0;
+
+/* Util function protos */
+static void _notification_format_message(Popup_Data *popup);
+
+static int next_pos = 0;
+
+static Eina_Bool
+_notification_timer_cb(Popup_Data *popup)
+{
+   _notification_popup_del(e_notification_id_get(popup->notif),
+                           E_NOTIFICATION_CLOSED_EXPIRED);
+   return EINA_FALSE;
+}
+
+int
+notification_popup_notify(E_Notification *n,
+                          unsigned int    replaces_id,
+                          const char     *appname __UNUSED__)
+{
+   double timeout;
+   Popup_Data *popup = NULL;
+   char urgency;
+
+   urgency = e_notification_hint_urgency_get(n);
+
+   switch (urgency)
+     {
+      case E_NOTIFICATION_URGENCY_LOW:
+        if (!notification_cfg->show_low) return 0;
+        break;
+      case E_NOTIFICATION_URGENCY_NORMAL:
+        if (!notification_cfg->show_normal) return 0;
+        break;
+      case E_NOTIFICATION_URGENCY_CRITICAL:
+        if (!notification_cfg->show_critical) return 0;
+        break;
+      default:
+        break;
+     }
+
+   if (notification_cfg->ignore_replacement) replaces_id = 0;
+   if (replaces_id && (popup = _notification_popup_find(replaces_id)))
+     {
+        e_notification_ref(n);
+
+        if (popup->notif)
+          e_notification_unref(popup->notif);
+
+        popup->notif = n;
+        _notification_popup_refresh(popup);
+     }
+   else if (!replaces_id)
+     {
+        if ((popup = _notification_popup_merge(n)))
+          _notification_popup_refresh(popup);
+     }
+
+   if (!popup)
+     {
+        popup = _notification_popup_new(n);
+        if (!popup) return 0;
+        notification_cfg->popups = eina_list_append(notification_cfg->popups, popup);
+        edje_object_signal_emit(popup->theme, "notification,new", "notification");
+     }
+
+   if (popup->timer)
+     {
+        ecore_timer_del(popup->timer);
+        popup->timer = NULL;
+     }
+
+   timeout = e_notification_timeout_get(popup->notif);
+
+   if (timeout < 0 || notification_cfg->force_timeout)
+     timeout = notification_cfg->timeout;
+   else timeout = (double)timeout / 1000.0;
+
+   if (timeout > 0)
+     popup->timer = ecore_timer_add(timeout, (Ecore_Task_Cb)_notification_timer_cb, popup);
+
+   return 1;
+}
+
+void
+notification_popup_shutdown(void)
+{
+   Popup_Data *popup;
+
+   EINA_LIST_FREE(notification_cfg->popups, popup)
+     _notification_popdown(popup, E_NOTIFICATION_CLOSED_REQUESTED);
+}
+
+void
+notification_popup_close(unsigned int id)
+{
+   _notification_popup_del(id, E_NOTIFICATION_CLOSED_REQUESTED);
+}
+
+static Popup_Data *
+_notification_popup_merge(E_Notification *n)
+{
+   Eina_List *l, *l2;
+   Eina_List *i, *i2;
+   E_Notification_Action *a, *a2;
+   Popup_Data *popup;
+   const char *str1, *str2;
+   const char *body_old;
+   const char *body_new;
+   char *body_final;
+   size_t len;
+
+   str1 = e_notification_app_name_get(n);
+   if (!str1) return NULL;
+
+   EINA_LIST_FOREACH(notification_cfg->popups, l, popup)
+     {
+        if (!popup->notif) continue;
+        if (!(str2 = e_notification_app_name_get(popup->notif)))
+          continue;
+        if (str1 == str2) break;
+     }
+
+   if (!popup)
+     {
+        /* printf("- no poup to merge\n"); */
+        return NULL;
+     }
+
+   str1 = e_notification_summary_get(n);
+   str2 = e_notification_summary_get(popup->notif);
+
+   if (str1 && str2 && (str1 != str2))
+     {
+        /* printf("- summary doesn match, %s, %s\n", str1, str2); */
+        return NULL;
+     }
+
+   l = e_notification_actions_get(popup->notif);
+   l2 = e_notification_actions_get(n);
+   if ((!!l) + (!!l2) == 1)
+     {
+        /* printf("- actions dont match\n"); */
+        return NULL;
+     }
+   for (i = l, i2 = l2; i && i2; i = i->next, i2 = i2->next)
+     {
+        if ((!!i) + (!!i2) == 1) return NULL;
+        a = i->data, a2 = i2->data;
+        if ((!!a) + (!!a2) == 1) return NULL;
+        if (e_notification_action_id_get(a) != 
+            e_notification_action_id_get(a2)) return NULL;
+        if (e_notification_action_name_get(a) != 
+            e_notification_action_name_get(a2)) return NULL;
+     }
+
+   /* TODO  p->n is not fallback alert..*/
+   /* TODO  both allow merging */
+
+   body_old = e_notification_body_get(popup->notif);
+   body_new = e_notification_body_get(n);
+
+   len = strlen(body_old);
+   len += strlen(body_new);
+   len += 4; /* "<ps>" */
+   if (len < 65536) body_final = alloca(len + 1);
+   else body_final = malloc(len + 1);
+   snprintf(body_final, len + 1, "%s<ps>%s", body_old, body_new);
+   /* printf("set body %s\n", body_final); */
+
+   e_notification_body_set(n, body_final);
+
+   e_notification_unref(popup->notif);
+   popup->notif = n;
+   e_notification_ref(popup->notif);
+   if (len >= 65536) free(body_final);
+
+   return popup;
+}
+
+
+static void
+_notification_theme_cb_deleted(Popup_Data *popup,
+                               Evas_Object *obj __UNUSED__,
+                               const char  *emission __UNUSED__,
+                               const char  *source __UNUSED__)
+{
+   _notification_popup_refresh(popup);
+   edje_object_signal_emit(popup->theme, "notification,new", "notification");
+}
+
+static void
+_notification_theme_cb_close(Popup_Data *popup,
+                             Evas_Object *obj __UNUSED__,
+                             const char  *emission __UNUSED__,
+                             const char  *source __UNUSED__)
+{
+   _notification_popup_del(e_notification_id_get(popup->notif),
+                           E_NOTIFICATION_CLOSED_DISMISSED);
+}
+
+static void
+_notification_theme_cb_find(Popup_Data *popup,
+                            Evas_Object *obj __UNUSED__,
+                            const char  *emission __UNUSED__,
+                            const char  *source __UNUSED__)
+{
+   Eina_List *l;
+   E_Border *bd;
+
+   if (!popup->app_name) return;
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+        size_t len, test;
+
+        len = strlen(popup->app_name);
+        test = eina_strlen_bounded(bd->client.icccm.name, len + 1);
+
+        /* We can't be sure that the app_name really match the application name.
+         * Some plugin put their name instead. But this search gives some good
+         * results.
+         */
+        if (strncasecmp(bd->client.icccm.name, popup->app_name, (test < len) ? test : len))
+          continue;
+
+        e_desk_show(bd->desk);
+        e_border_show(bd);
+        e_border_raise(bd);
+        e_border_focus_set_with_pointer(bd);
+        break;
+     }
+}
+
+static Popup_Data *
+_notification_popup_new(E_Notification *n)
+{
+   E_Container *con;
+   Popup_Data *popup;
+   char buf[PATH_MAX];
+   const Eina_List *l, *screens;
+   E_Screen *scr;
+   E_Zone *zone;
+
+   if (popups_displayed > POPUP_LIMIT) return 0;
+   popup = E_NEW(Popup_Data, 1);
+   if (!popup) return NULL;
+   e_notification_ref(n);
+   popup->notif = n;
+
+   con = e_container_current_get(e_manager_current_get());
+   screens = e_xinerama_screens_get();
+   if (notification_cfg->dual_screen &&
+       ((notification_cfg->corner == CORNER_BR) ||
+       (notification_cfg->corner == CORNER_TR)))
+     l = eina_list_last(screens);
+   else
+     l = screens;
+   if (l)
+     {
+        scr = eina_list_data_get(l);
+        EINA_SAFETY_ON_NULL_GOTO(scr, error);
+        EINA_LIST_FOREACH(con->zones, l, zone)
+          if ((int)zone->num == scr->screen) break;
+        if ((int)zone->num != scr->screen) goto error;
+     }
+   else
+     zone = e_zone_current_get(con);
+   popup->zone = zone;
+
+   /* Create the popup window */
+   popup->win = e_popup_new(zone, 0, 0, 0, 0);
+   popup->e = popup->win->evas;
+
+   /* Setup the theme */
+   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
+            notification_mod->dir);
+   popup->theme = edje_object_add(popup->e);
+
+   if (!e_theme_edje_object_set(popup->theme,
+                                "base/theme/modules/notification",
+                                "modules/notification/main"))
+     edje_object_file_set(popup->theme, buf, "modules/notification/main");
+
+   e_popup_edje_bg_object_set(popup->win, popup->theme);
+
+   evas_object_show(popup->theme);
+   edje_object_signal_callback_add
+     (popup->theme, "notification,deleted", "theme",
+     (Edje_Signal_Cb)_notification_theme_cb_deleted, popup);
+   edje_object_signal_callback_add
+     (popup->theme, "notification,close", "theme",
+     (Edje_Signal_Cb)_notification_theme_cb_close, popup);
+   edje_object_signal_callback_add
+     (popup->theme, "notification,find", "theme",
+     (Edje_Signal_Cb)_notification_theme_cb_find, popup);
+
+   _notification_popup_refresh(popup);
+   next_pos = _notification_popup_place(popup, next_pos);
+   e_popup_show(popup->win);
+   e_popup_layer_set(popup->win, 999);
+   popups_displayed++;
+
+   return popup;
+error:
+   free(popup);
+   e_notification_unref(n);
+   return NULL;
+}
+
+static int
+_notification_popup_place(Popup_Data *popup,
+                          int         pos)
+{
+   int w, h, sw, sh;
+   int gap = 10;
+   int to_edge = 15;
+
+   sw = popup->zone->w;
+   sh = popup->zone->h;
+   evas_object_geometry_get(popup->theme, NULL, NULL, &w, &h);
+
+   /* XXX for now ignore placement requests */
+
+   switch (notification_cfg->corner)
+     {
+      case CORNER_TL:
+        e_popup_move(popup->win,
+                     to_edge, to_edge + pos);
+        break;
+      case CORNER_TR:
+        e_popup_move(popup->win,
+                     sw - (w + to_edge),
+                     to_edge + pos);
+        break;
+      case CORNER_BL:
+        e_popup_move(popup->win,
+                     to_edge,
+                     (sh - h) - (to_edge + pos));
+        break;
+      case CORNER_BR:
+        e_popup_move(popup->win,
+                     sw - (w + to_edge),
+                     (sh - h) - (to_edge + pos));
+        break;
+      default:
+        break;
+     }
+   return pos + h + gap;
+}
+
+static void
+_notification_popups_place()
+{
+   Popup_Data *popup;
+   Eina_List *l;
+   int pos = 0;
+
+   EINA_LIST_FOREACH(notification_cfg->popups, l, popup)
+     {
+        pos = _notification_popup_place(popup, pos);
+     }
+
+   next_pos = pos;
+}
+
+static void
+_notification_popup_refresh(Popup_Data *popup)
+{
+   const char *icon_path;
+   const char *app_icon_max;
+   void *img;
+   int w, h, width = 80, height = 80;
+
+   if (!popup) return;
+
+   popup->app_name = e_notification_app_name_get(popup->notif);
+
+   if (popup->app_icon)
+     {
+        evas_object_del(popup->app_icon);
+        popup->app_icon = NULL;
+     }
+
+   app_icon_max = edje_object_data_get(popup->theme, "app_icon_max");
+   if (app_icon_max)
+     {
+        char *endptr;
+
+        errno = 0;
+        width = strtol(app_icon_max, &endptr, 10);
+        if (errno || (width < 1) || (endptr == app_icon_max))
+          {
+             width = 80;
+             height = 80;
+          }
+        else
+          {
+             endptr++;
+             if (endptr)
+               {
+                  height = strtol(endptr, NULL, 10);
+                  if (errno || (height < 1)) height = 80;
+               }
+             else height = 80;
+          }
+     }
+
+   /* Check if the app specify an icon either by a path or by a hint */
+   img = e_notification_hint_image_data_get(popup->notif);
+   if (!img)
+     {
+        icon_path = e_notification_hint_image_path_get(popup->notif);
+        if ((!icon_path) || (!icon_path[0]))
+          icon_path = e_notification_app_icon_get(popup->notif);
+        if (icon_path)
+          {
+             if (!strncmp(icon_path, "file://", 7)) icon_path += 7;
+             if (!ecore_file_exists(icon_path))
+               {
+                  const char *new_path;
+                  unsigned int size;
+
+                  size = e_util_icon_size_normalize(width * e_scale);
+                  new_path = efreet_icon_path_find(e_config->icon_theme, 
+                                                   icon_path, size);
+                  if (new_path)
+                    icon_path = new_path;
+                  else
+                    {
+                       Evas_Object *o = e_icon_add(popup->e);
+                       if (!e_util_icon_theme_set(o, icon_path)) evas_object_del(o);
+                       else
+                         {
+                            popup->app_icon = o;
+                            w = width;
+                            h = height;
+                         }
+                    }
+               }
+
+             if (!popup->app_icon)
+               {
+                  popup->app_icon = e_icon_add(popup->e);
+                  if (!e_icon_file_set(popup->app_icon, icon_path))
+                    {
+                       evas_object_del(popup->app_icon);
+                       popup->app_icon = NULL;
+                    }
+                  else e_icon_size_get(popup->app_icon, &w, &h);
+               }
+          }
+     }
+   if ((!img) && (!popup->app_icon))
+     img = e_notification_hint_icon_data_get(popup->notif);
+   if (img)
+     {
+        popup->app_icon = e_notification_image_evas_object_add(popup->e, img);
+        evas_object_image_filled_set(popup->app_icon, EINA_TRUE);
+        evas_object_image_alpha_set(popup->app_icon, EINA_TRUE);
+        evas_object_image_size_get(popup->app_icon, &w, &h);
+     }
+
+   if (!popup->app_icon)
+     {
+        char buf[PATH_MAX];
+
+        snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", 
+                 notification_mod->dir);
+        popup->app_icon = edje_object_add(popup->e);
+        if (!e_theme_edje_object_set(popup->app_icon, 
+                                     "base/theme/modules/notification",
+                                     "modules/notification/logo"))
+          edje_object_file_set(popup->app_icon, buf, 
+                               "modules/notification/logo");
+        w = width;
+        h = height;
+     }
+
+   if ((w > width) || (h > height))
+     {
+        int v;
+        v = w > h ? w : h;
+        h = h * height / v;
+        w = w * width / v;
+     }
+   edje_extern_object_min_size_set(popup->app_icon, w, h);
+   edje_extern_object_max_size_set(popup->app_icon, w, h);
+
+   edje_object_calc_force(popup->theme);
+   edje_object_part_swallow(popup->theme, "notification.swallow.app_icon", 
+                            popup->app_icon);
+   edje_object_signal_emit(popup->theme, "notification,icon", "notification");
+
+   /* Fill up the event message */
+   _notification_format_message(popup);
+
+   /* Compute the new size of the popup */
+   edje_object_calc_force(popup->theme);
+   edje_object_size_min_calc(popup->theme, &w, &h);
+   e_popup_resize(popup->win, w, h);
+   evas_object_resize(popup->theme, w, h);
+
+   _notification_popups_place();
+}
+
+static Popup_Data *
+_notification_popup_find(unsigned int id)
+{
+   Eina_List *l;
+   Popup_Data *popup;
+
+   if (!id) return NULL;
+   EINA_LIST_FOREACH(notification_cfg->popups, l, popup)
+     {
+        if (e_notification_id_get(popup->notif) == id) return popup;
+     }
+   return NULL;
+}
+
+static void
+_notification_popup_del(unsigned int                 id,
+                        E_Notification_Closed_Reason reason)
+{
+   Popup_Data *popup;
+   Eina_List *l, *l2;
+   int pos = 0;
+
+   EINA_LIST_FOREACH_SAFE(notification_cfg->popups, l, l2, popup)
+     {
+        if (e_notification_id_get(popup->notif) == id)
+          {
+             _notification_popdown(popup, reason);
+             notification_cfg->popups = eina_list_remove_list(notification_cfg->popups, l);
+          }
+        else
+          pos = _notification_popup_place(popup, pos);
+     }
+
+   next_pos = pos;
+}
+
+static void
+_notification_popdown(Popup_Data                  *popup,
+                      E_Notification_Closed_Reason reason)
+{
+   if (popup->timer) ecore_timer_del(popup->timer);
+   e_popup_hide(popup->win);
+   popups_displayed--;
+   evas_object_del(popup->app_icon);
+   evas_object_del(popup->theme);
+   e_object_del(E_OBJECT(popup->win));
+   e_notification_closed_set(popup->notif, 1);
+   e_notification_daemon_signal_notification_closed
+     (notification_cfg->daemon, e_notification_id_get(popup->notif), reason);
+   e_notification_unref(popup->notif);
+   free(popup);
+}
+
+static void
+_notification_format_message(Popup_Data *popup)
+{
+   Evas_Object *o = popup->theme;
+   const char *title = e_notification_summary_get(popup->notif);
+   const char *b = e_notification_body_get(popup->notif);
+   edje_object_part_text_set(o, "notification.textblock.message", b);
+   edje_object_part_text_set(o, "notification.text.title", title);
+}
diff --git a/src/modules/notification/e_modules-notification.spec.in b/src/modules/notification/e_modules-notification.spec.in
new file mode 100755 (executable)
index 0000000..dde36da
--- /dev/null
@@ -0,0 +1,48 @@
+%define module_name notification
+%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
+
+Summary: %{module_name} module for the Enlightenment window manager
+Name: e_modules-%{module_name}
+Version: @VERSION@
+Release: %{_rel}
+License: BSD
+Group: User Interface/Desktops
+URL: http://www.enlightenment.org/
+Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz
+Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+BuildRequires: ecore-devel, evas-devel, edje-bin
+BuildRequires: edje-devel, eet-devel, enlightenment-devel >= 0.16.999
+Requires: enlightenment >= 0.16.999
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+%{module_name} module for the Enlightenment window manager.
+
+%prep
+%setup -q -n %{module_name}-%{version}
+
+%build
+%{configure}
+%{__make} %{?_smp_mflags} %{?mflags}
+
+%install
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+%{find_lang} %{module_name} || true > %{module_name}.lang
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files -f %{module_name}.lang
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README
+%{_libdir}/enlightenment/modules/%{module_name}*
+
+%changelog
diff --git a/src/modules/notification/images/base_bg.png b/src/modules/notification/images/base_bg.png
new file mode 100644 (file)
index 0000000..f67dfa0
Binary files /dev/null and b/src/modules/notification/images/base_bg.png differ
diff --git a/src/modules/notification/images/base_bg_alpha.png b/src/modules/notification/images/base_bg_alpha.png
new file mode 100644 (file)
index 0000000..1ff51e8
Binary files /dev/null and b/src/modules/notification/images/base_bg_alpha.png differ
diff --git a/src/modules/notification/images/bd_button_close_focused.png b/src/modules/notification/images/bd_button_close_focused.png
new file mode 100644 (file)
index 0000000..7bfd3eb
Binary files /dev/null and b/src/modules/notification/images/bd_button_close_focused.png differ
diff --git a/src/modules/notification/images/bd_button_close_shadow.png b/src/modules/notification/images/bd_button_close_shadow.png
new file mode 100644 (file)
index 0000000..91a1955
Binary files /dev/null and b/src/modules/notification/images/bd_button_close_shadow.png differ
diff --git a/src/modules/notification/images/bd_title_bg.png b/src/modules/notification/images/bd_title_bg.png
new file mode 100644 (file)
index 0000000..2b2686b
Binary files /dev/null and b/src/modules/notification/images/bd_title_bg.png differ
diff --git a/src/modules/notification/images/bd_title_over.png b/src/modules/notification/images/bd_title_over.png
new file mode 100644 (file)
index 0000000..6dd6efb
Binary files /dev/null and b/src/modules/notification/images/bd_title_over.png differ
diff --git a/src/modules/notification/images/bd_top_hilight.png b/src/modules/notification/images/bd_top_hilight.png
new file mode 100644 (file)
index 0000000..bc58b9e
Binary files /dev/null and b/src/modules/notification/images/bd_top_hilight.png differ
diff --git a/src/modules/notification/images/close_btn.png b/src/modules/notification/images/close_btn.png
new file mode 100644 (file)
index 0000000..35f98d6
Binary files /dev/null and b/src/modules/notification/images/close_btn.png differ
diff --git a/src/modules/notification/images/e17_dialog_watermark.png b/src/modules/notification/images/e17_dialog_watermark.png
new file mode 100644 (file)
index 0000000..1496dd5
Binary files /dev/null and b/src/modules/notification/images/e17_dialog_watermark.png differ
diff --git a/src/modules/notification/images/e17_menu_bg_border.png b/src/modules/notification/images/e17_menu_bg_border.png
new file mode 100644 (file)
index 0000000..f95e8f1
Binary files /dev/null and b/src/modules/notification/images/e17_menu_bg_border.png differ
diff --git a/src/modules/notification/images/module_icon.png b/src/modules/notification/images/module_icon.png
new file mode 100644 (file)
index 0000000..1db56a2
Binary files /dev/null and b/src/modules/notification/images/module_icon.png differ
diff --git a/src/modules/notification/module.desktop.in b/src/modules/notification/module.desktop.in
new file mode 100644 (file)
index 0000000..e99a3fa
--- /dev/null
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Link
+Name=Notification
+Name[ru]=Уведомления
+Name[cs]=Notifikace
+Name[de]=Benachrichtigungen
+Name[eo]=Sciigo
+Name[hu]=Értesítések
+Name[el]=Ειδοποίηση
+Name[pt]=Notificação
+Icon=e-module-notification
+Comment=notification-daemon alternative.<br>Popup if an event occur.
+Comment[ru]=Замена notification-daemon.<br>Показывает окно сообщения если происходит событие.
+Comment[cs]=Alternativa k notification-daemon.<br>Zobrazí bublinu při události.
+Comment[de]=Alternative zu notification-daemon.<br>Zeigt Benachrichtigungen für Ereignisse an.
+Comment[eo]=Alternativa al notification-daemon.<br>Avertas ŝprucfenestro kiam okazas evento.
+Comment[it]=Alternativa a notification-daemon.<br>Mostra un popup al verificarsi di un evento.
+Comment[hu]=notification-daemon alternatíva.<br>Egy esemény megtörténtét jelzi.
+Comment[fr]=Alternative à notification-daemon.<br>Signale par pop-up l'occurrence d'un événement.
+Comment[el]=εναλλακτικό του notification-daemon.<br>Εμφανίζεται όταν συμβεί ένα γεγονός.
+Comment[pt]=Uma alternativa ao notification-daemon.<br>Alertas sobre eventos.
+X-Enlightenment-ModuleType=core
diff --git a/src/modules/notification/po/LINGUAS b/src/modules/notification/po/LINGUAS
new file mode 100755 (executable)
index 0000000..15425f6
--- /dev/null
@@ -0,0 +1 @@
+ar bg cs de el en_GB eo es fi fo fr he hr hu it ja lt nl pl pt pt_BR ru sk sl sv tr uk zh_CN
diff --git a/src/modules/notification/po/Makevars b/src/modules/notification/po/Makevars
new file mode 100755 (executable)
index 0000000..9275c25
--- /dev/null
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Enlightenment development team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = enlightenment-devel@lists.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/src/modules/notification/po/POTFILES.in b/src/modules/notification/po/POTFILES.in
new file mode 100755 (executable)
index 0000000..9d7e781
--- /dev/null
@@ -0,0 +1,4 @@
+src/e_mod_box.c
+src/e_mod_main.c
+src/e_mod_config.c
+src/e_mod_config_item.c
diff --git a/src/modules/notification/po/ar.po b/src/modules/notification/po/ar.po
new file mode 100755 (executable)
index 0000000..44fd48d
--- /dev/null
@@ -0,0 +1,181 @@
+# Arabic translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
+"POT-Creation-Date: 2010-09-09 08:01-0700\n"
+"PO-Revision-Date: 2011-02-24 19:28+0300\n"
+"Last-Translator: سمير حسين <sameeer_45@hotmail.com>\n"
+"Language-Team: Arabic <almusalimalmusalimah@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Arabic\n"
+"X-Poedit-Country: SAUDI ARABIA\n"
+
+#: ../src/e_mod_box.c:677
+#: ../src/e_mod_box.c:824
+#| msgid "General Settings"
+msgid "Settings"
+msgstr "اﻹعدادات"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "صندوق التنبيه"
+
+#: ../src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "ادخل نمط العرض"
+
+#: ../src/e_mod_main.c:214
+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 "إنلايتنمينت في نمط <b>العرض</b> اﻵن.<br>أثناء نمط العرض ، خدمات حافظة الشاشة من قفل و حفظ الطاقة سيتم تعطيلها لضمان عدم مقاطعتك."
+
+#: ../src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "تم الخروج من نمط العرض"
+
+#: ../src/e_mod_main.c:221
+msgid "Presentation mode is over.<br>Now screen saver, lock and power saving settings will be restored."
+msgstr "انتهى نمط العرض.<br>اﻵن إعدادات خدمات حافظة الشاشة من, قفل و حفظ طاقة ستستعاد."
+
+#: ../src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "أدخل نمط خارج الشبكة"
+
+#: ../src/e_mod_main.c:237
+msgid "Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules that use network will stop polling remote services."
+msgstr "إنلايتنمينت في نمط <b>خارج الشبكة</b>اﻵن.<br>أثناء وضع خارج الشبكة فإن الوحدات التي تستخدم الشبكة ستوقف خدمات اﻹستطلاع عن بعد."
+
+#: ../src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "تم الخروج من نمط خارج الشبكة"
+
+#: ../src/e_mod_main.c:244
+msgid "Now in <b>online</b> mode.<br>Now modules that use network will resume regular tasks."
+msgstr "أنت اﻵن في نمط<b>في الشبكة</b> .<br>كما أن الوحدات التي تستخدم الشبكة ستكمل مهامها اﻹعتيادية."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "الملحقات"
+
+#: ../src/e_mod_main.c:303
+msgid "Notification"
+msgstr "تنبيه"
+
+#: ../src/e_mod_main.c:335
+#| msgid "Notification Box"
+msgid "Notification Module"
+msgstr "وحدة التنبيه"
+
+#: ../src/e_mod_main.c:363
+msgid "Error During DBus Init!"
+msgstr "خطأ أثناء بدء DBus !"
+
+#: ../src/e_mod_main.c:364
+msgid "Error during DBus init! Please check if dbus is correctly installed and running."
+msgstr "خطأ أثناء بدء DBus! رجاءا تفقد ما إذا كان dbus قد نصب بشكل صحيح و يعمل جيدا."
+
+#: ../src/e_mod_config.c:37
+#| msgid "Notification"
+msgid "Notification Settings"
+msgstr "إعدادات التنبيه"
+
+#: ../src/e_mod_config.c:79
+#: ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "اﻹلحاح"
+
+#: ../src/e_mod_config.c:80
+msgid "Levels of urgency to popup : "
+msgstr "مستوى اﻹستعجال للمنبثقة"
+
+#: ../src/e_mod_config.c:82
+#: ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "منخفض"
+
+#: ../src/e_mod_config.c:84
+#: ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "عادي"
+
+#: ../src/e_mod_config.c:86
+#: ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "حرج"
+
+#: ../src/e_mod_config.c:90
+msgid "Default Timeout"
+msgstr "المهلة اﻹفتراضية"
+
+#: ../src/e_mod_config.c:91
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f ثواني"
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:106
+msgid "Popup Corner"
+msgstr "ركن المنبثقة"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "إعدادات صندوق التنبيه"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "اﻹعدادات العامة"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "اعرض ملصق اﻷيقونة"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "اعرض النافذة المنبثقة عند مرور الفأرة"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "مستوى اﻹستعجال ﻷجل اﻹستعادة:"
+
+#~ msgid "Configuration"
+#~ msgstr "الإعدادات"
+
+#~ msgid "Notification Configuration"
+#~ msgstr "إعددات التنبيه"
+
+#~ msgid "Placement"
+#~ msgstr "الموضع"
+
+#~ msgid "%2.0f x"
+#~ msgstr "%2.0f x"
+
+#~ msgid "Direction"
+#~ msgstr "الإتجاه"
+
+#~ msgid "Gap"
+#~ msgstr "تباعد"
+
+#~ msgid "Size of the gap between two popups : "
+#~ msgstr "حجم التباعد بين نافذتين منبثقتين : "
+
+#~ msgid "%2.0f pixels"
+#~ msgstr "%2.0f بكسل"
diff --git a/src/modules/notification/po/bg.po b/src/modules/notification/po/bg.po
new file mode 100755 (executable)
index 0000000..2e4af7b
--- /dev/null
@@ -0,0 +1,203 @@
+# Bulgarian translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-05 16:07+0800\n"
+"PO-Revision-Date: 2009-09-29 21:35+0000\n"
+"Last-Translator: vlood <vlood.vassilev@gmail.com>\n"
+"Language-Team: Bulgarian <bg@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-12 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Настройка"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr ""
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:207
+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 ""
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Разширения"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Уведомление"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Настройката на уведомленията бе обновена"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr ""
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Настройка на уведомленията"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Спешност"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr ""
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr ""
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr ""
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr ""
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr ""
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr ""
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr ""
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr ""
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr ""
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr ""
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr ""
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr ""
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr ""
diff --git a/src/modules/notification/po/cs.po b/src/modules/notification/po/cs.po
new file mode 100755 (executable)
index 0000000..838c063
--- /dev/null
@@ -0,0 +1,174 @@
+# Czech translation.
+# This file is put in the public domain.
+# quaker66@gmail.com
+# Vít Pelčák <vit@pelcak.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Notification\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2011-10-16 14:36+0200\n"
+"PO-Revision-Date: 2011-10-16 13:46+0200\n"
+"Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../src/e_mod_box.c:650 ../src/e_mod_box.c:794
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../src/e_mod_main.c:120
+msgid "Notification Box"
+msgstr "Upozorňování"
+
+#: ../src/e_mod_main.c:212
+msgid "Enter Presentation Mode"
+msgstr "Vstup do prezentačního režimu"
+
+#: ../src/e_mod_main.c:213
+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 je nyní v <b>prezentačním</b> režimu.<br>Během tohoto režimu "
+"budou spořič obrazovky, zamčení obrazovky a správa napájení zakázány."
+
+#: ../src/e_mod_main.c:219
+msgid "Exited Presentation Mode"
+msgstr "Opuštěn prezentační režim"
+
+#: ../src/e_mod_main.c:220
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Prezentační režim byl vypnut.<br>Nyní budou obnoveny nastavení spořiče, "
+"zamčení obrazovky a správy napájení."
+
+#: ../src/e_mod_main.c:235
+msgid "Enter Offline Mode"
+msgstr "Vstup do režimu offline"
+
+#: ../src/e_mod_main.c:236
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment je nyní v režimu <b>offline</b>.<br>Během offline módu moduly "
+"přestanou využívat sít."
+
+#: ../src/e_mod_main.c:242
+msgid "Exited Offline Mode"
+msgstr "Opuštěn režim offline"
+
+#: ../src/e_mod_main.c:243
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Nyní v režimu <b>online</b>.<br>Moduly používající síť nyní znovu spustí "
+"běžné úlohy."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:300
+msgid "Extensions"
+msgstr "Rozšíření"
+
+#: ../src/e_mod_main.c:302
+msgid "Notification"
+msgstr "Upozornění"
+
+#: ../src/e_mod_main.c:334
+msgid "Notification Module"
+msgstr "Modul upozornění"
+
+#: ../src/e_mod_main.c:353
+msgid "Error During DBus Init!"
+msgstr "Chyba při načítání DBus!"
+
+#: ../src/e_mod_main.c:354
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Chyba při načítání DBus! Prosím zkontrolujte, jestli máte dbus správně "
+"nainstalovaný a spuštěný."
+
+#: ../src/e_mod_config.c:38
+msgid "Notification Settings"
+msgstr "Nastavení upozorňování"
+
+#: ../src/e_mod_config.c:81 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Důležitost"
+
+#: ../src/e_mod_config.c:82
+msgid "Levels of urgency to popup : "
+msgstr "Úoveń důležitosti ke zobrazení :"
+
+#: ../src/e_mod_config.c:84 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "nízký"
+
+#: ../src/e_mod_config.c:86 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normální"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritický"
+
+#: ../src/e_mod_config.c:92
+msgid "Default Timeout"
+msgstr "Výchozí časový limit"
+
+#: ../src/e_mod_config.c:93
+msgid "Force timeout for all notifications"
+msgstr "Vynutit časový limit pro všechna upozornění"
+
+#: ../src/e_mod_config.c:95
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekund"
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:110
+msgid "Popup Corner"
+msgstr "Roh bubliny"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Nastavení modulu Notification"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Obecná nastavení"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Zobrazit titulek ikony"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Zobrazit bublinu při aktivaci kurzorem"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Aktivovat zdrojové okno při kliknutí"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Stupně důležitosti k zaznamenání:"
diff --git a/src/modules/notification/po/de.po b/src/modules/notification/po/de.po
new file mode 100755 (executable)
index 0000000..028c6d6
--- /dev/null
@@ -0,0 +1,226 @@
+# German translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-11-23 23:45+0100\n"
+"PO-Revision-Date: 2009-12-02 09:42+0000\n"
+"Last-Translator: Aron Xu <Unknown>\n"
+"Language-Team: German <de@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-03 04:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/e_mod_box.c:677 src/e_mod_box.c:824
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Benachrichtigungsfenster"
+
+#: src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "In den Präsentationsmodus wechseln"
+
+#: src/e_mod_main.c:214
+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 befindet sich im <b>Präsentations</b>-Modus.<br>Im "
+"Präsentationsmodus sind der Bildschirmschoner, Sperren des Bildschirms und "
+"Energiesparen deaktivert, um Sie nicht zu unterbrechen."
+
+#: src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Präsentationsmodus wurde verlassen"
+
+#: src/e_mod_main.c:221
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Der Präsentationsmodus ist beendet.<br>Die Bildschirmschoner-, Bildschirm "
+"sperren- und Energiespareinstellungen werden wiederhergestellt."
+
+#: src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "In den Offlinemodus wechseln"
+
+#: src/e_mod_main.c:237
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment befindet sich im <b>Offline</b>-Modus.<br>Im Offlinemodus "
+"werden keine Module entfernte Netzwerkdienste kontaktieren."
+
+#: src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Offlinemodus verlassen"
+
+#: src/e_mod_main.c:244
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Zurück im <b>Online</b>-Modus.<br>Die Module fahren mit ihren "
+"netzwerkbezogenen Aufgaben fort."
+
+#: src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Erweiterungen"
+
+#: src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Benachrichtigung"
+
+#: src/e_mod_main.c:335
+msgid "Notification Module"
+msgstr "Benachrichtigungsmodul"
+
+#: src/e_mod_main.c:363
+msgid "Error During DBus Init!"
+msgstr "Fehler bei der Initialisierung von D-Bus!"
+
+#: src/e_mod_main.c:364
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Fehler bei der Initialisierung von D-Bus! Prüfen Sie, ob D-Bus korrekt "
+"installiert ist und auch läuft."
+
+#: src/e_mod_config.c:37
+msgid "Notification Settings"
+msgstr "Benachrichtigungseinstellungen"
+
+#: src/e_mod_config.c:79 src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Dringlichkeit"
+
+#: src/e_mod_config.c:80
+msgid "Levels of urgency to popup : "
+msgstr "Dringlichkeitsstufen, die zu einem Popu führen:"
+
+#: src/e_mod_config.c:82 src/e_mod_config_item.c:94
+msgid "low"
+msgstr "niedrig"
+
+#: src/e_mod_config.c:84 src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: src/e_mod_config.c:86 src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritisch"
+
+#: src/e_mod_config.c:90
+msgid "Default Timeout"
+msgstr "Vorgabezeitbeschränkung"
+
+#: src/e_mod_config.c:91
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f Sekunden"
+
+#: src/e_mod_config.c:106
+msgid "Popup Corner"
+msgstr "Bildschirmecke für Popup"
+
+#: src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Benachrichtigungsfenstereinstellungen"
+
+#: src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+#: src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Symbolbeschriftung zeigen"
+
+#: src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Beim Überfahren mit der Maus den Popup zeigen"
+
+#: src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Das Hauptfenster durch Klicken fokussieren"
+
+#: src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Dringlichkeitsstufen, die gespeichert werden sollen: "
+
+#~ msgid "Configuration"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Notification Configuration Updated"
+#~ msgstr "Benachrichtigungseinstellungen aktualisiert"
+
+#~ msgid ""
+#~ "Notification Module Configuration data needed upgrading. Your old "
+#~ "configuration<br> has been wiped and a new set of defaults initialized. "
+#~ "This<br>will happen regularly during development, so don't report "
+#~ "a<br>bug. This simply means the Notification module needs new "
+#~ "configuration<br>data by default for usable functionality that your "
+#~ "old<br>configuration simply lacks. This new set of defaults will "
+#~ "fix<br>that by adding it in. You can re-configure things now to "
+#~ "your<br>liking. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "Die Moduleinstellungen bedurften einer Aktualisierung. Ihre alte "
+#~ "Konfiguration<br> wurde durch neue Standardwerte ersetzt. Dies<br>wird "
+#~ "regelmäßig während des Entwicklungsprozesses passieren. Melden Sie dies "
+#~ "nicht als<br>Fehler. Es bedeutet lediglich, dass das "
+#~ "Benachrichtigungsmodul neue Standard-<br>einstellungen benötigt, die Ihre "
+#~ "alte Einstellung nicht hatte,<br>um ordnungsgemäß zu funktionieren. Diese "
+#~ "Standardeinstellungen werden<br>hinzugefügt, um ordnungsgemäßes "
+#~ "Funktionieren sicherzustellen. Sie können die<br>Einstellungen nun nach "
+#~ "ihrem Belieben neu anpassen. Entschuldigen Sie die Umstände.<br>"
+
+#~ msgid ""
+#~ "Your Notification Module Configuration is NEWER than the Notification "
+#~ "Module version. This is very<br>strange. This should not happen unless "
+#~ "you downgraded<br>the Notification Module or copied the configuration "
+#~ "from a place where<br>a newer version of the Notification Module was "
+#~ "running. This is bad and<br>as a precaution your configuration has been "
+#~ "now restored to<br>defaults. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "Ihre Moduleinstellungen sind NEUER als die Modulversion selbst. Das ist "
+#~ "sehr<br>seltsam und sollte nicht passieren, außer Sie haben das Modul "
+#~ "<br>deaktualisiert oder die Moduleinstellungen von einem Ort kopiert, an "
+#~ "dem<br>eine neuere Version des Modules lief. Das ist kritisch.<br>Ihre "
+#~ "Einstellungen wurden vorbeugend auf Standardwerte<br>zurückgesetzt. "
+#~ "Entschuldigen Sie die Umstände.<br>"
+
+#~ msgid "Notification Configuration"
+#~ msgstr "Benachrichtigungseinstellungen"
+
+#~ msgid "Placement"
+#~ msgstr "Platzierung"
+
+#~ msgid "%2.0f x"
+#~ msgstr "%2.0f x"
+
+#~ msgid "%2.0f y"
+#~ msgstr "%2.0f y"
+
+#~ msgid "Direction"
+#~ msgstr "Ausrichtung"
+
+#~ msgid "Gap"
+#~ msgstr "Abstand"
+
+#~ msgid "Size of the gap between two popups : "
+#~ msgstr "Größe des Abstandes zwischen zwei Popups "
+
+#~ msgid "%2.0f pixels"
+#~ msgstr "%2.0f Pixel"
diff --git a/src/modules/notification/po/el.po b/src/modules/notification/po/el.po
new file mode 100755 (executable)
index 0000000..ed0a438
--- /dev/null
@@ -0,0 +1,187 @@
+# translation of el.po to Greek
+# Notification module (e17), French translation
+# This file is put in the public domain.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: el\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-07-17 15:33+0800\n"
+"PO-Revision-Date: 2011-11-20 22:32+0200\n"
+"Last-Translator: Alex-P. Natsios <drakevr@linuxteam.cs.teilar.gr>\n"
+"Language-Team: Greek <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675
+#: ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Ρύθμιση"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Κουτί Ειδοποίησης"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Εισέλθετε σε λειτουργία παρουσίασης"
+
+#: ../src/e_mod_main.c:207
+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/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Εξήλθατε από λειτουργία παρουσίασης."
+
+#: ../src/e_mod_main.c:214
+msgid "Presentation mode is over.<br>Now screen saver, lock and power saving settings will be restored."
+msgstr "Η λειτουργία παρουσίασης τελειωσε.<br>τώρα η προφύλαξη οθόνης, το κλείδωμα και οι ρυθμίσεις εξοικονομήσεις ενέργειας θα αποκατασταθούν."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Εισέλθετε σε λειτουργία εκτός σύνδεσης"
+
+#: ../src/e_mod_main.c:230
+#, fuzzy
+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/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Εξήλθατε από λειτουργία εκτός σύνδεσης"
+
+#: ../src/e_mod_main.c:237
+#, fuzzy
+msgid "Now in <b>online</b> mode.<br>Now modules that use network will resume regular tasks."
+msgstr "Τώρα σε λειτουργία<b>σύνδεσης</b>.<br>Τώρα τα αρθρώματα που χρησιμοποιούν το δίκτυο θα συνεχίσουν κανονικά την άντληση δεδομένων."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Επεκτάσεις"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Ειδοποίηση"
+
+#: ../src/e_mod_main.c:340
+#: ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Ρύθμιση Ειδοποιήσεων Ενημερώθηκε"
+
+#: ../src/e_mod_main.c:341
+msgid "Notification Module Configuration data needed upgrading. Your old configuration<br> has been wiped and a new set of defaults initialized. This<br>will happen regularly during development, so don't report a<br>bug. This simply means the Notification module needs new configuration<br>data by default for usable functionality that your old<br>configuration simply lacks. This new set of defaults will fix<br>that by adding it in. You can re-configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid "Your Notification Module Configuration is NEWER than the Notification Module version. This is very<br>strange. This should not happen unless you downgraded<br>the Notification Module or copied the configuration from a place where<br>a newer version of the Notification Module was running. This is bad and<br>as a precaution your configuration has been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr "Η ρύθμιση σας για το άρθρωμα ενημερώσεων είναι ΝΕΟΤΕΡΗ από την έκδοση αρθρώματος ενημερώσεων. Αυτό είναι πολύ<br> παράξενο. Αυτό δεν πρέπει να συμβεί εκτός κι αν έχετε υποβαθμίσει το άρθρωμα Ενημερώσεων ή αντιγράψατε την ρύθμιση από ένα σύστημα το οποιο εκτελούσε νεότερη έκδοση. Αυτό είναι κακό και  για προληπτικούς λόγους οι ρυθμίσεις σας έχουν πλέον αποκατασταθεί στις <br> προεπιλογές. Λυπούμαστε για την ταλαιπωρία.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Λάθος κατά την αρχικοποίηση του DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid "Error during DBus init! Please check if dbus is correctly installed and running."
+msgstr "Λάθος κατά την αρχικοποίηση του DBus! Παρακαλούμε ελέγξτε αν το dbus είναι σωστά εγκατεστημένο και εκτελείται."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Ρύθμιση Ειδοποίησης"
+
+#: ../src/e_mod_config.c:88
+#: ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Προτεραιότητα"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Επίπεδα προτεραιότητας των ειδοποιήσεων : "
+
+#: ../src/e_mod_config.c:91
+#: ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "χαμηλό"
+
+#: ../src/e_mod_config.c:93
+#: ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "κανονικό"
+
+#: ../src/e_mod_config.c:95
+#: ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "κρίσιμο"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Προκαθορισμένο χρονικό περιθώριο"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f δευτερόλεπτα"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Τοποθέτηση"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Κατεύθυνση"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Κατεύθυνση κατά την οποια θα στοιβάζονται τα αναδυόμενα : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Κενό"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Το μέγεθος του κενού ανάμεσα στις ειδοποιήσεις "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixel"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Ρύθμιση Ειδοποιήσεων"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Γενικές ρυθμίσεις"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Εμφανίστε την ετικέτα εικονιδίου"
+
+#: ../src/e_mod_config_item.c:85
+#, fuzzy
+msgid "Show the popup on mouse over"
+msgstr "Εμφάνιση αναδυόμενου κατά το mouse over"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Εστίασε στο παράθυρο προορισμού όταν κάνω κλικ"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Επίπεδα επίγοντων για αποθήκευση: "
+
diff --git a/src/modules/notification/po/en_GB.po b/src/modules/notification/po/en_GB.po
new file mode 100755 (executable)
index 0000000..aa44a4d
--- /dev/null
@@ -0,0 +1,226 @@
+# English (United Kingdom) translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Stanislaw Gackowski <launchpad@soeb.eu>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-11-05 16:07+0800\n"
+"PO-Revision-Date: 2009-09-28 23:37+0000\n"
+"Last-Translator: Steve Holmes <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-12 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Notification Box"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Enter Presentation Mode"
+
+#: ../src/e_mod_main.c:207
+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 is in <b>presentation</b> mode.<br>During presentation mode, "
+"screen saver, lock and power saving will be disabled so you are not "
+"interrupted."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Exited Presentation Mode"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Enter Offline Mode"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Exited Offline Mode"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Now in <b>online</b> mode.<br>Now modules that use the network will resume "
+"regular tasks."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Extensions"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Notification"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Notification Configuration Updated"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialised. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Error During DBus Init!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Notification Configuration"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgency"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Levels of urgency to popup : "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "low"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "critical"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Default Timeout"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f seconds"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Placement"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Direction"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Direction in which popups will stack themselves : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Gap"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Size of the gap between two popups : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixels"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Notification Box Configuration"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "General Settings"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Show Icon Label"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Show the popup on mouse-over"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Focus the source window when clicking"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Levels of urgency to store : "
diff --git a/src/modules/notification/po/eo.po b/src/modules/notification/po/eo.po
new file mode 100755 (executable)
index 0000000..9e321ca
--- /dev/null
@@ -0,0 +1,227 @@
+# translation of eo.po to Esperanto
+# Esperanto tranlation of news.
+# This file is distributed under the same license as the news package.
+#
+# Olivier M. <olivierweb@ifrance.com>, 2008.
+# Olivier <eliovir@nospam.gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: eo\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-12-01 15:38+0800\n"
+"PO-Revision-Date: 2010-01-23 20:31+0000\n"
+"Last-Translator: Michael Moroni <haikara90@gmail.com>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Agordoj"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Kesto de atentigo"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Startigi la prezentan reĝimon"
+
+#: ../src/e_mod_main.c:207
+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 estas en <b>prezenta</b> reĝimo.<br>Dum prezenta reĝimo, "
+"ekrankurteno, ekranŝlosilo kaj energiŝparo estos malaktivigitaj, tiel vi ne "
+"estos interrompita."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Prezenta reĝimo finiĝis"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Prezenta reĝimo finiĝis.<br>Nun, agordoj de ekrankurteno, ekranŝlosilo kaj "
+"energiŝparo estos restaŭrigitaj."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Startigi senretan reĝimon"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment estas en <b>senreta</b> reĝimo.<br>Dum senreta reĝimo, "
+"moduloj, kiuj uzas reton, ĉesos peti forajn servojn."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Senreta reĝimo finiĝis"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Nun en <b>reta</b> reĝimo.<br>Nun, moduloj, kiuj uzas reton, denove agos "
+"kiel kutime."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Etendaĵoj"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Atentigo"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Agordoj de atentigo ĝisdatigitaj"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"La agordo de la modulo Atentigo bezonas ĝisdatigon. Viaj malnovaj "
+"agordoj<br> estis viŝitaj kaj nova aro da defaŭltoj estis pravalorizitaj. "
+"Tio okazos ofte dum<br> la programado, do ne raportu cimon. Tio simple "
+"signifas, ke la modulo<br> Atentigo bezonas novajn datumojn de agordo "
+"defaŭlte por uzebla funkcieco,<br> kiuj viaj agordoj mankas. Tiu nova aro da "
+"defaŭltoj korektos tion aldoniĝante<br> Vi povas reagordi nun kiel vi volas. "
+"Pardonu por la malagrablaĵoj.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Via agordo de la modulo Agordoj estas PLI NOVA ol la modulo mem. Tio estas "
+"ege<br> strange. Tio ne devus okazi krom se vi antaŭdatiĝis la modulon aŭ "
+"kopiis la agordon<br> el loko kie nova versio de la modulo funkciis. Tio "
+"estas malbone kaj viaj<br> agordoj estis restaŭritaj al defaŭltoj, kiel "
+"antaŭzorgo. Pardonu por la malagrablaĵoj.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Eraro dum pravalorizo de DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Eraro dum pravalorizo de DBus! Bonvolu kontroli ĉu ĝi estas instalata kaj "
+"funkcianta."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Agordo de la modulo Atentigo"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urĝeco"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Ŝprucfenestrendaj niveloj de urĝeco: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "malalta"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normala"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritika"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Defaŭlta tempolimo"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekundoj"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Lokado"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Direkto"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Direkto en kiuj ŝprucfenestroj stakiĝos: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Intervalo"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Intervalo inter du ŝprucfenestroj: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f rastrumeroj"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Agordo de la kesto de atentigo"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Ĝeneralaj agordoj"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Montri piktograman etikedon"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Montri ŝprucfenestron dum la muso supras"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Fokusigi la fontan fenestron dum alklako"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Memorendaj niveloj de urĝeco: "
diff --git a/src/modules/notification/po/es.po b/src/modules/notification/po/es.po
new file mode 100755 (executable)
index 0000000..687e250
--- /dev/null
@@ -0,0 +1,229 @@
+# Spanish translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+#
+# Francisco Perez Lopez, 2008.
+# Paco Molinero <paco@byasl.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-08-19 03:46+0000\n"
+"Last-Translator: Federico Vera <Unknown>\n"
+"Language-Team: Spanish <>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Caja de notificación"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Entrar en modo presentación"
+
+#: ../src/e_mod_main.c:207
+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 está en modo <b>presentación</b>.<br>En este modo, el "
+"protector de pantalla, bloqueo y ahorro de energía serán deshabilitados para "
+"que usted no sea interrumpido."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Salió del modo presentación"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"El modo presentación se ha terminado.<br>Ahora se restaurarán las "
+"preferencias guardadas de salvapantallas y de gestión de energía."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Entrar en modo desconectado"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment está en modo <b>desconectado</b>.<br/>Durante el modo "
+"desconexión, los módulos que usen la red no sonderán servicios remotos."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Salió del modo desconectado"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Ahora está en modo <b>conectado</b>.<br>Ahora los módulos que usen la red "
+"continuarán con sus tareas normales."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Complementos"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Notificación"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Configuración de notificación actualizada"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"La configuración del módulo de configuración requiere una actualización. Su "
+"configuración anterior<br>ha sido eliminada y se han asignado los valores "
+"por defecto. Esto<br>pasará regularmente durante el desarrollo, por lo que "
+"no<br>informe de un error. Simplemente signitica que el módulo de "
+"noticiación necesita nuevos datos de configuración<br> para usar nuevas "
+"funcionalidades. Este conjunto de valores por defecto<br>lo arreglará "
+"añadiéndole esa funcionalidad. Puede reconfigurar cosas ahora a su<br>gusto. "
+"Disculpe las molestias.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Su configuración del módulo de notificación es MÁS NUEVA que el propio "
+"módulo. Esto es muy<br>extraño. Esto no debería pasar a menos que haya "
+"revertido<br>el módulo de notificación o haya copiado la configuración de "
+"otro lugar<br> con una versión más moderna. Esto está mal y <br>por "
+"precaución su configuración ha sido reiniciada<br>a sus valores por defecto. "
+"Disculpe las molestias.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "¡Error durante la carga de DBUS!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"¡Error durante la carga de DBUS! Verifique que dbus esté correctamente "
+"instalado y ejecutándose."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Configuración de notificaciones"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgencia"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Niveles de urgencia de emergentes: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "bajo"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "crítico"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Tiempo de vencimiento predeterminado"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f segundos"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Colocación"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Dirección"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Dirección en la que los emergentes se apilarán unos sobre otros: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Espacio"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Tamaño de la brecha entre dos ventanas emergentes: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f píxeles"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Configuración de caja de notificaciones"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Preferencias generales"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Mostrar etiqueta del icono"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Mostrar emergente al poner ratón encima"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "La ventana fuente toma el foco al pulsar sobre ella"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Niveles de emergencia para almacenar: "
diff --git a/src/modules/notification/po/fi.po b/src/modules/notification/po/fi.po
new file mode 100755 (executable)
index 0000000..f052c9f
--- /dev/null
@@ -0,0 +1,220 @@
+# Notification module (e17), Finnish translation
+# This file is put in the public domain.
+# Jani väyrynen <janivayrynen@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Notification module (e17)\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-07-17 15:33+0800\n"
+"PO-Revision-Date: 2008-01-23 01:50+0200\n"
+"Last-Translator: Jani väyrynen <janivayrynen@gmail.com>\n"
+"Language-Team: Finnish <janivayrynen@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+#, fuzzy
+msgid "Configuration"
+msgstr "Huomautuksen asetukset"
+
+#: ../src/e_mod_main.c:121
+#, fuzzy
+msgid "Notification Box"
+msgstr "Huomautus"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:207
+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 ""
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Laajennukset"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Huomautus"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Huomautuksen asetukset päivitetty"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Huomautusmoduulin asetustiedot tarvitsivat päivitystä. Vanhat asetuksesion "
+"pyyhitty<br>ja uudet oletukset asetettu. Tämä tulee tapahtumaan "
+"säännöllisesti<br>kehitystyön aikana, joten älä raportoi bugia. "
+"Tämä<br>tarkoittaa yksinkertaisesti sitä, että Huomautusmoduuli "
+"tarvitsee<br>uudet asetustiedot toimiakseen, mitä vanhat asetuksesi<br>eivät "
+"yksinkertaisesti suo. Nämä uudet oletusasetukset korjaavat "
+"tilanteen<br>lisäämällä tarvittavat toiminnot. Voit asettaa "
+"asiat<br>uudelleen mieleiseksesi. Pahoittelut aiheutetusta vaivasta.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Huomautusmoduulisi asetukset ovat UUDEMMAT kuin Huomautumoduulin versio. "
+"Tämä on hyvin outoa.<br>Tätä ei pitäisi tapahtua, ellet ole mahdollisesti "
+"alipäivittänyt<br>Huomautusmoduulia tai kopioinut asetuksia paikasta, jossa "
+"on käytössä<br>Huomautusmoduulin uudempi versio. Tämä on paha juttu, ja "
+"varotoimena<br>asetuksesi on nyt palautettu oletusarvoihin. Pahoittelut "
+"aiheutetusta vaivasta.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr ""
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Huomautuksen asetukset"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr ""
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr ""
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr ""
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr ""
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr ""
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr ""
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Asettelu"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Suunta"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr ""
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr ""
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr ""
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pikseliä"
+
+#: ../src/e_mod_config_item.c:37
+#, fuzzy
+msgid "Notification Box Configuration"
+msgstr "Huomautuksen asetukset"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr ""
+
+#~ msgid "Gap size"
+#~ msgstr "Raon koko"
diff --git a/src/modules/notification/po/fo.po b/src/modules/notification/po/fo.po
new file mode 100755 (executable)
index 0000000..fc002c3
--- /dev/null
@@ -0,0 +1,211 @@
+# Faroese translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-07-14 16:38+0000\n"
+"Last-Translator: Gunleif Joensen <Unknown>\n"
+"Language-Team: Faroese <fo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Samanseting"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Frásagnarkassi"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Far í framløgustand"
+
+#: ../src/e_mod_main.c:207
+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 er í <b>framløgu</b> standi.<br>Meðan tú er í framløgustandi, "
+"verða skíggja-verjin, lás og  orku-sparing sett úr gildi, so tú ikki verður "
+"órógvaður."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Farin úr fraløgu-standi"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Framløgustandur er liðugir.<br>Nú skíggja-verjin, lási og orku-sparingin "
+"endurtikin."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Far í avlinjustand"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment er í  <b>avlinju</b> standi.<br>Ímeðan tú er í avlinjustandi, "
+"vilja mótular ið nýta netið steðga við at kanna fjartænastur."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Farin úr avlinjustand"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Nú í <b>álijnu</b> standi.<br>Nú vilja mótular, ið nýta netið, taka upp "
+"aftur sínar vanligu koyringar."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Víðkanir"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Frásøgn"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Frásagna-samanseting dagførd"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Brek meðan DBus Innleiddi!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Brek meðan DBus Innleiddi! Vinarliga kann um DBus er innlagt rætt og er "
+"koyrandi."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Frásagnar-samanseting"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr ""
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr ""
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr ""
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "vanligt"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritiskt"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Forsett Leikbrá"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekund"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr ""
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Kós"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Kós hvar støkkmyndir vilja stakka seg sjálvar : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Glopp"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Støddin av gloppinum ímillum tvær støkkmyndir : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f  skíggjadeplar"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Samanseting av frásagnar-kassa"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Almennar setingar"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Vís ímynda-spjaldur"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Vís støkkmyndina við at halda músina yvir"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr ""
diff --git a/src/modules/notification/po/fr.po b/src/modules/notification/po/fr.po
new file mode 100755 (executable)
index 0000000..f906de9
--- /dev/null
@@ -0,0 +1,236 @@
+# Notification module (e17), French translation.
+# This file is put in the public domain.
+# batden <batden@orange.fr>, 2009, 2010.
+# dazibao <dazibao@sfr.fr>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Notification module\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2011-09-01 06:54+0200\n"
+"PO-Revision-Date: 2011-09-01 09:30+0200\n"
+"Last-Translator: dazibao <dazibao@sfr.fr>\n"
+"Language-Team: French <sansgourou@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/e_mod_box.c:666 src/e_mod_box.c:810
+msgid "Settings"
+msgstr "Configuration"
+
+#: src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Boîte de notification"
+
+#: src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "Entrée en mode présentation"
+
+#: src/e_mod_main.c:214
+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 est en mode <b>présentation</b>.<br>Dans ce mode, l'écran de "
+"veille, le verrouillage et la gestion de l'énergie sont désactivés pour ne "
+"pas vous interrompre."
+
+#: src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Sortie du mode présentation"
+
+#: src/e_mod_main.c:221
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Le mode présentation est terminé.<br>L'écran de veille, le verrouillage et "
+"la gestion de l'énergie sont réactivés."
+
+#: src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "Entrée en mode hors ligne"
+
+#: src/e_mod_main.c:237
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment est en mode <b>hors ligne</b>.<br>Dans ce mode, les modules "
+"qui utilisent le réseau n'interrogent plus les services distants."
+
+#: src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Sortie du mode hors ligne"
+
+#: src/e_mod_main.c:244
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"De nouveau <b>en ligne</b>.<br>Les modules qui utilisent le réseau "
+"retrouvent leurs fonctions habituelles."
+
+#: src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Extensions"
+
+#: src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Notification"
+
+#: src/e_mod_main.c:335
+msgid "Notification Module"
+msgstr "Module Notification"
+
+#: src/e_mod_main.c:364
+msgid "Error During DBus Init!"
+msgstr "Échec de l'initialisation de DBus !"
+
+#: src/e_mod_main.c:365
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Échec de l'initialisation de DBus ! Veuillez vérifier que dbus est installé "
+"et qu'il se lance correctement."
+
+#: src/e_mod_config.c:38
+msgid "Notification Settings"
+msgstr "Paramétrage de Notification"
+
+#: src/e_mod_config.c:81 src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgence"
+
+#: src/e_mod_config.c:82
+msgid "Levels of urgency to popup : "
+msgstr "Niveaux d'urgence à notifier par pop-up :"
+
+#: src/e_mod_config.c:84 src/e_mod_config_item.c:94
+msgid "low"
+msgstr "faible"
+
+#: src/e_mod_config.c:86 src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: src/e_mod_config.c:88 src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "critique"
+
+#: src/e_mod_config.c:92
+msgid "Default Timeout"
+msgstr "Délai d'expiration par défaut"
+
+#: src/e_mod_config.c:93
+msgid "Force timeout for all notifications"
+msgstr "Imposer ce délai à toutes les notifications"
+
+#: src/e_mod_config.c:95
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f secondes"
+
+#: src/e_mod_config.c:110
+msgid "Popup Corner"
+msgstr "Coin du pop-up"
+
+#: src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Configuration de la notification"
+
+#: src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+#: src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Montrer l'étiquette de l'icone"
+
+#: src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Montrer le pop-up au survol"
+
+#: src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Focaliser la fenêtre source lors du clic"
+
+#: src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Niveaux d'urgence à conserver :"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
+
+#~ msgid "Notification Configuration"
+#~ msgstr "Configuration de la notification"
+
+#~ msgid "Notification Configuration Updated"
+#~ msgstr "Configuration de la notification actualisée"
+
+#~ msgid ""
+#~ "Notification Module Configuration data needed upgrading. Your old "
+#~ "configuration<br> has been wiped and a new set of defaults initialized. "
+#~ "This<br>will happen regularly during development, so don't report "
+#~ "a<br>bug. This simply means the Notification module needs new "
+#~ "configuration<br>data by default for usable functionality that your "
+#~ "old<br>configuration simply lacks. This new set of defaults will "
+#~ "fix<br>that by adding it in. You can re-configure things now to "
+#~ "your<br>liking. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "La configuration du module de notification a dû être mise à jour. Votre "
+#~ "ancienne<br>configuration a été supprimée et de nouveaux paramètres "
+#~ "par<br>défaut sont en place. Ceci risque d'arriver en phase "
+#~ "de<br>développement, aussi est-il inutile de faire un rapport de bogue."
+#~ "<br>Cela signifie simplement que le module de notification a besoin<br>de "
+#~ "cette mise à niveau pour être à nouveau fonctionnel.<br>Vous pouvez "
+#~ "maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne "
+#~ "occasionnée.<br>"
+
+#~ msgid ""
+#~ "Your Notification Module Configuration is NEWER than the Notification "
+#~ "Module version. This is very<br>strange. This should not happen unless "
+#~ "you downgraded<br>the Notification Module or copied the configuration "
+#~ "from a place where<br>a newer version of the Notification Module was "
+#~ "running. This is bad and<br>as a precaution your configuration has been "
+#~ "now restored to<br>defaults. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "La configuration du module de notification est PLUS RÉCENTE que la "
+#~ "version du module Notification.<br>C'est vraiment étonnant. Cela ne "
+#~ "devrait pas se produire à<br>moins que vous n'ayez installé une version "
+#~ "antérieure ou copié<br>la configuration depuis une machine sur laquelle "
+#~ "une version<br>plus récente était en cours. Ce n'est pas bon et, "
+#~ "par<br>mesure de précaution, votre configuration a été<br>remise à zéro. "
+#~ "Désolé pour le désagrément.<br>"
+
+#~ msgid "Placement"
+#~ msgstr "Position"
+
+#~ msgid "%2.0f x"
+#~ msgstr "%2.0f x"
+
+#~ msgid "%2.0f y"
+#~ msgstr "%2.0f y"
+
+#~ msgid "Direction"
+#~ msgstr "Direction"
+
+#~ msgid "Direction in which popups will stack themselves : "
+#~ msgstr "Direction de l'empilement des pop-up :"
+
+#~ msgid "Gap"
+#~ msgstr "Espace"
+
+#~ msgid "Size of the gap between two popups : "
+#~ msgstr "Espace entre deux pop-up :"
+
+#~ msgid "%2.0f pixels"
+#~ msgstr "%2.0f pixels"
diff --git a/src/modules/notification/po/he.po b/src/modules/notification/po/he.po
new file mode 100755 (executable)
index 0000000..169c925
--- /dev/null
@@ -0,0 +1,220 @@
+# Hebrew translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Yaron <sh.yaron@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-07-25 16:59+0000\n"
+"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "הגדרות"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "תיבת הדיווחים"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "כניסה למצב מצגת"
+
+#: ../src/e_mod_main.c:207
+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 ""
+"Enlightement במצב <b>מצגת</b><br>במצב זה,שומר המסך, הנעילה והחסכון בצריכת "
+"החשמל יבוטלו כדי להמנע מהפרעות."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "מצב המצגת נפסק"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"מצב המצגת גבוי.<br>כעת הגדרות שומר המסך, הנעילה וניהול צריכת החשמל ישוחזרו."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "כניסה למצב ניתוק"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightement במצב <b>ניתוק</b>.<br>במצב זה המודולים המשתמשים ברשת יפסיקו "
+"לתשאל שירותים למרחוק."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "מצב הניתוק הופסק"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"כעת במצב <b>מחובר</b>.<br>כעת המודולים המשתמשים ברשת יוכלו להמשיך במשימותיהם "
+"הרגילות."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "הרחבות"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "דיווחים"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "תצורת הדיווחים עודכנה"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"נתוני תצורת מודול הדיווחים נזקקו לעדכון. התצורה הישנה שלך<br>נמחקה ובמקומה "
+"נטענו ערכה חדשה של ברירות מחדל. פעולות<br>כאלו קורות במהלך הפיתוח, לכן אין "
+"סיבה לדווח על תקלה.<br>משמעות הדבר היא שמודול הדיווחים זקוק לנתוני תצורה "
+"חדשים<br>כברירת מחדל עבור תכונות שימושיות שחסרות בתצורה הישנה שלך.<br>ערכת "
+"ברירות מחדל אלו יתקנו בעיות אלו על ידי הוספת<br>הגדרת התכונות. תוכל להגדיר "
+"את התצורה לצורה<br>המועדפת עליך. סליחה על אי הנעימות.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"תצורת מודול הדיווחים שלך חדשה יותר מגרסת מודול הדיווחים. מצב כזה "
+"נחשב<br>למוזר. מצב כזה לא אמור לקרות אלא אם כן החזרת<br>אחורה את גרסת מודול "
+"הדיווחים או שהעתקת את התצורה ממקום אחר<br>בו מופעלת גירסה חדשה יותר של מודול "
+"ההתראות. מצב כזה אינו תקין<br>וכצעד זהירות התצורה שלך כעת תשוחזר<br>לברירות "
+"המחדל. סליחה על אי הנעימות.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "שגיאה במהלך הפעלת DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr "שגיאה במהלך הפעלת DBus! אנא בדוק האם dbus פעיל ומותקן כראוי."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "תצורת הדיווחים"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "דחיפות"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "רמות הדחיפות להקפצת חלונית : "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "נמוכה"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "רגילה"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "קריטית"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "עבר זמן ברירת המחדל."
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f שניות"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "מיקום"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "כיוון"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "הכיוון בו יערמו החלוניות המוקפצות : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "מרווח"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "גודל המרווח בין שתי חלוניות מוקפצות : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f פיקסלים"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "הגדרות תיבת ההתרעות"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "הגדרות כלליות"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "הצג את תווית הסמל"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "הצגת חלונית מוקפצת בעת מעבר עכבר"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "מיקוד חלון המקור בעת לחיצה"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "רמות דחיפות לאחסון : "
diff --git a/src/modules/notification/po/hr.po b/src/modules/notification/po/hr.po
new file mode 100755 (executable)
index 0000000..036c048
--- /dev/null
@@ -0,0 +1,224 @@
+# Croatian translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Miro Glavic <glavicmiro@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-06-08 02:31+0000\n"
+"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Konfiguracija"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Kutija za Obavijesti"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Ulaz u Mod Prezentacije"
+
+#: ../src/e_mod_main.c:207
+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 je u <b>prezentacionom</b> modu.<br>Tijekom moda "
+"prezentiranja, zaštitnik zaslona, brava i štednja struje će biti onemogućeni "
+"da ne biste bili prekidani."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Izlaz iz Moda Prezentacije"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Mod prezentacije je završen.<br>Sada će postavke zaštitnika zaslona, brave i "
+"štednje struje biti restaurirane."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Ulaz u Isključeni Mod"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment je u <b>isključenom</b> modu.<br>Tijekom isključenog moda, "
+"moduli koji koriste mrežu će prestati pozivati udaljene servise."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Izlaz iz Isključenog Moda"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Sada u <b>priključenom</b> modu.<br>Sada će moduli koji koriste mrežu "
+"nastaviti sa regularnim zadacima."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Nastavci"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Obavijest"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Konfiguracija Obavijesti Osvježena"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Konfiguracija Modula Obavijesti je trebala nadogradnju. Stara "
+"konfiguracija<br>je izbrisana a novi set zadanih vrijednosti je pokrenut. "
+"Ovo<br>će se događati regularno tijekom razvoja, te nemojte prijavljivati "
+"kao grešku.<br> Ovo prosto znači da modul normalno treba nove konfiguracione "
+"podatke<br>za korisničku funkcionalnost koju vaša stara konfiguracija<br> "
+"jednostavno ne posjeduje. Ovaj novi set zadanih vrijednosti će riješiti<br> "
+"problem svojim dodavanjem. Sad možete re-konfigurirati stvari <br>po želji. "
+"Žao nam je zbog neugodnosti.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Konfiguracija Modula Obavijesti je NOVIJA od inačice modula. Ovo je jako "
+"čudno.<br> Ovo se nije smjelo desiti, osim da ste možda unazadili <br>modul "
+"ili ste kopirali konfiguraciju gdje je novija inačica modula bila aktivna."
+"<br> Ovo nije dobro i kao predostrožnost vaša konfiguracija je vraćena na "
+"zadane vrijednosti.<br> Žao nam je zbog neugodnosti.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Greška Tijekom DBus Init!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Greška Tijekom DBus Init! Molimo provjerite da je DBus ispravno instaliran i "
+"da funkcionira."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Konfiguracija Obavjesti"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Hitnost"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Nivo nužde za po-up: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "nisko"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normalno"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritično"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Zadano Vrijeme Neaktivnosti"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekundi"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Smještaj"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Smjer"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Smjer u kojem će se po-ups poredati: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Razmak"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Veličina razmaka između dva pop-upa: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f piksela"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Konfiguracija Kutije za Obavijesti"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Opće Postavke"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Prikaži Oznaku Ikone"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Prikaži po-up kad je miš preko"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Fokusiraj izvorni prozor kod klikanja"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Nivo nužde za spremanje: "
diff --git a/src/modules/notification/po/hu.po b/src/modules/notification/po/hu.po
new file mode 100755 (executable)
index 0000000..b1b6307
--- /dev/null
@@ -0,0 +1,230 @@
+# translation of fi.po to hungarian
+# Notification module (e17), Finnish translation
+# This file is put in the public domain.
+#
+# Jani väyrynen <janivayrynen@gmail.com>, 2008.
+# Lisovszki  <lisovszki@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fi\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-11-05 16:07+0800\n"
+"PO-Revision-Date: 2009-10-24 12:25+0000\n"
+"Last-Translator: lisovszki <lisovszki@gmail.com>\n"
+"Language-Team: hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-12 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Beállítások"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Figyelmeztető doboz"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Belépés a bemutató módba"
+
+#: ../src/e_mod_main.c:207
+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>bemutató</b> módban van.<br>A bemutató mód alatt a "
+"képernyővédő, az asztal lezárása és a kilépés tiltva amíg meg nem szakítod."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Kilépve a bemutató módból"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Bemutató mód vége.<br>A képernyővédő, asztal lezárási, energiatakarékossági "
+"beállítások helyreállítva."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Belépés kapcsolat nélküli módba"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Az Enlightenment <b>kapcsolat nélküli<b> módban fut.<br>Ez alatt azok a "
+"modulok, amelyek a netet használják, le lesznek állítva."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Kilépve a kapcsolat nélküli módból."
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Most <b>online<b> módban van.<br>A hálózatot használó modulok ismét "
+"szabályosan működnek."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Kiterjesztések"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Értesítés"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Értesítés beállítás frissítve"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"A beállításokat tartalmazó állományok elavultak, ezért<br>újakat kellett "
+"készíteni. Minden eddigi beállítás törlõdött,<br>de ez a fejlesztés folyamán "
+"gyakran megesik majd. KÉRJÜK,<br>HOGY NE JELENTS HIBÁT! Annyi történt, hogy "
+"a használhatóság<br>érdekében az értesítés modulnak új adatokra van "
+"szüksége, és<br>ezek az elõzõ fájlokból hiányoztak. Mindent "
+"visszaállíthatsz,<br>ahogy neked tetszik. Az esetleges galibákért elnézést "
+"kérünk!<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"A beállításokat tartalmazó fájlok verziója újabb, mint<br>az értesítés "
+"modulé. Ennek nem kellene így lennie, hacsak nem<br>váltottál vissza egy "
+"elõzõ verzióra, vagy egy újabb verzión ké-<br>szült beállításokat át nem "
+"másoltad. Ez így nem túl jó, és figyelmez-<br>tetésként a beállítások "
+"visszaálltak az alapértelmezésre.<br>A galibákért elnézést kérünk!<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Hiba a DBus folyamat közben!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Hiba a DBus folyamat közben! Kérlek ellenőrizd, hogy a dbus helyesen fel van-"
+"e telepítve, és hogy működik-e rendesen."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Értesítés beállítása"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Sűrgősség"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Sürgösséggi felugró szintek: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "alacsony"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normál"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritikus"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Alapértelmezett időtúllépés"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f másodperc"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Elhelyezés"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Irány"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Utasítás a felugrónak, hogy melyik tegye a téma polcokat halomba: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Hézag"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Két felugró közti hézag mérete: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixel"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Figyelmeztető doboz beállításai"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Ikon címke megjelenítése"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Felugró megjelenítése ha az egér felette van"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "A forrás ablakra fókuszál rákattintáskor"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Sürgösségi tárolási szintek "
+
+#~ msgid "Gap size"
+#~ msgstr "Méret"
diff --git a/src/modules/notification/po/it.po b/src/modules/notification/po/it.po
new file mode 100755 (executable)
index 0000000..0b7746c
--- /dev/null
@@ -0,0 +1,172 @@
+# Italian translation for E17 notification module.
+# This file is put in the public domain.
+# Massimo Maiurana <maiurana@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Notification\n"
+"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
+"POT-Creation-Date: 2011-07-28 02:00-0700\n"
+"PO-Revision-Date: 2011-07-28 11:51+0200\n"
+"Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: ../src/e_mod_box.c:666 ../src/e_mod_box.c:810
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Notification"
+
+#: ../src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "Entra in modalità presentazione"
+
+#: ../src/e_mod_main.c:214
+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 è in modalità <b>presentazione</b>.<br>Durante la modalità "
+"presentazione vengono disabilitati lo screensaver, il bloccaschermo e la "
+"gestione energetica in modo da non essere interrotti."
+
+#: ../src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Uscita da modalità presentazione"
+
+#: ../src/e_mod_main.c:221
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"La modalità presentazione è terminata.<br>Adesso verranno riabilitati lo "
+"screensaver, il bloccaschermo e la gestione energetica."
+
+#: ../src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "Entra in modalità non in linea"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment è in modalità <b>non in linea</b>.<br>Durante la modalità non "
+"in linea i moduli che usano la rete smettono di interrogare i servizi remoti."
+
+#: ../src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Uscita da modalità non in linea"
+
+#: ../src/e_mod_main.c:244
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Adesso si è in modalità <b>non in linea</b>.<br>Da ora in poi i moduli che "
+"usano la rete riprenderanno i loro compiti normali."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Estensioni"
+
+#: ../src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Notification"
+
+#: ../src/e_mod_main.c:336
+msgid "Notification Module"
+msgstr "Modulo Notification"
+
+#: ../src/e_mod_main.c:364
+msgid "Error During DBus Init!"
+msgstr "Errore nell'inizializzazione di DBus!"
+
+#: ../src/e_mod_main.c:365
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Errore nell'inizializzazione di DBus! Si prega di controllare che dbus sia "
+"correttamente installato e in funzione."
+
+#: ../src/e_mod_config.c:38
+msgid "Notification Settings"
+msgstr "Impostazioni di Notification"
+
+#: ../src/e_mod_config.c:81 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgenza"
+
+#: ../src/e_mod_config.c:82
+msgid "Levels of urgency to popup : "
+msgstr "Livelli di urgenza da notificare:"
+
+#: ../src/e_mod_config.c:84 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "basso"
+
+#: ../src/e_mod_config.c:86 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normale"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "critico"
+
+#: ../src/e_mod_config.c:92
+msgid "Default Timeout"
+msgstr "Timeout predefinito"
+
+#: ../src/e_mod_config.c:93
+msgid "Force timeout for all notifications"
+msgstr "Forza timeout per tutte le notifiche"
+
+#: ../src/e_mod_config.c:95
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f secondi"
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:110
+msgid "Popup Corner"
+msgstr "Angolo per popup"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Configurazione modulo Notification"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Impostazioni generali"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Mostra etichetta icona"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Mostra popup al passaggio del mouse"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Sposta fuoco su finestra sorgente al click"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Livelli di urgenza da salvare:"
diff --git a/src/modules/notification/po/ja.po b/src/modules/notification/po/ja.po
new file mode 100755 (executable)
index 0000000..0ea44d2
--- /dev/null
@@ -0,0 +1,202 @@
+# Japanese translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-07-17 15:33+0800\n"
+"PO-Revision-Date: 2009-03-14 09:09+0000\n"
+"Last-Translator: Yuki Kodama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "設定"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "通知ボックス"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:207
+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 ""
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "拡張機能"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "通知"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "通知設定を更新しました"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "DBusの初期化に失敗しました!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"DBusの初期化に失敗しました!\r\n"
+"dbusが正しくインストールされて動作しているか確認してください。"
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "通知設定"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "緊急"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "ポップアップする緊急レベル : "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "低い"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "通常"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "重大"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr ""
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "配置"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f X軸"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f Y軸"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "方向"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "ポップアップが積み重なる方向 : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "隙間"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "2つのポップアップ間の隙間 : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f ピクセル"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "通知ボックス設定"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "一般設定"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "アイコンのラベルを表示"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "マウスオーバでポップアップを表示"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "クリックしたら元のウィンドウにフォーカス"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "保存する緊急レベル : "
diff --git a/src/modules/notification/po/lt.po b/src/modules/notification/po/lt.po
new file mode 100755 (executable)
index 0000000..3546dc7
--- /dev/null
@@ -0,0 +1,229 @@
+# Lithuanian translation for enlightenment
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-01 15:38+0800\n"
+"PO-Revision-Date: 2010-01-26 19:50+0000\n"
+"Last-Translator: Joshas <Unknown>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-27 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Konfigūracija"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Pranešimo skydelis"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Pereiti į prezentacijos veikseną"
+
+#: ../src/e_mod_main.c:207
+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 dirba <b>prezentacijos</b> veiksenoje.<br>Prezentacijos "
+"veiksenoje ekrano užsklanda, užraktas ir energijos taupymas bus išjungti, "
+"kad nepertrauktų Jūsų darbo."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Išėjote iš prezentacijos veiksenos"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Prezentacijos veiksena baigėsi.<br>Ekrano užsklandos, užrakto ir energijos "
+"taupymo nuostatos bus atkurtos."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Pereiti į atjungties veikseną"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment dirba <b>atjungties</b> veiksenoje.<br>Atjungties veiksenoje "
+"visi besijungiantys prie tinklo moduliai nustos siųsti užklausas nuotolinėms "
+"tarnyboms."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Išėjote iš atjungties veiksenos"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Dirbama <b>prisijungus</b>.<br>Besijungiantys prie tinklo moduliai tęs "
+"įprastų užduočių vykdymą."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Plėtiniai"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Pranešimas"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Pranešimų konfigūracija atnaujinta"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Pranešimų modulio konfigūracijos duomenys turi būti atnaujinti. Jūsų sena "
+"konfigūracija<br>buvo ištrinta ir įrašyti nauji numatytieji "
+"nustatymai.<br>Tobulinimo metu tai nutiks dažnai, todėl nesiųskite pranešimo "
+"apie klaidą.<br>Tai reiškia, kad modulio veikimui reikia naujų "
+"konfigūracijos duomenų, kurių nėra Jūsų senojoje konfigūracijoje.<br>Tai bus "
+"sutaisyta pridedant naujas numatytąsias konfigūracijos reikšmes.<br>Jūs "
+"galėsite pasikeisti nustatymus pagal savo poreikius.<br>Atsiprašome už "
+"sukeltus nepatogumus.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Jūsų pranešimų modulio konfigūracija yra NAUJESNĖ nei pranešimų modulio "
+"versija. Tai labai keista.<br>To neturėtų nutikti, nebent įrašėte senesnę "
+"modulio versiją,<br>arba nukopijavote konfigūraciją iš sistemos su naujesne "
+"modulio versija.<br>Tai yra blogai, todėl saugumo sumetimais Jūsų "
+"konfigūracijos reikšmės buvo atstatytos į numatytąsias.<br>Atsiprašome už "
+"sukeltus nepatogumus.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Klaida inicijuojant DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Klaida inicijuojant DBus! Prašome patikrinti ar dbus tarnyba įdiegta ir "
+"veikia."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Pranešimų konfigūracija"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Skubumas"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Rodyti skubumo lygius: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "žemas"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "įprastas"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritinis"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Numatytasis skirtasis laikas"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekundės"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Padėtis"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Kryptis"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Kryptis, kuria pranešimai bus kraunami vienas ant kito: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Tarpas"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Tarpo tarp dviejų pranešimų dydis: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pikseliai"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Pranešimo skydelio konfigūracija"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Bendros nuostatos"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Rodyti piktogramos žymę"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Rodyti iššokantį langą užvedus žymeklį"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Suaktyvinti pirminį langą spragtelėjus"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Saugoti svarbumo lygius: "
diff --git a/src/modules/notification/po/nl.po b/src/modules/notification/po/nl.po
new file mode 100755 (executable)
index 0000000..c755c76
--- /dev/null
@@ -0,0 +1,228 @@
+# Dutch translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-28 16:31+0800\n"
+"PO-Revision-Date: 2009-07-17 08:44+0000\n"
+"Last-Translator: Yentl <y.v.t@scarlet.be>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Notificatievenster"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Presentatiemode activeren"
+
+#: ../src/e_mod_main.c:207
+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 is in <b>presentatie</b> mode.<br>Gedurende presentatiemode, "
+"zijn schermbeveiliging, vergrendeling en energiebesparing uitgeschakeld, "
+"zodat je niet gestoord wordt."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Presentatiemode Verlaten"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Presentatiemode is voorbij.<br>Nu zijn schermbeveiligings-, vergrendelings- "
+"en energiebesparingsinstellingen terug hersteld."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Offlinemode Activeren"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment is in <b>offline</b>mode.<br>Gedurende offlinemode zullen "
+"modules die het netwerk gebruiken stoppen met het pollen naar afgelegen "
+"services."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Offlinemode Verlaten"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Nu in <b>online</b>mode. <br>Nu zullen modules die het netwerk gebruiken "
+"terug hun normale taken verderzetten."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Extensies"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Notificatie"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Notification Configuratie Geupdate"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Notification Module Configuratiedata moet geupdrade worden. Jouw oude "
+"configuratie<br> is gewist en een nieuwe set van standaardwaarden is "
+"ingesteld. Dit<br> zal regelmatig gebeuren tijdens de ontwikkelingsfase, dus "
+"geef dit niet aan<br>als een bug. Dit betekent enkel dat de Notification "
+"Module een nieuwe configuratie<br>nodig had, voor alledaagse "
+"functionaliteit, welke jouw oude<br>configuratie gewoon niet had. Deze "
+"nieuwe set van standaardwaarden zal dit oplossen<br>door deze waarden in te "
+"geven. Je kan nu alles terug instellen naar jouw eigen<br>voorkeur. Sorry "
+"voor het ongemak.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Jouw Notification Module Configuratie is NIEUWER dan de Notificatie Module "
+"versie. Dit is erg<br>raar. Dit zou niet mogen gebeuren, tenzij je de "
+"Notification Module hebt gedowngrade<br>of een configuratiebestand van een "
+"andere plaats hebt gekopieerd, waar een nieuwere versie van de Notification "
+"Module draaide. Dit is slecht en<br>uit voorzorg is jouw configuratie "
+"hersteld naar<br>standaardwaarden. Sorry voor het ongemak.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Fout tijdens DBus Initialisatie!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Fout tijdens DBus Initialisatie! Controleer aub of dbus correct "
+"geïnstalleerd is en draait."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Notification Configuratie"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Belang"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Niveau van belang om een popup te maken: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "laag"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normaal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritiek"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Standaard Timeout"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f seconden"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Plaatsing"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Richting"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Richting waarin popups zullen stapelen: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Tussenruimte"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Grootte van de tussenruimte tussen twee popups: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixels"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Notificationvenster Configuratie"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Algemene Instellingen"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Icoonlabel weergeven"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Popup weergeven bij Muisover"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Focus het bronvenster bij klikken"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Niveau van belang op te slaan: "
diff --git a/src/modules/notification/po/pl.po b/src/modules/notification/po/pl.po
new file mode 100755 (executable)
index 0000000..31c7a79
--- /dev/null
@@ -0,0 +1,222 @@
+# Polish translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Stanislaw Gackowski <launchpad@soeb.eu>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-08-13 09:06+0000\n"
+"Last-Translator: Stanislaw Gackowski <launchpad@soeb.eu>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Okno powiadomień"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Włącz tryb prezentacji"
+
+#: ../src/e_mod_main.c:207
+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 ""
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Wyłączono tryb prezentacji"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Włącz tryb offline"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment jest w trybie <b>offline</b>.<br>Podczas trybu offilne, moduły "
+"używające sieci przestaną sprawdzać zdalne usługi."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Wyłączono tryb offline"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Teraz w trybie <b>online</b>.<br>Moduły które używają sieci powrócą do "
+"swoich normalnych zadań."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Rozszerzenia"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Powiadomienie"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Uaktualniono konfigurację powiadomień"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Dane konfiguracji modułu notyfikacji potrzebowały aktualizację. Twoja stara "
+"konfiguracja<br> była usunięta i zastąpiona nowym zestaw standardów. "
+"To<br>się zdarza regularnie podczas rozwoju, także proszę nie "
+"raportować<br>błąd. To po prostu oznacza ze moduł potrzebuje nowe domyślne "
+"dane<br>konfiguracji dla użytkowej funkcjonalności, którą twoja "
+"stara<br>konfiguracja nie ma. Nowy zestaw domyślnych poprawi<br>to poprzez "
+"dodanie. Teraz możesz re-konfigurować rzeczy według własnego<br>uznania. "
+"Przepraszamy za niedogodności.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Twoja konfiguracja modułu notyfikacji jest NOWSZA niż wersja modułu. To jest "
+"bardzo<br>dziwne. Nie powinno się to stawać, jeżeli nie "
+"dezaktualizowałeś<br> moduł, lub kopiowałeś konfiguracje z miejsca "
+"gdzie<br>nowsza wersja modułu działała. To jest źle i<br>jako ostrożność "
+"twoja konfiguracja została przywrócona do ustawień<br>domyślnych. "
+"Przepraszamy za niedogodności.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Błąd inicjalizacji DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Błąd inicjalizacji DBus! Sprawdź czy dbus jest poprawnie zainstalowany i czy "
+"działa."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Konfiguracja powaidomień"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Ważność"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Poziomy ważności do wyświetlenia: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "niska"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normalny"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "krytyczny"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr ""
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekund"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Położenie"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Kierunek"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Kierunek składowania okienek : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Odstęp"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Rozmiar przerwy między okienkami: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pikseli"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Konfiguracja okna notyfikacji"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Pokaż etykietę ikony"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Pokaż okno przy najechaniu myszką"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Poziomy pilności do przechowania : "
diff --git a/src/modules/notification/po/pt.po b/src/modules/notification/po/pt.po
new file mode 100755 (executable)
index 0000000..b1309fd
--- /dev/null
@@ -0,0 +1,162 @@
+# Portuguese translation for notificationetk
+# This file is distributed under the same license as the enlightenment package.
+# Adaptado ao acordo ortográfico de 1990
+# Sérgio Marques <smarquespt@gmail.com>, 2010.
+# Sérgio Marques <sarquespt@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: notifications\n"
+"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
+"POT-Creation-Date: 2011-07-26 02:01-0700\n"
+"PO-Revision-Date: 2011-07-27 22:34-0000\n"
+"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
+"Language-Team: Portuguese <>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: Portugal\n"
+"X-Generator: Lokalize 1.1\n"
+
+#: ../src/e_mod_box.c:666
+#: ../src/e_mod_box.c:810
+msgid "Settings"
+msgstr "Definições"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Caixa de notificação"
+
+#: ../src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "Entrar no modo de demonstração"
+
+#: ../src/e_mod_main.c:214
+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 "O Enlightenment está no modo de <b>demostração.</b> Durante este modo e para que não seja incomodado, os serviços de bloqueio, poupança de energia e proteção de ecrã estarão inativos."
+
+#: ../src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Saiu do modo de demonstração"
+
+#: ../src/e_mod_main.c:221
+msgid "Presentation mode is over.<br>Now screen saver, lock and power saving settings will be restored."
+msgstr "Terminou o modo de demonstração.<br> Os serviços de bloqueio, poupança de energia e proteção de ecrã vão ser restaurados."
+
+#: ../src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "Entrar no modo \"off-line\""
+
+#: ../src/e_mod_main.c:237
+msgid "Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules that use network will stop polling remote services."
+msgstr "O Enlightenment está no modo <b>\"off-line\".</b> Durante este modo, os módulo que utilizem a rede irão parar de analisar os serviços remotos."
+
+#: ../src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Saiu do modo \"off-line\""
+
+#: ../src/e_mod_main.c:244
+msgid "Now in <b>online</b> mode.<br>Now modules that use network will resume regular tasks."
+msgstr "Terminou o modo <b>\"off-line\"</b>. Os módulos que utilizam a rede irão retomar os serviços."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Extensões"
+
+#: ../src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Notificação"
+
+#: ../src/e_mod_main.c:336
+msgid "Notification Module"
+msgstr "Módulo de notificações"
+
+#: ../src/e_mod_main.c:364
+msgid "Error During DBus Init!"
+msgstr "Erro ao iniciar DBus!"
+
+#: ../src/e_mod_main.c:365
+msgid "Error during DBus init! Please check if dbus is correctly installed and running."
+msgstr "Erro ao iniciar DBus! Verifique se o DBus está bem instalado e em execução."
+
+#: ../src/e_mod_config.c:38
+msgid "Notification Settings"
+msgstr "Definições das notificações"
+
+#: ../src/e_mod_config.c:81
+#: ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgência"
+
+#: ../src/e_mod_config.c:82
+msgid "Levels of urgency to popup : "
+msgstr "Níveis para o alerta de urgência: "
+
+#: ../src/e_mod_config.c:84
+#: ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "baixo"
+
+#: ../src/e_mod_config.c:86
+#: ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:88
+#: ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "crítico"
+
+#: ../src/e_mod_config.c:92
+msgid "Default Timeout"
+msgstr "Expiração por omissão"
+
+#: ../src/e_mod_config.c:93
+msgid "Force timeout for all notifications"
+msgstr "Tempo limite para as notificações"
+
+#: ../src/e_mod_config.c:95
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f segundos"
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:110
+msgid "Popup Corner"
+msgstr "Alerta no canto"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Configuração da caixa de notificação"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Definições gerais"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Mostrar texto no ícone"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Mostrar um alerta ao passar com o rato"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Focar a janela de origem ao clicar "
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Níveis de urgência a guardar: "
+
diff --git a/src/modules/notification/po/pt_BR.po b/src/modules/notification/po/pt_BR.po
new file mode 100755 (executable)
index 0000000..b1aba07
--- /dev/null
@@ -0,0 +1,210 @@
+# Brazilian Portuguese translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Enrico Nicoletto <liverig@gmail.com>, 2009.
+# Ricardo Ichizo <n1ghtcr4wler@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-07-01 16:21+0000\n"
+"Last-Translator: Waldir Leoncio <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Configuração"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Caixa de notificação"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Entrar no modo de apresentação"
+
+#: ../src/e_mod_main.c:207
+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 ""
+"O Enlightenment está em modo de <b>apresentação</b>.<br> Durante o modo de "
+"apresentação, a proteção e o travamento da tela, bem como a economia de "
+"energia estarão desabilitadas para que você não seja interrompido"
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Modo de apresentação finalizado"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"O modo de apresentação foi finalizado.<br>A partir de agora, a proteção e o "
+"travamento da tela, bem como a economia de energia estão reabilitados."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Entrar em modo offline."
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Modo offline finalizado"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Extensões"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Notificação"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Configurações de notificação atualizadas"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Erro durante a inicialização do DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Erro durante a inicialização do DBus! Por favor, cheque se o dbus está "
+"corretamente instalado e executando."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Configurações de notificação"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgência"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Níveis de urgência para popup : "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "baixo"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "crítico"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Tempo de espera padrão"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f segundos"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Posicionamento"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Direção"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Direção que os popups empilharão-se : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Intervalo"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Tamanho do intervalo entre dois popups: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixels"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Configuração da caixa de notificação"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Configurações gerais"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Mostrar rótulo do ícone"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Mostrar o popup ao passar o mouse"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Destacar a janela fonte ao clicar"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Níveis de urgência para armazenar : "
diff --git a/src/modules/notification/po/ru.po b/src/modules/notification/po/ru.po
new file mode 100755 (executable)
index 0000000..50339d1
--- /dev/null
@@ -0,0 +1,225 @@
+# Russian translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-07-16 09:38+0000\n"
+"Last-Translator: Peter Belyaev <kapone2002@yandex.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Настройка"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Область уведомлений"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Включить режим презентации"
+
+#: ../src/e_mod_main.c:207
+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 ""
+"Включен режим <b>Презентации</b>.<br>В этом режиме заставка, блокировка "
+"экрана и контроль энергопотребления отключены, чтобы не мешать Вам."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Режим Презентации отключен"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Режим Презентации отключен.<br>Работа заставки, блокировки экрана и контроля "
+"энергопотребления возобновляются."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Включить автономный режим работы"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Включен <b>автономный</b> режим работы.<br>В этом режиме модули, "
+"использующие сеть, прекратят ее использование."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Выключить автономный режим"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Режим <b>подключения к сети</b> активен. Модули, использующие сеть, "
+"продолжат работу."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Расширения"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Уведомление"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Настройки уведомления обновлены"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Данные настроек модуля уведомлений нуждаются в обновлении. Ваши старые "
+"настройки<br> будут стерты и новые настройки будут установлены по умолччанию."
+"<br> Это будет происходить регулярно во время разработки, поэтому не "
+"создавайте отчет об ошибке.<br>Это означает что модулю уведомлений требуются "
+"данные новых настроек<br>установленных по умолчанию для необходимой "
+"функциональности, которую<br>не обечпечивают ваши старые настройки. Новые "
+"данные это исправят<br>путем добавления настроек по умолчанию. Вы можете "
+"снова настроить все как<br>вам нравится. Извините за продоставленные "
+"неудобства.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Настройки вашего модуля уведомлений НОВЕЕ чем модуль уведомлений. Это "
+"очень<br>странно. Этого не должно было произойти если только вы не "
+"откатывали<br>модуль уведомлений или копировали настройки из другого "
+"места<br>где запущена более новая версия модуля уведомлений. Это плохо "
+"и<br>на всякий случай ваши настройки установлены по<br>умолчанию. Извините "
+"за предоставленные неудобства.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Ошибка при инициализации DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Ошибка при инициализации DBus! Пожалуйста проверьте правильно ли установлен "
+"и запущен dbus."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Настройки уведомления"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Актуальность"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Уровень важности для уведомления "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "низкий"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "нормальный"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "критический"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Таймаут по умолчанию"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f секунд"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Расположение"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Направление"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Направление в котором уведомления будут прилипать друг к другу : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Разрыв"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Размер разрыва между двумя уведомлениями : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f пикселей"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Настройка области уведомлений"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Основные настройки"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Показывать иконку метки"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Показывать подсказку при наведении мыши"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Фокусировать окно источника при клике"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Уровни важности для сохранения : "
diff --git a/src/modules/notification/po/sk.po b/src/modules/notification/po/sk.po
new file mode 100755 (executable)
index 0000000..dfcd36c
--- /dev/null
@@ -0,0 +1,225 @@
+# Slovak translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-06-12 16:26+0000\n"
+"Last-Translator: milboy <Unknown>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Konfigurácia"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Oznamovací dialóg"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Vstup do prezentačného módu"
+
+#: ../src/e_mod_main.c:207
+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 je v <b>prezentačnom</b> móde.<br>Počas prezentačného módu, "
+"šetrič obrazovky, zámok obrazovky a úspora energie budú vypnuté, ale nie sú "
+"prerušené."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Ukončenie prezentačného módu"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Prezentačný mód bol vypnutý.<br>Teraz budú obnovené nastavenia šetriča "
+"obrazovky, zamknutie obrazovky a správy napájania"
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Vstup do offline módu"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightenment je v <b>offline</b> móde.<br>Počas offline módu,budú zastavené "
+"moduly ktoré používajú sieť."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Ukončenie offline módu"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Teraz v <b>online</b> móde.<br>Moduly používajúce sieť teraz znovu spustia "
+"bežné úlohy"
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Rozšírenia"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Upozorňovanie"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Konfigurácia upozorňovania bola aktualizovaná"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"Konfiguračné údaje modulu upozorňovania bolo potrebné aktualizovať.<br> Vaša "
+"stará konfigurácia bola zmazaná a boli inicializované nové predvolené "
+"hodnoty.<br> To sa pravidelne stáva počas vývoja, takže to neoznamujte ako "
+"chybu.<br> Jednoducho to znamená, že modul upozorňovania potrebuje nové "
+"konfiguračné údaje<br> na funkcionalitu, ktorá vo vašej pôvodnej "
+"konfigurácii jednoducho chýba.<br> Táto nová konfigurácia to opraví tak, že "
+"pre ňu pridá predvolené hodnoty.<br> Teraz môžete veci nakonfigurovať podľa "
+"svojej ľubovôle. Ospravedlňujeme sa za nepríjemnosti.<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"Vaša konfigurácia modulu upozorňovania je NOVŠIA ako verzia modulu "
+"upozorňovania.<br>To je veľmi zvláštne. Nemalo by sa to stať, jedine že by "
+"ste znížili verziu modulu upozorňovania<br>alebo skopírovali konfiguráciu z "
+"miesta, kde bežala novšia verzia modulu upozorňovania.<br>To je zlé a "
+"preventívne bola vaša konfigurácia obnovená na predvolené hodnoty."
+"<br>Ospravedlňujeme sa za nepríjemnosti.<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "Chyba počas inicializácie DBus!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Chyba počas inicializácie DBus! Skontrolujte prosím, či je dbus správne "
+"nainštalovaný a beží."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Konfigurácia upozorňovania"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Urgentnosť"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Urgentnosť vyskakovacieho okna: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "nízka"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normálna"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritická"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Predvolený časový limit"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekúnd"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Umiestnenie"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Smer"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Smer, v ktorom sa skladajú upozornenia na seba: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Medzera"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "Veľkosť rozostupov medzi vyskakovacími dialógmi: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f pixelov"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Konfigurácia dialógu upozornení"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Všeobecné nastavenia"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Zobrazovať menovku ikony"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Zobrazovať vyskakovacií dialóg pri presunutí myši naň"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Zamerať zdrojové okno pri kliknutí"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Koľko úrovní urgentnosti ukladať: "
diff --git a/src/modules/notification/po/sl.po b/src/modules/notification/po/sl.po
new file mode 100755 (executable)
index 0000000..ce3e909
--- /dev/null
@@ -0,0 +1,163 @@
+# translation of notification.po to Slovenian
+# Slovenian translation of Notification_sl.
+# This file is put in the public domain.
+#
+# r1to <renato.rener@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: notification\n"
+"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
+"POT-Creation-Date: 2011-02-17 15:00-0800\n"
+"PO-Revision-Date: 2011-02-22 17:54+0100\n"
+"Last-Translator: r1to <renato.rener@gmail.com>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../src/e_mod_box.c:677 ../src/e_mod_box.c:824
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Obvestilna škatla"
+
+#: ../src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "Zagon predstavitvenega načina"
+
+#: ../src/e_mod_main.c:214
+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·je·v·<b>predstavitvenem</b>·načinu.<br>Med predstavitvenim načinom,·"
+"so ohranjevalnik zaslona,·zaklepanje·in upravljanje porabe onemogočeni, tako·da vas nič ne prekinja."
+
+#: ../src/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Predstavitveni način zaključen"
+
+#: ../src/e_mod_main.c:221
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr "Predstavitveni način je zaključen.<br>Zdaj bodo nastavitve za ohranjevalnik zaslona, zaklepanje in upravljanje porabe obnovljene."
+
+#: ../src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "Zagon nepovezanega načina"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr "Enlightenment·je v·<b>nepovezanem</b>·načinu.<br>Med nepovezanim načinom,·bodo moduli, ki uporabljajo·omrežje prenehali preverjati storitve oddaljenega dostopa."
+
+#: ../src/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Povezan način zaključen"
+
+#: ../src/e_mod_main.c:244
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr "Zdaj ste v·<b>povezanem</b>·načinu.<br>Moduli, ki uporabljajo omrežje, bodo zdaj ponovno začeli svoja redna opravila."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Razširitve"
+
+#: ../src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Obvestila"
+
+#: ../src/e_mod_main.c:335
+msgid "Notification Module"
+msgstr "Modul Obvestila"
+
+#: ../src/e_mod_main.c:363
+msgid "Error During DBus Init!"
+msgstr "Napaka·med·zagonom DBus !"
+
+#: ../src/e_mod_main.c:364
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr "Napaka med zagonom·DBus·!·Prosim, preverite, če je·dbus·pravilno nameščen in ali je zagnan."
+
+#: ../src/e_mod_config.c:37
+msgid "Notification Settings"
+msgstr "Nastavitve modula Obvestila"
+
+#: ../src/e_mod_config.c:79 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Nujnost"
+
+#: ../src/e_mod_config.c:80
+msgid "Levels of urgency to popup : "
+msgstr "Nivoji nujnosti za odpiranje pojavnih oken"
+
+#: ../src/e_mod_config.c:82 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "nizek"
+
+#: ../src/e_mod_config.c:84 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normalen"
+
+#: ../src/e_mod_config.c:86 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritičen"
+
+#: ../src/e_mod_config.c:90
+msgid "Default Timeout"
+msgstr "Privzeta časovna zakasnitev"
+
+#: ../src/e_mod_config.c:91
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f·sek."
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:106
+msgid "Popup Corner"
+msgstr "Vogal pojavnega okna"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Nastavitev Obvestilne škatle"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Splošne nastavitve"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Prikaži ime ikone"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Prikaz pojavnega okna ob prehodu z miško"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Ob kliku na izvorno okno ga postavi v fokus "
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Nivoji nujnosti za shranjevanje"
+
diff --git a/src/modules/notification/po/sv.po b/src/modules/notification/po/sv.po
new file mode 100755 (executable)
index 0000000..e25a32c
--- /dev/null
@@ -0,0 +1,200 @@
+# Swedish translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Daniel Nylander <yeager@ubuntu.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-07-17 15:33+0800\n"
+"PO-Revision-Date: 2009-01-10 12:45+0000\n"
+"Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr ""
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:207
+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 ""
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr ""
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Utökningar"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Notifiering"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr ""
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr ""
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr ""
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr ""
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr ""
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "låg"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritisk"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr ""
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Placering"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Riktning"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr ""
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr ""
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr ""
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f bildpunkter"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Allmänna inställningar"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Visa ikonetikett"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr ""
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr ""
diff --git a/src/modules/notification/po/tr.po b/src/modules/notification/po/tr.po
new file mode 100755 (executable)
index 0000000..a8f4d37
--- /dev/null
@@ -0,0 +1,212 @@
+# Turkish translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Hasan Yılmaz <iletisim@hasanyilmaz.net>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-11-05 16:07+0800\n"
+"PO-Revision-Date: 2009-11-15 09:53+0000\n"
+"Last-Translator: Mustafa Yılmaz <apshalasha@gmail.com>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-16 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Bildirim Kutusu"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "Sunum Moduna Gir"
+
+#: ../src/e_mod_main.c:207
+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 ""
+"Enlightment <b>sunum</b> modunda.<br>Sunum modu sırasında, ekran koruyucu, "
+"kilit ve güç koruma devre dışı bırakılacak."
+
+#: ../src/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "Sunum Modundan Çıkıldı"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Sunum modu sona erdi.<br>Şimdi, ekran koruyucu, kilit ve güç koruma "
+"seçenekleri eski haline getirilecek."
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "Çevrimdışı Moduna Gir"
+
+#: ../src/e_mod_main.c:230
+msgid ""
+"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
+"that use network will stop polling remote services."
+msgstr ""
+"Enlightment <b>çevrimdışı</b> modunda.<br>Çevrimdışı modu sırasında, ağı "
+"kullanan modüller dış servislerden veri almayı durduracak."
+
+#: ../src/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "Çevrimdışı Modundan Çıkıldı"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Şimdi <b>çevrimiçi</b> modunda.<br>Ağı kullanan modüller şimdi normal "
+"görevlerine devam edecek."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "Uzantılar"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "Bildirim"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Bildirim Yapılandırması Güncellendi"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "DBus Başlatılması Sırasında Hata!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"DBus Başlatılması Sırasında Hata! dbus'ın doğru kurulduğundan ve "
+"çalıştığından emin olun."
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "Bildirim Yapılandırması"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Aciliyet"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "Açılır pencere oluşturma aciliyet seviyeleri : "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "düşük"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "normal"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "kritik"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "Varsayılan Zaman Aşımı"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f saniye"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "Yerleştirme"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "Yön"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "Açılır pencerelerin birbirine yapışma yönü : "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "Boşluk"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "İki açılır pencere arasındaki boşluğun boyutu : "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f benek"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Bildirim Kutusu Yapılandırması"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Genel Ayarlar"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Simge Etiketini Göster"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Fare üzerine geldiğinde açılır pencere göster"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "Tıklayınca kaynak pencereye odaklan"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Depolama önceliği seviyeleri : "
diff --git a/src/modules/notification/po/uk.po b/src/modules/notification/po/uk.po
new file mode 100755 (executable)
index 0000000..c9ddbdf
--- /dev/null
@@ -0,0 +1,241 @@
+# This file is put in the public domain.
+# Daniel Korostil <ted.korostiled@gmail.com>, 2009.
+# Korostil Daniel <ted.korostiled@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: notification.HEAD\n"
+"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
+"POT-Creation-Date: 2010-09-09 08:01-0700\n"
+"PO-Revision-Date: 2011-02-06 09:33+0300\n"
+"Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
+"Language-Team: translation@linux.org.ua\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.6.1\n"
+
+#: ../src/e_mod_box.c:677 ../src/e_mod_box.c:824
+#| msgid "General Settings"
+msgid "Settings"
+msgstr "Налаштування"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "Сповіщення"
+
+#: ../src/e_mod_main.c:213
+msgid "Enter Presentation Mode"
+msgstr "Увійти в презентаційний режим"
+
+#: ../src/e_mod_main.c:214
+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/e_mod_main.c:220
+msgid "Exited Presentation Mode"
+msgstr "Покинути презентаційний режим"
+
+#: ../src/e_mod_main.c:221
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr ""
+"Презентаційний режим завершився.<br>Тепер налаштування зберігача екрана, "
+"замикача і зберігача живлення буде відновлено."
+
+#: ../src/e_mod_main.c:236
+msgid "Enter Offline Mode"
+msgstr "Увійти в автономний режим"
+
+#: ../src/e_mod_main.c:237
+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/e_mod_main.c:243
+msgid "Exited Offline Mode"
+msgstr "Покинути автономний режим"
+
+#: ../src/e_mod_main.c:244
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr ""
+"Зараз ви покинули <b>автономний</b> режим.<br>Тепер модулі, котрі "
+"використовували мережу відновлять свою роботу."
+
+#. register config panel entry
+#: ../src/e_mod_main.c:301
+msgid "Extensions"
+msgstr "Розширення"
+
+#: ../src/e_mod_main.c:303
+msgid "Notification"
+msgstr "Сповіщення"
+
+#: ../src/e_mod_main.c:335
+#| msgid "Notification Box"
+msgid "Notification Module"
+msgstr "Сповіщення"
+
+#: ../src/e_mod_main.c:363
+msgid "Error During DBus Init!"
+msgstr "Помилка при запуску DBus!"
+
+#: ../src/e_mod_main.c:364
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr ""
+"Помилка при запуску DBus! Будь ласка, перевірте, чи DBus коректно "
+"встановлений і запущений."
+
+#: ../src/e_mod_config.c:37
+#| msgid "Notification"
+msgid "Notification Settings"
+msgstr "Налаштування сповіщень"
+
+#: ../src/e_mod_config.c:79 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "Потреба"
+
+#: ../src/e_mod_config.c:80
+msgid "Levels of urgency to popup : "
+msgstr "Рівні потреби у виринанні :"
+
+#: ../src/e_mod_config.c:82 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "низький"
+
+#: ../src/e_mod_config.c:84 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "звичайний"
+
+#: ../src/e_mod_config.c:86 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "важливий"
+
+#: ../src/e_mod_config.c:90
+msgid "Default Timeout"
+msgstr "Типовий лічильник часу"
+
+#: ../src/e_mod_config.c:91
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f секунд"
+
+#. man = e_manager_current_get();
+#. * of = e_widget_framelist_add(evas, D_("Placement"), 0);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f x"), 0.0, man->w, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.x), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * ow = e_widget_slider_add(evas, 1, 0, D_("%2.0f y"), 0.0, man->h, 1.0, 0,
+#. *                          NULL, &(cfdata->placement.y), 200);
+#. * e_widget_framelist_object_append(of, ow);
+#. * e_widget_list_object_append(o, of, 1, 1, 0.5);
+#: ../src/e_mod_config.c:106
+msgid "Popup Corner"
+msgstr "Куток для виринань"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "Налаштування"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "Загальні налаштування"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "Показувати мітку піктограми"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "Показувати виринання при натисненні правої клавіші миші"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "При натиснені фокусуватись на джерелі вікна"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "Рівні потреби у зберіганні :"
+
+#~ msgid "Configuration"
+#~ msgstr "Налаштування"
+
+#~ msgid "Notification Configuration Updated"
+#~ msgstr "Налаштування повідомлення оновлені"
+
+#~ msgid ""
+#~ "Notification Module Configuration data needed upgrading. Your old "
+#~ "configuration<br> has been wiped and a new set of defaults initialized. "
+#~ "This<br>will happen regularly during development, so don't report "
+#~ "a<br>bug. This simply means the Notification module needs new "
+#~ "configuration<br>data by default for usable functionality that your "
+#~ "old<br>configuration simply lacks. This new set of defaults will "
+#~ "fix<br>that by adding it in. You can re-configure things now to "
+#~ "your<br>liking. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "Налаштування модуля повідомлення потребує оновлення даних. Ваші старі "
+#~ "налаштування<br> витерлись і встановлено типові. Це<br> буде "
+#~ "здійснюватись постійно під час розробки, тому не повідомляйте про "
+#~ "цю<br>ваду. Це просто-напросто означає, що модуль потребує зміни "
+#~ "даних<br>налаштувань до типових для залучення нових функцій, яких "
+#~ "бракувало в старій версії. Встановлення до типових виправить,<br>це "
+#~ "залучивши нові функції. Тепер ви можете налаштувати все на ваші<br> "
+#~ "вподобання. Вибачте за незручності.<br>"
+
+#~ msgid ""
+#~ "Your Notification Module Configuration is NEWER than the Notification "
+#~ "Module version. This is very<br>strange. This should not happen unless "
+#~ "you downgraded<br>the Notification Module or copied the configuration "
+#~ "from a place where<br>a newer version of the Notification Module was "
+#~ "running. This is bad and<br>as a precaution your configuration has been "
+#~ "now restored to<br>defaults. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "Ваші налаштування модуля повідомлення — новіші ніж версія самого модуля. "
+#~ "Це дуже<br>дивно. Цьому не слід траплятися, хіба що ви знизили "
+#~ "версію<br>модуля або скопіювали налаштування звідкіллясь, де<br>є новіша "
+#~ "версія модуля. Це недобре,<br>тому, для надійності роботи, налаштування "
+#~ "будуть повернуті до<br>типових. Вибачте за незручність.<br>"
+
+#~ msgid "Notification Configuration"
+#~ msgstr "Налаштування повідомлення"
+
+#~ msgid "Placement"
+#~ msgstr "Розташовування"
+
+#~ msgid "%2.0f x"
+#~ msgstr "%2.0f x"
+
+#~ msgid "%2.0f y"
+#~ msgstr "%2.0f y"
+
+#~ msgid "Direction"
+#~ msgstr "Напрям"
+
+#~ msgid "Direction in which popups will stack themselves : "
+#~ msgstr "Напрям виринаннь:"
+
+#~ msgid "Gap"
+#~ msgstr "Проміжок"
+
+#~ msgid "Size of the gap between two popups : "
+#~ msgstr "Розмір проміжка між двома виринаннями:"
+
+#~ msgid "%2.0f pixels"
+#~ msgstr "%2.0f пікселів"
diff --git a/src/modules/notification/po/zh_CN.po b/src/modules/notification/po/zh_CN.po
new file mode 100755 (executable)
index 0000000..ecef93f
--- /dev/null
@@ -0,0 +1,212 @@
+# Notification module (e17), Simplified Chinese translation
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the e17 notification module.
+#
+# Aron Xu <aronmalache@163.com>, 2009.
+# Careone <zzbusagain@yahoo.com.cn>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Notification module (e17)\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-08-25 17:14+0800\n"
+"PO-Revision-Date: 2009-07-06 09:55+0000\n"
+"Last-Translator: Careone <zzbusagain@yahoo.com.cn>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/e_mod_box.c:675 ../src/e_mod_box.c:823
+msgid "Configuration"
+msgstr "配置"
+
+#: ../src/e_mod_main.c:121
+msgid "Notification Box"
+msgstr "通知框"
+
+#: ../src/e_mod_main.c:206
+msgid "Enter Presentation Mode"
+msgstr "进入演示模式"
+
+#: ../src/e_mod_main.c:207
+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/e_mod_main.c:213
+msgid "Exited Presentation Mode"
+msgstr "离开演示模式"
+
+#: ../src/e_mod_main.c:214
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr "演示模式结束。<br>现在屏幕保护,时钟和省电功能恢复正常。"
+
+#: ../src/e_mod_main.c:229
+msgid "Enter Offline Mode"
+msgstr "进入脱机模式"
+
+#: ../src/e_mod_main.c:230
+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/e_mod_main.c:236
+msgid "Exited Offline Mode"
+msgstr "离开脱机模式"
+
+#: ../src/e_mod_main.c:237
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr "现在处于<b>在线</b>模式。<br>从现在起程序恢复与网络的接连。"
+
+#. register config panel entry
+#: ../src/e_mod_main.c:294
+msgid "Extensions"
+msgstr "扩展"
+
+#: ../src/e_mod_main.c:296
+msgid "Notification"
+msgstr "通知"
+
+#: ../src/e_mod_main.c:340 ../src/e_mod_main.c:358
+msgid "Notification Configuration Updated"
+msgstr "Huomautuksen asetukset päivitetty"
+
+#: ../src/e_mod_main.c:341
+msgid ""
+"Notification Module Configuration data needed upgrading. Your old "
+"configuration<br> has been wiped and a new set of defaults initialized. "
+"This<br>will happen regularly during development, so don't report a<br>bug. "
+"This simply means the Notification module needs new configuration<br>data by "
+"default for usable functionality that your old<br>configuration simply "
+"lacks. This new set of defaults will fix<br>that by adding it in. You can re-"
+"configure things now to your<br>liking. Sorry for the inconvenience.<br>"
+msgstr ""
+"通知模块配置数据需要升级。你的旧配置<br>已被清除,并设定为新的默认值。这通常"
+"出现在<br>程序开发时,不需要报告为<br>Bug。这只是因为通知模块增加了<br>新选项"
+"设置来实现新功能。<br>你也可以重新进行设置。非常抱歉给您带来不便。<br>"
+
+#: ../src/e_mod_main.c:359
+msgid ""
+"Your Notification Module Configuration is NEWER than the Notification Module "
+"version. This is very<br>strange. This should not happen unless you "
+"downgraded<br>the Notification Module or copied the configuration from a "
+"place where<br>a newer version of the Notification Module was running. This "
+"is bad and<br>as a precaution your configuration has been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+"你的通知模块配置文件比当前程序的版本要新。这有点<br>奇怪。可能是你降级了<br>"
+"通知模块,或者从别的地方复制了<br>高版本的模块配置文件。这不适合当前程序<br>"
+"为安全起见,程序已自动还原为<br>默认值。非常抱歉给您带来不便。<br>"
+
+#: ../src/e_mod_main.c:393
+msgid "Error During DBus Init!"
+msgstr "DBus 初始化出错!"
+
+#: ../src/e_mod_main.c:394
+msgid ""
+"Error during DBus init! Please check if dbus is correctly installed and "
+"running."
+msgstr "DBus 初始化出错!请检查 dbug 是否已经安装正确并已运行。"
+
+#: ../src/e_mod_config.c:43
+msgid "Notification Configuration"
+msgstr "提醒区配置"
+
+#: ../src/e_mod_config.c:88 ../src/e_mod_config_item.c:91
+msgid "Urgency"
+msgstr "紧急程度"
+
+#: ../src/e_mod_config.c:89
+msgid "Levels of urgency to popup : "
+msgstr "弹出的紧要级别: "
+
+#: ../src/e_mod_config.c:91 ../src/e_mod_config_item.c:94
+msgid "low"
+msgstr "低"
+
+#: ../src/e_mod_config.c:93 ../src/e_mod_config_item.c:96
+msgid "normal"
+msgstr "普通"
+
+#: ../src/e_mod_config.c:95 ../src/e_mod_config_item.c:98
+msgid "critical"
+msgstr "严重"
+
+#: ../src/e_mod_config.c:99
+msgid "Default Timeout"
+msgstr "默认的延时"
+
+#: ../src/e_mod_config.c:100
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f 秒"
+
+#: ../src/e_mod_config.c:106
+msgid "Placement"
+msgstr "位置"
+
+#: ../src/e_mod_config.c:107
+#, c-format
+msgid "%2.0f x"
+msgstr "%2.0f x"
+
+#: ../src/e_mod_config.c:110
+#, c-format
+msgid "%2.0f y"
+msgstr "%2.0f y"
+
+#: ../src/e_mod_config.c:115
+msgid "Direction"
+msgstr "方向"
+
+#: ../src/e_mod_config.c:116
+msgid "Direction in which popups will stack themselves : "
+msgstr "弹出框堆叠的方向: "
+
+#: ../src/e_mod_config.c:129
+msgid "Gap"
+msgstr "间隔"
+
+#: ../src/e_mod_config.c:130
+msgid "Size of the gap between two popups : "
+msgstr "两个弹出框之前的间隔大小: "
+
+#: ../src/e_mod_config.c:132
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f 像素"
+
+#: ../src/e_mod_config_item.c:37
+msgid "Notification Box Configuration"
+msgstr "通知框配置"
+
+#: ../src/e_mod_config_item.c:82
+msgid "General Settings"
+msgstr "常规设置"
+
+#: ../src/e_mod_config_item.c:83
+msgid "Show Icon Label"
+msgstr "显示图标标签"
+
+#: ../src/e_mod_config_item.c:85
+msgid "Show the popup on mouse over"
+msgstr "鼠标经过时显示弹出框"
+
+#: ../src/e_mod_config_item.c:87
+msgid "Focus the source window when clicking"
+msgstr "点击聚集源窗口"
+
+#: ../src/e_mod_config_item.c:92
+msgid "Levels of urgency to store : "
+msgstr "存储的紧要级别: "
index ac5e628..826c0f5 100644 (file)
@@ -503,7 +503,7 @@ _gc_orient(E_Gadcon_Client       *gcc,
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_ofono_Name);
diff --git a/src/modules/pager/.cvsignore b/src/modules/pager/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index fbd4773..d096804 100644 (file)
@@ -5,7 +5,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__);
-static char *_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__);
 
@@ -251,7 +251,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Pager");
@@ -609,7 +609,7 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
        edje_object_part_swallow(pw->o_window, "e.swallow.icon", o);
      }
 
-   if (border->client.icccm.urgent)
+   if (border->client.icccm.urgent && !border->focused)
      {
        if (!(border->iconic))
          edje_object_signal_emit(pd->o_desk, "e,state,urgent", "e");
@@ -1357,7 +1357,7 @@ _pager_cb_event_border_urgent_change(void *data __UNUSED__, int type __UNUSED__,
             pw = _pager_desk_window_find(pd, ev->border);
             if (pw)
               {
-                 if (urgent)
+                 if (urgent && !ev->border->focused)
                    {
                       if (!(ev->border->iconic))
                         {
@@ -2460,7 +2460,7 @@ _pager_popup_cb_action_show(E_Object *obj __UNUSED__, const char *params __UNUSE
 static void
 _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev)
 {
-   int max_x,max_y, desk_x, desk_y;
+   int max_x,max_y, desk_x;
    int x = 0, y = 0;
 
    if (!act_popup)
@@ -2473,7 +2473,6 @@ _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecor
 
    e_zone_desk_count_get(act_popup->pager->zone, &max_x, &max_y);
    desk_x = current_desk->x /* + x <=this is always 0 */;
-   desk_y = current_desk->y /* + y <=this is always 0 */;
 
    if (!strcmp(params, "left"))
      x = -1;
diff --git a/src/modules/shot/.cvsignore b/src/modules/shot/.cvsignore
deleted file mode 100755 (executable)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index f4a85c7..0941876 100644 (file)
@@ -172,7 +172,7 @@ _save_to(const char *file)
         if (z)
           {
              unsigned char *src, *dst, *s, *d;
-             int sstd, dstd, y;
+             int sstd, y;
              
              o = evas_object_image_add(evas_object_evas_get(o_img));
              evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
@@ -181,7 +181,6 @@ _save_to(const char *file)
              src = evas_object_image_data_get(o_img, EINA_FALSE);
              sstd = evas_object_image_stride_get(o_img);
              dst = evas_object_image_data_get(o, EINA_TRUE);
-             dstd = evas_object_image_stride_get(o);
              d = dst;
              for (y = 0; y < z->h; y++)
                {
@@ -201,6 +200,7 @@ _file_select_ok_cb(void *data __UNUSED__, E_Dialog *dia)
    const char *file;
 
    file = e_widget_fsel_selection_path_get(o_fsel);
+   printf("SAVE: %s\n", file);
    if (file) _save_to(file);
    if (dia) e_util_defer_object_del(E_OBJECT(dia));
    if (win)
@@ -227,12 +227,13 @@ _win_save_cb(void *data __UNUSED__, void *data2 __UNUSED__)
    E_Dialog *dia;
    Evas_Object *o;
    Evas_Coord mw, mh;
-  
+   
    dia = e_dialog_new(scon, "E", "_e_shot_fsel");
    e_dialog_title_set(dia, _("Select screenshot save location"));
-   o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
+   o = e_widget_fsel_add(dia->win->evas, "~/", "/", "shot.jpg", NULL,
                          NULL, NULL,
                          NULL, NULL, 1);
+   e_widget_fsel_window_object_set(o, E_OBJECT(dia->win));
    o_fsel = o;
    evas_object_show(o);
    e_widget_size_min_get(o, &mw, &mh);
old mode 100755 (executable)
new mode 100644 (file)
index d13feb9..c938163
@@ -3,9 +3,11 @@ Type=Link
 Name=Shot
 Name[fr]=Déclic
 Name[ko]=스크린샷
+Name[pt]=Capturas de ecrã
 Icon=e-module-shot
 X-Enlightenment-ModuleType=utils
 Comment=Simple screenshot+save/upload module
 Comment[fr]=Module pour faire des captures d'écran et les partager.
 Comment[it]=Semplice modulo per il salvataggio e l'upload di istantanee del desktop.
 Comment[ko]=간단한 스크린샷 저장/공유 모듈
+Comment[pt]=Módulo para capturar, gravar e enviar capturas de ecrã 
diff --git a/src/modules/start/.cvsignore b/src/modules/start/.cvsignore
deleted file mode 100644 (file)
index bb0ec76..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-module.la
-*.lo
-Makefile.in
-Makefile
-.libs
-.deps
-module.desktop
index 7eff93f..0af991f 100644 (file)
@@ -5,7 +5,7 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
@@ -96,7 +96,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, mw, mh);
 }
    
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Start");
diff --git a/src/modules/syscon/.cvsignore b/src/modules/syscon/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index 89c2a92..6a9e2f9 100644 (file)
@@ -32,7 +32,7 @@ e_modapi_init(E_Module *m)
                                 NULL, NULL, 0);
      }
    maug = e_int_menus_menu_augmentation_add_sorted
-     ("main/10", _("System"), _e_mod_menu_add, NULL, NULL, NULL);
+     ("main/8", _("System"), _e_mod_menu_add, NULL, NULL, NULL);
    e_module_delayed_set(m, 1);
    return m;
 }
@@ -43,7 +43,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    /* remove module-supplied menu additions */
    if (maug)
      {
-       e_int_menus_menu_augmentation_del("main/10", maug);
+       e_int_menus_menu_augmentation_del("main/8", maug);
        maug = NULL;
      }
    /* remove module-supplied action */
index fbb2f4e..d949ca4 100644 (file)
@@ -24,6 +24,8 @@ static Evas_Object *o_flow_secondary = NULL;
 static Evas_Object *o_flow_extra = NULL;
 static int inevas = 0;
 static Ecore_Timer *deftimer = NULL;
+static double show_time = 0.0;
+static int act_count = 0;
 
 /* externally accessible functions */
 int
@@ -47,8 +49,32 @@ e_syscon_show(E_Zone *zone, const char *defact)
    int x, y, w, h, zx, zy, zw, zh;
    int iw, ih;
    Eina_List *l;
+   double t;
 
-   if (popup) return 0;
+   t = ecore_loop_time_get();
+   if (popup)
+     {
+        if ((t - show_time) > 0.5)
+          {
+             for (l = e_config->syscon.actions; l; l = l->next)
+               {
+                  E_Config_Syscon_Action *sca;
+                  E_Action *a;
+                  
+                  if (!(sca = l->data)) continue;
+                  if (!sca->action) continue;
+                  a = e_action_find(sca->action);
+                  if (!a) continue;
+                  if (sca->is_main == 2)
+                    {
+                       a->func.go(NULL, sca->params);
+                       e_syscon_hide();
+                       break;
+                    }
+               }
+          }
+        return 0;
+     }
 
    input_window = ecore_x_window_input_new(zone->container->win, zone->x,
                                            zone->y, zone->w, zone->h);
@@ -97,6 +123,9 @@ e_syscon_show(E_Zone *zone, const char *defact)
    edje_object_signal_callback_add(o, "e,action,syscon", "*", 
                                    _cb_signal_syscon, NULL);
 
+   act_count = 0;
+   show_time = t;
+   
    // main (default):
    //  halt | suspend | desk_lock
    // secondary (default):
@@ -104,8 +133,6 @@ e_syscon_show(E_Zone *zone, const char *defact)
    // extra (example for illume):
    //  home | close | kill
 
-   iw = 64 * e_scale;
-   ih = 64 * e_scale;
 
    o = e_flowlayout_add(popup->evas);
    o_flow_main = o;
@@ -317,6 +344,69 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
      {
         // FIXME: implement focus and key control... eventually
      }
+   else if (!strcmp(ev->key, "Down"))
+     {
+        // FIXME: implement focus and key control... eventually
+     }
+   else if (!strcmp(ev->key, "Left"))
+     {
+        // FIXME: implement focus and key control... eventually
+     }
+   else if (!strcmp(ev->key, "Right"))
+     {
+        // FIXME: implement focus and key control... eventually
+     }
+   else if (!strcmp(ev->key, "Tab"))
+     {
+        // FIXME: implement focus and key control... eventually
+     }
+   else if (!strcmp(ev->key, "Enter"))
+     {
+        // FIXME: implement focus and key control... eventually
+     }
+   else
+     {
+        E_Action *act;
+        double t;
+        
+        t = ecore_loop_time_get();
+        if (t - show_time > 0.5)
+          {
+             act = e_bindings_key_down_event_find(E_BINDING_CONTEXT_ANY, ev);
+             if ((act) && (act->name))
+               {
+                  if (!strcmp(act->name, "syscon"))
+                    {
+                       if (popup)
+                         {
+                            e_syscon_show(popup->zone, do_defact);
+                         }
+                    }
+                  else
+                    {
+                       Eina_List *l;
+                       
+                       for (l = e_config->syscon.actions; l; l = l->next)
+                         {
+                            E_Config_Syscon_Action *sca;
+                            
+                            if (!(sca = l->data)) continue;
+                            if (!sca->action) continue;
+                            if (!strcmp(sca->action, act->name))
+                              {
+                                 act_count++;
+                                 if (act_count > 2)
+                                   {
+                                      act->func.go(NULL, sca->params);
+                                      e_syscon_hide();
+                                      break;
+                                   }
+                              }
+                         }
+                    }
+               }
+          }
+     }
 
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -445,9 +535,15 @@ _cb_signal_action_extra(void *data, Evas_Object *obj __UNUSED__, const char *emi
 static Eina_Bool
 _cb_timeout_defaction(void *data __UNUSED__)
 {
+   const char *defact = NULL;
    deftimer = NULL;
    if (!do_defact) return ECORE_CALLBACK_CANCEL;
+   defact = eina_stringshare_add(do_defact);
    e_syscon_hide();
-   _do_action_name(do_defact);
+   if (defact)
+     {
+        _do_action_name(defact);
+        eina_stringshare_del(defact);
+     }
    return ECORE_CALLBACK_CANCEL;
 }
index 3fba27e..3b5bd35 100644 (file)
@@ -10,8 +10,6 @@
  */
 
 #include "e.h"
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 #include "e_mod_main.h"
 
 #define RETRY_TIMEOUT 2.0
@@ -112,6 +110,20 @@ static E_Module *systray_mod = NULL;
 static Instance *instance = NULL; /* only one systray ever possible */
 static char tmpbuf[PATH_MAX]; /* general purpose buffer, just use immediately */
 
+static Eina_Bool 
+_systray_site_is_safe(E_Gadcon_Site site) 
+{
+   /* NB: filter out sites we know are not safe for a systray to sit.
+    * This was done so that systray could be put into illume indicator 
+    * (or anywhere else really) that is 'safe' for systray to be. 
+    * Pretty much, this is anywhere but Desktop and toolbars at the moment */
+   if (e_gadcon_site_is_desktop(site)) 
+     return EINA_FALSE;
+   else if (e_gadcon_site_is_any_toolbar(site)) 
+     return EINA_FALSE;
+   return EINA_TRUE;
+}
+
 static const char *
 _systray_theme_path(void)
 {
@@ -378,7 +390,7 @@ _systray_icon_del_list(Instance *inst, Eina_List *l, Icon *icon)
    inst->icons = eina_list_remove_list(inst->icons, l);
 
    ecore_x_window_save_set_del(icon->win);
-   ecore_x_window_reparent(icon->win, None, 0, 0);
+   ecore_x_window_reparent(icon->win, 0, 0, 0);
    evas_object_del(icon->o);
    free(icon);
 
@@ -399,19 +411,17 @@ _systray_atom_st_get(int screen_num)
    return _atom_st_num;
 }
 
-/* XXX TODO: should be in ecore_x */
 static Eina_Bool
 _systray_selection_owner_set(int screen_num, Ecore_X_Window win)
 {
    Ecore_X_Atom atom;
-   Ecore_X_Display *disp = ecore_x_display_get();
    Ecore_X_Window cur_selection;
    Eina_Bool ret;
 
    atom = _systray_atom_st_get(screen_num);
-   XSetSelectionOwner(disp, atom, win, ecore_x_current_time_get());
+   ecore_x_selection_owner_set(win, atom, ecore_x_current_time_get());
    ecore_x_sync();
-   cur_selection = XGetSelectionOwner(disp, atom);
+   cur_selection = ecore_x_selection_owner_get(atom);
 
    ret = (cur_selection == win);
    if (!ret)
@@ -433,7 +443,7 @@ _systray_deactivate(Instance *inst)
 {
    Ecore_X_Window old;
 
-   if (inst->win.selection == None) return;
+   if (inst->win.selection == 0) return;
 
    edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
 
@@ -441,12 +451,12 @@ _systray_deactivate(Instance *inst)
      _systray_icon_del_list(inst, inst->icons, inst->icons->data);
 
    old = inst->win.selection;
-   inst->win.selection = None;
+   inst->win.selection = 0;
    _systray_selection_owner_set_current(inst);
    ecore_x_sync();
    ecore_x_window_free(old);
    ecore_x_window_free(inst->win.base);
-   inst->win.base = None;
+   inst->win.base = 0;
 }
 
 static Eina_Bool
@@ -491,43 +501,41 @@ _systray_activate(Instance *inst)
    Ecore_X_Atom atom;
    Ecore_X_Window old_win;
    Ecore_X_Window_Attributes attr;
-   Ecore_X_Display *dpy;
 
-   if (inst->win.selection != None) return 1;
+   if (inst->win.selection != 0) return 1;
 
    atom = _systray_atom_st_get(inst->con->manager->num);
-   dpy = ecore_x_display_get();
-   old_win = XGetSelectionOwner(dpy, atom);
-   if (old_win != None) return 0;
+   old_win = ecore_x_selection_owner_get(atom);
+   if (old_win != 0) return 0;
 
-   if (inst->win.base == None)
+   if (inst->win.base == 0)
      {
        if (!_systray_base_create(inst))
          return 0;
      }
 
    inst->win.selection = ecore_x_window_input_new(inst->win.base, 0, 0, 1, 1);
-   if (inst->win.selection == None)
+   if (inst->win.selection == 0)
      {
        ecore_x_window_free(inst->win.base);
-       inst->win.base = None;
+       inst->win.base = 0;
        return 0;
      }
 
    if (!_systray_selection_owner_set_current(inst))
      {
        ecore_x_window_free(inst->win.selection);
-       inst->win.selection = None;
+       inst->win.selection = 0;
        ecore_x_window_free(inst->win.base);
-       inst->win.base = None;
+       inst->win.base = 0;
        return 0;
      }
 
    ecore_x_window_attributes_get(inst->win.base, &attr);
 
-   visual = XVisualIDFromVisual(attr.visual);
-   XChangeProperty(dpy, inst->win.selection, _atom_st_visual, XA_VISUALID,
-                  32, PropModeReplace, (void *)&visual, 1);
+   visual = ecore_x_visual_id_get(attr.visual);
+   ecore_x_window_prop_card32_set(inst->win.selection, _atom_st_visual,
+                                  (void *)&visual, 1);
 
    ecore_x_client_message32_send(inst->con->manager->root, _atom_manager,
                                 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -784,7 +792,7 @@ _systray_cb_selection_clear(void *data, int type __UNUSED__, void *event)
    Ecore_X_Event_Selection_Clear *ev = event;
    Instance *inst = data;
 
-   if ((ev->win == inst->win.selection) && (inst->win.selection != None) &&
+   if ((ev->win == inst->win.selection) && (inst->win.selection != 0) &&
        (ev->atom == _systray_atom_st_get(inst->con->manager->num)))
      {
        edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
@@ -793,9 +801,9 @@ _systray_cb_selection_clear(void *data, int type __UNUSED__, void *event)
          _systray_icon_del_list(inst, inst->icons, inst->icons->data);
 
        ecore_x_window_free(inst->win.selection);
-       inst->win.selection = None;
+       inst->win.selection = 0;
        ecore_x_window_free(inst->win.base);
-       inst->win.base = None;
+       inst->win.base = 0;
        _systray_retry(inst);
      }
    return ECORE_CALLBACK_PASS_ON;
@@ -891,6 +899,14 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
        return NULL;
      }
 
+   if ((gc->shelf) && (!gc->shelf->popup))
+     {
+       e_util_dialog_internal
+         (_("Systray Error"),
+          _("Systray cannot work in a shelf that is set to below everything."));
+       return NULL;
+     }
+
    inst = E_NEW(Instance, 1);
    if (!inst)
      return NULL;
@@ -907,8 +923,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    else
      inst->win.parent = (Ecore_X_Window) ecore_evas_window_get(gc->ecore_evas);
 
-   inst->win.base = None;
-   inst->win.selection = None;
+   inst->win.base = 0;
+   inst->win.selection = 0;
 
    inst->ui.gadget = edje_object_add(inst->evas);
 
@@ -1086,7 +1102,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
    _systray_size_apply(inst);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Systray");
@@ -1116,7 +1132,7 @@ static const E_Gadcon_Client_Class _gc_class =
   GADCON_CLIENT_CLASS_VERSION, _name,
   {
      _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
-     e_gadcon_site_is_shelf
+     _systray_site_is_safe
   },
   E_GADCON_CLIENT_STYLE_INSET
 };
diff --git a/src/modules/tasks/Makefile.am b/src/modules/tasks/Makefile.am
new file mode 100644 (file)
index 0000000..ac61e16
--- /dev/null
@@ -0,0 +1,29 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = tasks
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_builddir)/src/bin \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+                         e_mod_config.c
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+       rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/tasks/e-module-tasks.edj b/src/modules/tasks/e-module-tasks.edj
new file mode 100644 (file)
index 0000000..75aa3dc
Binary files /dev/null and b/src/modules/tasks/e-module-tasks.edj differ
diff --git a/src/modules/tasks/e_mod_config.c b/src/modules/tasks/e_mod_config.c
new file mode 100644 (file)
index 0000000..f893739
--- /dev/null
@@ -0,0 +1,104 @@
+#include <e.h>
+#include "e_mod_main.h"
+
+struct _E_Config_Dialog_Data
+{
+   int show_all;
+   int minw, minh;
+};
+
+/* Protos */
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+
+void
+_config_tasks_module(Config_Item *ci)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+   E_Container *con;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply_data;
+   v->basic.create_widgets = _basic_create_widgets;
+
+   con = e_container_current_get(e_manager_current_get());
+   cfd = e_config_dialog_new(con, _("Tasks Configuration"), "Tasks", 
+                             "_e_modules_tasks_config_dialog", NULL, 0, v, ci);
+   if (tasks_config->config_dialog)
+     e_object_del(E_OBJECT(tasks_config->config_dialog));
+   tasks_config->config_dialog = cfd;
+}
+
+static void
+_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
+{
+   cfdata->show_all = ci->show_all;
+   cfdata->minw = ci->minw;
+   cfdata->minh = ci->minh;
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd)
+{
+   E_Config_Dialog_Data *cfdata;
+   Config_Item *ci;
+
+   ci = cfd->data;
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(ci, cfdata);
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
+   if (!tasks_config) return;
+   tasks_config->config_dialog = NULL;
+   free(cfdata);
+}
+
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o, *of, *ob, *ow;
+
+   o = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("Display"), 0);
+   ob = e_widget_check_add(evas, _("Show windows from all desktops"),
+                           &(cfdata->show_all));
+   e_widget_framelist_object_append(of, ob);
+   ow = e_widget_label_add(evas, _("Minimum Width"));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f px"), 20, 420, 1, 0,
+                            NULL, &(cfdata->minw), 100);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_label_add(evas, _("Minimum Height"));
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f px"), 20, 420, 1, 0,
+                            NULL, &(cfdata->minh), 100);
+   e_widget_framelist_object_append(of, ow);
+   
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   return o;
+}
+
+static int
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+   Config_Item *ci;
+
+   ci = cfd->data;
+   ci->show_all = cfdata->show_all;
+   ci->minw = cfdata->minw;
+   ci->minh = cfdata->minh;
+   e_config_save_queue();
+   _tasks_config_updated(ci);
+   return 1;
+}
diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
new file mode 100644 (file)
index 0000000..324e68c
--- /dev/null
@@ -0,0 +1,901 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+ /**/
+/* gadcon requirements */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+
+/* and actually define the gadcon class that this module provides (just 1) */
+static E_Gadcon_Client_Class _gadcon_class = {
+   GADCON_CLIENT_CLASS_VERSION,
+   "tasks",
+   {
+      _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, NULL
+   },
+   E_GADCON_CLIENT_STYLE_PLAIN
+};
+/**/
+/***************************************************************************/
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+typedef struct _Tasks Tasks;
+typedef struct _Tasks_Item Tasks_Item;
+
+struct _Tasks
+{
+   E_Gadcon_Client *gcc;        // The gadcon client
+   Evas_Object *o_items;        // Table of items
+   Eina_List *items;            // List of items
+   E_Zone *zone;                // Current Zone
+   Config_Item *config;         // Configuration
+   int horizontal;
+};
+
+struct _Tasks_Item
+{
+   Tasks *tasks;            // Parent tasks
+   E_Border *border;            // The border this item points to
+   Evas_Object *o_item;         // The edje theme object
+   Evas_Object *o_icon;         // The icon
+};
+
+static Tasks *_tasks_new(Evas *evas, E_Zone *zone, const char *id);
+static void _tasks_free(Tasks *tasks);
+static void _tasks_refill(Tasks *tasks);
+static void _tasks_refill_all();
+static void _tasks_refill_border(E_Border *border);
+static void _tasks_signal_emit(E_Border *border, char *sig, char *src);
+
+static Tasks_Item *_tasks_item_find(Tasks *tasks, E_Border *border);
+static Tasks_Item *_tasks_item_new(Tasks *tasks, E_Border *border);
+
+static int _tasks_item_check_add(Tasks *tasks, E_Border *border);
+static void _tasks_item_add(Tasks *tasks, E_Border *border);
+static void _tasks_item_remove(Tasks_Item *item);
+static void _tasks_item_refill(Tasks_Item *item);
+static void _tasks_item_fill(Tasks_Item *item);
+static void _tasks_item_free(Tasks_Item *item);
+static void _tasks_item_signal_emit(Tasks_Item *item, char *sig, char *src);
+
+static Config_Item *_tasks_config_item_get(const char *id);
+
+static void _tasks_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _tasks_cb_item_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _tasks_cb_item_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+
+static Eina_Bool _tasks_cb_event_border_add(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_remove(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_iconify(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_uniconify(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_icon_change(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_zone_set(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_desk_set(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_window_focus_in(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_window_focus_out(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_property(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_desk_show(void *data, int type, void *event);
+static Eina_Bool _tasks_cb_event_border_urgent_change(void *data, int type, void *event);
+
+static E_Config_DD *conf_edd = NULL;
+static E_Config_DD *conf_item_edd = NULL;
+
+Config *tasks_config = NULL;
+
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+   "Tasks"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   conf_item_edd = E_CONFIG_DD_NEW("Tasks_Config_Item", Config_Item);
+
+#undef T
+#undef D
+#define T Config_Item
+#define D conf_item_edd
+   E_CONFIG_VAL(D, T, id, STR);
+   E_CONFIG_VAL(D, T, show_all, INT);
+   E_CONFIG_VAL(D, T, minw, INT);
+   E_CONFIG_VAL(D, T, minh, INT);
+
+   conf_edd = E_CONFIG_DD_NEW("Tasks_Config", Config);
+
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
+   E_CONFIG_LIST(D, T, items, conf_item_edd);
+
+   tasks_config = e_config_domain_load("module.tasks", conf_edd);
+   if (!tasks_config)
+     {
+        Config_Item *config;
+        
+        tasks_config = E_NEW(Config, 1);
+        
+        config = E_NEW(Config_Item, 1);
+        config->id = eina_stringshare_add("0");
+        config->show_all = 0;
+        config->minw = 100;
+        config->minh = 32;
+        tasks_config->items = eina_list_append(tasks_config->items, config);
+     }
+
+   tasks_config->module = m;
+
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ADD, _tasks_cb_event_border_add, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_REMOVE, _tasks_cb_event_border_remove, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ICONIFY, _tasks_cb_event_border_iconify, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_UNICONIFY, _tasks_cb_event_border_uniconify, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ICON_CHANGE, _tasks_cb_event_border_icon_change, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_DESK_SET, _tasks_cb_event_border_desk_set, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ZONE_SET, _tasks_cb_event_border_zone_set, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_FOCUS_IN, _tasks_cb_window_focus_in, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_FOCUS_OUT, _tasks_cb_window_focus_out, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_PROPERTY, _tasks_cb_event_border_property, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_DESK_SHOW, _tasks_cb_event_desk_show, NULL));
+   tasks_config->handlers = eina_list_append
+     (tasks_config->handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_URGENT_CHANGE, _tasks_cb_event_border_urgent_change, NULL));
+   
+   tasks_config->borders = eina_list_clone(e_border_client_list());
+   
+   e_gadcon_provider_register(&_gadcon_class);
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m __UNUSED__)
+{
+   Ecore_Event_Handler *eh;
+   Tasks *tasks;
+
+   e_gadcon_provider_unregister(&_gadcon_class);
+
+   EINA_LIST_FREE(tasks_config->tasks, tasks)
+     {
+        _tasks_free(tasks);
+     }
+
+   if (tasks_config->config_dialog)
+     e_object_del(E_OBJECT(tasks_config->config_dialog));
+
+   EINA_LIST_FREE(tasks_config->handlers, eh)
+     {
+        ecore_event_handler_del(eh);
+     }
+
+   eina_list_free(tasks_config->borders);
+
+   free(tasks_config);
+   tasks_config = NULL;
+   E_CONFIG_DD_FREE(conf_item_edd);
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m __UNUSED__)
+{
+   e_config_domain_save("module.tasks", conf_edd, tasks_config);
+   return 1;
+}
+
+/**************************************************************/
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style __UNUSED__)
+{
+   Tasks *tasks;
+   Evas_Object *o;
+   E_Gadcon_Client *gcc;
+   Evas_Coord x, y, w, h;
+   int cx, cy, cw, ch;
+
+   tasks = _tasks_new(gc->evas, gc->zone, id);
+   
+   o = tasks->o_items;
+   gcc = e_gadcon_client_new(gc, name, id, E_GADCON_CLIENT_STYLE_INSET, o);
+   gcc->data = tasks;
+   tasks->gcc = gcc;
+   
+   e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch);
+   evas_object_geometry_get(o, &x, &y, &w, &h);
+   
+   tasks_config->tasks = eina_list_append(tasks_config->tasks, tasks);
+
+   e_gadcon_client_autoscroll_set(gcc, 1);
+   // Fill on initial config
+   _tasks_config_updated(tasks->config);
+   return gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   Tasks *tasks;
+   
+   tasks = (Tasks *)gcc->data;
+   tasks_config->tasks = eina_list_remove(tasks_config->tasks, tasks);
+   _tasks_free(tasks);
+}
+
+/* TODO */
+static void
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
+{
+   Tasks *tasks;
+
+   tasks = (Tasks *)gcc->data;
+
+   switch (orient)
+     {
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+      case E_GADCON_ORIENT_CORNER_BL:
+      case E_GADCON_ORIENT_CORNER_BR:
+       if (!tasks->horizontal)
+         {
+             tasks->horizontal = 1;
+             e_box_orientation_set(tasks->o_items, tasks->horizontal);
+             _tasks_refill(tasks);
+         }
+       break;
+      case E_GADCON_ORIENT_VERT:
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_LT:
+      case E_GADCON_ORIENT_CORNER_RT:
+      case E_GADCON_ORIENT_CORNER_LB:
+      case E_GADCON_ORIENT_CORNER_RB:
+       if (tasks->horizontal)
+         {
+             tasks->horizontal = 0;
+             e_box_orientation_set(tasks->o_items, tasks->horizontal);
+             _tasks_refill(tasks);
+         }
+       break;
+      default:
+       break;
+     }
+   e_box_align_set(tasks->o_items, 0.5, 0.5);
+}
+
+static const char *
+_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _("Tasks");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+{
+   Evas_Object *o;
+   char buf[4096];
+
+   o = edje_object_add(evas);
+   snprintf(buf, sizeof(buf), "%s/e-module-tasks.edj",
+            e_module_dir_get(tasks_config->module));
+   edje_object_file_set(o, buf, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   Config_Item *config;
+
+   config = _tasks_config_item_get(NULL);
+   return config->id;
+}
+
+/***************************************************************************/
+
+static Tasks *
+_tasks_new(Evas *evas, E_Zone *zone, const char *id)
+{
+   Tasks *tasks;
+
+   tasks = E_NEW(Tasks, 1);
+   tasks->config = _tasks_config_item_get(id);
+   tasks->o_items = e_box_add(evas);
+   tasks->horizontal = 1;
+
+   e_box_homogenous_set(tasks->o_items, 1);
+   e_box_orientation_set(tasks->o_items, tasks->horizontal);
+   e_box_align_set(tasks->o_items, 0.5, 0.5);
+   tasks->zone = zone;
+   return tasks;
+}
+
+static void
+_tasks_free(Tasks *tasks)
+{
+   Tasks_Item *item;
+   EINA_LIST_FREE(tasks->items, item) _tasks_item_free(item);
+   evas_object_del(tasks->o_items);
+   free(tasks);
+}
+
+static void 
+_tasks_refill(Tasks *tasks)
+{
+   Eina_List *l;
+   E_Border *border;
+   Tasks_Item *item;
+   Evas_Coord w, h;
+
+   while (tasks->items)
+     {
+        item = tasks->items->data;
+        _tasks_item_remove(item);
+     }
+   EINA_LIST_FOREACH(tasks_config->borders, l, border)
+     {
+        _tasks_item_check_add(tasks, border);
+     }
+   if (tasks->items)
+     {
+        item = tasks->items->data;
+       edje_object_size_min_calc(item->o_item, &w, &h);
+        if (tasks->horizontal)
+          {
+             if (w < tasks->config->minw) w = tasks->config->minw;
+          }
+        else
+          {
+             if (h < tasks->config->minh) h = tasks->config->minh;
+          }
+       if (!tasks->gcc->resizable)
+         {
+            if (tasks->horizontal)
+               e_gadcon_client_min_size_set(tasks->gcc, 
+                                            w * eina_list_count(tasks->items),
+                                            h);
+            else
+               e_gadcon_client_min_size_set(tasks->gcc, 
+                                            w,
+                                            h * eina_list_count(tasks->items));
+          }
+     }
+   else
+     e_gadcon_client_min_size_set(tasks->gcc, 0, 0);
+}
+
+static void
+_tasks_refill_all(void)
+{
+   const Eina_List *l;
+   Tasks *tasks;
+
+   EINA_LIST_FOREACH(tasks_config->tasks, l, tasks)
+     {
+        _tasks_refill(tasks);
+     }
+}
+
+
+static void
+_tasks_refill_border(E_Border *border)
+{
+   const Eina_List *l;
+   Tasks *tasks;
+   
+   EINA_LIST_FOREACH(tasks_config->tasks, l, tasks)
+     {
+       const Eina_List *m;
+       Tasks_Item *item;
+       EINA_LIST_FOREACH(tasks->items, m, item)
+          {
+             if (item->border == border) _tasks_item_refill(item);
+          }
+     }
+}
+
+static void 
+_tasks_signal_emit(E_Border *border, char *sig, char *src)
+{
+   const Eina_List *l;
+   Tasks *tasks;
+   
+   EINA_LIST_FOREACH(tasks_config->tasks, l, tasks)
+     {
+       const Eina_List *m;
+       Tasks_Item *item;
+        
+       EINA_LIST_FOREACH(tasks->items, m, item)
+          {
+             if (item->border == border)
+               _tasks_item_signal_emit(item, sig, src);
+          }
+     }
+}
+
+static Tasks_Item *
+_tasks_item_find(Tasks *tasks, E_Border *border)
+{
+   const Eina_List *l;
+   Tasks_Item *item;
+
+   EINA_LIST_FOREACH(tasks->items, l, item)
+     {
+        if (item->border == border) return item;
+     }
+   return NULL;
+}
+
+static Tasks_Item *
+_tasks_item_new(Tasks *tasks, E_Border *border)
+{
+   Tasks_Item *item;
+
+   item = E_NEW(Tasks_Item, 1);
+   e_object_ref(E_OBJECT(border));
+   item->tasks = tasks;
+   item->border = border;
+   item->o_item = edje_object_add(evas_object_evas_get(tasks->o_items));
+   if (tasks->horizontal)
+     e_theme_edje_object_set(item->o_item, 
+                             "base/theme/modules/tasks", 
+                             "modules/tasks/item");
+   else
+     {
+        if (!e_theme_edje_object_set(item->o_item, 
+                                     "base/theme/modules/tasks", 
+                                     "modules/tasks/item_vert"))
+          e_theme_edje_object_set(item->o_item, 
+                                  "base/theme/modules/tasks", 
+                                  "modules/tasks/item");
+     }
+   evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _tasks_cb_item_mouse_down, item);
+   evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_UP,
+                                  _tasks_cb_item_mouse_up, item);
+   evas_object_show(item->o_item);
+   
+   _tasks_item_fill(item);
+   return item;
+}
+
+static int
+_tasks_item_check_add(Tasks *tasks, E_Border *border)
+{
+   if (border->user_skip_winlist) return 1;
+   if (border->client.netwm.state.skip_taskbar) return 1;
+   if (_tasks_item_find(tasks, border)) return 1;
+   if (!tasks->config) return 1;
+   if (!(tasks->config->show_all))
+     {
+        if (border->zone != tasks->zone) return 1;
+        if ((border->desk != e_desk_current_get(border->zone)) && 
+            (!border->sticky))
+          return 1;
+     }
+   _tasks_item_add(tasks, border);
+   return 0;
+}
+
+static void
+_tasks_item_add(Tasks *tasks, E_Border *border)
+{
+   Tasks_Item *item;
+
+   item = _tasks_item_new(tasks, border);
+   e_box_pack_end(tasks->o_items, item->o_item);
+   e_box_pack_options_set(item->o_item,
+                          1, 1, /* fill */
+                          1, 1, /* expand */
+                          0.5, 0.5, /* align */
+                          1, 1, /* min */
+                          9999, 9999 /* max */
+                         );
+   tasks->items = eina_list_append(tasks->items, item);
+}
+
+static void
+_tasks_item_remove(Tasks_Item *item)
+{
+   item->tasks->items = eina_list_remove(item->tasks->items, item);
+   e_box_unpack(item->o_item);
+   evas_object_del(item->o_item);
+   _tasks_item_free(item);
+}
+
+static void
+_tasks_item_free(Tasks_Item *item)
+{
+   if (item->o_icon) evas_object_del(item->o_icon);
+   e_object_unref(E_OBJECT(item->border));
+   evas_object_del(item->o_item);
+   free(item);
+}
+
+static void
+_tasks_item_refill(Tasks_Item *item)
+{
+   if (item->o_icon) evas_object_del(item->o_icon);
+   _tasks_item_fill(item);
+}
+
+static void
+_tasks_item_fill(Tasks_Item *item)
+{
+   const char *label;
+   
+   item->o_icon = e_border_icon_add(item->border, evas_object_evas_get(item->tasks->o_items));
+   edje_object_part_swallow(item->o_item, "e.swallow.icon", item->o_icon);
+   evas_object_pass_events_set(item->o_icon, 1);
+   evas_object_show(item->o_icon);
+   
+   label = e_border_name_get(item->border);
+   edje_object_part_text_set(item->o_item, "e.text.label", label);
+   
+   if (item->border->iconic)
+     _tasks_item_signal_emit(item, "e,state,iconified", "e");
+   else
+     _tasks_item_signal_emit(item, "e,state,uniconified", "e");
+   if (item->border->focused)
+     _tasks_item_signal_emit(item, "e,state,focused", "e");
+   else
+     _tasks_item_signal_emit(item, "e,state,unfocused", "e");
+   if (item->border->client.icccm.urgent && !item->border->focused)
+     _tasks_item_signal_emit(item, "e,state,urgent", "e");
+   else
+     _tasks_item_signal_emit(item, "e,state,not_urgent", "e");
+}
+
+static void
+_tasks_item_signal_emit(Tasks_Item *item, char *sig, char *src)
+{
+   if (item->o_item) edje_object_signal_emit(item->o_item, sig, src);
+   if (item->o_icon) edje_object_signal_emit(item->o_icon, sig, src);
+}
+
+static Config_Item *
+_tasks_config_item_get(const char *id)
+{
+   Eina_List *l;
+   Config_Item *config;
+   char buf[128];
+   
+   if (!id)
+     {
+        int num = 0;
+        
+        /* Create id */
+        if (tasks_config->items)
+          {
+             const char *p;
+             
+             config = eina_list_last(tasks_config->items)->data;
+             p = strrchr(config->id, '.');
+             if (p) num = atoi(p + 1) + 1;
+          }
+        snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num);
+        id = buf;
+     }
+   else
+     {
+       EINA_LIST_FOREACH(tasks_config->items, l, config)
+          {
+             if (!config->id) continue;
+             if (!strcmp(config->id, id)) return config;
+          }
+     }
+
+   config = E_NEW(Config_Item, 1);
+   config->id = eina_stringshare_add(id);
+   config->show_all = 0;
+   config->minw = 100;
+   config->minh = 32;
+
+   tasks_config->items = eina_list_append(tasks_config->items, config);
+
+   return config;
+}
+
+void
+_tasks_config_updated(Config_Item *config)
+{
+   const Eina_List *l;
+   Tasks *tasks;
+   
+   if (!tasks_config) return;
+   EINA_LIST_FOREACH(tasks_config->tasks, l, tasks)
+     {
+        if (tasks->config == config) _tasks_refill(tasks);
+     }
+}
+
+static void
+_tasks_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+{
+   Tasks *tasks;
+
+   tasks = (Tasks *) data;
+   _config_tasks_module(tasks->config);
+}
+
+static void
+_tasks_cb_item_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   Tasks_Item *item;
+   
+   item = (Tasks_Item *) data;
+   ev = event_info;
+   if (ev->button == 3) 
+     {
+        E_Menu *m;
+       E_Menu_Item *mi;
+        int cx, cy, cw, ch;
+        
+        e_gadcon_canvas_zone_geometry_get(item->tasks->gcc->gadcon, &cx, &cy, &cw, &ch);
+        
+       e_int_border_menu_create(item->border);
+        
+       mi = e_menu_item_new(item->border->border_menu);
+       e_menu_item_separator_set(mi, 1);
+        
+       m = e_menu_new();
+        mi = e_menu_item_new(m);
+       e_menu_item_label_set(mi, _("Settings"));
+       e_util_menu_item_theme_icon_set(mi, "preferences-system");
+       e_menu_item_callback_set(mi, _tasks_cb_menu_configure, item->tasks);
+        
+       m = e_gadcon_client_util_menu_items_append(item->tasks->gcc, m, 0);
+        
+        mi = e_menu_item_new(item->border->border_menu);
+        e_menu_item_label_set(mi, _("Tasks"));
+        e_menu_item_submenu_set(mi, m);
+       e_util_menu_item_theme_icon_set(mi, "preferences-system");
+        
+       e_menu_activate_mouse(item->border->border_menu,
+                              e_util_zone_current_get(e_manager_current_get()),
+                              cx + ev->output.x, cy + ev->output.y, 1, 1,
+                              E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+        evas_event_feed_mouse_up(item->tasks->gcc->gadcon->evas, ev->button,
+                                 EVAS_BUTTON_NONE, ev->timestamp, NULL);
+     }
+   
+}
+
+static void
+_tasks_cb_item_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Evas_Event_Mouse_Up *ev;
+   Tasks_Item *item;
+   
+   ev = event_info;
+   item = data;
+   if (ev->button == 1)
+     {
+        if (!item->border->sticky && item->tasks->config->show_all)
+          e_desk_show(item->border->desk);
+        if (evas_key_modifier_is_set(ev->modifiers, "Alt"))
+          {
+             if (item->border->iconic)
+               e_border_uniconify(item->border);
+             else
+               e_border_iconify(item->border);
+          }
+        else if (evas_key_modifier_is_set(ev->modifiers, "Control"))
+          {
+             if (item->border->maximized)
+               e_border_unmaximize(item->border, e_config->maximize_policy);
+             else
+               e_border_maximize(item->border, e_config->maximize_policy);
+          }
+        else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+          {
+             if (item->border->shaded)
+               e_border_unshade(item->border, item->border->shade.dir);
+             else
+               e_border_shade(item->border, item->border->shade.dir);
+          }
+        else if (evas_key_modifier_is_set(ev->modifiers, "Super"))
+          {
+             e_border_act_close_begin(item->border);
+          }
+        else
+          {
+             if (item->border->iconic)
+               {
+                  e_border_uniconify(item->border);
+                  e_border_focus_set(item->border, 1, 1);
+               }
+             else
+               {
+                  if (item->border->focused)
+                    {
+                       e_border_iconify(item->border);
+                    }
+                  else
+                    {
+                       e_border_raise(item->border);
+                       e_border_focus_set(item->border, 1, 1);
+                    }
+               }
+          }
+     }
+   else if (ev->button == 2)
+     {
+        if (!item->border->sticky && item->tasks->config->show_all)
+          e_desk_show(item->border->desk);
+        e_border_raise(item->border);
+        e_border_focus_set(item->border, 1, 1);
+        if (item->border->maximized)
+          e_border_unmaximize(item->border, e_config->maximize_policy);
+        else
+          e_border_maximize(item->border, e_config->maximize_policy);
+     }
+}
+
+/************ BORDER CALLBACKS *********************/
+
+static Eina_Bool
+_tasks_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Add *ev;
+
+   ev = event;
+   tasks_config->borders = eina_list_append(tasks_config->borders, ev->border);
+   _tasks_refill_all();
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Remove *ev;
+
+   ev = event;
+   tasks_config->borders = eina_list_remove(tasks_config->borders, ev->border);
+   _tasks_refill_all();
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_iconify(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Iconify *ev;
+
+   ev = event;
+   _tasks_signal_emit(ev->border, "e,state,iconified", "e");
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Uniconify *ev;
+
+   ev = event;
+   _tasks_signal_emit(ev->border, "e,state,uniconified", "e");
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Focus_In *ev;
+
+   ev = event;
+   _tasks_signal_emit(ev->border, "e,state,focused", "e");
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Focus_Out *ev;
+
+   ev = event;
+   _tasks_signal_emit(ev->border, "e,state,unfocused", "e");
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Urgent_Change *ev;
+
+   ev = event;
+
+   if (ev->border->focused) return EINA_TRUE;
+
+   if (ev->border->client.icccm.urgent)
+     _tasks_signal_emit(ev->border, "e,state,urgent", "e");
+   else
+     _tasks_signal_emit(ev->border, "e,state,not_urgent", "e");
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_property(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Property *ev;
+   E_Border *border;
+
+   ev = event;
+   border = ev->border;
+   if (border) _tasks_refill_border(border);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_icon_change(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Icon_Change *ev;
+   E_Border *border;
+   
+   ev = event;
+   border = ev->border;
+   if (border) _tasks_refill_border(border);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_zone_set(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   _tasks_refill_all();
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_border_desk_set(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   _tasks_refill_all();
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_tasks_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   _tasks_refill_all();
+   return EINA_TRUE;
+}
+
+/***************************************************************************/
+ /**/
+
+ /**/
+/***************************************************************************/
diff --git a/src/modules/tasks/e_mod_main.h b/src/modules/tasks/e_mod_main.h
new file mode 100644 (file)
index 0000000..f4ffc79
--- /dev/null
@@ -0,0 +1,35 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+typedef struct _Config Config;
+typedef struct _Config_Item Config_Item;
+
+struct _Config
+{
+   E_Module *module;
+   Eina_List *tasks;
+   Eina_List *borders;
+   Eina_List *items;
+   E_Menu *menu;
+   Eina_List *handlers;
+   E_Config_Dialog *config_dialog;
+};
+
+struct _Config_Item
+{
+   const char *id;
+   int show_all;
+   int minw, minh;
+};
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+
+void _config_tasks_module(Config_Item *ci);
+void _tasks_config_updated(Config_Item *ci);
+extern Config *tasks_config;
+
+#endif
diff --git a/src/modules/tasks/module.desktop.in b/src/modules/tasks/module.desktop.in
new file mode 100644 (file)
index 0000000..d5196da
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Link
+Name=Tasks
+Name[fr]=Tâches
+Name[pt]=Tarefas
+Icon=e-module-tasks
+X-Enlightenment-ModuleType=utils
+Comment=Gadget to allow you to switch tasks
+Comment[fr]=Ce gadget vous permet de passer d'une tâche à une autre.
+Comment[it]=Gadget che permette di commutare tra i task.
+Comment[pt]=Módulo que lhe permite trocar as tarefas
diff --git a/src/modules/temperature/.cvsignore b/src/modules/temperature/.cvsignore
deleted file mode 100644 (file)
index 78ec9c8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-e_mod_main.lo
-module.la
-*.la
-*.lo
-module.desktop
-tempget
index 5868a1f..df6e936 100644 (file)
@@ -117,6 +117,29 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
                     }
                   break;
                }
+           case SENSOR_TYPE_LINUX_SYS: 
+               {
+                  Eina_List *l;
+                  
+                  if ((l = ecore_file_ls("/sys/class/thermal")))
+                    {
+                       char *name;
+                       int n = 0;
+                       
+                       EINA_LIST_FREE(l, name) 
+                         {
+                            if (!strncmp(name, "thermal", 7))
+                              {
+                                 cfdata->sensors = 
+                                    eina_list_append(cfdata->sensors, name);
+                                 if (!strcmp(cfdata->inst->sensor_name, name))
+                                    cfdata->sensor = n;
+                                 n++;
+                              }
+                         }
+                    }
+                  break;
+               }
            default:
              break;
           }
index e46f73d..b5b2fb1 100644 (file)
@@ -6,11 +6,18 @@
 #include <sys/sysctl.h>
 #endif
 
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#endif
+
+
 /* gadcon requirements */
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static char *_gc_label(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
@@ -163,7 +170,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
-static char *
+static const char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Temperature");
index c91f1b6..83b3ce4 100644 (file)
@@ -45,7 +45,7 @@ struct _Config_Face
    Ecore_Event_Handler *tempget_del_handler;
 
    Eina_Bool have_temp:1;
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
    int mib[5];
 #endif
 };
index 7159292..232859a 100644 (file)
@@ -5,6 +5,7 @@ typedef enum _Sensor_Type
 {
    SENSOR_TYPE_NONE,
    SENSOR_TYPE_FREEBSD,
+   SENSOR_TYPE_OPENBSD,
    SENSOR_TYPE_OMNIBOOK,
    SENSOR_TYPE_LINUX_MACMINI,
    SENSOR_TYPE_LINUX_I2C,
@@ -12,7 +13,8 @@ typedef enum _Sensor_Type
    SENSOR_TYPE_LINUX_PCI,
    SENSOR_TYPE_LINUX_PBOOK,
    SENSOR_TYPE_LINUX_INTELCORETEMP,
-   SENSOR_TYPE_LINUX_THINKPAD
+   SENSOR_TYPE_LINUX_THINKPAD,
+   SENSOR_TYPE_LINUX_SYS
 } Sensor_Type;
 
 #endif
old mode 100755 (executable)
new mode 100644 (file)
index 99495a3..28d3be2 100644 (file)
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -8,6 +11,15 @@
 # include <sys/sysctl.h>
 #endif
 
+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <errno.h>
+#include <err.h>
+#endif
+
+#include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_File.h>
 
@@ -19,9 +31,18 @@ static int poll_interval = 32;
 static int cur_poll_interval = 32;
 
 static char *sensor_path = NULL;
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
 static int mib[5];
 #endif
+
+#ifdef __OpenBSD__
+static int dev, numt;
+static struct sensordev snsrdev;  
+static size_t sdlen = sizeof(snsrdev);
+static struct sensor snsr;
+static size_t slen = sizeof(snsr);
+#endif
+
 static Ecore_Poller *poller = NULL;
 static int ptemp = 0;
 
@@ -90,6 +111,24 @@ init(void)
        /* TODO: FreeBSD can also have more temperature sensors! */
        sensor_type = SENSOR_TYPE_FREEBSD;
        sensor_name = strdup("tz0");
+#elif __OpenBSD__ 
+       mib[0] = CTL_HW;
+       mib[1] = HW_SENSORS;
+
+       for (dev = 0; ; dev++) {
+               mib[2] = dev;
+               if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1) {
+                       if (errno == ENOENT)    /* no further sensors */
+                               break;
+                       else
+                               continue;                                       
+               }
+               if (strcmp(snsrdev.xname, "cpu0") == 0) {
+                       sensor_type = SENSOR_TYPE_OPENBSD;
+                       sensor_name = strdup("cpu0");
+                       break;
+               }
+       }
 #else
        therms = ecore_file_ls("/proc/acpi/thermal_zone");
        if (therms)
@@ -105,89 +144,111 @@ init(void)
        else
          {
             eina_list_free(therms);
-            if (ecore_file_exists("/proc/omnibook/temperature"))
-              {
-                 sensor_type = SENSOR_TYPE_OMNIBOOK;
-                 sensor_name = strdup("dummy");
-              }
-            else if (ecore_file_exists("/sys/devices/temperatures/sensor1_temperature"))
-              {
-                 sensor_type = SENSOR_TYPE_LINUX_PBOOK;
-                 sensor_name = strdup("dummy");
-              }
-            else if (ecore_file_exists("/sys/devices/temperatures/cpu_temperature"))
-              {
-                 sensor_type = SENSOR_TYPE_LINUX_MACMINI;
-                 sensor_name = strdup("dummy");
-              }
-            else if (ecore_file_exists("/sys/devices/platform/coretemp.0/temp1_input"))
-              {
-                 sensor_type = SENSOR_TYPE_LINUX_INTELCORETEMP;
-                 sensor_name = strdup("dummy");
-              }
-             else if (ecore_file_exists("/sys/devices/platform/thinkpad_hwmon/temp1_input"))
+             therms = ecore_file_ls("/sys/class/thermal");
+             if (therms)
                {
-                  sensor_type = SENSOR_TYPE_LINUX_THINKPAD;
-                  sensor_name = strdup("dummy");
+                  char *name;
+                  Eina_List *l;
+                  
+                  EINA_LIST_FOREACH(therms, l, name)
+                    {
+                       if (!strncmp(name, "thermal", 7))
+                         {
+                            sensor_type = SENSOR_TYPE_LINUX_SYS;
+                            sensor_name = strdup(name);
+                            eina_list_free(therms);
+                            therms = NULL;
+                            break;
+                         }
+                    }
+                  if (therms) eina_list_free(therms);
                }
-            else
-              {
-                 // try the i2c bus
-                 therms = temperature_get_bus_files("i2c");
-                 if (therms)
-                   {
-                      char *name;
-
-                      if ((name = eina_list_data_get(therms)))
-                        {
-                           if (ecore_file_exists(name))
-                             {
-                                int len;
-
-                                snprintf(path, sizeof(path),
-                                         "%s", ecore_file_file_get(name));
-                                len = strlen(path);
-                                if (len > 6) path[len - 6] = '\0';
-                                sensor_type = SENSOR_TYPE_LINUX_I2C;
-                                sensor_path = strdup(name);
-                                sensor_name = strdup(path);
-                                printf("sensor type = i2c\n"
-                                        "sensor path = %s\n"
-                                        "sensor name = %s\n",
-                                        sensor_path, sensor_name);
-                             }
-                        }
-                      eina_list_free(therms);
-                   }
-                 if (!sensor_path)
-                   {
-                      // try the pci bus
-                      therms = temperature_get_bus_files("pci");
-                      if (therms)
-                        {
-                           char *name;
-
-                           if ((name = eina_list_data_get(therms)))
-                             {
-                                if (ecore_file_exists(name))
-                                  {
-                                     int len;
-
-                                     snprintf(path, sizeof(path),
+             if (therms)
+               {
+                  if (ecore_file_exists("/proc/omnibook/temperature"))
+                    {
+                       sensor_type = SENSOR_TYPE_OMNIBOOK;
+                       sensor_name = strdup("dummy");
+                    }
+                  else if (ecore_file_exists("/sys/devices/temperatures/sensor1_temperature"))
+                    {
+                       sensor_type = SENSOR_TYPE_LINUX_PBOOK;
+                       sensor_name = strdup("dummy");
+                    }
+                  else if (ecore_file_exists("/sys/devices/temperatures/cpu_temperature"))
+                    {
+                       sensor_type = SENSOR_TYPE_LINUX_MACMINI;
+                       sensor_name = strdup("dummy");
+                    }
+                  else if (ecore_file_exists("/sys/devices/platform/coretemp.0/temp1_input"))
+                    {
+                       sensor_type = SENSOR_TYPE_LINUX_INTELCORETEMP;
+                       sensor_name = strdup("dummy");
+                    }
+                  else if (ecore_file_exists("/sys/devices/platform/thinkpad_hwmon/temp1_input"))
+                    {
+                       sensor_type = SENSOR_TYPE_LINUX_THINKPAD;
+                       sensor_name = strdup("dummy");
+                    }
+                  else
+                    {
+                       // try the i2c bus
+                       therms = temperature_get_bus_files("i2c");
+                       if (therms)
+                         {
+                            char *name;
+                            
+                            if ((name = eina_list_data_get(therms)))
+                              {
+                                 if (ecore_file_exists(name))
+                                   {
+                                      int len;
+                                      
+                                      snprintf(path, sizeof(path),
                                                "%s", ecore_file_file_get(name));
-                                     len = strlen(path);
-                                     if (len > 6) path[len - 6] = '\0';
-                                     sensor_type = SENSOR_TYPE_LINUX_PCI;
-                                     sensor_path = strdup(name);
-                                     sensor_name = strdup(path);
-                                     printf("sensor type = pci\n"
+                                      len = strlen(path);
+                                      if (len > 6) path[len - 6] = '\0';
+                                      sensor_type = SENSOR_TYPE_LINUX_I2C;
+                                      sensor_path = strdup(name);
+                                      sensor_name = strdup(path);
+                                      printf("sensor type = i2c\n"
                                              "sensor path = %s\n"
                                              "sensor name = %s\n",
                                              sensor_path, sensor_name);
-                                  }
-                             }
-                           eina_list_free(therms);
-                        }
+                                   }
+                              }
+                            eina_list_free(therms);
+                         }
+                       if (!sensor_path)
+                         {
+                            // try the pci bus
+                            therms = temperature_get_bus_files("pci");
+                            if (therms)
+                              {
+                                 char *name;
+                                 
+                                 if ((name = eina_list_data_get(therms)))
+                                   {
+                                      if (ecore_file_exists(name))
+                                        {
+                                           int len;
+                                           
+                                           snprintf(path, sizeof(path),
+                                                    "%s", ecore_file_file_get(name));
+                                           len = strlen(path);
+                                           if (len > 6) path[len - 6] = '\0';
+                                           sensor_type = SENSOR_TYPE_LINUX_PCI;
+                                           sensor_path = strdup(name);
+                                           sensor_name = strdup(path);
+                                           printf("sensor type = pci\n"
+                                                  "sensor path = %s\n"
+                                                  "sensor name = %s\n",
+                                                  sensor_path, sensor_name);
+                                        }
+                                   }
+                                 eina_list_free(therms);
+                              }
+                         }
                    }
               }
          }
@@ -210,6 +271,20 @@ init(void)
             sysctlnametomib(sensor_path, mib, &len);
 #endif
             break;
+          case SENSOR_TYPE_OPENBSD:
+#ifdef __OpenBSD__
+               for (numt = 0; numt < snsrdev.maxnumt[SENSOR_TEMP]; numt++) {
+                       mib[4] = numt;
+                       slen = sizeof(snsr);
+                       if (sysctl(mib, 5, &snsr, &slen, NULL, 0) == -1)        
+                               continue;
+                       if (slen > 0 && (snsr.flags & SENSOR_FINVALID) == 0) {
+                               break;
+                       }
+               }
+#endif
+
+               break;
           case SENSOR_TYPE_OMNIBOOK:
             sensor_path = strdup("/proc/omnibook/temperature");
             break;
@@ -254,10 +329,10 @@ init(void)
                   if (ecore_file_exists(path))
                     {
                        sensor_path = strdup(path);
-                           /* We really only care about the first
-                            * one for the default. */
+                       /* We really only care about the first
+                        * one for the default. */
                        break;
-                        }
+                    }
                  free(name);
               }
             break;
@@ -266,6 +341,13 @@ init(void)
                      "/proc/acpi/thermal_zone/%s/temperature", sensor_name);
             sensor_path = strdup(path);
             break;
+          case SENSOR_TYPE_LINUX_SYS:
+            snprintf(path, sizeof(path),
+                     "/sys/class/thermal/thermal/%s/temp", sensor_name);
+            sensor_path = strdup(path);
+            break;
+           default:
+             break;
          }
      }
 }
@@ -303,6 +385,16 @@ check(void)
          goto error;
 #endif
        break;
+      case SENSOR_TYPE_OPENBSD:
+#ifdef __OpenBSD__
+       if (sysctl(mib, 5, &snsr, &slen, NULL, 0) != -1) {
+        temp = (snsr.value - 273150000) / 1000000.0;
+        ret = 1;
+       }
+       else
+        goto error;
+#endif
+       break;
       case SENSOR_TYPE_OMNIBOOK:
        f = fopen(sensor_path, "r");
        if (f)
@@ -401,6 +493,21 @@ check(void)
        else
          goto error;
        break;
+      case SENSOR_TYPE_LINUX_SYS:
+       f = fopen(sensor_path, "r");
+       if (f)
+         {
+             fgets(buf, sizeof(buf), f);
+             buf[sizeof(buf) - 1] = 0;
+            fclose(f);
+             temp = atoi(buf);
+             temp /= 1000;
+         }
+       else
+         goto error;
+       break;
+      default:
+        break;
      }
 
    if (ret) return temp;
@@ -416,7 +523,7 @@ error:
 }
 
 static Eina_Bool
-poll_cb(void *data)
+poll_cb(void *data __UNUSED__)
 {
    int t, pp;
 
diff --git a/src/modules/winlist/.cvsignore b/src/modules/winlist/.cvsignore
deleted file mode 100644 (file)
index 06d064a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
index a84adb6..d582113 100644 (file)
@@ -460,7 +460,7 @@ e_winlist_left(E_Zone *zone)
        center_next = bd->x + bd->w / 2;
        if (center_next >= center) continue;
        delta_next = bd_orig->x - (bd->x + bd->w);
-       if (delta_next < 0) delta = center - center_next;
+       if (delta_next < 0) delta_next = center - center_next;
        if (delta_next >= 0 && delta_next < delta)
          {
             _bd_next = bd;
@@ -579,7 +579,7 @@ e_winlist_down(E_Zone *zone)
        center_next = bd->y + bd->h/2;
        if (center_next <= center) continue;
        delta_next = bd->y - (bd_orig->y + bd_orig->h);
-       if (delta_next < 0) delta = center - center_next;
+       if (delta_next < 0) delta_next = center - center_next;
        if (delta_next >= 0 && delta_next < delta)
          {
             _bd_next = bd;
@@ -698,7 +698,7 @@ e_winlist_up(E_Zone *zone)
        center_next = bd->y + bd->h/2;
        if (center_next >= center) continue;
        delta_next = bd_orig->y - (bd->y + bd->h);
-       if (delta_next < 0) delta = center - center_next;
+       if (delta_next < 0) delta_next = center - center_next;
        if (delta_next >= 0 && delta_next < delta)
          {
             _bd_next = bd;
@@ -999,14 +999,12 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
 static void
 _e_winlist_border_del(E_Border *bd)
 {
+   E_Winlist_Win *ww;
    Eina_List *l;
 
    if (bd == _last_border) _last_border = NULL;
-   for (l = _wins; l; l = l->next)
+   EINA_LIST_FOREACH(_wins, l, ww)
      {
-       E_Winlist_Win *ww;
-
-       ww = l->data;
        if (ww->border == bd)
          {
              e_object_unref(E_OBJECT(ww->border));
diff --git a/src/modules/wizard/.cvsignore b/src/modules/wizard/.cvsignore
deleted file mode 100644 (file)
index a390423..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-module.desktop
index 9f87135..1308312 100644 (file)
@@ -3,11 +3,35 @@ MODULE = wizard
 
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+data/def-ibar.txt
+
+desksdir = $(libdir)/enlightenment/modules/$(MODULE)/extra_desktops
+desks_DATA = \
+data/extra_desktops/mplayer.desktop \
+data/extra_desktops/xterm.desktop
+
+favsdir = $(libdir)/enlightenment/modules/$(MODULE)/favorites
+favs_DATA = \
+data/favorites/.order \
+data/favorites/desktop.desktop \
+data/favorites/home.desktop \
+data/favorites/root.desktop \
+data/favorites/tmp.desktop
+
+desktopdir = $(libdir)/enlightenment/modules/$(MODULE)/desktop
+desktop_DATA = \
+data/desktop/home.desktop \
+data/desktop/root.desktop \
+data/desktop/tmp.desktop
+
+### dont install these - this way e wont list the module for people to
+# accidentally load
 #files_DATA = \
 # e-module-$(MODULE).edj 
 # module.desktop
 
-EXTRA_DIST = $(files_DATA) page_040.c page_050.c page_060.c
+EXTRA_DIST = $(files_DATA) $(desks_DATA) $(favs_DATA) $(desktop_DATA)
 
 # the module .so file
 INCLUDES               = -I. \
@@ -16,23 +40,30 @@ INCLUDES               = -I. \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_builddir)/src/bin \
                          -I$(top_srcdir)/src/modules \
-                         @e_cflags@
+                         @ECONNMAN_CFLAGS@ \
+                         @e_cflags@ \
+                         -I$(top_srcdir)/src/modules/comp
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la \
                          page_000.la \
                          page_010.la \
                          page_020.la \
                          page_030.la \
+                         page_040.la \
+                         page_050.la \
+                         page_060.la \
                          page_070.la \
                          page_080.la \
+                         page_090.la \
+                         page_100.la \
+                         page_110.la \
+                         page_120.la \
+                         page_130.la \
+                         page_140.la \
+                         page_150.la \
+                         page_160.la \
                          page_200.la
 
-### disabled because profile selector really does the job. code here just for
-### informational purposes on how to make wizard pages
-# page_040.la
-# page_050.la
-# page_060.la
-
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
                         e_wizard.c \
@@ -42,7 +73,7 @@ module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
-#Splash screen
+#Auto - Splash screen
 page_000_la_SOURCES      = page_000.c
 page_000_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_000_la_LDFLAGS      = -module -avoid-version
@@ -60,39 +91,91 @@ page_020_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_020_la_LDFLAGS      = -module -avoid-version
 page_020_la_DEPENDENCIES = $(top_builddir)/config.h
 
-#Choose Menus
+#Auto - set up menu
 page_030_la_SOURCES      = page_030.c
 page_030_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_030_la_LDFLAGS      = -module -avoid-version
 page_030_la_DEPENDENCIES = $(top_builddir)/config.h
 
-#page_040_la_SOURCES      = page_040.c
-#page_040_la_LIBADD       = @e_libs@ @dlopen_libs@
-#page_040_la_LDFLAGS      = -module -avoid-version
-#page_040_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#page_050_la_SOURCES      = page_050.c
-#page_050_la_LIBADD       = @e_libs@ @dlopen_libs@
-#page_050_la_LDFLAGS      = -module -avoid-version
-#page_050_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#page_060_la_SOURCES      = page_060.c
-#page_060_la_LIBADD       = @e_libs@ @dlopen_libs@
-#page_060_la_LDFLAGS      = -module -avoid-version
-#page_060_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Choose appliactions
+#Auto - add new app icons
+page_040_la_SOURCES      = page_040.c
+page_040_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_040_la_LDFLAGS      = -module -avoid-version
+page_040_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Request what scaling to use
+page_050_la_SOURCES      = page_050.c
+page_050_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_050_la_LDFLAGS      = -module -avoid-version
+page_050_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Request which focus style to use
+page_060_la_SOURCES      = page_060.c
+page_060_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_060_la_LDFLAGS      = -module -avoid-version
+page_060_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - Figure out icon theme to use
 page_070_la_SOURCES      = page_070.c
 page_070_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_070_la_LDFLAGS      = -module -avoid-version
 page_070_la_DEPENDENCIES = $(top_builddir)/config.h
 
-#Choose quick launch
+#Auto - fill ibar
 page_080_la_SOURCES      = page_080.c
 page_080_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_080_la_LDFLAGS      = -module -avoid-version
 page_080_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Auto - do we need battery?
+page_090_la_SOURCES      = page_090.c
+page_090_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_090_la_LDFLAGS      = -module -avoid-version
+page_090_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - do we need cpufreq?
+page_100_la_SOURCES      = page_100.c
+page_100_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_100_la_LDFLAGS      = -module -avoid-version
+page_100_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto+feedback - do we need connman?
+page_110_la_SOURCES      = page_110.c
+page_110_la_LIBADD       = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
+page_110_la_LDFLAGS      = -module -avoid-version
+page_110_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - do we need temperature?
+page_120_la_SOURCES      = page_120.c
+page_120_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_120_la_LDFLAGS      = -module -avoid-version
+page_120_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - do we need backlight?
+page_130_la_SOURCES      = page_130.c
+page_130_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_130_la_LDFLAGS      = -module -avoid-version
+page_130_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - do we need temperature?
+page_140_la_SOURCES      = page_140.c
+page_140_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_140_la_LDFLAGS      = -module -avoid-version
+page_140_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - do we need temperature?
+page_150_la_SOURCES      = page_150.c $(top_srcdir)/src/modules/comp/e_mod_comp_cfdata.c
+page_150_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_150_la_LDFLAGS      = -module -avoid-version
+page_150_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - install favorites and ~/Desktop and entries
+page_160_la_SOURCES      = page_160.c
+page_160_la_LIBADD       = @e_libs@ @dlopen_libs@
+page_160_la_LDFLAGS      = -module -avoid-version
+page_160_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Auto - finish up applying
 page_200_la_SOURCES      = page_200.c
 page_200_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_200_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/wizard/data/def-ibar.txt b/src/modules/wizard/data/def-ibar.txt
new file mode 100755 (executable)
index 0000000..5b7d792
--- /dev/null
@@ -0,0 +1,12 @@
+# list of desktop files to put in ibar by default minus the .desktop extension
+# each line is 1 entry in ibar and it is a list of desktop files to
+# look for in order of preference - first found is put in to ibar
+
+xterm rxvt urxvt gnome-terminal konsole xfce4-terminal exo-terminal-emulator lxde-x-terminal-emulator lxterminal mlterm roxterm Terminal terminator vala-terminal
+sylpheed claws-mail thunderbird evolution KMail
+firefox iceweasel chromium-browser eve epiphany midori konqueror opera rekonq dooble
+xchat pidgin konversation kvirc loqui lostirc quassel qutim
+enjoy banshee rhythmbox amarok listen audacious xmms2
+gimp
+inkscape
+libreoffice-startcenter openoffice.org-startcenter koffice
diff --git a/src/modules/wizard/data/desktop/home.desktop b/src/modules/wizard/data/desktop/home.desktop
new file mode 100755 (executable)
index 0000000..db7e2a4
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Home
+Comment=The Directory containing all your personal files
+Comment[it]=La directory contenente i vostri file personali
+Comment[fr]=Le dossier contenant vos fichiers personnels
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:$HOME
+Icon=user-home
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/desktop/root.desktop b/src/modules/wizard/data/desktop/root.desktop
new file mode 100755 (executable)
index 0000000..f339adc
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Root
+Comment=The Root Filesystem base
+Comment[it]=Il filesystem principale
+Comment[fr]=Le système de fichiers à la base
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:/
+Icon=computer
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/desktop/tmp.desktop b/src/modules/wizard/data/desktop/tmp.desktop
new file mode 100755 (executable)
index 0000000..b601015
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Temp
+Comment=Temporary files
+Comment[it]=File temporanei
+Comment[fr]=Les fichiers temporaires
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:/tmp
+Icon=user-temp
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/extra_desktops/mplayer.desktop b/src/modules/wizard/data/extra_desktops/mplayer.desktop
new file mode 100755 (executable)
index 0000000..498069e
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=MPlayer
+GenericName=Movie Player
+Comment=Watch movies and videos
+Exec=mplayer %U
+Icon=video_player.png
+StartupWMClass=MPlayer
+Categories=Application;AudioVideo;Player;
+MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
diff --git a/src/modules/wizard/data/extra_desktops/xterm.desktop b/src/modules/wizard/data/extra_desktops/xterm.desktop
new file mode 100755 (executable)
index 0000000..db10b77
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=XTerm
+GenericName=Terminal
+Comment=Run commands in a shell
+Exec=xterm
+Icon=xterm.png
+StartupWMClass=XTerm
+Categories=Utility;TerminalEmulator;
diff --git a/src/modules/wizard/data/favorites/.order b/src/modules/wizard/data/favorites/.order
new file mode 100755 (executable)
index 0000000..717448d
--- /dev/null
@@ -0,0 +1,4 @@
+home.desktop
+desktop.desktop
+root.desktop
+tmp.desktop
diff --git a/src/modules/wizard/data/favorites/desktop.desktop b/src/modules/wizard/data/favorites/desktop.desktop
new file mode 100755 (executable)
index 0000000..7e9c640
--- /dev/null
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Desktop
+Name[fr]=Bureau
+Comment=Files on your Desktop
+Comment[it]=I file sul vostro desktop
+Comment[fr]=Les fichiers sur votre bureau
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:$HOME/Desktop
+Icon=user-desktop
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/favorites/home.desktop b/src/modules/wizard/data/favorites/home.desktop
new file mode 100755 (executable)
index 0000000..db7e2a4
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Home
+Comment=The Directory containing all your personal files
+Comment[it]=La directory contenente i vostri file personali
+Comment[fr]=Le dossier contenant vos fichiers personnels
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:$HOME
+Icon=user-home
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/favorites/root.desktop b/src/modules/wizard/data/favorites/root.desktop
new file mode 100755 (executable)
index 0000000..f339adc
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Root
+Comment=The Root Filesystem base
+Comment[it]=Il filesystem principale
+Comment[fr]=Le système de fichiers à la base
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:/
+Icon=computer
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
diff --git a/src/modules/wizard/data/favorites/tmp.desktop b/src/modules/wizard/data/favorites/tmp.desktop
new file mode 100755 (executable)
index 0000000..b601015
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Temp
+Comment=Temporary files
+Comment[it]=File temporanei
+Comment[fr]=Les fichiers temporaires
+Type=Link
+X-Enlightenment-Type=Mount
+URL=file:/tmp
+Icon=user-temp
+NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
index a52098d..8067b60 100644 (file)
@@ -2,7 +2,7 @@
 #include "e_mod_main.h"
 
 /* actual module specifics */
-static E_Module *conf_module = NULL;
+E_Module *wiz_module = NULL;
 
 /*
  * These are the currently planned wizard pages:
@@ -50,33 +50,36 @@ e_modapi_init(E_Module *m)
    char buf[PATH_MAX];
    char *file;
    
-   conf_module = m;
+   wiz_module = m;
    e_wizard_init();
    
    snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
    files = ecore_file_ls(buf);
    files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
    EINA_LIST_FREE(files, file)
-         {
-            if (!strncmp(file, "page_", 5))
-              {
-                 void *handle;
-                 
-                 snprintf(buf, sizeof(buf), "%s/%s/%s",
-                          e_module_dir_get(m), MODULE_ARCH, file);
-                 handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
-                 if (handle)
-                   {
-                      e_wizard_page_add(handle,
-                                        dlsym(handle, "wizard_page_init"),
-                                        dlsym(handle, "wizard_page_shutdown"),
-                                        dlsym(handle, "wizard_page_show"),
-                                        dlsym(handle, "wizard_page_hide"),
-                                        dlsym(handle, "wizard_page_apply"));
-                   }
-                  else
-                    printf("%s\n", dlerror());
-              }
+     {
+        if (!strncmp(file, "page_", 5))
+          {
+             void *handle;
+             
+             snprintf(buf, sizeof(buf), "%s/%s/%s",
+                      e_module_dir_get(m), MODULE_ARCH, file);
+             handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
+             if (handle)
+                e_wizard_page_add(handle,
+                                  dlsym(handle, "wizard_page_init"),
+                                  dlsym(handle, "wizard_page_shutdown"),
+                                  dlsym(handle, "wizard_page_show"),
+                                  dlsym(handle, "wizard_page_hide"),
+                                  dlsym(handle, "wizard_page_apply"));
+             else
+               {
+                  // if its an executable...
+                  // XXX
+                  // else...
+                  printf("%s\n", dlerror());
+               }
+          }
        free(file);
      }
    e_wizard_go();
@@ -88,7 +91,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    e_wizard_shutdown();
-   conf_module = NULL;
+   wiz_module = NULL;
 // FIXME: wrong place   
 //   e_module_disable(m); /* disable - on restart this won't be loaded now */
 //   e_sys_action_do(E_SYS_RESTART, NULL); /* restart e - cleanly try settings */
index 3d898ad..8fa8592 100644 (file)
@@ -14,4 +14,6 @@ EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
 
+extern E_Module *wiz_module;
+
 #endif
index b66e0db..9740fab 100644 (file)
@@ -194,7 +194,10 @@ e_wizard_page_add(void *handle,
 EAPI void
 e_wizard_page_del(E_Wizard_Page *pg)
 {
-   if (pg->handle) dlclose(pg->handle);
+// rare thing.. if we do e_wizard_next() from a page and we end up finishing
+// ther page seq.. we cant REALLY dlclose... not a problem as wizard runs
+// once only then e restarts itself with final wizard page
+//   if (pg->handle) dlclose(pg->handle);
    pages = eina_list_remove(pages, pg);
    free(pg);
 }
@@ -218,6 +221,12 @@ e_wizard_labels_update(void)
    edje_object_part_text_set(o_bg, "e.text.label", _("Next"));
 }
 
+EAPI const char *
+e_wizard_dir_get(void)
+{
+   return e_module_dir_get(wiz_module);
+}
+
 static void
 _e_wizard_next_eval(void)
 {
index 575cfb5..f10039b 100644 (file)
@@ -24,18 +24,18 @@ EAPI void e_wizard_go(void);
 EAPI void e_wizard_apply(void);
 EAPI void e_wizard_next(void);
 EAPI void e_wizard_page_show(Evas_Object *obj);
-EAPI E_Wizard_Page *
-  e_wizard_page_add(void *handle,
-                   int (*init)     (E_Wizard_Page *pg),
-                   int (*shutdown) (E_Wizard_Page *pg),
-                   int (*show)     (E_Wizard_Page *pg),
-                   int (*hide)     (E_Wizard_Page *pg),
-                   int (*apply)    (E_Wizard_Page *pg)
-                   );
+EAPI E_Wizard_Page *e_wizard_page_add(void *handle,
+                                      int (*init)     (E_Wizard_Page *pg),
+                                      int (*shutdown) (E_Wizard_Page *pg),
+                                      int (*show)     (E_Wizard_Page *pg),
+                                      int (*hide)     (E_Wizard_Page *pg),
+                                      int (*apply)    (E_Wizard_Page *pg)
+                                     );
 EAPI void e_wizard_page_del(E_Wizard_Page *pg);
 EAPI void e_wizard_button_next_enable_set(int enable);
 EAPI void e_wizard_title_set(const char *title);
 EAPI void e_wizard_labels_update(void);
-    
+EAPI const char *e_wizard_dir_get(void);
+
 #endif
 #endif
old mode 100755 (executable)
new mode 100644 (file)
index 6435f8f..6bdafb2 100644 (file)
@@ -13,47 +13,49 @@ struct _E_Intl_Pair
    const char *locale_translation;
 };
 
-const E_Intl_Pair basic_language_predefined_pairs[ ] = {
-     {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
-     {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
-     {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"},
-     {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"},
-     {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"},
-     {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"},
-     {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"},
-     {"en_US.UTF-8", "lang-en_US.png", "English"},
-     {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"},
-     {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"},
-     {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"},
-     {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"},
-     {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"},
-     {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"},
-     {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"},
-     {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"},
-     {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"},
-     {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"},
-     {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"},
-     {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"},
-     {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"},
-     {"es_AR.UTF-8", "lang-es_AR.png", "Español"},
-     {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"},
-     {"el_GR.UTF-8", "lang-el_GR.png", "Ελληνικά"},
-     { NULL, NULL, NULL }
+const E_Intl_Pair basic_language_predefined_pairs[ ] =
+{
+   {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
+   {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
+   {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"},
+   {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"},
+   {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"},
+   {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"},
+   {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"},
+   {"en_US.UTF-8", "lang-en_US.png", "English"},
+   {"en_GB.UTF-8", NULL,             "British English"},
+   {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"},
+   {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"},
+   {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"},
+   {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"},
+   {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"},
+   {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"},
+   {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"},
+   {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"},
+   {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"},
+   {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"},
+   {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"},
+   {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"},
+   {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"},
+   {"es_AR.UTF-8", "lang-es_AR.png", "Español"},
+   {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"},
+   {"el_GR.UTF-8", "lang-el_GR.png", "Ελληνικά"},
+   { NULL, NULL, NULL }
 };
 
 static const char *lang = NULL;
 static Eina_List *blang_list = NULL;
 
-static int 
-_basic_lang_list_sort(const void *data1, const void *data2) 
+static int
+_basic_lang_list_sort(const void *data1, const void *data2)
 {
    E_Intl_Pair *ln1, *ln2;
    const char *trans1;
    const char *trans2;
-   
+
    if (!data1) return 1;
    if (!data2) return -1;
-   
+
    ln1 = (E_Intl_Pair *)data1;
    ln2 = (E_Intl_Pair *)data2;
 
@@ -62,7 +64,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
 
    if (!ln2->locale_translation) return -1;
    trans2 = ln2->locale_translation;
-   
+
    return (strcmp(trans1, trans2));
 }
 
@@ -71,8 +73,12 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
    FILE *output;
 
+#ifdef __OpenBSD__
+   output = popen("ls /usr/share/locale", "r");
+#else
    output = popen("locale -a", "r");
-   if (output) 
+#endif
+   if (output)
      {
        char line[32];
 
@@ -85,7 +91,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
               {
                  char *basic_language;
 
-                 basic_language = 
+                 basic_language =
                    e_intl_locale_parts_combine
                    (locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION);
                  if (basic_language)
@@ -100,10 +106,10 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
                                 basic_language, strlen(basic_language)))
                              {
                                 if (!eina_list_data_find
-                                    (blang_list, 
+                                    (blang_list,
                                      &basic_language_predefined_pairs[i]))
                                   blang_list = eina_list_append
-                                  (blang_list, 
+                                  (blang_list,
                                    &basic_language_predefined_pairs[i]);
                                 break;
                              }
@@ -114,7 +120,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
                  e_intl_locale_parts_free(locale_parts);
               }
          }
-       /* Sort basic languages */      
+       /* Sort basic languages */
        blang_list = eina_list_sort(blang_list, eina_list_count(blang_list), _basic_lang_list_sort);
        pclose(output);
      }
@@ -131,9 +137,10 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
-   Evas_Object *o, *of, *ob;
+   Evas_Object *o, *of, *ob, *ic;
    Eina_List *l;
    int i, sel = -1;
+   char buf[PATH_MAX];
 
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Language"));
@@ -143,18 +150,23 @@ wizard_page_show(E_Wizard_Page *pg)
 
    e_widget_ilist_freeze(ob);
 
-   e_widget_ilist_append(ob, NULL, _("System Default"), 
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   ic = e_util_icon_add(buf, pg->evas);
+   e_widget_ilist_append(ob, ic, _("System Default"),
                          NULL, NULL, NULL);
    for (i = 1, l = blang_list; l; l = l->next, i++)
      {
        E_Intl_Pair *pair;
-        Evas_Object *ic;
-       char buf[PATH_MAX];
 
        pair = l->data;
-       e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", pair->locale_icon);
-       ic = e_util_icon_add(buf, pg->evas);
-       e_widget_ilist_append(ob, ic, _(pair->locale_translation), 
+       if (pair->locale_icon)
+         {
+            e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", pair->locale_icon);
+            ic = e_util_icon_add(buf, pg->evas);
+         }
+        else
+         ic = NULL;
+       e_widget_ilist_append(ob, ic, _(pair->locale_translation),
                              NULL, NULL, pair->locale_key);
        if (e_intl_language_get())
          {
@@ -170,14 +182,14 @@ wizard_page_show(E_Wizard_Page *pg)
    evas_object_show(ob);
    evas_object_show(of);
    e_wizard_page_show(o);
-   pg->data = of;
+//   pg->data = o;
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
+//   evas_object_del(pg->data);
    /* special - language inits its stuff the moment it goes away */
    eina_stringshare_del(e_config->language);
    e_config->language = eina_stringshare_ref(lang);
index 41e29c9..e95dd81 100644 (file)
@@ -22,10 +22,12 @@ _profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
    snprintf(buf, sizeof(buf), "%s/profile.desktop", dir);
    desk = efreet_desktop_new(buf);
    if (desk)
-     e_widget_textblock_markup_set(textblock, desk->comment);
+     {
+        e_widget_textblock_markup_set(textblock, desk->comment);
+        efreet_desktop_free(desk);
+     }
    else
      e_widget_textblock_markup_set(textblock, _("Unknown"));
-   if (desk) efreet_desktop_free(desk);
 
    // enable next once you choose a profile
    e_wizard_button_next_enable_set(1);
@@ -92,6 +94,7 @@ wizard_page_show(E_Wizard_Page *pg)
             free(prof);
             continue;
          }
+        if (!strcmp(prof, "standard")) sel = i;
        snprintf(buf, sizeof(buf), "%s/profile.desktop", dir);
         desk = efreet_desktop_new(buf);
        label = prof;
@@ -127,32 +130,26 @@ wizard_page_show(E_Wizard_Page *pg)
    evas_object_show(ob);
    evas_object_show(of);
    e_wizard_page_show(o);
-   pg->data = of;
+//   pg->data = o;
    e_wizard_button_next_enable_set(0);
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
+//   evas_object_del(pg->data);
    // actually apply profile
-   if (e_config_profile_get())
-     {
-       char buf[PATH_MAX];
-       if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", 
-                                e_config_profile_get()) >= sizeof(buf))
-         return 1;
-       ecore_file_recursive_rm(buf);
-     }
    if (!profile) profile = "standard";
    e_config_profile_set(profile);
+   e_config_profile_del(e_config_profile_get());
+   e_config_load();
+   e_config_save();
    return 1;
 }
 
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
-   // no need. done in page_070's wizard_page_show()
    return 1;
 }
index e835dd8..509f4cc 100644 (file)
-/* Menu chooser */
+/* Menu setup */
 #include "e.h"
 #include "e_mod_main.h"
 
-static const char *xdg_sel = NULL;
-static Eina_List *menus = NULL;
-
-static void
-check_menu_dir(const char *dir)
-{
-   char buf[PATH_MAX], *file;
-   Eina_List *files;
-
-   snprintf(buf, sizeof(buf), "%s/menus", dir);
-   files = ecore_file_ls(buf);
-   EINA_LIST_FREE(files, file)
-     {
-        if (e_util_glob_match(file, "*.menu"))
-          {
-             snprintf(buf, sizeof(buf), "%s/menus/%s", dir, file);
-             menus = eina_list_append(menus, strdup(buf));
-          }
-       free(file);
-     }
-}
-
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
-   char buf[PATH_MAX];
-   const char *dirs[] = 
-     {
-       "/etc/xdg",
-         "/usr/etc/xdg",
-         "/usr/local/etc/xdg",
-         "/usr/opt/etc/xdg",
-         "/usr/opt/xdg",
-         "/usr/local/opt/etc/xdg",
-         "/usr/local/opt/xdg",
-          "/opt/etc/xdg",
-          "/opt/xdg",
-         // FIXME: add more "known locations"
-         NULL
-     };
-   int i, newdir;
-
-   e_user_homedir_concat(buf, sizeof(buf), ".config");
-   check_menu_dir(buf);
-   
-   for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i]);
-   
-   newdir = 1;
-   snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get());
-   for (i = 0; dirs[i]; i++)
-     {
-        if (!strcmp(dirs[i], buf))
-          {
-             newdir = 0;
-             break;
-          }
-     }
-   if (newdir) check_menu_dir(buf);
    return 1;
 }
 
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
-   // FIXME: free menus
    return 1;
 }
 
 EAPI int
-wizard_page_show(E_Wizard_Page *pg)
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   Evas_Object *o, *of, *ob;
-   char *file;
-   int sel = -1, i = 0;
-
-   o = e_widget_list_add(pg->evas, 1, 0);
-   e_wizard_title_set(_("Menus"));
-
-   if (!menus)
-     {
-       of = e_widget_framelist_add(pg->evas, _("Error"), 0);
-
-       ob = e_widget_textblock_add(pg->evas);
-        e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
-        e_widget_textblock_markup_set
-         (ob, 
-          _("No menu files were<br>"
-            "found on your system.<br>"
-            "Please see the<br>"
-            "documentation on<br>"
-            "www.enlightenment.org<br>"
-            "for more details on<br>"
-            "how to get your<br>"
-            "application menus<br>"
-            "working."));
-       e_widget_framelist_object_append(of, ob);
-       e_widget_list_object_append(o, of, 1, 1, 0.5);
-       evas_object_show(ob);
-       evas_object_show(of);
-     }
-   else
-     {
-       of = e_widget_framelist_add(pg->evas, _("Select application menu"), 0);
-
-       ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &xdg_sel);
-       e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
-
-       e_widget_ilist_freeze(ob);
-
-       EINA_LIST_FREE(menus, file)
-         {
-            char buf[PATH_MAX], buf2[PATH_MAX], *p, *p2, *tlabel, *tdesc;
-            const char *label;
-
-            label = file;
-            tlabel = NULL;
-            tdesc = NULL;
-             e_user_homedir_concat(buf, sizeof(buf),
-                                   ".config/menus/applications.menu");
-             snprintf(buf2, sizeof(buf2), 
-                      "%s/etc/xdg/menus/enlightenment.menu", 
-                      e_prefix_get());
-             if (!strcmp("/etc/xdg/menus/applications.menu", file))
-              {
-                 label = _("System Default");
-                 sel = i;
-              }
-             else if (!strcmp(buf2, file))
-               {
-                  label = _("Enlightenment Default");
-                  sel = i;
-               }
-             else if (!strcmp(buf, file))
-               {
-                  label = _("Personal Default");
-               }
-             else
-              {
-                 p = strrchr(file, '/');
-                 if (p)
-                   {
-                      p++;
-                      p2 = strchr(p, '-');
-                      if (!p2) p2 = strrchr(p, '.');
-                      if (p2)
-                        {
-                           tlabel = malloc(p2 - p + 1);
-                           if (tlabel)
-                             {
-                                eina_strlcpy(tlabel, p, p2 - p + 1);
-                                tlabel[0] = toupper(tlabel[0]);
-                                if (*p2 == '-')
-                                  {
-                                     p2++;
-                                     p = strrchr(p2, '.');
-                                     if (p)
-                                       {
-                                          tdesc = malloc(p - p2 + 1);
-                                          if (tdesc)
-                                            {
-                                               eina_strlcpy(tdesc, p2, p - p2 + 1);
-                                               tdesc[0] = toupper(tdesc[0]);
-                                               snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc);
-                                            }
-                                          else
-                                            snprintf(buf, sizeof(buf), "%s", tlabel);
-                                       }
-                                     else
-                                       snprintf(buf, sizeof(buf), "%s", tlabel);
-                                  }
-                                else
-                                  snprintf(buf, sizeof(buf), "%s", tlabel);
-                                label = buf;
-                             }
-                        }
-                      else
-                        label = p;
-                   }
-              }
-            e_widget_ilist_append(ob, NULL, label, NULL, NULL, file);
-            if (tlabel) free(tlabel);
-            if (tdesc) free(tdesc);
-            free(file);
-            i++;
-         }
-       e_widget_ilist_go(ob);
-       e_widget_ilist_thaw(ob);
-
-       if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
-
-       e_widget_framelist_object_append(of, ob);
-       e_widget_list_object_append(o, of, 1, 1, 0.5);
-       evas_object_show(ob);
-       evas_object_show(of);
-     }
-
-   e_wizard_page_show(o);
-   pg->data = of;
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+   char buf[PATH_MAX];
+   
+   snprintf(buf, sizeof(buf), "%s/etc/xdg/menus/enlightenment.menu", 
+            e_prefix_get());
+   e_config->default_system_menu = eina_stringshare_add(buf);
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
    return 1;
 }
 
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
-   if ((xdg_sel) && (!strcmp("/etc/xdg/menus/applications.menu", xdg_sel)))
-     {
-       eina_stringshare_del(xdg_sel);
-       xdg_sel = NULL;
-     }
-   e_config->default_system_menu = eina_stringshare_ref(xdg_sel);
-   efreet_menu_file_set(e_config->default_system_menu);
    return 1;
 }
index 6dbe044..54b108f 100644 (file)
@@ -1,54 +1,96 @@
+/* Extra desktop files setup */
 #include "e.h"
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg)
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
 EAPI int
-wizard_page_show(E_Wizard_Page *pg)
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   Evas_Object *o, *of, *ob;
-   Eina_List *l;
-   int i, sel = -1;
-   
-   o = e_widget_list_add(pg->evas, 1, 0);
-   e_wizard_title_set(_("Launcher Bar"));
-   
-   of = e_widget_framelist_add(pg->evas, _("Select applications"), 0);
-       
-   ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, NULL);
-   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
-       
-   e_widget_ilist_freeze(ob);
-   e_widget_ilist_go(ob);
-   e_widget_ilist_thaw(ob);
-   
-   if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
-   
-   e_widget_framelist_object_append(of, ob);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
-   evas_object_show(ob);
-   evas_object_show(of);
+   Eina_List *extra_desks, *desks;
+   Efreet_Desktop *desk, *extra_desk;
+   char buf[PATH_MAX], *file;
+   int found;
 
-   e_wizard_page_show(o);
-   pg->data = of;
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+   snprintf(buf, sizeof(buf), "%s/extra_desktops", e_wizard_dir_get());
+   extra_desks = ecore_file_ls(buf);
+   if (!extra_desks) return 0;
+   EINA_LIST_FREE(extra_desks, file)
+     {
+        snprintf(buf, sizeof(buf), "%s/extra_desktops/%s", 
+                 e_wizard_dir_get(), file);
+        extra_desk = efreet_desktop_uncached_new(buf);
+        if (extra_desk)
+          {
+             if (extra_desk->exec)
+               {
+                  char abuf[4096], dbuf[4096];
+               
+                  found = 0;
+                  if (sscanf(extra_desk->exec, "%4000s", abuf) == 1)
+                    {
+                       if (ecore_file_app_installed(abuf))
+                         {
+                            desks = efreet_util_desktop_name_glob_list("*");
+                            EINA_LIST_FREE(desks, desk)
+                              {
+                                 if ((!found) && (desk->exec))
+                                   {
+                                      if (sscanf(desk->exec, "%4000s", dbuf) == 1)
+                                        {
+                                           char *p1, *p2;
+                                           
+                                           p1 = strrchr(dbuf, '/');
+                                           if (p1) p1++;
+                                           else p1 = dbuf;
+                                           p2 = strrchr(abuf, '/');
+                                           if (p2) p2++;
+                                           else p2 = abuf;
+                                           if (!strcmp(p1, p2)) found = 1;
+                                        }
+                                   }
+                                 efreet_desktop_free(desk);
+                              }
+                         }
+                    }
+                  if (!found)
+                    {
+                       // copy file
+                       snprintf(abuf, sizeof(abuf), 
+                                "%s/applications",
+                                efreet_data_home_get());
+                       ecore_file_mkpath(abuf);
+                       snprintf(abuf, sizeof(abuf), 
+                                "%s/applications/%s",
+                                efreet_data_home_get(), file);
+                       ecore_file_cp(buf, abuf);
+                    }
+               }
+             efreet_desktop_free(extra_desk);
+          }
+        free(file);
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
    return 1;
 }
+
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg)
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
index 00aba97..c9d1684 100644 (file)
+/* Ask about Scaling */
 #include "e.h"
 #include "e_mod_main.h"
 
-static int desktop_files = 1;
+static double scale = 1.0;
+static Eina_List *obs = NULL;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg)
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
+static void
+_scale_preview_sel_set(Evas_Object *ob, int sel)
+{
+   Evas_Object *rc, *ob2;
+   double *sc, scl;
+   int v;
+   Eina_List *l;
+   
+   rc = evas_object_data_get(ob, "rec");
+   if (sel)
+     {
+        evas_object_color_set(rc, 0, 0, 0, 0);
+        sc = evas_object_data_get(ob, "scalep");
+        v = (int)(unsigned long)evas_object_data_get(ob, "scale");
+        scl = (double)v / 1000.0;
+        if (sc) *sc = scl;
+        EINA_LIST_FOREACH(obs, l, ob2)
+          {
+             if (ob == ob2) continue;
+             _scale_preview_sel_set(ob2, 0);
+          }
+     }
+   else evas_object_color_set(rc, 0, 0, 0, 192);
+}
+
+static void
+_scale_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *ob = data;
+   
+   _scale_preview_sel_set(ob, 1);
+}
+
+static Evas_Object *
+_scale_preview_new(Evas *e, double sc, double *scp)
+{
+   Evas_Object *ob, *bg, *cm, *bd, *wb, *rc;
+   const char *file;
+   char buf[64];
+   int v;
+   
+#define SZW 110
+#define SZH 80
+   ob = e_widget_preview_add(e, SZW, SZH);
+   e_widget_preview_vsize_set(ob, SZW, SZH);
+   
+   bg = edje_object_add(e_widget_preview_evas_get(ob));
+   file = e_bg_file_get(0, 0, 0, 0);
+   edje_object_file_set(bg, file, "e/desktop/background");
+   evas_object_move(bg, 0, 0);
+   evas_object_resize(bg, 640, 480);
+   evas_object_show(bg);
+   
+   cm = edje_object_add(e_widget_preview_evas_get(ob));
+   e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default");
+   evas_object_move(cm, 16, 16);
+   evas_object_resize(cm, 320, 400);
+   evas_object_show(cm);
+   
+   bd = edje_object_add(e_widget_preview_evas_get(ob));
+   e_theme_edje_object_set(bd, "base/theme/borders", "e/widgets/border/default/border");
+   edje_object_part_swallow(cm, "e.swallow.content", bd);
+   evas_object_show(bd);
+   
+   wb = edje_object_add(e_widget_preview_evas_get(ob));
+   e_theme_edje_object_set(wb, "base/theme/dialog", "e/widgets/dialog/main");
+   edje_object_part_swallow(bd, "e.swallow.client", wb);
+   evas_object_show(wb);
+   
+   rc = evas_object_rectangle_add(e_widget_preview_evas_get(ob));
+   evas_object_move(rc, 0, 0);
+   evas_object_resize(rc, 640, 480);
+   evas_object_color_set(rc, 0, 0, 0, 192);
+   evas_object_show(rc);
+   
+   snprintf(buf, sizeof(buf), "%1.1f %s", sc, _("Title"));
+   edje_object_part_text_set(bd, "e.text.title", buf);
+   edje_object_signal_emit(bd, "e,state,focused", "e");
+   
+   edje_object_signal_emit(cm, "e,state,visible,on", "e");
+   edje_object_signal_emit(cm, "e,state,shadow,on", "e");
+   edje_object_signal_emit(cm, "e,state,focus,on", "e");
+   
+   edje_object_scale_set(bd, sc);
+   edje_object_scale_set(cm, sc);
+   edje_object_scale_set(bg, sc);
+   edje_object_scale_set(wb, sc);
+   
+   evas_object_data_set(ob, "rec", rc);
+   v = sc * 1000;
+   evas_object_data_set(ob, "scale", (void *)(unsigned long)v);
+   evas_object_data_set(ob, "scalep", scp);
+
+   evas_object_event_callback_add(rc,
+                                  EVAS_CALLBACK_MOUSE_DOWN,
+                                  _scale_down, ob);
+   obs = eina_list_append(obs, ob);
+   
+   return ob;
+}
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
-   E_Radio_Group *rg;
+   Evas_Coord sw, sh;
    
    o = e_widget_list_add(pg->evas, 1, 0);
-   e_wizard_title_set(_("File Manager"));
+   e_wizard_title_set(_("Sizing"));
    
-   of = e_widget_framelist_add(pg->evas, _("Desktop Files"), 0);
-
-   rg = e_widget_radio_group_new(&desktop_files);
+   of = e_widget_frametable_add(pg->evas, _("Select preferred size"), 1);
+   e_widget_frametable_content_align_set(of, 0.5, 0.5);
+   
+   ob = _scale_preview_new(pg->evas, 0.80, &scale);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 0, 0, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
+   evas_object_show(ob);
+   
+   ob = _scale_preview_new(pg->evas, 1.00, &scale);
+   _scale_preview_sel_set(ob, 1);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 1, 0, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
+   evas_object_show(ob);
    
-   ob = e_widget_radio_add(pg->evas, _("No icons on desktop"), 0, rg);
-   e_widget_framelist_object_append(of, ob);
+   ob = _scale_preview_new(pg->evas, 1.20, &scale);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 0, 1, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
    evas_object_show(ob);
-   ob = e_widget_radio_add(pg->evas, _("Enable desktop icons"), 1, rg);
-   e_widget_framelist_object_append(of, ob);
+   
+   ob = _scale_preview_new(pg->evas, 1.50, &scale);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 1, 1, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
+   evas_object_show(ob);
+   
+   ob = _scale_preview_new(pg->evas, 1.70, &scale);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 0, 2, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
+   evas_object_show(ob);
+   
+   ob = _scale_preview_new(pg->evas, 2.00, &scale);
+   e_widget_size_min_get(ob, &sw, &sh);
+   e_widget_frametable_object_append_full(of, ob, 1, 2, 1, 1, 0, 0, 1, 1, 0.5, 0.5, sw, sh, sw, sh);
    evas_object_show(ob);
    
    e_widget_list_object_append(o, of, 0, 0, 0.5);
    evas_object_show(ob);
    evas_object_show(of);
-
+   
    e_wizard_page_show(o);
-   pg->data = of;
+//   pg->data = o;
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
+   obs = eina_list_free(obs);
+//   evas_object_del(pg->data);
+   
+   e_config->scale.use_dpi = 0;
+   e_config->scale.use_custom = 1;
+   e_config->scale.factor = scale;
+   e_scale_update();
    return 1;
 }
+
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg)
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
-   if (!desktop_files)
-     {
-       // FIXME: disable fileman
-     }
-   else
-     {
-       // FIXME: enable fileman
-       // FIXME: populate ~/Desktop
-     }
    return 1;
 }
index c648666..01de444 100644 (file)
@@ -1,62 +1,80 @@
+/* Ask about focus mode */
 #include "e.h"
 #include "e_mod_main.h"
 
 static int focus_mode = 1;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg)
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
+
+   if (e_config->focus_policy == E_FOCUS_CLICK) focus_mode = 0;
    
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Window Focus"));
    
-   of = e_widget_framelist_add(pg->evas, _("Focus mode"), 0);
+   of = e_widget_framelist_add(pg->evas, _("Focus by ..."), 0);
 
    rg = e_widget_radio_group_new(&focus_mode);
    
-   ob = e_widget_radio_add(pg->evas, _("Click to focus windows"), 0, rg);
+   ob = e_widget_radio_add(pg->evas, _("Click"), 0, rg);
    e_widget_framelist_object_append(of, ob);
    evas_object_show(ob);
-   ob = e_widget_radio_add(pg->evas, _("Mouse over focuses windows"), 1, rg);
+   ob = e_widget_radio_add(pg->evas, _("Mouse Over"), 1, rg);
    e_widget_framelist_object_append(of, ob);
    evas_object_show(ob);
    
    e_widget_list_object_append(o, of, 0, 0, 0.5);
-   evas_object_show(ob);
    evas_object_show(of);
 
    e_wizard_page_show(o);
-   pg->data = of;
+//   pg->data = o;
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
-{
-   evas_object_del(pg->data);
-   return 1;
-}
-EAPI int
-wizard_page_apply(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
    if (!focus_mode)
      {
-       // FIXME: click to focus
+        e_config->focus_policy = E_FOCUS_CLICK;
+        e_config->focus_setting = E_FOCUS_NEW_WINDOW;
+        e_config->pass_click_on = 1;
+        e_config->always_click_to_raise = 0;
+        e_config->always_click_to_focus = 0;
+        e_config->focus_last_focused_per_desktop = 1;
+        e_config->pointer_slide = 0;
      }
    else
      {
-       // FIXME: sloppy focus
+        e_config->focus_policy = E_FOCUS_SLOPPY;
+        e_config->focus_setting = E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED;
+        e_config->pass_click_on = 1;
+        e_config->always_click_to_raise = 0;
+        e_config->always_click_to_focus = 0;
+        e_config->focus_last_focused_per_desktop = 1;
+        e_config->pointer_slide = 1;
      }
+//   evas_object_del(pg->data);
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
    return 1;
 }
index 505e6ec..846450c 100644 (file)
-/* Adding application icons */
+/* Setup of default icon theme */
 #include "e.h"
 #include "e_mod_main.h"
 
-typedef struct _App App;
-struct _App
-{
-   const char *file; // must be unique - should normally be app name
-   const char *name, *generic, *comment; // fields we should provide
-   const char *exec; // the exec line
-   const char *icon; // icon file
-   const char *extra; // extra fields (tranlations etc.)
-   int found;
-};
-
-static App apps[] =
-{
-     { "firefox", "Firefox", "Web Browser", "Browse the Internet",
-          "firefox %u", "web_browser.png",
-          "StartupNotify=true\n"
-          "StartupWMClass=Firefox-bin\n"
-          "Categories=Application;Network;", 
-          0 },
-     { "xterm", "XTerm", "Terminal", "Run commands in a shell",
-          "xterm", "xterm.png",
-          "StartupWMClass=XTerm\n"
-          "Categories=Utility;TerminalEmulator;", 
-          0 },
-     { "eterm", "ETerm", "Terminal", "Run commands in a shell",
-          "Eterm", "xterm.png",
-          "StartupWMClass=Eterm\n"
-          "Categories=Utility;TerminalEmulator;", 
-          0 },
-     { "sylpheed", "Sylpheed", "E-Mail Client", "Read and write E-Mail",
-          "sylpheed", "mail_client.png",
-          "StartupNotify=true\n"
-          "StartupWMClass=Sylpheed\n"
-          "Categories=Application;Network;", 
-          0 },
-     { "xine", "Xine", "Movie Player", "Watch movies and videos",
-          "xine %U", "video_player.png",
-          "StartupWMClass=xine\n"
-          "Categories=Application;AudioVideo;Player;",
-          0 },
-     { "mplayer", "MPlayer", "Movie Player", "Watch movies and videos",
-          "mplayer %U", "video_player.png",
-          "StartupWMClass=MPlayer\n"
-          "Categories=Application;AudioVideo;Player;",
-          0 },
-     { "xmms", "XMMS", "Audio Player", "Listen to music",
-          "xmms %U", "audio_player.png",
-          "StartupWMClass=XMMS\n"
-          "Categories=Application;AudioVideo;Player;",
-          0 },
-     { "beep-media-player", "BMP", "Audio Player", "Listen to music",
-          "beep-media-player %U", "audio_player.png",
-          "StartupWMClass=Beep-Media-Player\n"
-          "Categories=Application;AudioVideo;Player;",
-          0 },
-     { "audacious", "Audacious", "Audio Player", "Listen to music",
-          "audacious %U", "audio_player.png",
-          "StartupWMClass=Audacious\n"
-          "Categories=Application;AudioVideo;Player;",
-          0 },
-     { "gqview", "GQView", "Image Viewer", "Look at photos",
-          "gqview %U", "image_viewer.png",
-          "StartupWMClass=GQView\n"
-          "Categories=Application;Graphics;Viewer;",
-          0 },
-     { "xjed", "X-Jed", "Text Editor", "Edit text files",
-          "xjed %U", "text_editor.png",
-          "StartupWMClass=XJed\n"
-          "Categories=Application;Utility;TextEditor;\n"
-          "MimeType=text/plain;",
-          0 }
-   // FIXME: add more apps to search for to add .desktops for OR add to ibar.
-   // feel free to have a pretty big list here. only list from the above ones
-   // that have a executable installed.
-   // FIXME: make sure these .desktop handle MimteType lists like xjed
-   // FIXME: this might be nice moved into a set of sample .desktops that get
-   // loaded and parsed to make it easier to add more in some dir somewhere
-};
-
-/* FIXME unused*/
-#if 0
-static int
-_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
-{
-   if (!d1->name) return 1;
-   if (!d2->name) return -1;
-   return strcmp(d1->name, d2->name);
-}
-#endif
-
-static void
-_app_write(App *a)
-{
-   FILE *f;
-   char buf[PATH_MAX];
-   
-   snprintf(buf, sizeof(buf), "%s/applications",
-            efreet_data_home_get());
-   ecore_file_mkpath(buf);
-   snprintf(buf, sizeof(buf), "%s/applications/%s.desktop",
-            efreet_data_home_get(), a->file);
-   f = fopen(buf, "w");
-   if (!f) return;
-   fprintf(f,
-           "[Desktop Entry]\n"
-           "Encoding=UTF-8\n"
-           "Type=Application\n"
-           "Name=%s\n"
-           "GenericName=%s\n"
-           "Comment=%s\n"
-           "Exec=%s\n"
-           "Icon=%s\n",
-           a->name, a->generic, a->comment, a->exec, a->icon);
-   if (a->extra) fprintf(f, "%s\n", a->extra);
-   fclose(f);
-}
-
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
-   Eina_List *desks = NULL;
-   Efreet_Desktop *desk;
-   int i;
-
-   desks = efreet_util_desktop_name_glob_list("*");
-   EINA_LIST_FREE(desks, desk)
-     {
-        char dbuf[4096];
-
-        if (!desk->exec)
-          {
-             efreet_desktop_free(desk);
-             continue;
-          }
-        if (sscanf(desk->exec, "%4000s", dbuf) == 1)
-          {
-             for (i = 0; i < (sizeof(apps) / sizeof(App)); i++)
-               {
-                  if (apps[i].found == 0)
-                    {
-                       char abuf[4096];
-                            
-                       if (sscanf(apps[i].exec, "%4000s", abuf) == 1)
-                         {
-                            char *p1, *p2;
-                                 
-                            if (!ecore_file_app_installed(abuf))
-                              {
-                                 /* can't find exe - mark as not available */
-                                 apps[i].found = -1;
-                              }
-                            else
-                              {
-                                 p1 = strrchr(dbuf, '/');
-                                 if (p1) p1++;
-                                 else p1 = dbuf;
-                                 p2 = strrchr(abuf, '/');
-                                 if (p2) p2++;
-                                 else p2 = abuf;
-                                 if (!strcmp(p1, p2))
-                                   /* mark as found in .desktops */
-                                   apps[i].found = 2;
-                              }
-                         }
-                    }
-               }
-          }
-        efreet_desktop_free(desk);
-     }
-
-   // FIXME: list all apps and of the apps either already installed, or to be
-   // created, offer them to be added to ibar by default. (actually should be
-   // page_080)
    return 1;
 }
+
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
@@ -184,81 +15,54 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 }
 
 EAPI int
-wizard_page_show(E_Wizard_Page *pg)
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   Evas_Object *o, *of, *ob, *li, *ck;
-   Evas_Coord mw, mh;
+   Eina_List *l, *themes = efreet_icon_theme_list_get();
+   Efreet_Icon_Theme *th;
    int i;
-   int appnum = 0;
-   
-   for (i = 0; i < (sizeof(apps) / sizeof(App)); i++)
+   const char *selected = NULL;
+   const char *search[] =
      {
-        if (apps[i].found == 0) appnum++;
-     }
-   if (appnum == 0) return 0;
+        "gnome",
+        "Humanity",
+        "Humanity-Dark",
+        "ubuntu-mono-light",
+        "ubuntu-mono-dark",
+        "ubuntu-mono-light",
+        "unity-icon-theme",
+        NULL
+     };
    
-   o = e_widget_list_add(pg->evas, 1, 0);
-   e_wizard_title_set(_("Applications"));
-   
-   of = e_widget_framelist_add(pg->evas, _("Select Icons to Add"), 0);
-
-   li = e_widget_list_add(pg->evas, 1, 0);
-   ob = e_widget_scrollframe_simple_add(pg->evas, li);
-   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
-
-   for (i = 0; i < (sizeof(apps) / sizeof(App)); i++)
+   if (!themes) return 0;
+   for (i = 0; search[i]; i++)
      {
-        if (apps[i].found == 0)
+        EINA_LIST_FOREACH(themes, l, th)
           {
-             const char *icon;
-
-             apps[i].found = 1;
-             icon = efreet_icon_path_find(e_config->icon_theme, 
-                                          apps[i].icon, 48);
-             ck = e_widget_check_icon_add(pg->evas, apps[i].name, 
-                                          icon, 32 * e_scale, 32 * e_scale,
-                                          &(apps[i].found));
-             e_widget_list_object_append(li, ck, 1, 1, 0.0);
-             evas_object_show(ck);
+             if (!strcasecmp(search[i], th->name.internal))
+               {
+                  selected = search[i];
+                  goto done;
+               }
           }
      }
-
-   e_widget_size_min_get(li, &mw, &mh);
-   evas_object_resize(li, mw, mh);
-   
-   e_widget_framelist_object_append(of, ob);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
-   evas_object_show(ob);
-   evas_object_show(of);
-   evas_object_show(li);
-   
-   e_wizard_page_show(o);
-
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+done:
+   if (selected)
+     {
+        if (e_config->icon_theme) eina_stringshare_del(e_config->icon_theme);
+        e_config->icon_theme = eina_stringshare_add(selected);
+     }
+   eina_list_free(themes);
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   int i;
-   
-   /* .desktops are actually written here. this is because page_080 needs them
-    * to exist in the efreet desktops list to select what is to go in ibar */
-   for (i = 0; i < (sizeof(apps) / sizeof(App)); i++)
-     {
-        printf("%s %i\n", apps[i].name, apps[i].found);
-        if (apps[i].found == 1)
-          {
-             _app_write(&(apps[i]));
-          }
-     }
-   evas_object_del(pg->data);
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
-   // FIXME: write ~/.e/e/applications/bar/default/.order
-   // which should contain whatever apps the user wants in their bar by
-   // default (should be page_080)
    return 1;
 }
index d93ec8b..cd0962e 100644 (file)
@@ -1,41 +1,10 @@
-/* Quick launch chooser */
+/* Ibar setup */
 #include "e.h"
 #include "e_mod_main.h"
 
-static Eina_List *desktops = NULL;
-static int *desktops_add = NULL;
-static int desktops_num = 0;
-
-static int
-_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
-{
-   if (!d1->name) return 1;
-   if (!d2->name) return -1;
-   return strcmp(d1->name, d2->name);
-}
-
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 {
-   Eina_List *desks = NULL;
-   Efreet_Desktop *desk;
-   
-   desks = efreet_util_desktop_name_glob_list("*");
-   desks = eina_list_sort(desks, 0, (Eina_Compare_Cb)_cb_sort_desks);
-   EINA_LIST_FREE(desks, desk)
-     {
-        if (!desk->exec)
-          {
-             efreet_desktop_free(desk);
-             continue;
-          }
-        desktops = eina_list_append(desktops, desk);
-     }
-   if (desktops)
-     {
-        desktops_num = eina_list_count(desktops);
-        desktops_add = calloc(sizeof(int), desktops_num);
-     }
    return 1;
 }
 
@@ -48,98 +17,56 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   Evas_Object *o, *of, *ob, *li, *ck;
-   Evas_Coord mw, mh;
-   Eina_List *l;
-   int i;
-
-   if (!desktops) return 0;
-   
-   o = e_widget_list_add(pg->evas, 1, 0);
-   e_wizard_title_set(_("Quick Launch"));
-   
-   of = e_widget_framelist_add(pg->evas, _("Select Applications"), 0);
-
-   li = e_widget_list_add(pg->evas, 1, 0);
-   ob = e_widget_scrollframe_simple_add(pg->evas, li);
-   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
-
-   for (i = 0, l = desktops; l ; l = l->next, i++)
-     {
-        Efreet_Desktop *desk;
-        const char *icon;
-        
-        desk = l->data;
-        icon = NULL;
-        if (desk->icon)
-          icon = efreet_icon_path_find(e_config->icon_theme, 
-                                       desk->icon, 48);
-        ck = e_widget_check_icon_add(pg->evas, desk->name, 
-                                     icon, 32 * e_scale, 32 * e_scale,
-                                     &(desktops_add[i]));
-        e_widget_list_object_append(li, ck, 1, 1, 0.0);
-        evas_object_show(ck);
-     }
-
-   e_widget_size_min_get(li, &mw, &mh);
-   evas_object_resize(li, mw, mh);
-   
-   e_widget_framelist_object_append(of, ob);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
-   evas_object_show(ob);
-   evas_object_show(of);
-   evas_object_show(li);
-   
-   e_wizard_page_show(o);
-
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
-}
-
-EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
-{
-   evas_object_del(pg->data);
-   return 1;
-}
-
-EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
-{
-   Efreet_Desktop *desk;
-   Eina_List *l;
-   int i;
-   FILE *f;
+   FILE *f, *fin;
    char buf[PATH_MAX];
 
+   snprintf(buf, sizeof(buf), "%s/def-ibar.txt", e_wizard_dir_get());
+   fin = fopen(buf, "r");
+   if (!fin) return 0;
    e_user_dir_concat_static(buf, "applications/bar/default");
    ecore_file_mkpath(buf);
    e_user_dir_concat_static(buf, "applications/bar/default/.order");
    f = fopen(buf, "w");
    if (f)
      {
-        for (i = 0, l = desktops; l ; l = l->next, i++)
+        while (fgets(buf, sizeof(buf), fin))
           {
-             if (desktops_add[i])
+             Efreet_Desktop *desk;
+             char name[PATH_MAX], buf2[PATH_MAX], *p;
+             int n;
+             
+             if (buf[0] == '#') continue;
+             p = buf;
+             while (isspace(*p)) p++;
+             for (;;)
                {
-                  char *p;
-                  
-                  desk = l->data;
-                  p = strrchr(desk->orig_path, '/');
-                  if (!p) p = desk->orig_path;
-                  else p++;
-                  fprintf(f, "%s\n", p);
+                  n = sscanf(p, "%s", name);
+                  if (n != 1) break;
+                  p += strlen(name);
+                  while (isspace(*p)) p++;
+                  snprintf(buf2, sizeof(buf2), "%s.desktop", name);
+                  desk = efreet_util_desktop_file_id_find(buf2);
+                  if (desk)
+                    {
+                       fprintf(f, "%s\n", buf2);
+                       efreet_desktop_free(desk);
+                       break;
+                    }
                }
           }
         fclose(f);
      }
-   EINA_LIST_FREE(desktops, desk)
-     efreet_desktop_free(desk);
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
 
-   if (desktops_add)
-     {
-        free(desktops_add);
-        desktops_add = NULL;
-     }
-   desktops_num = 0;
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
    return 1;
 }
diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c
new file mode 100644 (file)
index 0000000..9e27cc3
--- /dev/null
@@ -0,0 +1,130 @@
+/* Setup if we need battery? */
+#include "e.h"
+#include "e_mod_main.h"
+
+#ifdef __FreeBSD__
+# include <sys/ioctl.h>
+# include <sys/sysctl.h>
+# ifdef __i386__
+#  include <machine/apm_bios.h>
+# endif
+#endif
+
+static char *
+read_file(const char *file)
+{
+   FILE *f = fopen(file, "r");
+   size_t len;
+   char buf[4096], *p;
+   if (!f) return NULL;
+   len = fread(buf, 1, sizeof(buf) - 1, f);
+   if (len == 0)
+     {
+        fclose(f);
+        return NULL;
+     }
+   buf[len] = 0;
+   for (p = buf; *p; p++)
+     {
+        if (p[0] == '\n') p[0] = 0;
+     }
+   fclose(f);
+   return strdup(buf);
+}
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   int hav_bat = 0;
+   Eina_List *dir;
+   char buf[PATH_MAX], *file, *dname, *str;
+
+   dname = "/sys/class/power_supply";
+   dir = ecore_file_ls(dname);
+   if (dir)
+     {
+        EINA_LIST_FREE(dir, file)
+          {
+             snprintf(buf, sizeof(buf), "%s/%s/type", dname, file);
+             str = read_file(buf);
+             if (str)
+               {
+                  if (!strcasecmp(str, "Battery")) hav_bat = 1;
+                  free(str);
+               }
+          }
+     }
+   dname = "/proc/acpi/battery/";
+   dir = ecore_file_ls(dname);
+   if (dir)
+     {
+        EINA_LIST_FREE(dir, file)
+          {
+             snprintf(buf, sizeof(buf), "%s/%s/state", dname, file);
+             str = read_file(buf);
+             if (str)
+               {
+                  hav_bat = 1;
+                  free(str);
+               }
+          }
+     }
+#ifdef __FreeBSD__
+   do {
+      int mib_state[4];
+      int state = 0;
+      size_t len;
+      
+      /* Read some information on first run. */
+      len = 4;
+      sysctlnametomib("hw.acpi.battery.state", mib_state, &len);
+      len = sizeof(state);
+      if (sysctl(mib_state, 4, &state, &len, NULL, 0) != -1)
+         hav_bat = 1;
+   } while (0);
+#endif
+   if (!hav_bat)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "battery"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c
new file mode 100644 (file)
index 0000000..4995354
--- /dev/null
@@ -0,0 +1,104 @@
+/* Setup if we need cpufreq? */
+#include "e.h"
+#include "e_mod_main.h"
+
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
+static char *
+read_file(const char *file)
+{
+   FILE *f = fopen(file, "r");
+   size_t len;
+   char buf[4096], *p;
+   if (!f) return NULL;
+   len = fread(buf, 1, sizeof(buf) - 1, f);
+   if (len == 0)
+     {
+        fclose(f);
+        return NULL;
+     }
+   buf[len] = 0;
+   for (p = buf; *p; p++)
+     {
+        if (p[0] == '\n') p[0] = 0;
+     }
+   fclose(f);
+   return strdup(buf);
+}
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   int hav_cpufreq = 0;
+#ifdef __FreeBSD__
+   char buf[PATH_MAX];
+   size_t len = 0;
+   
+   len = sizeof(buf);
+   if (sysctlbyname("dev.cpu.0.freq_levels", buf, &len, NULL, 0) == 0)
+      hav_cpufreq = 1;
+#else
+   char *str, *p;
+
+   str = read_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies");
+   if (str)
+     {
+        for (p = str; *p; p++)
+          {
+             if (isspace(*p))
+               {
+                  hav_cpufreq = 1;
+                  break;
+               }
+          }
+        free(str);
+     }
+#endif
+   if (!hav_cpufreq)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "cpufreq"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c
new file mode 100644 (file)
index 0000000..cace9c5
--- /dev/null
@@ -0,0 +1,166 @@
+/* Setup if we need connman? */
+#include "e.h"
+#include "e_mod_main.h"
+#ifdef HAVE_ECONNMAN
+#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
+#include <connman0_7x/E_Connman.h>
+#endif
+
+static Ecore_Event_Handler *handler = NULL;
+static Ecore_Timer *connman_timeout = NULL;
+
+static void
+_recommend_connman(E_Wizard_Page *pg)
+{
+   Evas_Object *o, *of, *ob;
+   
+   o = e_widget_list_add(pg->evas, 1, 0);
+   e_wizard_title_set(_("Network Management"));
+
+   of = e_widget_framelist_add(pg->evas, 
+                               _("Connman network service not found"), 0);
+   
+   ob = e_widget_label_add
+      (pg->evas, _("Install Connman for network management support"));
+   e_widget_framelist_object_append(of, ob);
+   evas_object_show(ob);
+   
+   e_widget_list_object_append(o, of, 0, 0, 0.5);
+   evas_object_show(ob);
+   evas_object_show(of);
+   
+   e_wizard_page_show(o);
+//   pg->data = o;
+   
+   e_wizard_button_next_enable_set(1);
+}
+
+#ifdef HAVE_ECONNMAN
+static Eina_Bool
+_connman_in(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   if (handler)
+     {
+        ecore_event_handler_del(handler);
+        handler = NULL;
+     }
+   if (connman_timeout)
+     {
+        ecore_timer_del(connman_timeout);
+        connman_timeout = NULL;
+     }
+   e_wizard_button_next_enable_set(1);
+   e_wizard_next();
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_connman_timeout(void *data)
+{
+   E_Wizard_Page *pg = data;
+   E_Config_Module *em;
+   Eina_List *l;
+   
+   EINA_LIST_FOREACH(e_config->modules, l, em)
+     {
+        if (!em->name) continue;
+        if (!strcmp(em->name, "connman"))
+          {
+             e_config->modules = eina_list_remove_list
+                (e_config->modules, l);
+             if (em->name) eina_stringshare_del(em->name);
+             free(em);
+             break;
+          }
+     }
+   e_config_save_queue();
+   connman_timeout = NULL;
+   if (handler)
+     {
+        ecore_event_handler_del(handler);
+        handler = NULL;
+     }
+   _recommend_connman(pg);
+   return EINA_FALSE;
+}
+#endif
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg)
+{
+   int have_connman = 0;
+   E_DBus_Connection *c;
+   
+   c = e_dbus_bus_get(DBUS_BUS_SYSTEM);
+   if (c)
+     {
+#ifdef HAVE_ECONNMAN             
+        if (e_connman_system_init(c))
+          {
+             handler = ecore_event_handler_add
+                (E_CONNMAN_EVENT_MANAGER_IN, _connman_in, NULL);
+             if (connman_timeout) ecore_timer_del(connman_timeout);
+             connman_timeout = ecore_timer_add(2.0, _connman_timeout, pg);
+             have_connman = 1;
+             e_wizard_button_next_enable_set(0);
+          }
+#endif             
+     }
+   if (!have_connman)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "connman"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+        _recommend_connman(pg);
+     }
+   e_wizard_title_set(_("Checking to see if Connman exists"));
+   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   if (handler)
+     {
+        ecore_event_handler_del(handler);
+        handler = NULL;
+     }
+   if (connman_timeout)
+     {
+        ecore_timer_del(connman_timeout);
+        connman_timeout = NULL;
+     }
+//   if (pg->data) evas_object_del(pg->data);
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c
new file mode 100644 (file)
index 0000000..f8c6afb
--- /dev/null
@@ -0,0 +1,87 @@
+/* Setup if we need temperature? */
+#include "e.h"
+#include "e_mod_main.h"
+
+#ifdef __FreeBSD__
+# include <sys/types.h>
+# include <sys/sysctl.h>
+#endif
+
+/*
+static char *
+read_file(const char *file)
+{
+   FILE *f = fopen(file, "r");
+   size_t len;
+   char buf[4096], *p;
+   if (!f) return NULL;
+   len = fread(buf, 1, sizeof(buf) - 1, f);
+   if (len == 0)
+     {
+        fclose(f);
+        return NULL;
+     }
+   buf[len] = 0;
+   for (p = buf; *p; p++)
+     {
+        if (p[0] == '\n') p[0] = 0;
+     }
+   fclose(f);
+   return strdup(buf);
+}
+*/
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   int hav_temperature = 1;
+#ifdef __FreeBSD__
+   // figure out on bsd if we have temp sensors
+#else
+   // figure out on linux if we have temp sensors
+#endif
+   if (!hav_temperature)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "temperature"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c
new file mode 100644 (file)
index 0000000..0a6ae32
--- /dev/null
@@ -0,0 +1,55 @@
+/* Setup if we need backlight? */
+#include "e.h"
+#include "e_mod_main.h"
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   int hav_backlight = 0;
+
+   if (e_backlight_exists()) hav_backlight = 1;
+   if (!hav_backlight)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "backlight"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_140.c b/src/modules/wizard/page_140.c
new file mode 100644 (file)
index 0000000..35a9f6c
--- /dev/null
@@ -0,0 +1,56 @@
+/* Setup if we need mixer? */
+#include "e.h"
+#include "e_mod_main.h"
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   int hav_mixer = 0;
+#ifdef HAVE_ALSA
+   hav_mixer = 1;
+#endif
+   if (!hav_mixer)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "mixer"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config_save_queue();
+     }
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c
new file mode 100644 (file)
index 0000000..573d162
--- /dev/null
@@ -0,0 +1,210 @@
+/* Ask about compositing */
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_comp_cfdata.h"
+
+static int do_comp = 1;
+static int do_gl = 0;
+static int do_vsync = 0;
+
+static int
+match_file_glob(FILE *f, const char *glob)
+{
+   char buf[32768];
+   int found = 0;
+   
+   while (fgets(buf, sizeof(buf), f))
+     {
+        if (e_util_glob_match(buf, glob))
+          {
+             found = 1;
+             break;
+          }
+     }
+   fclose(f);
+   return found;
+}
+
+static int
+match_xorg_log(const char *glob)
+{
+   FILE *f;
+   int i;
+   char buf[PATH_MAX];
+   
+   for (i = 0; i < 5; i++)
+     {
+        snprintf(buf, sizeof(buf), "/var/log/Xorg.%i.log", i);
+        f = fopen(buf, "rb");
+        if (f)
+          {
+             if (match_file_glob(f, glob)) return 1;
+          }
+     }
+   return 0;
+}
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg)
+{
+   Evas_Object *o, *of, *ob;
+   Ecore_Evas *ee;
+   Ecore_X_Window_Attributes att;
+   
+   if (!ecore_x_composite_query()) return 0;
+   if (!ecore_x_damage_query()) return 0;
+   
+   memset((&att), 0, sizeof(Ecore_X_Window_Attributes));
+   ecore_x_window_attributes_get(ecore_x_window_root_first_get(), &att);
+   if ((att.depth != 24) && (att.depth != 32)) return 0;
+   
+   ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 320, 240);
+   if (ee)
+     {
+        ecore_evas_free(ee);
+        if (
+            (match_xorg_log("*(II)*NVIDIA*: Creating default Display*")) ||
+            (match_xorg_log("*(II)*intel*: Creating default Display*")) ||
+            (match_xorg_log("*(II)*NOUVEAU*: Creating default Display*")) ||
+            (match_xorg_log("*(II)*RADEON*: Creating default Display*"))
+           )
+          {
+             do_gl = 1;
+             do_vsync = 1;
+          }
+     }
+   
+   o = e_widget_list_add(pg->evas, 1, 0);
+   e_wizard_title_set(_("Compositing"));
+   
+   of = e_widget_framelist_add(pg->evas, _("Transparent windows and effects"), 0);
+   
+   ob = e_widget_textblock_add(pg->evas);
+   e_widget_size_min_set(ob, 200 * e_scale, 180 * e_scale);
+   e_widget_textblock_markup_set
+      (ob, 
+          _("Compositing provides translucency<br>"
+            "for windows, window effects like<br>"
+            "fading in and out and zooming<br>"
+            "when they appear and dissapear.<br>"
+            "It is highly recommended to<br>"
+            "enable this for a better<br>"
+            "experience, but it comes at a<br>"
+            "cost. It requires extra CPU<br>"
+            "or a GLSL Shader capable GPU<br>"
+            "with well written drivers.<br>"
+            "It also will add between 10 to<br>"
+            "100 MB to the memory needed<br>"
+            "for Enlightenment."
+              )
+      );
+   e_widget_framelist_object_append(of, ob);
+   
+   ob = e_widget_check_add(pg->evas, _("Enable Compositing"), &(do_comp));
+   e_widget_framelist_object_append(of, ob);
+   
+   if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
+     {
+        ob = e_widget_check_add(pg->evas, _("Hardware Accelerated (OpenGL)"), &(do_gl));
+        e_widget_framelist_object_append(of, ob);
+        
+        ob = e_widget_check_add(pg->evas, _("Tear-free Rendering (OpenGL only)"), &(do_vsync));
+        e_widget_framelist_object_append(of, ob);
+     }
+   
+   e_widget_list_object_append(o, of, 0, 0, 0.5);
+
+   evas_object_show(of);
+
+   e_wizard_page_show(o);
+//   pg->data = o;
+   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   if (!do_comp)
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "comp"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        e_config->use_composite = 0;
+     }
+   else
+     {
+        E_Config_Module *em;
+        Eina_List *l;
+        E_Config_DD *conf_edd = NULL;
+        E_Config_DD *conf_match_edd = NULL;
+        Config *cfg = NULL;
+        
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!em->name) continue;
+             if (!strcmp(em->name, "dropshadow"))
+               {
+                  e_config->modules = eina_list_remove_list
+                     (e_config->modules, l);
+                  if (em->name) eina_stringshare_del(em->name);
+                  free(em);
+                  break;
+               }
+          }
+        
+        e_config->use_composite = 1;
+        
+        e_mod_comp_cfdata_edd_init(&(conf_edd), &(conf_match_edd));
+        cfg = e_mod_comp_cfdata_config_new();
+        
+        if (do_gl)
+          {
+             cfg->engine = E_EVAS_ENGINE_GL_X11;
+             cfg->smooth_windows = 1;
+             cfg->vsync = do_vsync;
+          }
+        else
+          {
+             cfg->engine = E_EVAS_ENGINE_SOFTWARE_X11;
+             cfg->smooth_windows = 0;
+             cfg->vsync = 0;
+          }
+        
+        e_config_domain_save("module.comp", conf_edd, cfg);
+        E_CONFIG_DD_FREE(conf_match_edd);
+        E_CONFIG_DD_FREE(conf_edd);
+     }
+   e_config_save_queue();
+//   if (pg->data) evas_object_del(pg->data);
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c
new file mode 100644 (file)
index 0000000..97dcf7e
--- /dev/null
@@ -0,0 +1,67 @@
+/* Setup favorites and desktop links */
+#include "e.h"
+#include "e_mod_main.h"
+
+EAPI int
+wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+{
+   Eina_List *files;
+   char buf[PATH_MAX], buf2[PATH_MAX], *file;
+
+   // make dir for favorites and install ones shipped
+   snprintf(buf, sizeof(buf), "%s/fileman/favorites", e_user_dir_get());
+   ecore_file_mkpath(buf);
+   snprintf(buf, sizeof(buf), "%s/favorites", e_wizard_dir_get());
+   files = ecore_file_ls(buf);
+   if (!files) return 0;
+   EINA_LIST_FREE(files, file)
+     {
+        snprintf(buf, sizeof(buf), "%s/favorites/%s", 
+                 e_wizard_dir_get(), file);
+        snprintf(buf2, sizeof(buf2), "%s/fileman/favorites/%s", 
+                 e_user_dir_get(), file);
+        ecore_file_cp(buf, buf2);
+        free(file);
+     }
+   // make desktop dir
+   e_user_homedir_concat(buf, sizeof(buf), _("Desktop"));
+   ecore_file_mkpath(buf);
+   snprintf(buf, sizeof(buf), "%s/desktop", e_wizard_dir_get());
+   files = ecore_file_ls(buf);
+   if (!files) return 0;
+   EINA_LIST_FREE(files, file)
+     {
+        snprintf(buf, sizeof(buf), "%s/desktop/%s",
+                 e_wizard_dir_get(), file);
+        snprintf(buf2, sizeof(buf2), "%s/%s/%s",
+                 e_user_homedir_get(), _("Desktop"), file);
+        ecore_file_cp(buf, buf2);
+        free(file);
+     }
+   
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
+}
+
+EAPI int
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
+
+EAPI int
+wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+{
+   return 1;
+}
index 337fefd..8f7ef39 100644 (file)
@@ -1,3 +1,4 @@
+/* Delete previous copy of config profile and save new one */
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -16,50 +17,18 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   char buf[PATH_MAX];
-
-   if ((e_config_profile_get()) && (strlen(e_config_profile_get()) > 0))
-     {
-       if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", e_config_profile_get()) >= sizeof(buf))
-         return 0;
-       if (ecore_file_is_dir(buf)) ecore_file_recursive_rm(buf);
-     }
-   // load profile as e_config
-   e_config_load();
    return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg)
+wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 {
-   evas_object_del(pg->data);
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
-   char buf[PATH_MAX];
-   // setup ~/Desktop and ~/.e/e/fileman/favorites and 
-   // ~/.e/e/applications/bar/default, maybe ~/.e/e/applications/startup/.order
-
-   // FIXME: should become a wizard page on its own
-   // setup fileman favorites
-   snprintf(buf, sizeof(buf),
-           "gzip -d -c < %s/data/other/efm_favorites.tar.gz | "
-           "(cd %s/.e/e/ ; tar -xkf -)",
-           e_prefix_data_get(), e_user_homedir_get());
-   system(buf);
-   // FIXME: efm favorites linked to desktop should be an option in another
-   // wizard page
-   // ~/Desktop
-   e_user_homedir_concat(buf, sizeof(buf), _("Desktop"));
-   ecore_file_mkpath(buf);
-   e_user_homedir_snprintf(buf, sizeof(buf), "%s/%s", _("Desktop"), "home.desktop");
-   ecore_file_symlink("../.e/e/fileman/favorites/home.desktop", buf);
-   e_user_homedir_snprintf(buf, sizeof(buf), "%s/%s", _("Desktop"), "root.desktop");
-   ecore_file_symlink("../.e/e/fileman/favorites/root.desktop", buf);
-   e_user_homedir_snprintf(buf, sizeof(buf), "%s/%s", _("Desktop"), "tmp.desktop");
-   ecore_file_symlink("../.e/e/fileman/favorites/tmp.desktop", buf);
-   
    // save the config now everyone has modified it
    e_config_save();
    // restart e
diff --git a/src/preload/.cvsignore b/src/preload/.cvsignore
deleted file mode 100644 (file)
index 3be8966..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-e_hack.la
-e_hack.lo
-*.lo
-*.la
index cf74c6b..1f5fc01 100644 (file)
@@ -3,7 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)src/preload \
-                         @x_cflags@ \
                          @e_cflags@
 
 pkgdir                 = $(libdir)/enlightenment/preload
@@ -14,7 +13,7 @@ pkg_LTLIBRARIES        = e_precache.la
 #e_hack_la_SOURCES      = \
 #e_hack.c \
 #e_hack.h
-#e_hack_la_LIBADD       = @x_libs@ @dlopen_libs@
+#e_hack_la_LIBADD       = @dlopen_libs@
 #e_hack_la_LDFLAGS      = -module -avoid-version
 #e_hack_la_DEPENDENCIES = $(top_builddir)/config.h
 
index 8795dc3..272fa2a 100644 (file)
@@ -1,8 +1,12 @@
 #include "config.h"
 #include "e_precache.h"
 
-static void *lib_evas = NULL;
+static void *lib_eina = NULL;
+static void *lib_ecore = NULL;
 static void *lib_ecore_file = NULL;
+static void *lib_ecore_x = NULL;
+static void *lib_evas = NULL;
+static void *lib_edje = NULL;
 static void *lib_eet = NULL;
 
 static int *e_precache_end = NULL;
@@ -105,21 +109,35 @@ lib_func(const char *lib1, const char *lib2, const char *fname, const char *libn
 }
 
 /* intercepts */
-void
-evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
+Eina_Module *
+eina_module_find(const Eina_Array *array, const char *module) 
 {
-   static void (*func) (Evas_Object *obj, const char *file, const char *key) = NULL;
-   if (!func)
-     func = lib_func("libevas.so", "libevas.so.1", 
-                    "evas_object_image_file_set", "lib_evas", &lib_evas);
-   if (do_log) log_write("o", file);
-   (*func) (obj, file, key);
+   static Eina_Module *(*func) (const Eina_Array *array, const char *module) = NULL;
+
+   if (!func) 
+     func = lib_func("libeina.so", "libeina.so.1", 
+                     "eina_module_find", "lib_eina", &lib_eina);
+   if (do_log) log_write("o", module);
+   return (*func) (array, module);
+}
+
+void 
+ecore_app_args_set(int argc, const char **argv)
+{
+   static void (*func) (int argc, const char **argv) = NULL;
+
+   if (!func) 
+     func = lib_func("libecore.so", "libecore.so.1", 
+                     "ecore_app_args_set", "lib_ecore", &lib_ecore);
+   if (do_log) log_write("o", (const char *)argv);
+   (*func) (argc, argv);
 }
 
 long long
 ecore_file_mod_time(const char *file)
 {
    static long long (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_mod_time", "lib_ecore_file", &lib_ecore_file);
@@ -131,6 +149,7 @@ long long
 ecore_file_size(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_size", "lib_ecore_file", &lib_ecore_file);
@@ -142,6 +161,7 @@ Eina_Bool
 ecore_file_exists(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_exists", "lib_ecore_file", &lib_ecore_file);
@@ -153,6 +173,7 @@ Eina_Bool
 ecore_file_is_dir(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_is_dir", "lib_ecore_file", &lib_ecore_file);
@@ -164,6 +185,7 @@ Eina_Bool
 ecore_file_can_read(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_can_read", "lib_ecore_file", &lib_ecore_file);
@@ -175,6 +197,7 @@ Eina_Bool
 ecore_file_can_write(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_can_write", "lib_ecore_file", &lib_ecore_file);
@@ -186,6 +209,7 @@ Eina_Bool
 ecore_file_can_exec(const char *file)
 {
    static int (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_can_exec", "lib_ecore_file", &lib_ecore_file);
@@ -197,6 +221,7 @@ Eina_List *
 ecore_file_ls(const char *file)
 {
    static Eina_List * (*func) (const char *file) = NULL;
+
    if (!func)
      func = lib_func("libecore_file.so", "libecore_file.so.1", 
                     "ecore_file_ls", "lib_ecore_file", &lib_ecore_file);
@@ -204,13 +229,52 @@ ecore_file_ls(const char *file)
    return (*func) (file);
 }
 
+int 
+ecore_x_init(const char *name) 
+{
+   static int (*func) (const char *name) = NULL;
+
+   if (!func) 
+     func = lib_func("libecore_x.so", "libecore_x.so.1", 
+                     "ecore_x_init", "lib_ecore_x", &lib_ecore_x);
+   if (do_log) log_write("o", name);
+   return (*func) (name);
+}
+
+void
+evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
+{
+   static void (*func) (Evas_Object *obj, const char *file, const char *key) = NULL;
+
+   if (!func)
+     func = lib_func("libevas.so", "libevas.so.1", 
+                    "evas_object_image_file_set", "lib_evas", &lib_evas);
+   if (do_log) log_write("o", file);
+   (*func) (obj, file, key);
+}
+
+/* edje */
+Eina_Bool 
+edje_object_file_set(Evas_Object *obj, const char *file, const char *group) 
+{
+   static Eina_Bool (*func) (Evas_Object *obj, const char *file, const char *group) = NULL;
+
+   if (!func)
+     func = lib_func("libedje.so", "libedje.so.1", 
+                     "edje_object_file_set", "lib_edje", &lib_edje);
+   if (do_log) log_write("o", file);
+   return (*func) (obj, file, group);
+}
+
 Eet_File *
 eet_open(const char *file, Eet_File_Mode mode)
 {
    static Eet_File * (*func) (const char *file, Eet_File_Mode mode) = NULL;
+
    if (!func)
      func = lib_func("libeet.so", "libeet.so.0", 
                     "eet_open", "lib_eet", &lib_eet);
    if (do_log) log_write("o", file);
    return (*func) (file, mode);
 }
+
diff --git a/x-ui.sh b/x-ui.sh
index b5fe594..f36ba40 100755 (executable)
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -191,7 +191,7 @@ if [ ! -z "$TEST_HOME" ]; then
     mkdir -p "$TEST_HOME"
 fi
 
-unset E_RESTART E_START E_IPC_SOCKET E_START_TIME E_CONF_PROFILE
+unset E_RESTART E_START E_IPC_SOCKET E_START_TIME E_CONF_PROFILE E_PREFIX
 
 if [ $VERBOSE -ne 0 ]; then
     cat <<EOF